Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32106: fix a DC handle leak
by tkreuzer＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: tkreuzer Date: Sun Feb 3 17:26:52 2008 New Revision: 32106 URL: http://svn.reactos.org/svn/reactos?rev=32106&view=rev Log: fix a DC handle leak Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Sun Feb 3 17:26:52 2008 @@ -1711,7 +1711,7 @@ Ret = TRUE; cleanup: - if(DoFlickerFree) + if(DoFlickerFree || bAlpha) { if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush);

1 0

[cfinck] 32105: - Use host/typedefs.h for rsym instead of reinventing the wheel for host types - Get rsym to compile warning-free under any host
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 16:53:27 2008 New Revision: 32105 URL: http://svn.reactos.org/svn/reactos?rev=32105&view=rev Log: - Use host/typedefs.h for rsym instead of reinventing the wheel for host types - Get rsym to compile warning-free under any host Modified: trunk/reactos/tools/rsym.c trunk/reactos/tools/rsym.h trunk/reactos/tools/rsym.mak Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=32105&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c (original) +++ trunk/reactos/tools/rsym.c Sun Feb 3 16:53:27 2008 @@ -490,7 +490,7 @@ *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); if (NULL == *ProcessedRelocs) { - fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData); return 1; } *ProcessedRelocsLength = 0; @@ -566,7 +566,7 @@ OutHeader = malloc(StartOfRawData); if (NULL == OutHeader) { - fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData); return 1; } memset(OutHeader, '\0', StartOfRawData); @@ -679,7 +679,7 @@ PaddedRosSym = malloc(RosSymFileLength); if (NULL == PaddedRosSym) { - fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); + fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength); return 1; } memcpy(PaddedRosSym, RosSymSection, RosSymLength); Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=32105&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h (original) +++ trunk/reactos/tools/rsym.h Sun Feb 3 16:53:27 2008 @@ -10,28 +10,7 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -typedef unsigned char BYTE; -typedef unsigned char UCHAR; -typedef unsigned short WORD; -typedef unsigned short USHORT; -#if defined(__x86_64__) && defined(unix) -typedef signed int LONG; -typedef unsigned int ULONG; -typedef unsigned int DWORD; -#else -typedef signed long LONG; -typedef unsigned long ULONG; -typedef unsigned long DWORD; -#endif -#if defined(_WIN64) -typedef unsigned __int64 ULONG_PTR; -#else -#if defined(__x86_64__) && defined(unix) -typedef unsigned int ULONG_PTR; -#else -typedef unsigned long ULONG_PTR; -#endif -#endif +#include <host/typedefs.h> #pragma pack(2) typedef struct _IMAGE_DOS_HEADER { Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=32105&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Sun Feb 3 16:53:27 2008 @@ -16,7 +16,7 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[cfinck] 32104: Get inflib_host to build warning-free
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 16:36:10 2008 New Revision: 32104 URL: http://svn.reactos.org/svn/reactos?rev=32104&view=rev Log: Get inflib_host to build warning-free Modified: trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/infhostgen.c trunk/reactos/lib/inflib/infhostput.c trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sun Feb 3 16:36:10 2008 @@ -16,9 +16,9 @@ #include <errno.h> #define FREE(Area) free(Area) -#define MALLOC(Size) malloc(Size) -#define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size)) -#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (Size)) +#define MALLOC(Size) malloc((size_t)(Size)) +#define ZEROMEMORY(Area, Size) memset((Area), '\0', (size_t)(Size)) +#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (size_t)(Size)) #define INF_STATUS_SUCCESS 0 #define INF_STATUS_NO_MEMORY ENOMEM Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c (original) +++ trunk/reactos/lib/inflib/infhostgen.c Sun Feb 3 16:36:10 2008 @@ -100,7 +100,7 @@ DPRINT("fopen() successful\n"); /* Query file size */ - if (fseek(File, 0, SEEK_END)) + if (fseek(File, (size_t)0, SEEK_END)) { DPRINT1("fseek() to EOF failed (errno %d)\n", errno); fclose(File); @@ -114,10 +114,10 @@ fclose(File); return -1; } - DPRINT("File size: %lu\n", FileLength); + DPRINT("File size: %u\n", (UINT)FileLength); /* Rewind */ - if (fseek(File, 0, SEEK_SET)) + if (fseek(File, (size_t)0, SEEK_SET)) { DPRINT1("fseek() to BOF failed (errno %d)\n", errno); fclose(File); @@ -134,7 +134,7 @@ } /* Read file */ - if (FileLength != fread(FileBuffer, 1, FileLength, File)) + if (FileLength != fread(FileBuffer, (size_t)1, (size_t)FileLength, File)) { DPRINT1("fread() failed (errno %d)\n", errno); fclose(File); Modified: trunk/reactos/lib/inflib/infhostput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostput.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostput.c (original) +++ trunk/reactos/lib/inflib/infhostput.c Sun Feb 3 16:36:10 2008 @@ -43,7 +43,7 @@ fprintf(File, "; %s\r\n\r\n", HeaderComment); } - if (BufferSize != fwrite(Buffer, 1, BufferSize, File)) + if (BufferSize != fwrite(Buffer, (size_t)1, (size_t)BufferSize, File)) { DPRINT1("fwrite() failed (errno %d)\n", errno); fclose(File); Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=32… ============================================================================== --- trunk/reactos/lib/inflib/infput.c (original) +++ trunk/reactos/lib/inflib/infput.c Sun Feb 3 16:36:10 2008 @@ -40,13 +40,13 @@ Length = _tcslen(Text); if (OutBuf->FreeSize < Length + 1 && INF_SUCCESS(OutBuf->Status)) { - DPRINT("Out of free space. TotalSize %lu FreeSize %lu Length %u\n", - OutBuf->TotalSize, OutBuf->FreeSize, Length); + DPRINT("Out of free space. TotalSize %u FreeSize %u Length %u\n", + (UINT)OutBuf->TotalSize, (UINT)OutBuf->FreeSize, (UINT)Length); /* Round up to next SIZE_INC */ NewSize = OutBuf->TotalSize + (((Length + 1) - OutBuf->FreeSize + (SIZE_INC - 1)) / SIZE_INC) * SIZE_INC; - DPRINT("NewSize %lu\n", NewSize); + DPRINT("NewSize %u\n", (UINT)NewSize); NewBuf = MALLOC(NewSize); /* Abort if failed */ if (NULL == NewBuf) @@ -59,8 +59,8 @@ /* Need to copy old contents? */ if (NULL != OutBuf->Buffer) { - DPRINT("Copying %lu bytes from old content\n", - OutBuf->TotalSize - OutBuf->FreeSize); + DPRINT("Copying %u bytes from old content\n", + (UINT)(OutBuf->TotalSize - OutBuf->FreeSize)); MEMCPY(NewBuf, OutBuf->Buffer, OutBuf->TotalSize - OutBuf->FreeSize); OutBuf->Current = NewBuf + (OutBuf->Current - OutBuf->Buffer); FREE(OutBuf->Buffer); @@ -72,8 +72,8 @@ OutBuf->Buffer = NewBuf; OutBuf->FreeSize += NewSize - OutBuf->TotalSize; OutBuf->TotalSize = NewSize; - DPRINT("After reallocation TotalSize %lu FreeSize %lu\n", - OutBuf->TotalSize, OutBuf->FreeSize); + DPRINT("After reallocation TotalSize %u FreeSize %u\n", + (UINT)OutBuf->TotalSize, (UINT)OutBuf->FreeSize); } /* We're guaranteed to have enough room now. Copy char by char because of

1 0

[cfinck] 32103: Finally fix all cabman warnings and the 64-bit build
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 14:52:42 2008 New Revision: 32103 URL: http://svn.reactos.org/svn/reactos?rev=32103&view=rev Log: Finally fix all cabman warnings and the 64-bit build Modified: trunk/reactos/tools/cabman/cabinet.cxx 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 Sun Feb 3 14:52:42 2008 @@ -1105,8 +1105,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", - (UINT_PTR)CurrentBuffer, (UINT_PTR)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", + (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) @@ -1228,7 +1228,7 @@ BytesToWrite = BytesLeftInBlock; DPRINT(MAX_TRACE, ("Seeking to absolute offset 0x%X.\n", - (UINT)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize)); + (UINT)(CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize))); if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA)))

1 0

[fireball] 32102: - Remove accidentally committed stuff, noticed by Stefan.
by fireball＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: fireball Date: Sun Feb 3 14:50:26 2008 New Revision: 32102 URL: http://svn.reactos.org/svn/reactos?rev=32102&view=rev Log: - Remove accidentally committed stuff, noticed by Stefan. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sun Feb 3 14:50:26 2008 @@ -549,7 +549,7 @@ // TEMP, DEBUG! // adding special reserved memory zones for vmware workstation -#if 1 +#if 0 { Mad[MadCount].BasePage = 0xfec00; Mad[MadCount].PageCount = 0x10;

1 0

[cfinck] 32101: Fix many warnings (hopefully all) in cabman under different hosts. We cast all ULONG's to UINT's here, because this is the only type for which we can be sure that it defines to "unsigned int". ULONG is "unsigned long" with the Windows headers and "unsigned int" with the host headers (for 64-bit compatibility), therefore we need the casts.
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 14:23:31 2008 New Revision: 32101 URL: http://svn.reactos.org/svn/reactos?rev=32101&view=rev Log: Fix many warnings (hopefully all) in cabman under different hosts. We cast all ULONG's to UINT's here, because this is the only type for which we can be sure that it defines to "unsigned int". ULONG is "unsigned long" with the Windows headers and "unsigned int" with the host headers (for 64-bit compatibility), therefore we need the casts. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx 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 Sun Feb 3 14:23:31 2008 @@ -78,13 +78,13 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("ERROR OPENING '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR OPENING '%u'.\n", (UINT)GetLastError())); return; } if (!WriteFile(FileHandle, Buffer, Size, &BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); } CloseFile(FileHandle); @@ -142,7 +142,7 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR '%u'.\n", (UINT)GetLastError())); return CAB_STATUS_CANNOT_CREATE; } #else /* !WIN32 */ @@ -152,7 +152,7 @@ /* FileHandle = fopen(FullName, "w+b"); if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); return CAB_STATUS_CANNOT_CREATE; } */ @@ -198,7 +198,7 @@ FileHandle = tmpfile(); if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); return CAB_STATUS_FAILURE; } #endif @@ -679,7 +679,7 @@ if ((Status = ReadBlock(&CABHeader, sizeof(CFHEADER), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -704,7 +704,7 @@ if ((Status = ReadBlock(&Size, sizeof(ULONG), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } CabinetReserved = Size & 0xFFFF; @@ -714,7 +714,7 @@ #if defined(WIN32) if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_FAILURE; } #else @@ -778,7 +778,7 @@ if ((Status = ReadBlock(&FolderNode->Folder, sizeof(CFFOLDER), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } } @@ -787,7 +787,7 @@ Status = ReadFileTable(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("ReadFileTable() failed (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("ReadFileTable() failed (%u).\n", (UINT)Status)); return Status; } @@ -798,7 +798,7 @@ Status = ReadDataBlocks(FolderNode); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%u).\n", (UINT)Status)); return Status; } FolderNode = FolderNode->Next; @@ -859,8 +859,8 @@ (Search->Next->File.FileControlID > CAB_FILE_MAX_FOLDER) && (Search->Next->File.FileOffset <= LastFileOffset)) { - DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%lX) LastFileOffset (0x%lX).\n", - Search->Next->FileName, Search->Next->File.FileOffset, LastFileOffset)); + DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%X) LastFileOffset (0x%X).\n", + Search->Next->FileName, (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); Search->Next = Search->Next->Next; } @@ -932,7 +932,7 @@ Status = LocateFile(FileName, &File); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MID_TRACE, ("Cannot locate file (%lu).\n", (ULONG)Status)); + DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); return Status; } @@ -952,11 +952,11 @@ return CAB_STATUS_UNSUPPCOMP; } - DPRINT(MAX_TRACE, ("Extracting file at uncompressed offset (0x%lX) Size (%lu bytes) AO (0x%lX) UO (0x%lX).\n", - (ULONG)File->File.FileOffset, - (ULONG)File->File.FileSize, - (ULONG)File->DataBlock->AbsoluteOffset, - (ULONG)File->DataBlock->UncompOffset)); + DPRINT(MAX_TRACE, ("Extracting file at uncompressed offset (0x%X) Size (%u bytes) AO (0x%X) UO (0x%X).\n", + (UINT)File->File.FileOffset, + (UINT)File->File.FileSize, + (UINT)File->DataBlock->AbsoluteOffset, + (UINT)File->DataBlock->UncompOffset)); strcpy(DestName, DestPath); strcat(DestName, FileName); @@ -1021,7 +1021,7 @@ if (!DosDateTimeToFileTime(File->File.FileDate, File->File.FileTime, &FileTime)) { CloseFile(DestFile); - DPRINT(MIN_TRACE, ("DosDateTimeToFileTime() failed (%lu).\n", GetLastError())); + DPRINT(MIN_TRACE, ("DosDateTimeToFileTime() failed (%u).\n", (UINT)GetLastError())); return CAB_STATUS_CANNOT_WRITE; } @@ -1050,7 +1050,7 @@ FILE_BEGIN); if (Offset == INVALID_SET_FILE_POINTER) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1073,47 +1073,47 @@ { do { - DPRINT(MAX_TRACE, ("CO (0x%lX) ReuseBlock (%lu) Offset (0x%lX) Size (%ld) BytesLeftInBlock (%ld)\n", - File->DataBlock->UncompOffset, (ULONG)ReuseBlock, Offset, Size, - BytesLeftInBlock)); + DPRINT(MAX_TRACE, ("CO (0x%X) ReuseBlock (%u) Offset (0x%X) Size (%d) BytesLeftInBlock (%d)\n", + (UINT)File->DataBlock->UncompOffset, (UINT)ReuseBlock, (UINT)Offset, (UINT)Size, + (UINT)BytesLeftInBlock)); if (/*(CurrentDataNode != File->DataBlock) &&*/ (!ReuseBlock) || (BytesLeftInBlock <= 0)) { - DPRINT(MAX_TRACE, ("Filling buffer. ReuseBlock (%lu)\n", (ULONG)ReuseBlock)); + DPRINT(MAX_TRACE, ("Filling buffer. ReuseBlock (%u)\n", (UINT)ReuseBlock)); CurrentBuffer = Buffer; TotalBytesRead = 0; do { - DPRINT(MAX_TRACE, ("Size (%lu bytes).\n", Size)); + DPRINT(MAX_TRACE, ("Size (%u bytes).\n", (UINT)Size)); if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } - DPRINT(MAX_TRACE, ("Data block: Checksum (0x%lX) CompSize (%lu bytes) UncompSize (%lu bytes)\n", - (ULONG)CFData.Checksum, - (ULONG)CFData.CompSize, - (ULONG)CFData.UncompSize)); + DPRINT(MAX_TRACE, ("Data block: Checksum (0x%X) CompSize (%u bytes) UncompSize (%u bytes)\n", + (UINT)CFData.Checksum, + CFData.CompSize, + CFData.UncompSize)); ASSERT(CFData.CompSize <= CAB_BLOCKSIZE + 12); BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", - (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", + (UINT_PTR)CurrentBuffer, (UINT_PTR)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1161,7 +1161,7 @@ Status = LocateFile(TempName, &File); if (Status == CAB_STATUS_NOFILE) { - DPRINT(MID_TRACE, ("Cannot locate file (%lu).\n", (ULONG)Status)); + DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); return Status; } @@ -1175,7 +1175,7 @@ NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1186,11 +1186,11 @@ } #endif - DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%lX) Size (%lu bytes) AO (0x%lX) UO (0x%lX).\n", - (ULONG)File->File.FileOffset, - (ULONG)File->File.FileSize, - (ULONG)File->DataBlock->AbsoluteOffset, - (ULONG)File->DataBlock->UncompOffset)); + DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%X) Size (%u bytes) AO (0x%X) UO (0x%X).\n", + (UINT)File->File.FileOffset, + (UINT)File->File.FileSize, + (UINT)File->DataBlock->AbsoluteOffset, + (UINT)File->DataBlock->UncompOffset)); CurrentDataNode = File->DataBlock; ReuseBlock = true; @@ -1199,7 +1199,7 @@ } } while (CFData.UncompSize == 0); - DPRINT(MAX_TRACE, ("TotalBytesRead (%lu).\n", TotalBytesRead)); + DPRINT(MAX_TRACE, ("TotalBytesRead (%u).\n", (UINT)TotalBytesRead)); Status = Codec->Uncompress(OutputBuffer, Buffer, TotalBytesRead, &BytesToWrite); if (Status != CS_SUCCESS) @@ -1214,8 +1214,8 @@ if (BytesToWrite != CFData.UncompSize) { - DPRINT(MID_TRACE, ("BytesToWrite (%lu) != CFData.UncompSize (%d)\n", - BytesToWrite, CFData.UncompSize)); + DPRINT(MID_TRACE, ("BytesToWrite (%u) != CFData.UncompSize (%d)\n", + (UINT)BytesToWrite, CFData.UncompSize)); return CAB_STATUS_INVALID_CAB; } @@ -1223,20 +1223,19 @@ } else { - DPRINT(MAX_TRACE, ("Using same buffer. ReuseBlock (%lu)\n", (ULONG)ReuseBlock)); + DPRINT(MAX_TRACE, ("Using same buffer. ReuseBlock (%u)\n", (UINT)ReuseBlock)); BytesToWrite = BytesLeftInBlock; - DPRINT(MAX_TRACE, ("Seeking to absolute offset 0x%lX.\n", - CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + - CurrentDataNode->Data.CompSize)); + DPRINT(MAX_TRACE, ("Seeking to absolute offset 0x%X.\n", + (UINT)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize)); if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1251,7 +1250,7 @@ NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1276,19 +1275,19 @@ if (Size < BytesToWrite) BytesToWrite = Size; - DPRINT(MAX_TRACE, ("Offset (0x%lX) CurrentOffset (0x%lX) ToWrite (%lu) Skipped (%lu)(%lu) Size (%lu).\n", - (ULONG)Offset, - (ULONG)CurrentOffset, - (ULONG)BytesToWrite, - (ULONG)BytesSkipped, (ULONG)Skip, - (ULONG)Size)); + DPRINT(MAX_TRACE, ("Offset (0x%X) CurrentOffset (0x%X) ToWrite (%u) Skipped (%u)(%u) Size (%u).\n", + (UINT)Offset, + (UINT)CurrentOffset, + (UINT)BytesToWrite, + (UINT)BytesSkipped, (UINT)Skip, + (UINT)Size)); #if defined(WIN32) if (!WriteFile(DestFile, (void*)((unsigned long *)OutputBuffer + BytesSkipped), BytesToWrite, (LPDWORD)&BytesWritten, NULL) || (BytesToWrite != BytesWritten)) { - DPRINT(MIN_TRACE, ("Status 0x%lX.\n", GetLastError())); + DPRINT(MIN_TRACE, ("Status 0x%X.\n", (UINT)GetLastError())); #else BytesWritten = BytesToWrite; if (fwrite((void*)((unsigned long *)OutputBuffer + BytesSkipped), @@ -1585,8 +1584,8 @@ if (!ReadFileData(SourceFile, CurrentIBuffer, BytesToRead, &BytesRead) || (BytesToRead != BytesRead)) { - DPRINT(MIN_TRACE, ("Cannot read from file. BytesToRead (%lu) BytesRead (%lu) CurrentIBufferSize (%lu).\n", - BytesToRead, BytesRead, CurrentIBufferSize)); + DPRINT(MIN_TRACE, ("Cannot read from file. BytesToRead (%u) BytesRead (%u) CurrentIBufferSize (%u).\n", + (UINT)BytesToRead, (UINT)BytesRead, (UINT)CurrentIBufferSize)); return CAB_STATUS_INVALID_CAB; } @@ -1670,8 +1669,8 @@ ContinueFile = true; CreateNewDisk = false; - DPRINT(MAX_TRACE, ("First on new disk. CurrentIBufferSize (%lu) CurrentOBufferSize (%lu).\n", - CurrentIBufferSize, CurrentOBufferSize)); + DPRINT(MAX_TRACE, ("First on new disk. CurrentIBufferSize (%u) CurrentOBufferSize (%u).\n", + (UINT)CurrentIBufferSize, (UINT)CurrentOBufferSize)); if ((CurrentIBufferSize > 0) || (CurrentOBufferSize > 0)) { @@ -2102,18 +2101,18 @@ { PCFDATA_NODE Node; - DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%lX) FileSize (%lu).\n", + DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%u).\n", File->FileName, - (ULONG)File->File.FileOffset, - (ULONG)File->File.FileSize)); + (UINT)File->File.FileOffset, + (UINT)File->File.FileSize)); Node = CurrentFolderNode->DataListHead; while (Node != NULL) { - DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%lX, 0x%lX) (%lu).\n", - (ULONG)Node->UncompOffset, - (ULONG)Node->UncompOffset + Node->Data.UncompSize, - (ULONG)Node->Data.UncompSize)); + DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%X, 0x%X) (%u).\n", + (UINT)Node->UncompOffset, + (UINT)(Node->UncompOffset + Node->Data.UncompSize), + (UINT)Node->Data.UncompSize)); /* Node->Data.UncompSize will be 0 if the block is split (ie. it is the last block in this cabinet) */ @@ -2158,8 +2157,8 @@ CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); if (!CurrentFolderNode) { - DPRINT(MID_TRACE, ("Folder with index number (%lu) not found.\n", - (ULONG)Node->File.FileControlID)); + DPRINT(MID_TRACE, ("Folder with index number (%u) not found.\n", + Node->File.FileControlID)); return CAB_STATUS_INVALID_CAB; } @@ -2208,7 +2207,7 @@ Status = ReadBlock(&String[Offset], Size, &BytesRead); if ((Status != CAB_STATUS_SUCCESS) || (BytesRead != Size)) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -2233,7 +2232,7 @@ NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2259,8 +2258,8 @@ ULONG BytesRead; PCFFILE_NODE File; - DPRINT(MAX_TRACE, ("Reading file table at absolute offset (0x%lX).\n", - CABHeader.FileTableOffset)); + DPRINT(MAX_TRACE, ("Reading file table at absolute offset (0x%X).\n", + (UINT)CABHeader.FileTableOffset)); /* Seek to file table */ #if defined(WIN32) @@ -2269,7 +2268,7 @@ NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2292,7 +2291,7 @@ if ((Status = ReadBlock(&File->File, sizeof(CFFILE), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -2308,11 +2307,11 @@ if (Status != CAB_STATUS_SUCCESS) return Status; - DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%lX). Size (%lu bytes) ControlId (0x%lX).\n", + DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", File->FileName, - (ULONG)File->File.FileOffset, - (ULONG)File->File.FileSize, - (ULONG)File->File.FileControlID)); + (UINT)File->File.FileOffset, + (UINT)File->File.FileSize, + File->File.FileControlID)); } return CAB_STATUS_SUCCESS; @@ -2335,8 +2334,8 @@ ULONG Status; ULONG i; - DPRINT(MAX_TRACE, ("Reading data blocks for folder (%lu) at absolute offset (0x%lX).\n", - FolderNode->Index, FolderNode->Folder.DataOffset)); + DPRINT(MAX_TRACE, ("Reading data blocks for folder (%u) at absolute offset (0x%X).\n", + (UINT)FolderNode->Index, (UINT)FolderNode->Folder.DataOffset)); AbsoluteOffset = FolderNode->Folder.DataOffset; UncompOffset = FolderNode->UncompOffset; @@ -2357,7 +2356,7 @@ NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2371,16 +2370,16 @@ if ((Status = ReadBlock(&Node->Data, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } - DPRINT(MAX_TRACE, ("AbsOffset (0x%lX) UncompOffset (0x%lX) Checksum (0x%lX) CompSize (%lu) UncompSize (%lu).\n", - (ULONG)AbsoluteOffset, - (ULONG)UncompOffset, - (ULONG)Node->Data.Checksum, - (ULONG)Node->Data.CompSize, - (ULONG)Node->Data.UncompSize)); + DPRINT(MAX_TRACE, ("AbsOffset (0x%X) UncompOffset (0x%X) Checksum (0x%X) CompSize (%u) UncompSize (%u).\n", + (UINT)AbsoluteOffset, + (UINT)UncompOffset, + (UINT)Node->Data.Checksum, + Node->Data.CompSize, + Node->Data.UncompSize)); Node->AbsoluteOffset = AbsoluteOffset; Node->UncompOffset = UncompOffset; @@ -2662,7 +2661,7 @@ /* FIXME: Doesn't seem to be correct. EXTRACT.EXE won't accept checksums computed by this routine */ - DPRINT(MIN_TRACE, ("Checksumming buffer (0x%p) Size (%lu)\n", Buffer, Size)); + DPRINT(MIN_TRACE, ("Checksumming buffer (0x%p) Size (%u)\n", Buffer, (UINT)Size)); UlongCount = Size / 4; // Number of ULONGs Checksum = Seed; // Init checksum @@ -3014,8 +3013,8 @@ { if (FolderNode->Commit) { - DPRINT(MAX_TRACE, ("Writing folder entry. CompressionType (0x%X) DataBlockCount (%d) DataOffset (0x%lX).\n", - FolderNode->Folder.CompressionType, FolderNode->Folder.DataBlockCount, FolderNode->Folder.DataOffset)); + DPRINT(MAX_TRACE, ("Writing folder entry. CompressionType (0x%X) DataBlockCount (%d) DataOffset (0x%X).\n", + FolderNode->Folder.CompressionType, FolderNode->Folder.DataBlockCount, (UINT)FolderNode->Folder.DataOffset)); #if defined(WIN32) if (!WriteFile(FileHandle, @@ -3076,8 +3075,8 @@ SetCont = true; } - DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%lX) FileSize (%lu) FileName (%s).\n", - File->File.FileControlID, File->File.FileOffset, File->File.FileSize, File->FileName)); + DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%X) FileSize (%u) FileName (%s).\n", + File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName)); #if defined(WIN32) if (!WriteFile(FileHandle, @@ -3144,8 +3143,8 @@ while (DataNode != NULL) { - DPRINT(MAX_TRACE, ("Reading block at (0x%lX) CompSize (%d) UncompSize (%d).\n", - DataNode->ScratchFilePosition, + DPRINT(MAX_TRACE, ("Reading block at (0x%X) CompSize (%u) UncompSize (%u).\n", + (UINT)DataNode->ScratchFilePosition, DataNode->Data.CompSize, DataNode->Data.UncompSize)); @@ -3155,7 +3154,7 @@ Status = ScratchFile->ReadBlock(&DataNode->Data, InputBuffer, &BytesRead); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from scratch file (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from scratch file (%u).\n", (UINT)Status)); return Status; } @@ -3215,8 +3214,8 @@ CurrentIBufferSize, &TotalCompSize); - DPRINT(MAX_TRACE, ("Block compressed. CurrentIBufferSize (%lu) TotalCompSize(%lu).\n", - CurrentIBufferSize, TotalCompSize)); + DPRINT(MAX_TRACE, ("Block compressed. CurrentIBufferSize (%u) TotalCompSize(%u).\n", + (UINT)CurrentIBufferSize, (UINT)TotalCompSize)); CurrentOBuffer = OutputBuffer; CurrentOBufferSize = TotalCompSize; @@ -3255,10 +3254,10 @@ // FIXME: MAKECAB.EXE does not like this checksum algorithm //DataNode->Data.Checksum = ComputeChecksum(CurrentOBuffer, DataNode->Data.CompSize, 0); - DPRINT(MAX_TRACE, ("Writing block. Checksum (0x%lX) CompSize (%lu) UncompSize (%lu).\n", - (ULONG)DataNode->Data.Checksum, - (ULONG)DataNode->Data.CompSize, - (ULONG)DataNode->Data.UncompSize)); + DPRINT(MAX_TRACE, ("Writing block. Checksum (0x%X) CompSize (%u) UncompSize (%u).\n", + (UINT)DataNode->Data.Checksum, + DataNode->Data.CompSize, + DataNode->Data.UncompSize)); Status = ScratchFile->WriteBlock(&DataNode->Data, CurrentOBuffer, &BytesWritten); 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 Sun Feb 3 14:23:31 2008 @@ -66,6 +66,7 @@ extern ULONG DebugTraceLevel; +#undef DPRINT #define DPRINT(_t_, _x_) \ if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ @@ -73,6 +74,7 @@ printf _x_ ; \ } +#undef ASSERT #define ASSERT(_b_) { \ if (!(_b_)) { \ printf("(%s:%d)(%s) ASSERTION: ", __FILE__, __LINE__, __FUNCTION__); \ @@ -83,8 +85,10 @@ #else /* DBG */ +#undef DPRINT #define DPRINT(_t_, _x_) +#undef ASSERT #define ASSERT(_x_) #endif /* DBG */ Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sun Feb 3 14:23:31 2008 @@ -159,14 +159,14 @@ NULL); // No attribute template if (InfFileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("Error creating '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("Error creating '%u'.\n", (UINT)GetLastError())); return; } #else /* !WIN32 */ InfFileHandle = fopen(buf, "wb"); if (InfFileHandle == NULL) { - DPRINT(MID_TRACE, ("Error creating '%lu'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("Error creating '%i'.\n", errno)); return; } #endif @@ -175,7 +175,7 @@ #if defined(WIN32) if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); return; } #else @@ -189,7 +189,7 @@ #if defined(WIN32) if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); return; } #else @@ -259,7 +259,7 @@ FileLoaded = true; - DPRINT(MAX_TRACE, ("File (%lu bytes)\n", FileBufferSize)); + DPRINT(MAX_TRACE, ("File (%u bytes)\n", (UINT)FileBufferSize)); return CAB_STATUS_SUCCESS; } @@ -335,7 +335,7 @@ switch (CurrentToken) { case TokenInteger: - sprintf(CurrentString, "%lu", CurrentInteger); + sprintf(CurrentString, "%u", (UINT)CurrentInteger); case TokenIdentifier: case TokenString: if (Command) @@ -345,7 +345,7 @@ if (Status == CAB_STATUS_FAILURE) { - printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); + printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while executing command.\n")); } @@ -359,7 +359,7 @@ if (Status != CAB_STATUS_SUCCESS) { - printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); + printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while copying file.\n")); } @@ -380,8 +380,8 @@ break; default: - printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); - DPRINT(MID_TRACE, ("Token is (%lu).\n", (ULONG)CurrentToken)); + printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + DPRINT(MID_TRACE, ("Token is (%u).\n", (UINT)CurrentToken)); return CAB_STATUS_SUCCESS; } NextToken(); @@ -400,7 +400,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); return Status; } } @@ -410,7 +410,7 @@ Status = CloseCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot close cabinet (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot close cabinet (%u).\n", (UINT)Status)); return Status; } } @@ -453,7 +453,7 @@ Number += 1; - DPRINT(MID_TRACE, ("Giving disk (%lu) a label...\n", (ULONG)Number)); + DPRINT(MID_TRACE, ("Giving disk (%u) a label...\n", (UINT)Number)); if (GetDiskName(&DiskLabel, Number, Label)) return true; @@ -467,7 +467,7 @@ ch = DiskLabelTemplate[i]; if (ch == '*') { - sprintf(Buffer, "%lu", Number); + sprintf(Buffer, "%u", (UINT)Number); strcat(Label, Buffer); j += (LONG)strlen(Buffer); } @@ -505,7 +505,7 @@ Number += 1; - DPRINT(MID_TRACE, ("Giving cabinet (%lu) a name...\n", (ULONG)Number)); + DPRINT(MID_TRACE, ("Giving cabinet (%u) a name...\n", (UINT)Number)); if (GetDiskName(&CabinetName, Number, Buffer)) { @@ -523,7 +523,7 @@ ch = CabinetNameTemplate[i]; if (ch == '*') { - sprintf(Buffer, "%lu", Number); + sprintf(Buffer, "%u", (UINT)Number); strcat(Name, Buffer); j += (LONG)strlen(Buffer); } @@ -685,7 +685,7 @@ * false if there was not enough free memory available */ { - DPRINT(MID_TRACE, ("Setting label of disk (%lu) to '%s'\n", (ULONG)Number, Label)); + DPRINT(MID_TRACE, ("Setting label of disk (%u) to '%s'\n", (UINT)Number, Label)); return SetDiskName(&DiskLabel, Number, Label); } @@ -715,7 +715,7 @@ * false if there was not enough free memory available */ { - DPRINT(MID_TRACE, ("Setting name of cabinet (%lu) to '%s'\n", (ULONG)Number, Name)); + DPRINT(MID_TRACE, ("Setting name of cabinet (%u) to '%s'\n", (UINT)Number, Name)); return SetDiskName(&CabinetName, Number, Name); } @@ -1002,7 +1002,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = false; @@ -1011,7 +1011,7 @@ Status = NewDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create disk (%u).\n", (UINT)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = true; @@ -1026,7 +1026,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = false; @@ -1035,7 +1035,7 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = true; @@ -1180,7 +1180,7 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); printf("Cannot create cabinet.\n"); return CAB_STATUS_FAILURE; } @@ -1191,7 +1191,7 @@ Status = NewDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create disk (%u).\n", (UINT)Status)); printf("Cannot create disk.\n"); return CAB_STATUS_FAILURE; } @@ -1231,7 +1231,7 @@ break; default: - printf("Cannot add file: %s (%lu).\n", SrcName, Status); + printf("Cannot add file: %s (%u).\n", SrcName, (UINT)Status); break; } return Status; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Sun Feb 3 14:23:31 2008 @@ -408,14 +408,14 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); return false; } Status = AddFile(FileName); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%u).\n", (UINT)Status)); return false; } @@ -424,7 +424,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); return false; } @@ -457,7 +457,7 @@ printf("%s ", Date2Str(Str, Search.File->FileDate)); printf("%s ", Time2Str(Str, Search.File->FileTime)); printf("%s ", Attr2Str(Str, Search.File->Attributes)); - sprintf(Str, "%lu", Search.File->FileSize); + sprintf(Str, "%u", (UINT)Search.File->FileSize); printf("%s ", Pad(Str, ' ', 13)); printf("%s\n", Search.FileName); @@ -472,7 +472,7 @@ printf(" 1 file "); else { - sprintf(Str, "%lu", FileCount); + sprintf(Str, "%u", (UINT)FileCount); printf(" %s files ", Pad(Str, ' ', 12)); } @@ -480,7 +480,7 @@ printf(" 1 byte\n"); else { - sprintf(Str, "%lu", ByteCount); + sprintf(Str, "%u", (UINT)ByteCount); printf("%s bytes\n", Pad(Str, ' ', 12)); } } @@ -531,7 +531,7 @@ return false; default: - printf("Unspecified error code (%lu).\n", (ULONG)Status); + printf("Unspecified error code (%u).\n", (UINT)Status); return false; } } while (FindNext(&Search) == CAB_STATUS_SUCCESS); Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx (original) +++ trunk/reactos/tools/cabman/mszip.cxx Sun Feb 3 14:23:31 2008 @@ -53,9 +53,9 @@ ULONG CMSZipCodec::Compress(void* OutputBuffer, - void* InputBuffer, - ULONG InputLength, - PULONG OutputLength) + void* InputBuffer, + ULONG InputLength, + PULONG OutputLength) /* * FUNCTION: Compresses data in a buffer * ARGUMENTS: @@ -67,7 +67,7 @@ { PUSHORT Magic; - DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); + DPRINT(MAX_TRACE, ("InputLength (%u).\n", (UINT)InputLength)); Magic = (PUSHORT)OutputBuffer; *Magic = MSZIP_MAGIC; @@ -113,9 +113,9 @@ ULONG CMSZipCodec::Uncompress(void* OutputBuffer, - void* InputBuffer, - ULONG InputLength, - PULONG OutputLength) + void* InputBuffer, + ULONG InputLength, + PULONG OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: @@ -127,7 +127,7 @@ { USHORT Magic; - DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); + DPRINT(MAX_TRACE, ("InputLength (%u).\n", (UINT)InputLength)); Magic = *((PUSHORT)InputBuffer);

1 0

[dreimer] 32100: German Translations by Dark_Shadow@gmx.at
by dreimer＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: dreimer Date: Sun Feb 3 11:34:44 2008 New Revision: 32100 URL: http://svn.reactos.org/svn/reactos?rev=32100&view=rev Log: German Translations by Dark_Shadow(a)gmx.at Modified: trunk/reactos/subsystems/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc Modified: trunk/reactos/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/de-D… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/de-DE.rc (original) +++ trunk/reactos/subsystems/ntvdm/lang/de-DE.rc Sun Feb 3 11:34:44 2008 @@ -2,12 +2,13 @@ /* * Translate into German. * By Rouven Wessling 2005 pentiumforever(a)gmail.com + * 2008 dark_shadow(a)gmx.at */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -STRING_WelcomeMsg, "ReactOS Virtuelle DOS Unterstützung.\n" -STRING_PromptMsg, "Drücken Sie r<cr> zum starten, s<cr> zum herunterfahren oder q<cr> zum beenden." +STRING_WelcomeMsg, "ReactOS virtuelle DOS-Unterstützung.\n" +STRING_PromptMsg, "Drücken Sie r<cr> zum Starten, s<cr> zum Herunterfahren oder q<cr> zum Beenden." END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc Sun Feb 3 11:34:44 2008 @@ -8,7 +8,7 @@ LTEXT "Programm wird beendet...",IDC_STATIC,7,7,186,11 CONTROL "Fortschritt",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 - LTEXT "Wenn Sie das Program sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + LTEXT "Wenn Sie das Programm sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC,7,40,186,26 DEFPUSHBUTTON "J&etzt beenden",IDC_END_NOW,150,71,43,17 END @@ -23,7 +23,7 @@ LTEXT "Das Programm reagiert nicht",IDC_STATIC,7,7,178,8 LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", IDC_STATIC,7,26,178,16 - LTEXT "Wenn Sie das Program sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + LTEXT "Wenn Sie das Programm sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC,7,53,178,26 END @@ -38,11 +38,11 @@ IDS_FIND "Suchen..." IDS_DEFAULTS "Standardwerte" IDS_PROPERTIES "Eigenschaften" - IDS_SCROLLHERE "Hier Scrollen" - IDS_SCROLLTOP "Ganz nach oben Scrollen" - IDS_SCROLLBOTTOM "Ganz nach unten Scrollen" + IDS_SCROLLHERE "Hier scrollen" + IDS_SCROLLTOP "Ganz nach oben scrollen" + IDS_SCROLLBOTTOM "Ganz nach unten scrollen" IDS_SCROLLPAGE_UP "Seite nach oben" IDS_SCROLLPAGE_DOWN "Seite nach unten" - IDS_SCROLLUP "Nach oben Scrollen" - IDS_SCROLLDOWN "Nach unten Scrollen" + IDS_SCROLLUP "Nach oben scrollen" + IDS_SCROLLDOWN "Nach unten scrollen" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc Sun Feb 3 11:34:44 2008 @@ -8,7 +8,7 @@ LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 - LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", + LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", IDC_STATIC,7,40,186,26 DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 END @@ -38,11 +38,11 @@ IDS_FIND "Find..." IDS_DEFAULTS "Defaults" IDS_PROPERTIES "Properties" - IDS_SCROLLHERE "Scroll Here" - IDS_SCROLLTOP "Scroll Top" - IDS_SCROLLBOTTOM "Scroll Bottom" - IDS_SCROLLPAGE_UP "Page Up" - IDS_SCROLLPAGE_DOWN "Page Down" - IDS_SCROLLUP "Scroll Up" - IDS_SCROLLDOWN "Scroll Down" + IDS_SCROLLHERE "Scroll here" + IDS_SCROLLTOP "Scroll top" + IDS_SCROLLBOTTOM "Scroll bottom" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "Scroll up" + IDS_SCROLLDOWN "Scroll down" END

1 0

[dreimer] 32099: German RC File Updates by (Dark_Shadow@gmx.at)
by dreimer＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: dreimer Date: Sun Feb 3 11:21:00 2008 New Revision: 32099 URL: http://svn.reactos.org/svn/reactos?rev=32099&view=rev Log: German RC File Updates by (Dark_Shadow(a)gmx.at) Added: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/packmgr/lib/de.rc Added: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (added) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Sun Feb 3 11:21:00 2008 @@ -1,0 +1,82 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/de-DE.rc + * PURPOSE: German resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: Dark_Shadow(a)gmx.at + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Über" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "ReactOS VGA Font Editor", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 + DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Glyphen bearbeiten" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 + + DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Neu\tStrg+N", ID_FILE_NEW + MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "Schliessen", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "Speichern\tStrg+S", ID_FILE_SAVE + MENUITEM "Speichern unter...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Beenden\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Fenster" + BEGIN + MENUITEM "&Überlappend", ID_WINDOW_CASCADE + MENUITEM "&Horizontal teilen", ID_WINDOW_TILE_HORZ + MENUITEM "&Vertikal teilen", ID_WINDOW_TILE_VERT + MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nächs&tes\tStrg+F6", ID_WINDOW_NEXT + END + + POPUP "&Hilfe" + BEGIN + MENUITEM "&Über...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binary Font Files (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binäre Font Dateien (*.bin)|*.bin|" + IDS_OPENERROR, "Fehler beim Öffnen der Datei! (Fehlernummer %1!u!)" + IDS_READERROR, "Fehler beim Lesen der Datei! (Fehlernummer %1!u!)" + IDS_WRITEERROR, "Fehler beim Schreiben der Datei! (Fehlernummer %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Nicht unterstütztes Dateiformat!" + IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF Font Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." + IDS_DOCNAME, "Font %1!u!" + IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" + + IDS_TOOLTIP_NEW, "Neu" + IDS_TOOLTIP_OPEN, "Öffnen" + IDS_TOOLTIP_SAVE, "Speichern" + IDS_TOOLTIP_EDIT_GLYPH, "Glyphen bearbeiten" +END Propchange: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Sun Feb 3 11:21:00 2008 @@ -30,3 +30,4 @@ // Languages #include "lang/en-US.rc" +#include "lang/de-DE.rc" Modified: trunk/rosapps/packmgr/lib/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/de.rc?rev=3209… ============================================================================== --- trunk/rosapps/packmgr/lib/de.rc (original) +++ trunk/rosapps/packmgr/lib/de.rc Sun Feb 3 11:21:00 2008 @@ -1,4 +1,3 @@ - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* String Tables */ @@ -11,13 +10,13 @@ ERR_DOWNL "Eine benötigte Datei konnte nicht runtergeladen werden!\nFür mehr Details schauen Sie bitte in ""logfile.html""." ERR_FILE "Bei der Scriptausfürhung trat ein Fehler auf.\nDatei konnte nicht geöffnet werden." - ERR_SYNATX "Bei der Scriptausfürhung trat ein Fehler auf.\nSynatx-Fehler." + ERR_SYNATX "Bei der Scriptausfürhung trat ein Fehler auf.\nSyntax-Fehler." ERR_CALL "Bei der Scriptausfürhung trat ein Fehler auf.\nUnbekannte Funktion." ERR_PARAMETER "Bei der Scriptausfürhung trat ein Fehler auf.\nUngültige(r) Parameter." - ERR_DEP1 "Um diese Package zu installieren müssen die ebenfall die folende/n Package/s installieren:\n\n" + ERR_DEP1 "Um dieses Package zu installieren müssen sie ebenfalls folende(s) Package(s) installieren:\n\n" ERR_DEP2 "\nMöchten sie fortfahren ?" - ERR_READY "Sie haben %d package/s ausgewählt. Um sie zu installieren müssen sie sich mit jeder einzellnen Lizenz einverstanden erklärt haben. \n\nMöchten sie forfahren ?" + ERR_READY "Sie haben %d package(s)ausgewählt. Um sie zu installieren müssen sie sich mit jeder einzellnen Lizenz einverstanden erklärt haben. \n\nMöchten sie forfahren ?" END 123 RCDATA "options.xml"

1 0

[cwittich] 32098: build unicode version
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 01:49:24 2008 New Revision: 32098 URL: http://svn.reactos.org/svn/reactos?rev=32098&view=rev Log: build unicode version Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c Sun Feb 3 01:49:24 2008 @@ -37,7 +37,7 @@ { while (*Aliases != '\0') { - printf(_T("%s\n"), Aliases); + _tprintf(_T("%s\n"), Aliases); Aliases = Aliases + lstrlen(Aliases); Aliases++; } @@ -49,22 +49,25 @@ { LPTSTR ptr; - while (*param == ' ') + while (*param == _T(' ')) param++; /* error if no '=' found */ if ((ptr = _tcschr (param, _T('='))) == 0) - { return 1; - } - while (*param == ' ') + while (*param == _T(' ')) param++; + + while (*ptr == _T(' ')) + ptr--; /* Split rest into name and substitute */ *ptr++ = _T('\0'); partstrlwr (param); + + _tprintf(_T("%s, %s\n"), ptr, param); if (ptr[0] == _T('\0')) AddConsoleAlias(param, NULL, _T("cmd.exe")); @@ -74,17 +77,27 @@ return 0; } -static VOID ReadFromFile(LPTSTR param) +static VOID ReadFromFile(LPSTR param) { FILE* fp; char line[MAX_PATH]; +#ifdef UNICODE + WCHAR lineW[MAX_PATH]; +#endif /* FIXME */ param += 11; - fp = _tfopen(param,"r"); + fp = fopen(param,"r"); while ( fgets(line, MAX_PATH, fp) != NULL) + { +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, line, -1, lineW, MAX_PATH); + SetMacro(lineW); +#else SetMacro(line); +#endif + } fclose(fp); return; @@ -93,7 +106,10 @@ int main (int argc, char **argv) { - +#ifdef UNICODE + WCHAR lineW[MAX_PATH]; +#endif + if (argc < 2) return 0; @@ -106,10 +122,13 @@ } else { +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, argv[1], -1, lineW, MAX_PATH); + SetMacro(lineW); +#else SetMacro(argv[1]); +#endif } - - return 0; } Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild Sun Feb 3 01:49:24 2008 @@ -3,6 +3,8 @@ <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <file>doskey.c</file> <file>doskey.rc</file>

1 0

[cwittich] 32097: add support for /macrofile (bit hacky - but it should work for RosBE)
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 00:52:46 2008 New Revision: 32097 URL: http://svn.reactos.org/svn/reactos?rev=32097&view=rev Log: add support for /macrofile (bit hacky - but it should work for RosBE) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c Sun Feb 3 00:52:46 2008 @@ -49,11 +49,17 @@ { LPTSTR ptr; + while (*param == ' ') + param++; + /* error if no '=' found */ if ((ptr = _tcschr (param, _T('='))) == 0) { return 1; } + + while (*param == ' ') + param++; /* Split rest into name and substitute */ *ptr++ = _T('\0'); @@ -68,6 +74,22 @@ return 0; } +static VOID ReadFromFile(LPTSTR param) +{ + FILE* fp; + char line[MAX_PATH]; + + /* FIXME */ + param += 11; + + fp = _tfopen(param,"r"); + while ( fgets(line, MAX_PATH, fp) != NULL) + SetMacro(line); + + fclose(fp); + return; +} + int main (int argc, char **argv) { @@ -77,6 +99,8 @@ if (argv[1][0] == '/') { + if (strnicmp(argv[1], "/macrofile", 10) == 0) + ReadFromFile(argv[1]); if (stricmp(argv[1], "/macros") == 0) PrintAlias(); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs