Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[gbrunmar] 32172: * Fixed compiling of the native d3d9.dll * Packed structures in d3d9types.h correctly to be compatible with Windows
by gbrunmar＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: gbrunmar Date: Thu Feb 7 00:22:23 2008 New Revision: 32172 URL: http://svn.reactos.org/svn/reactos?rev=32172&view=rev Log: * Fixed compiling of the native d3d9.dll * Packed structures in d3d9types.h correctly to be compatible with Windows Modified: trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=32… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Thu Feb 7 00:22:23 2008 @@ -66,6 +66,7 @@ #endif #define D3DADAPTER_DEFAULT 0 +#define D3DENUM_WHQL_LEVEL 0x00000002L #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L #define D3DSGR_NO_CALIBRATION 0x00000000L Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Thu Feb 7 00:22:23 2008 @@ -20,6 +20,8 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H + +#pragma pack(push, 4) /***************************************************************************** * Direct 3D v9 #defines @@ -1531,4 +1533,6 @@ UINT Depth; } D3DVOLUME_DESC; +#pragma pack(pop) + #endif /* __WINE_D3D9TYPES_H */

1 0

[ros-arm-bringup] 32171: Removed certain ARM Machine Callbacks which we shouldn't need at all until much later for SetupLDR. Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the assertions.
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 23:47:53 2008 New Revision: 32171 URL: http://svn.reactos.org/svn/reactos?rev=32171&view=rev Log: Removed certain ARM Machine Callbacks which we shouldn't need at all until much later for SetupLDR. Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the assertions. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 23:47:53 2008 @@ -22,6 +22,32 @@ // // Start the OS // +} + + +BOOLEAN +ArmDiskGetDriveGeometry(IN ULONG DriveNumber, + OUT PGEOMETRY Geometry) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +BOOLEAN +ArmDiskReadLogicalSectors(IN ULONG DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + IN PVOID Buffer) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +ULONG +ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; } BOOLEAN @@ -55,19 +81,6 @@ return TRUE; } -VOID -ArmDiskGetBootDevice(OUT PULONG BootDevice) -{ - while (TRUE); -} - -BOOLEAN -ArmDiskBootingFromFloppy(VOID) -{ - while (TRUE); - return FALSE; -} - BOOLEAN ArmDiskGetSystemVolume(IN PCHAR SystemPath, OUT PCHAR RemainingPath, @@ -82,52 +95,10 @@ } BOOLEAN -ArmDiskGetBootPath(IN PCHAR BootPath, - IN unsigned Size) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN ArmDiskNormalizeSystemPath(IN PCHAR SystemPath, IN unsigned Size) { while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskGetDriveGeometry(IN ULONG DriveNumber, - OUT PGEOMETRY Geometry) -{ - ASSERT(FALSE); - return FALSE; -} - -BOOLEAN -ArmDiskGetPartitionEntry(IN ULONG DriveNumber, - IN ULONG PartitionNumber, - OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskReadLogicalSectors(IN ULONG DriveNumber, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) -{ - ASSERT(FALSE); - return FALSE; -} - -ULONG -ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) -{ - ASSERT(FALSE); return FALSE; } @@ -190,12 +161,8 @@ MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume; - MachVtbl.DiskGetBootPath = ArmDiskGetBootPath; - MachVtbl.DiskGetBootDevice = ArmDiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = ArmDiskBootingFromFloppy; MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = ArmDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; MachVtbl.HwDetect = ArmHwDetect;

1 0

[ros-arm-bringup] 32170: We now report the correct sector start for the ramdisk -- the actual volume boot sector is at 0x63, not 0x00 which is the MBR. FreeLDR now reads freeldr.ini correctly and continues all the way to hardware detection (ArmHwDetect)
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 23:38:59 2008 New Revision: 32170 URL: http://svn.reactos.org/svn/reactos?rev=32170&view=rev Log: We now report the correct sector start for the ramdisk -- the actual volume boot sector is at 0x63, not 0x00 which is the MBR. FreeLDR now reads freeldr.ini correctly and continues all the way to hardware detection (ArmHwDetect) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/ui/noui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 23:38:59 2008 @@ -40,7 +40,7 @@ // Use magic ramdisk drive number and count the number of 512-byte sectors // *DriveNumber = 0x49; - *StartSector = 0; + *StartSector = 63; *SectorCount = gRamDiskSize * 512; // Modified: trunk/reactos/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/no… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/noui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/noui.c Wed Feb 6 23:38:59 2008 @@ -43,6 +43,7 @@ VOID NoUiDrawStatusText(PCSTR StatusText) { + printf("%s\n", StatusText); } VOID NoUiUpdateDateTime(VOID)

1 0

[ros-arm-bringup] 32169: We now enable ramdisk support by calling RamDiskSwitchFromBios() to allow the ramdisk routines to take control of disk r/w. Unlike the x86 virtual-ramdisk, the ramdisk here is also used as boot device, not only system device. Current FreeLDR output: Booting FreeLDR... FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 This file system has cluster sizes bigger than 64k. FreeLoader does not support this. Press any key
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 22:15:46 2008 New Revision: 32169 URL: http://svn.reactos.org/svn/reactos?rev=32169&view=rev Log: We now enable ramdisk support by calling RamDiskSwitchFromBios() to allow the ramdisk routines to take control of disk r/w. Unlike the x86 virtual-ramdisk, the ramdisk here is also used as boot device, not only system device. Current FreeLDR output: Booting FreeLDR... FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 This file system has cluster sizes bigger than 64k. FreeLoader does not support this. Press any key Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 22:15:46 2008 @@ -35,10 +35,23 @@ // ASSERT(gRamDiskBase); ASSERT(gRamDiskSize); + + // + // Use magic ramdisk drive number and count the number of 512-byte sectors + // *DriveNumber = 0x49; *StartSector = 0; *SectorCount = gRamDiskSize * 512; + + // + // Ramdisk support is FAT-only for now + // *FsType = FS_FAT; + + // + // Now that ramdisk is enabled, use ramdisk routines + // + RamDiskSwitchFromBios(); return TRUE; } @@ -88,7 +101,7 @@ ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) { - while (TRUE); + ASSERT(FALSE); return FALSE; } @@ -107,14 +120,14 @@ IN ULONG SectorCount, IN PVOID Buffer) { - while (TRUE); + ASSERT(FALSE); return FALSE; } ULONG ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) { - while (TRUE); + ASSERT(FALSE); return FALSE; }

1 0

[janderwald] 32168: - apply changes from prev rev
by janderwald＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: janderwald Date: Wed Feb 6 21:59:51 2008 New Revision: 32168 URL: http://svn.reactos.org/svn/reactos?rev=32168&view=rev Log: - apply changes from prev rev Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Wed Feb 6 21:59:51 2008 @@ -414,19 +414,18 @@ typedef struct { - LPCWSTR lpSource; - LPCWSTR lpTarget; - LPCWSTR lpExeName; + ULONG SourceLength; + ULONG ExeLength; + ULONG TargetLength; } CSRSS_ADD_CONSOLE_ALIAS, *PCSRSS_ADD_CONSOLE_ALIAS; typedef struct { - LPWSTR lpSource; - LPWSTR lpExeName; - DWORD BytesWritten; - DWORD TargetBufferLength; - LPWSTR TargetBuffer; - + ULONG SourceLength; + ULONG ExeLength; + ULONG BytesWritten; + ULONG TargetBufferLength; + PVOID TargetBuffer; } CSRSS_GET_CONSOLE_ALIAS, *PCSRSS_GET_CONSOLE_ALIAS; typedef struct @@ -468,6 +467,7 @@ /* WCHARs, not bytes! */ #define CSRSS_MAX_TITLE_LENGTH 80 +#define CSRSS_MAX_ALIAS_TARGET_LENGTH 80 #define CREATE_PROCESS (0x0) #define TERMINATE_PROCESS (0x1)

1 0

[janderwald] 32167: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working
by janderwald＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: janderwald Date: Wed Feb 6 21:59:18 2008 New Revision: 32167 URL: http://svn.reactos.org/svn/reactos?rev=32167&view=rev Log: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Wed Feb 6 21:59:18 2008 @@ -112,6 +112,7 @@ PALIAS_ENTRY RootHeader = Header->Data; while(RootHeader) { + DPRINT("IntGetAliasEntry>lpSource %S\n", RootHeader->lpSource); INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); if (!diff) return RootHeader; @@ -136,6 +137,7 @@ if (!CurrentEntry) { Header->Data = NewEntry; + NewEntry->Next = NULL; return; } @@ -235,10 +237,12 @@ Length += wcslen(CurEntry->lpTarget); Length += 2; // zero byte and '=' } + if (Length) - Length++; // extra zero - - return sizeof(WCHAR) * Length; + { + return (Length+1) * sizeof(WCHAR); + } + return 0; } UINT IntGetAllConsoleAliases(PALIAS_HEADER Header, LPWSTR TargetBuffer, UINT TargetBufferLength) @@ -298,17 +302,31 @@ { PALIAS_HEADER Header; PALIAS_ENTRY Entry; - - if (Request->Data.AddConsoleAlias.lpExeName == NULL || Request->Data.AddConsoleAlias.lpSource == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.AddConsoleAlias.lpExeName); - if (!Header && Request->Data.AddConsoleAlias.lpTarget != NULL) - { - Header = IntCreateAliasHeader(Request->Data.AddConsoleAlias.lpExeName); + WCHAR * lpExeName; + WCHAR * lpSource; + WCHAR * lpTarget; + ULONG TotalLength; + WCHAR * Ptr; + + TotalLength = Request->Data.AddConsoleAlias.SourceLength + Request->Data.AddConsoleAlias.ExeLength + Request->Data.AddConsoleAlias.TargetLength; + Ptr = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + + lpSource = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + lpExeName = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE) + Request->Data.AddConsoleAlias.SourceLength * sizeof(WCHAR)); + lpTarget = (Request->Data.AddConsoleAlias.TargetLength != 0 ? lpExeName + Request->Data.AddConsoleAlias.ExeLength : NULL); + + DPRINT("CsrAddConsoleAlias entered Request %p lpSource %p lpExeName %p lpTarget %p\n", Request, lpSource, lpExeName, lpTarget); + + if (lpExeName == NULL || lpSource == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, lpExeName); + if (!Header && lpTarget != NULL) + { + Header = IntCreateAliasHeader(lpExeName); if (!Header) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; @@ -317,9 +335,9 @@ IntInsertAliasHeader(&RootHeader, Header); } - if (Request->Data.AddConsoleAlias.lpTarget == NULL) // delete the entry - { - Entry = IntGetAliasEntry(Header, Request->Data.AddConsoleAlias.lpSource); + if (lpTarget == NULL) // delete the entry + { + Entry = IntGetAliasEntry(Header, lpSource); if (Entry) { IntDeleteAliasEntry(Header, Entry); @@ -329,12 +347,10 @@ { Request->Status = STATUS_INVALID_PARAMETER; } - - return Request->Status; - } - - Entry = IntCreateAliasEntry(Request->Data.AddConsoleAlias.lpSource, - Request->Data.AddConsoleAlias.lpTarget); + return Request->Status; + } + + Entry = IntCreateAliasEntry(lpSource, lpTarget); if (!Entry) { @@ -343,7 +359,6 @@ } IntInsertAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; return Request->Status; } @@ -353,22 +368,33 @@ PALIAS_HEADER Header; PALIAS_ENTRY Entry; UINT Length; - - if (Request->Data.GetConsoleAlias.lpExeName == NULL || Request->Data.GetConsoleAlias.TargetBuffer == NULL || - Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.lpSource == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); + WCHAR * lpExeName; + WCHAR * lpSource; + WCHAR * lpTarget; + + lpSource = (LPWSTR)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + lpExeName = lpSource + Request->Data.GetConsoleAlias.SourceLength; + lpTarget = (LPWSTR)lpExeName + Request->Data.GetConsoleAlias.ExeLength; + + + DPRINT("CsrGetConsoleAlias entered lpExeName %p lpSource %p TargetBuffer %p TargetBufferLength %u\n", + lpExeName, lpSource, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength); + + if (Request->Data.GetConsoleAlias.ExeLength == 0 || lpTarget == NULL || + Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.SourceLength == 0) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, lpExeName); if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; return Request->Status; } - Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); + Entry = IntGetAliasEntry(Header, lpSource); if (!Entry) { Request->Status = STATUS_INVALID_PARAMETER; @@ -381,7 +407,20 @@ Request->Status = ERROR_INSUFFICIENT_BUFFER; return Request->Status; } - wcscpy(Request->Data.GetConsoleAlias.TargetBuffer, Entry->lpTarget); + +#if 0 + if (((PVOID)lpTarget < ProcessData->CsrSectionViewBase) + || (((ULONG_PTR)lpTarget + Request->Data.GetConsoleAlias.TargetBufferLength) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + { + Request->Status = STATUS_ACCESS_VIOLATION; + DPRINT1("CsrGetConsoleAlias out of range lpTarget %p LowerViewBase %p UpperViewBase %p Size %p\n", lpTarget, + ProcessData->CsrSectionViewBase, (ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize, ProcessData->CsrSectionViewSize); + return Request->Status; + } +#endif + + wcscpy(lpTarget, Entry->lpTarget); + lpTarget[CSRSS_MAX_ALIAS_TARGET_LENGTH-1] = '\0'; Request->Data.GetConsoleAlias.BytesWritten = Length; Request->Status = STATUS_SUCCESS; return Request->Status; @@ -448,7 +487,11 @@ CSR_API(CsrGetConsoleAliasesExes) { UINT BytesWritten; - UINT ExesLength = IntGetConsoleAliasesExesLength(RootHeader); + UINT ExesLength; + + DPRINT("CsrGetConsoleAliasesExes entered\n"); + + ExesLength = IntGetConsoleAliasesExesLength(RootHeader); if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { @@ -473,6 +516,8 @@ CSR_API(CsrGetConsoleAliasesExesLength) { + DPRINT("CsrGetConsoleAliasesExesLength entered\n"); + Request->Status = STATUS_SUCCESS; Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); return Request->Status;

1 0

[janderwald] 32166: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working
by janderwald＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: janderwald Date: Wed Feb 6 21:57:40 2008 New Revision: 32166 URL: http://svn.reactos.org/svn/reactos?rev=32166&view=rev Log: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Wed Feb 6 21:57:40 2008 @@ -181,27 +181,55 @@ LPCWSTR lpTarget, LPCWSTR lpExeName) { - CSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + ULONG SourceLength; + ULONG TargetLength = 0; + ULONG ExeLength; + ULONG Size; + ULONG RequestLength; + WCHAR * Ptr; + + DPRINT("AddConsoleAliasW enterd with lpSource %S lpTarget %S lpExeName %S\n", lpSource, lpTarget, lpExeName); + + ExeLength = wcslen(lpExeName) + 1; + SourceLength = wcslen(lpSource)+ 1; + if (lpTarget) + TargetLength = wcslen(lpTarget) + 1; + + Size = (ExeLength + SourceLength + TargetLength) * sizeof(WCHAR); + RequestLength = sizeof(CSR_API_MESSAGE) + Size; + + Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, RequestLength); + Ptr = (WCHAR*)(((ULONG_PTR)Request) + sizeof(CSR_API_MESSAGE)); + + wcscpy(Ptr, lpSource); + Request->Data.AddConsoleAlias.SourceLength = SourceLength; + Ptr = (WCHAR*)(((ULONG_PTR)Request) + sizeof(CSR_API_MESSAGE) + SourceLength * sizeof(WCHAR)); + + wcscpy(Ptr, lpExeName); + Request->Data.AddConsoleAlias.ExeLength = ExeLength; + Ptr = (WCHAR*)(((ULONG_PTR)Request) + sizeof(CSR_API_MESSAGE) + (ExeLength + SourceLength)* sizeof(WCHAR)); + + if (lpTarget) /* target can be optional */ + wcscpy(Ptr, lpTarget); + + Request->Data.AddConsoleAlias.TargetLength = TargetLength; CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); - - Request.Data.AddConsoleAlias.lpExeName = lpExeName; - Request.Data.AddConsoleAlias.lpTarget = lpTarget; - Request.Data.AddConsoleAlias.lpSource = lpSource; - - Status = CsrClientCallServer(& Request, - NULL, + Status = CsrClientCallServer(Request, + NULL, CsrRequest, - sizeof(CSR_API_MESSAGE)); - - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + RequestLength); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) { SetLastErrorByStatus(Status); + RtlFreeHeap(GetProcessHeap(), 0, Request); return FALSE; } - + RtlFreeHeap(GetProcessHeap(), 0, Request); return TRUE; } @@ -298,29 +326,73 @@ DWORD TargetBufferLength, LPWSTR lpExeName) { - CSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + ULONG Size; + ULONG ExeLength; + ULONG SourceLength; + ULONG RequestLength; + //PVOID CaptureBuffer; + WCHAR * Ptr; + + DPRINT("GetConsoleAliasW entered lpSource %S lpExeName %S\n", lpSource, lpExeName); CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); - Request.Data.GetConsoleAlias.lpExeName = lpExeName; - Request.Data.GetConsoleAlias.lpSource = lpSource; - Request.Data.GetConsoleAlias.TargetBuffer = lpTargetBuffer; - Request.Data.GetConsoleAlias.TargetBufferLength = TargetBufferLength; - - Status = CsrClientCallServer(& Request, - NULL, + ExeLength = wcslen(lpExeName) + 1; + SourceLength = wcslen(lpSource) + 1; + + Size = (ExeLength + SourceLength + CSRSS_MAX_ALIAS_TARGET_LENGTH) * sizeof(WCHAR); + + RequestLength = Size + sizeof(CSR_API_MESSAGE); + Request = RtlAllocateHeap(GetProcessHeap(), 0, RequestLength); + +#if 0 + CaptureBuffer = CsrAllocateCaptureBuffer(1, TargetBufferLength); + if (!CaptureBuffer) + { + RtlFreeHeap(GetProcessHeap(), 0, Request); + return 0; + } + + Request->Data.GetConsoleAlias.TargetBuffer = NULL; + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + TargetBufferLength, + (PVOID*)&Request->Data.GetConsoleAlias.TargetBuffer); + Request->Data.GetConsoleAlias.TargetBufferLength = TargetBufferLength; + +#endif + + Ptr = (LPWSTR)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + wcscpy(Ptr, lpSource); + Ptr += SourceLength; + wcscpy(Ptr, lpExeName); + Ptr += ExeLength; + + Request->Data.GetConsoleAlias.ExeLength = ExeLength; + Request->Data.GetConsoleAlias.TargetBufferLength = CSRSS_MAX_ALIAS_TARGET_LENGTH * sizeof(WCHAR); + Request->Data.GetConsoleAlias.SourceLength = SourceLength; + + Status = CsrClientCallServer(Request, + NULL, //CaptureBuffer, CsrRequest, - sizeof(CSR_API_MESSAGE)); - - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { + sizeof(CSR_API_MESSAGE) + Size); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, Request); + //CsrFreeCaptureBuffer(CaptureBuffer); SetLastErrorByStatus(Status); return 0; } - return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR); + wcscpy(lpTargetBuffer, Ptr); + RtlFreeHeap(GetProcessHeap(), 0, Request); + //CsrFreeCaptureBuffer(CaptureBuffer); + + return Size; } @@ -340,6 +412,8 @@ UINT dwExeNameSize; UINT dwResult; + DPRINT("GetConsoleAliasA entered\n"); + dwSourceSize = (strlen(lpSource)+1) * sizeof(WCHAR); lpwSource = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSourceSize); MultiByteToWideChar(CP_ACP, 0, lpSource, -1, lpwSource, dwSourceSize); @@ -374,6 +448,8 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + + DPRINT("GetConsoleAliasExesW entered\n"); CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer; @@ -404,6 +480,8 @@ LPWSTR lpwExeNameBuffer; DWORD dwResult; + DPRINT("GetConsoleAliasExesA entered\n"); + lpwExeNameBuffer = HeapAlloc(GetProcessHeap(), 0, ExeNameBufferLength * sizeof(WCHAR)); dwResult = GetConsoleAliasExesW(lpwExeNameBuffer, ExeNameBufferLength); @@ -424,6 +502,8 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + + DPRINT("GetConsoleAliasExesLengthW entered\n"); CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CSR_NATIVE); Request.Data.GetConsoleAliasesExesLength.Length = 0; @@ -451,6 +531,8 @@ { DWORD dwLength; + DPRINT("GetConsoleAliasExesLengthA entered\n"); + dwLength = GetConsoleAliasExesLengthW(); if (dwLength) @@ -473,6 +555,8 @@ NTSTATUS Status; DWORD dwLength; + DPRINT("GetConsoleAliasesW entered\n"); + dwLength = GetConsoleAliasesLengthW(ExeName); if (!dwLength || dwLength > AliasBufferLength) return 0; @@ -508,6 +592,8 @@ DWORD dwRetVal = 0; LPWSTR lpwExeName = NULL; LPWSTR lpwAliasBuffer; + + DPRINT("GetConsoleAliasesA entered\n"); if (ExeName) BasepAnsiStringToHeapUnicodeString(ExeName, (LPWSTR*) &lpwExeName); @@ -536,6 +622,8 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + + DPRINT("GetConsoleAliasesLengthW entered\n"); CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CSR_NATIVE); Request.Data.GetAllConsoleAliasesLength.lpExeName = lpExeName;

1 0

[cfinck] 32165: - Cast the OutputBuffer to a byte (UCHAR) array, not a ULONG array, so adding a byte offset to its address works as expected. This fixes the extraction of any file, which is not the first file in the cabinet. - I don't see a reason for reading the file name in 32 byte chunks in ReadString() instead of reading it completely in one call. As the previous algorithm was buggy for files longer than 32 characters, I read the file name string completely now. Cabman is now able to extract
by cfinck＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: cfinck Date: Wed Feb 6 21:30:15 2008 New Revision: 32165 URL: http://svn.reactos.org/svn/reactos?rev=32165&view=rev Log: - Cast the OutputBuffer to a byte (UCHAR) array, not a ULONG array, so adding a byte offset to its address works as expected. This fixes the extraction of any file, which is not the first file in the cabinet. - I don't see a reason for reading the file name in 32 byte chunks in ReadString() instead of reading it completely in one call. As the previous algorithm was buggy for files longer than 32 characters, I read the file name string completely now. Cabman is now able to extract the "reactos.cab" it created itself without any problems :-) - Simplify CreateSimpleCabinet() a bit Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Wed Feb 6 21:30:15 2008 @@ -1021,8 +1021,8 @@ ULONG BytesToWrite; ULONG TotalBytesRead; ULONG CurrentOffset; - unsigned char* Buffer; - unsigned char* CurrentBuffer; + PUCHAR Buffer; + PUCHAR CurrentBuffer; FILEHANDLE DestFile; PCFFILE_NODE File; CFDATA CFData; @@ -1031,8 +1031,8 @@ #if defined(WIN32) FILETIME FileTime; #endif - char DestName[MAX_PATH]; - char TempName[MAX_PATH]; + CHAR DestName[MAX_PATH]; + CHAR TempName[MAX_PATH]; Status = LocateFile(FileName, &File); if (Status != CAB_STATUS_SUCCESS) @@ -1136,7 +1136,7 @@ #endif SetAttributesOnFile(DestName, File->File.Attributes); - Buffer = (unsigned char*)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + Buffer = (PUCHAR)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if (!Buffer) { CloseFile(DestFile); @@ -1388,14 +1388,14 @@ (UINT)Size)); #if defined(WIN32) - if (!WriteFile(DestFile, (void*)((unsigned long *)OutputBuffer + BytesSkipped), + if (!WriteFile(DestFile, (void*)((PUCHAR)OutputBuffer + BytesSkipped), BytesToWrite, (LPDWORD)&BytesWritten, NULL) || (BytesToWrite != BytesWritten)) { DPRINT(MIN_TRACE, ("Status 0x%X.\n", (UINT)GetLastError())); #else BytesWritten = BytesToWrite; - if (fwrite((void*)((unsigned long *)OutputBuffer + BytesSkipped), + if (fwrite((void*)((PUCHAR)OutputBuffer + BytesSkipped), BytesToWrite, 1, DestFile) < 1) { #endif @@ -2101,12 +2101,7 @@ { // Store the file path with a trailing slash in szFilePath ConvertPath(Criteria->Search, false); - -#if defined(WIN32) - pszFile = strrchr(Criteria->Search, '\\'); -#else - pszFile = strrchr(Criteria->Search, '/'); -#endif + pszFile = strrchr(Criteria->Search, DIR_SEPARATOR_CHAR); if(pszFile) { @@ -2387,7 +2382,7 @@ ULONG CCabinet::LocateFile(char* FileName, - PCFFILE_NODE *File) + PCFFILE_NODE *File) /* * FUNCTION: Locates a file in the cabinet * ARGUMENTS: @@ -2431,7 +2426,7 @@ } -ULONG CCabinet::ReadString(char* String, ULONG MaxLength) +ULONG CCabinet::ReadString(char* String, LONG MaxLength) /* * FUNCTION: Reads a NULL-terminated string from the cabinet * ARGUMENTS: @@ -2442,48 +2437,43 @@ */ { ULONG BytesRead; - ULONG Offset; ULONG Status; - ULONG Size; + LONG Size; bool Found; - Offset = 0; Found = false; - do - { - Size = ((Offset + 32) <= MaxLength)? 32 : MaxLength - Offset; - - if (Size == 0) - { - DPRINT(MIN_TRACE, ("Too long a filename.\n")); - return CAB_STATUS_INVALID_CAB; - } - - Status = ReadBlock(&String[Offset], Size, &BytesRead); - if ((Status != CAB_STATUS_SUCCESS) || (BytesRead != Size)) - { - DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); - return CAB_STATUS_INVALID_CAB; - } - - for (Size = Offset; Size < Offset + BytesRead; Size++) - { - if (String[Size] == '\0') - { - Found = true; - break; - } - } - - Offset += BytesRead; - - } while (!Found); - - /* Back up some bytes */ - Size = (BytesRead - Size) - 1; + + Status = ReadBlock(String, MaxLength, &BytesRead); + if (Status != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); + return CAB_STATUS_INVALID_CAB; + } + + // Find the terminating NULL character + for (Size = 0; Size < MaxLength; Size++) + { + if (String[Size] == '\0') + { + Found = true; + break; + } + } + + if (!Found) + { + DPRINT(MIN_TRACE, ("Filename in the cabinet file is too long.\n")); + return CAB_STATUS_INVALID_CAB; + } + + // Compute the offset of the next CFFILE. + // We have to subtract from the current offset here, because we read MaxLength characters above and most-probably the file name isn't MaxLength characters long. + // + 1 to skip the terminating NULL character as well. + Size = -(MaxLength - Size) + 1; + #if defined(WIN32) if( SetFilePointer(FileHandle, - -(LONG)Size, + (LONG)Size, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER ) { @@ -2491,7 +2481,7 @@ return CAB_STATUS_INVALID_CAB; } #else - if (fseek(FileHandle, (off_t)(-(LONG)Size), SEEK_CUR) != 0) + if (fseek(FileHandle, (off_t)Size, SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Wed Feb 6 21:30:15 2008 @@ -413,7 +413,7 @@ PCFFOLDER_NODE LocateFolderNode(ULONG Index); ULONG GetAbsoluteOffset(PCFFILE_NODE File); ULONG LocateFile(char* FileName, PCFFILE_NODE *File); - ULONG ReadString(char* String, ULONG MaxLength); + ULONG ReadString(char* String, LONG MaxLength); ULONG ReadFileTable(); ULONG ReadDataBlocks(PCFFOLDER_NODE FolderNode); PCFFOLDER_NODE NewFolderNode();

1 0

[ros-arm-bringup] 32164: We now support ArmDiskGetBootVolume for ramdisk only, later revisions will support NAND boot as well. The ramdisk parameter parsing had several bugs which were fixed, including support for hex parameters and using proper return values from strstr. We also rewrote command line parsing to be much simpler. It was very broken, modifying the memory contents of the command line -- this wouldn't work on systems where the command line is stored in ROM unless a copy is first made
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 21:27:53 2008 New Revision: 32164 URL: http://svn.reactos.org/svn/reactos?rev=32164&view=rev Log: We now support ArmDiskGetBootVolume for ramdisk only, later revisions will support NAND boot as well. The ramdisk parameter parsing had several bugs which were fixed, including support for hex parameters and using proper return values from strstr. We also rewrote command line parsing to be much simpler. It was very broken, modifying the memory contents of the command line -- this wouldn't work on systems where the command line is stored in ROM unless a copy is first made. It also broke ram disk parameters by modifying whitespaces to NULL chars for purposes of reading its own parameters, but did not put the whitespace back, terminating the command line early. Finally, we now have an integrated ramdisk parameter parsing with the new command line code. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/cmdline.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 21:27:53 2008 @@ -30,8 +30,16 @@ IN PULONGLONG SectorCount, OUT PINT FsType) { - while (TRUE); - return FALSE; + // + // We only support RAM disk for now -- add support for NAND later + // + ASSERT(gRamDiskBase); + ASSERT(gRamDiskSize); + *DriveNumber = 0x49; + *StartSector = 0; + *SectorCount = gRamDiskSize * 512; + *FsType = FS_FAT; + return TRUE; } VOID @@ -183,4 +191,5 @@ // We can now print to the console // TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); + TuiPrintf("Bootargs: %s\n", CommandLine); } Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cmdli… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cmdline.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c Wed Feb 6 21:27:53 2008 @@ -1,120 +1,91 @@ -/* $Id$ - * - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/cmdline.c + * PURPOSE: FreeLDR Command Line Parsing + * PROGRAMMERS: ReactOS Portable Systems Group */ + +/* INCLUDES *******************************************************************/ #include <freeldr.h> -static CMDLINEINFO CmdLineInfo; +/* GLOBALS ********************************************************************/ -static char * -SkipWhitespace(char *s) +CCHAR DefaultOs[256]; +CMDLINEINFO CmdLineInfo; + +/* FUNCTIONS ******************************************************************/ + +VOID +CmdLineParse(IN PCHAR CmdLine) { - while ('\0' != *s && isspace(*s)) + PCHAR End, Setting; + ULONG Length; + + // + // Set defaults + // + CmdLineInfo.DefaultOperatingSystem = NULL; + CmdLineInfo.TimeOut = -1; + + // + // Get timeout + // + Setting = strstr(CmdLine, "timeout="); + if (Setting) CmdLineInfo.TimeOut = atoi(Setting + + sizeof("timeout=") + + sizeof(ANSI_NULL)); + + // + // Get default OS + // + Setting = strstr(CmdLine, "defaultos="); + if (Setting) { - s++; + // + // Check if there's more command-line parameters following + // + Setting += sizeof("defaultos=") + sizeof(ANSI_NULL); + End = strstr(Setting, " "); + if (End) Length = End - Setting; else Length = sizeof(DefaultOs); + + // + // Copy the default OS + // + strncpy(DefaultOs, Setting, Length); + CmdLineInfo.DefaultOperatingSystem = DefaultOs; } - - return s; + + // + // Get ramdisk base address + // + Setting = strstr(CmdLine, "rdbase="); + if (Setting) gRamDiskBase = (PVOID)strtoul(Setting + + sizeof("rdbase=") - + sizeof(ANSI_NULL), + NULL, + 0); + + // + // Get ramdisk size + // + Setting = strstr(CmdLine, "rdsize="); + if (Setting) gRamDiskSize = strtoul(Setting + + sizeof("rdsize=") - + sizeof(ANSI_NULL), + NULL, + 0); } -void -CmdLineParse(char *CmdLine) +PCCH +CmdLineGetDefaultOS(VOID) { - char *s; - char *Name; - char *Value; - char *End; - - CmdLineInfo.DefaultOperatingSystem = NULL; - CmdLineInfo.TimeOut = -1; - - if (NULL == CmdLine) - { - return; - } - - /* Skip over "kernel name" */ - s = CmdLine; - while ('\0' != *s && ! isspace(*s)) - { - s++; - } - s = SkipWhitespace(s); - - while ('\0' != *s) - { - Name = s; - while (! isspace(*s) && '=' != *s && '\0' != *s) - { - s++; - } - End = s; - s = SkipWhitespace(s); - if ('=' == *s) - { - s++; - *End = '\0'; - s = SkipWhitespace(s); - if ('"' == *s) - { - s++; - Value = s; - while ('"' != *s && '\0' != *s) - { - s++; - } - } - else - { - Value = s; - while (! isspace(*s) && '\0' != *s) - { - s++; - } - } - if ('\0' != *s) - { - *s++ = '\0'; - } - if (0 == _stricmp(Name, "defaultos")) - { - CmdLineInfo.DefaultOperatingSystem = Value; - } - else if (0 == _stricmp(Name, "timeout")) - { - CmdLineInfo.TimeOut = atoi(Value); - } - } - } -} - -const char * -CmdLineGetDefaultOS(void) -{ - return CmdLineInfo.DefaultOperatingSystem; + return CmdLineInfo.DefaultOperatingSystem; } LONG -CmdLineGetTimeOut(void) +CmdLineGetTimeOut(VOID) { - return CmdLineInfo.TimeOut; + return CmdLineInfo.TimeOut; } - -/* EOF */ - Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Wed Feb 6 21:27:53 2008 @@ -163,18 +163,3 @@ gCacheEnabled = FALSE; } } - -VOID -NTAPI -RamDiskInit(IN PCHAR CmdLine) -{ - PCHAR Setting; - - // - // Get RAM disk parameters - // - Setting = strstr(CmdLine, "rdbase="); - if (Setting) gRamDiskBase = (PVOID)atoi(Setting); - Setting = strstr(CmdLine, "rdsize="); - if (Setting) gRamDiskSize = atoi(Setting); -} Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c Wed Feb 6 21:27:53 2008 @@ -26,8 +26,6 @@ MachInit(CmdLine); - RamDiskInit(CmdLine); - DebugInit(); DbgPrint((DPRINT_WARNING, "BootMain() called.\n")); Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h Wed Feb 6 21:27:53 2008 @@ -14,12 +14,6 @@ // VOID NTAPI -RamDiskInit( - IN PCHAR CmdLine -); - -VOID -NTAPI RamDiskSwitchFromBios( VOID ); @@ -30,4 +24,7 @@ VOID ); +extern PVOID gRamDiskBase; +extern ULONG gRamDiskSize; + #endif

1 0

[dchapyshev] 32163: - Import atl.dll from Wine - Add atl to bootcd
by dchapyshev＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: dchapyshev Date: Wed Feb 6 20:29:28 2008 New Revision: 32163 URL: http://svn.reactos.org/svn/reactos?rev=32163&view=rev Log: - Import atl.dll from Wine - Add atl to bootcd Added: trunk/reactos/dll/win32/atl/ trunk/reactos/dll/win32/atl/atl.rbuild (with props) trunk/reactos/dll/win32/atl/atl.rgs (with props) trunk/reactos/dll/win32/atl/atl.spec (with props) trunk/reactos/dll/win32/atl/atl_ax.c (with props) trunk/reactos/dll/win32/atl/atl_main.c (with props) trunk/reactos/dll/win32/atl/atlbase.h (with props) trunk/reactos/dll/win32/atl/atliface.idl (with props) trunk/reactos/dll/win32/atl/atlwin.h (with props) trunk/reactos/dll/win32/atl/registrar.c (with props) trunk/reactos/dll/win32/atl/rsrc.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=321… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/atl/atl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rbuild?r… Added: trunk/reactos/dll/win32/atl/atl.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rgs?rev=… Added: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… Added: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… Added: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… Added: trunk/reactos/dll/win32/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atlbase.h?re… Added: trunk/reactos/dll/win32/atl/atliface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atliface.idl… Added: trunk/reactos/dll/win32/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atlwin.h?rev… Added: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… Added: trunk/reactos/dll/win32/atl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/rsrc.rc?rev=… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
46
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008