Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[hbirr] 20883: Bochs debug output is only a simple print routine and not a wrapper which can handle faults.

by hbirr＠svn.reactos.org

Bochs debug output is only a simple print routine and not a wrapper which can handle faults. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2006-01-15 03:11:31 UTC (rev 20882) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2006-01-15 08:49:26 UTC (rev 20883) @@ -202,7 +202,8 @@ #define KdScreen 0 #define KdSerial 1 #define KdFile 2 -#define KdMax 3 +#define KdBochs 3 +#define KdMax 4 /* KD Private Debug Modes */ typedef struct _KDP_DEBUG_MODE @@ -215,11 +216,11 @@ UCHAR Screen :1; UCHAR Serial :1; UCHAR File :1; + UCHAR Bochs :1; /* Currently Supported Wrappers */ UCHAR Pice :1; UCHAR Gdb :1; - UCHAR Bochs :1; }; /* Generic Value */ _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2006-01-15 03:11:31 UTC (rev 20882) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2006-01-15 08:49:26 UTC (rev 20883) @@ -25,20 +25,19 @@ ULONG KdpPortIrq; #ifdef AUTO_ENABLE_BOCHS KDP_DEBUG_MODE KdpDebugMode = {{{.Bochs=TRUE}}};; -PKDP_INIT_ROUTINE WrapperInitRoutine = KdpBochsInit; -KD_DISPATCH_TABLE WrapperTable = {.KdpInitRoutine = KdpBochsInit, .KdpPrintRoutine = KdpBochsDebugPrint}; #else KDP_DEBUG_MODE KdpDebugMode; +#endif PKDP_INIT_ROUTINE WrapperInitRoutine; KD_DISPATCH_TABLE WrapperTable; -#endif BOOLEAN KdpEarlyBreak = FALSE; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit, KdpSerialInit, - KdpInitDebugLog}; + KdpInitDebugLog, + KdpBochsInit}; /* PRIVATE FUNCTIONS *********************************************************/ @@ -49,15 +48,6 @@ { PCHAR p2 = Currentp2; - /* Check for BOCHS Debugging */ - if (!_strnicmp(p2, "BOCHS", 5)) - { - /* Enable It */ - p2 += 5; - KdpDebugMode.Bochs = TRUE; - WrapperInitRoutine = KdpBochsInit; - } - /* Check for GDB Debugging */ if (!_strnicmp(p2, "GDB", 3)) { @@ -128,6 +118,14 @@ KdpDebugMode.File = TRUE; } + /* Check for BOCHS Debugging */ + else if (!_strnicmp(p2, "BOCHS", 5)) + { + /* Enable It */ + p2 += 5; + KdpDebugMode.Bochs = TRUE; + } + return p2; } _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2006-01-15 03:11:31 UTC (rev 20882) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2006-01-15 08:49:26 UTC (rev 20883) @@ -21,6 +21,8 @@ KdpBochsDebugPrint(IN PCH Message, IN ULONG Length) { + if (!KdpDebugMode.Bochs) return; + while (*Message != 0) { if (*Message == '\n') @@ -44,16 +46,31 @@ VOID STDCALL -KdpBochsInit(PKD_DISPATCH_TABLE WrapperTable, +KdpBochsInit(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase) { + BYTE Value; if (!KdpDebugMode.Bochs) return; if (BootPhase == 0) { +#if defined(_M_IX86) && defined(__GNUC__) + __asm__("inb %w1, %b0\n\t" : "=a" (Value) : "d" (BOCHS_LOGGER_PORT)); +#else + Value = READ_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT); +#endif + if (Value != BOCHS_LOGGER_PORT) + { + KdpDebugMode.Bochs = FALSE; + return; + } + /* Write out the functions that we support for now */ - WrapperTable->KdpInitRoutine = KdpBochsInit; - WrapperTable->KdpPrintRoutine = KdpBochsDebugPrint; + DispatchTable->KdpInitRoutine = KdpBochsInit; + DispatchTable->KdpPrintRoutine = KdpBochsDebugPrint; + + /* Register as a Provider */ + InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 2) {

18 years, 8 months

[weiden] 20882: implemented FindFirstStreamW() and FindNextStreamW() (untested!)

by weiden＠svn.reactos.org

implemented FindFirstStreamW() and FindNextStreamW() (untested!) Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2006-01-15 01:24:59 UTC (rev 20881) +++ trunk/reactos/include/ndk/iotypes.h 2006-01-15 03:11:31 UTC (rev 20882) @@ -320,6 +320,15 @@ BOOLEAN Directory; } FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; +typedef struct _FILE_STREAM_INFORMATION +{ + ULONG NextEntryOffset; + ULONG StreamNameLength; + LARGE_INTEGER StreamSize; + LARGE_INTEGER StreamAllocationSize; + WCHAR StreamName[1]; +} FILE_STREAM_INFORMATION, *PFILE_STREAM_INFORMATION; + typedef struct _FILE_NETWORK_OPEN_INFORMATION { LARGE_INTEGER CreationTime; _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2006-01-15 01:24:59 UTC (rev 20881) +++ trunk/reactos/lib/kernel32/file/find.c 2006-01-15 03:11:31 UTC (rev 20882) @@ -19,10 +19,6 @@ /* TYPES ********************************************************************/ -#ifndef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) &( ((TYPE *) 0)->MEMBER )) -#endif - #define FIND_DATA_SIZE (16*1024) typedef struct _KERNEL32_FIND_FILE_DATA @@ -32,9 +28,41 @@ PFILE_BOTH_DIR_INFORMATION pFileInfo; } KERNEL32_FIND_FILE_DATA, *PKERNEL32_FIND_FILE_DATA; +typedef struct _KERNEL32_FIND_STREAM_DATA +{ + STREAM_INFO_LEVELS InfoLevel; + PFILE_STREAM_INFORMATION pFileStreamInfo; + PFILE_STREAM_INFORMATION pCurrent; +} KERNEL32_FIND_STREAM_DATA, *PKERNEL32_FIND_STREAM_DATA; +typedef enum _KERNEL32_FIND_DATA_TYPE +{ + FileFind, + StreamFind +} KERNEL32_FIND_DATA_TYPE; + +typedef struct _KERNEL32_FIND_DATA_HEADER +{ + KERNEL32_FIND_DATA_TYPE Type; +} KERNEL32_FIND_DATA_HEADER, *PKERNEL32_FIND_DATA_HEADER; + + /* FUNCTIONS ****************************************************************/ +static __inline PKERNEL32_FIND_FILE_DATA +HandleToFindData(IN HANDLE Handle) +{ + PKERNEL32_FIND_DATA_HEADER FindData = (PKERNEL32_FIND_DATA_HEADER)Handle; + + if (Handle != NULL && Handle != INVALID_HANDLE_VALUE && + FindData->Type == FileFind) + { + return (PKERNEL32_FIND_FILE_DATA)(FindData + 1); + } + + return NULL; +} + VOID InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, PFILE_BOTH_DIR_INFORMATION lpFileInfo) @@ -122,14 +150,23 @@ PUNICODE_STRING SearchPattern ) { + PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; DPRINT("InternalFindNextFile(%lx)\n", hFindFile); - IData = (PKERNEL32_FIND_FILE_DATA)hFindFile; + IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; + if (hFindFile == NULL || hFindFile == INVALID_HANDLE_VALUE || + IHeader->Type != FileFind) + { + SetLastError (ERROR_INVALID_HANDLE); + return FALSE; + } + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + while (1) { if (IData->pFileInfo->NextEntryOffset != 0) @@ -178,6 +215,7 @@ ) { OBJECT_ATTRIBUTES ObjectAttributes; + PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING NtPathU; @@ -302,10 +340,11 @@ DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); - IData = RtlAllocateHeap (hProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); - if (NULL == IData) + IHeader = RtlAllocateHeap (hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(KERNEL32_FIND_DATA_HEADER) + + sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); + if (NULL == IHeader) { RtlFreeHeap (hProcessHeap, 0, @@ -320,6 +359,9 @@ return NULL; } + IHeader->Type = FileFind; + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + /* change pattern: "*.*" --> "*" */ if (wcscmp (SearchPattern, L"*.*")) { @@ -348,7 +390,7 @@ if (!NT_SUCCESS(Status)) { - RtlFreeHeap (hProcessHeap, 0, IData); + RtlFreeHeap (hProcessHeap, 0, IHeader); if (NULL != SlashlessFileName) { RtlFreeHeap(hProcessHeap, @@ -362,7 +404,7 @@ IData->pFileInfo->FileIndex = 0; IData->DirectoryOnly = DirectoryOnly; - bResult = InternalFindNextFile((HANDLE)IData, &PatternStr); + bResult = InternalFindNextFile((HANDLE)IHeader, &PatternStr); if (NULL != SlashlessFileName) { RtlFreeHeap(hProcessHeap, @@ -372,11 +414,11 @@ if (!bResult) { - FindClose((HANDLE)IData); + FindClose((HANDLE)IHeader); return NULL; } - return IData; + return (HANDLE)IHeader; } @@ -390,6 +432,7 @@ LPWIN32_FIND_DATAA lpFindFileData ) { + PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; UNICODE_STRING FileNameU; ANSI_STRING FileName; @@ -407,16 +450,18 @@ &FileName, TRUE); - IData = InternalFindFirstFile (FileNameU.Buffer, FALSE); + IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE); RtlFreeUnicodeString (&FileNameU); - if (IData == NULL) + if (IHeader == NULL) { DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + DPRINT("IData->pFileInfo->FileNameLength %d\n", IData->pFileInfo->FileNameLength); @@ -424,7 +469,7 @@ InternalCopyFindDataA(lpFindFileData, IData->pFileInfo); - return (HANDLE)IData; + return (HANDLE)IHeader; } @@ -439,20 +484,14 @@ { PKERNEL32_FIND_FILE_DATA IData; - if (hFindFile == INVALID_HANDLE_VALUE) - { - SetLastError (ERROR_INVALID_HANDLE); - DPRINT("Failing request\n"); - return FALSE; - } - - IData = (PKERNEL32_FIND_FILE_DATA)hFindFile; if (!InternalFindNextFile (hFindFile, NULL)) { DPRINT("InternalFindNextFile() failed\n"); return FALSE; } + IData = (PKERNEL32_FIND_FILE_DATA)((PKERNEL32_FIND_DATA_HEADER)hFindFile + 1); + DPRINT("IData->pFileInfo->FileNameLength %d\n", IData->pFileInfo->FileNameLength); @@ -472,7 +511,7 @@ HANDLE hFindFile ) { - PKERNEL32_FIND_FILE_DATA IData; + PKERNEL32_FIND_DATA_HEADER IHeader; DPRINT("FindClose(hFindFile %x)\n",hFindFile); @@ -482,11 +521,34 @@ return FALSE; } - IData = (PKERNEL32_FIND_FILE_DATA)hFindFile; + IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; - CloseHandle (IData->DirectoryHandle); - RtlFreeHeap (hProcessHeap, 0, IData); + switch (IHeader->Type) + { + case FileFind: + { + PKERNEL32_FIND_FILE_DATA IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + CloseHandle (IData->DirectoryHandle); + break; + } + case StreamFind: + { + PKERNEL32_FIND_STREAM_DATA IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); + if (IData->pFileStreamInfo != NULL) + { + RtlFreeHeap (hProcessHeap, 0, IData->pFileStreamInfo); + } + break; + } + + default: + SetLastError (ERROR_INVALID_HANDLE); + return FALSE; + } + + RtlFreeHeap (hProcessHeap, 0, IHeader); + return TRUE; } @@ -522,20 +584,14 @@ { PKERNEL32_FIND_FILE_DATA IData; - if (hFindFile == INVALID_HANDLE_VALUE) - { - SetLastError (ERROR_INVALID_HANDLE); - DPRINT("Failing request\n"); - return FALSE; - } - - IData = (PKERNEL32_FIND_FILE_DATA)hFindFile; if (!InternalFindNextFile(hFindFile, NULL)) { DPRINT("Failing request\n"); return FALSE; } + IData = (PKERNEL32_FIND_FILE_DATA)((PKERNEL32_FIND_DATA_HEADER)hFindFile + 1); + /* copy data into WIN32_FIND_DATA structure */ InternalCopyFindDataW(lpFindFileData, IData->pFileInfo); @@ -555,6 +611,7 @@ LPVOID lpSearchFilter, DWORD dwAdditionalFlags) { + PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; if (fInfoLevelId != FindExInfoStandard) @@ -570,17 +627,19 @@ return INVALID_HANDLE_VALUE; } - IData = InternalFindFirstFile (lpFileName, fSearchOp == FindExSearchLimitToDirectories ? TRUE : FALSE); - if (IData == NULL) + IHeader = InternalFindFirstFile (lpFileName, fSearchOp == FindExSearchLimitToDirectories ? TRUE : FALSE); + if (IHeader == NULL) { DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } - /* copy data into WIN32_FIND_DATA structure */ + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + + /* copy data into WIN32_FIND_DATA structure */ InternalCopyFindDataW((LPWIN32_FIND_DATAW)lpFindFileData, IData->pFileInfo); - return (HANDLE)IData; + return (HANDLE)IHeader; } SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; @@ -600,6 +659,7 @@ DWORD dwAdditionalFlags ) { + PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; UNICODE_STRING FileNameU; ANSI_STRING FileNameA; @@ -625,22 +685,263 @@ else RtlOemStringToUnicodeString (&FileNameU, &FileNameA, TRUE); - IData = InternalFindFirstFile (FileNameU.Buffer, FALSE); + IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE); RtlFreeUnicodeString (&FileNameU); - if (IData == NULL) + if (IHeader == NULL) { DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + /* copy data into WIN32_FIND_DATA structure */ InternalCopyFindDataA(lpFindFileData, IData->pFileInfo); + + return (HANDLE)IHeader; } SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } +static VOID +InternalCopyStreamInfo(IN OUT PKERNEL32_FIND_STREAM_DATA IData, + OUT LPVOID lpFindStreamData) +{ + ASSERT(IData->pCurrent != NULL); + + switch (IData->InfoLevel) + { + case FindStreamInfoStandard: + { + ULONG StreamNameLen; + WIN32_FIND_STREAM_DATAW *StreamData = (WIN32_FIND_STREAM_DATAW*)lpFindStreamData; + + StreamNameLen = IData->pCurrent->StreamNameLength; + if (StreamNameLen > sizeof(StreamData->cStreamName) - sizeof(WCHAR)) + StreamNameLen = sizeof(StreamData->cStreamName) - sizeof(WCHAR); + + StreamData->StreamSize.QuadPart = IData->pCurrent->StreamSize.QuadPart; + RtlCopyMemory(StreamData->cStreamName, + IData->pCurrent->StreamName, + StreamNameLen); + StreamData->cStreamName[StreamNameLen / sizeof(WCHAR)] = L'\0'; + break; + } + + default: + ASSERT(FALSE); + break; + } +} + + +/* + * @implemented + */ +HANDLE +WINAPI +FindFirstStreamW(IN LPCWSTR lpFileName, + IN STREAM_INFO_LEVELS InfoLevel, + OUT LPVOID lpFindStreamData, + IN DWORD dwFlags) +{ + PKERNEL32_FIND_DATA_HEADER IHeader = NULL; + PKERNEL32_FIND_STREAM_DATA IData = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING NtPathU; + HANDLE FileHandle = NULL; + NTSTATUS Status; + ULONG BufferSize = 0; + + if (dwFlags != 0 || InfoLevel != FindStreamInfoStandard || + lpFindStreamData == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + /* validate & translate the filename */ + if (!RtlDosPathNameToNtPathName_U(lpFileName, + &NtPathU, + NULL, + NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + /* open the file */ + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&FileHandle, + 0, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the search context */ + IHeader = RtlAllocateHeap(hProcessHeap, + 0, + sizeof(KERNEL32_FIND_DATA_HEADER) + + sizeof(KERNEL32_FIND_STREAM_DATA)); + if (IHeader == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + IHeader->Type = StreamFind; + IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); + + /* capture all information about the streams */ + IData->InfoLevel = InfoLevel; + IData->pCurrent = NULL; + IData->pFileStreamInfo = NULL; + + do + { + BufferSize += 0x1000; + + if (IData->pFileStreamInfo == NULL) + { + IData->pFileStreamInfo = RtlAllocateHeap(hProcessHeap, + 0, + BufferSize); + if (IData->pFileStreamInfo == NULL) + { + Status = STATUS_NO_MEMORY; + break; + } + } + else + { + PFILE_STREAM_INFORMATION pfsi; + + pfsi = RtlReAllocateHeap(hProcessHeap, + 0, + IData->pFileStreamInfo, + BufferSize); + if (pfsi == NULL) + { + Status = STATUS_NO_MEMORY; + break; + } + + IData->pFileStreamInfo = pfsi; + } + + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + IData->pFileStreamInfo, + BufferSize, + FileStreamInformation); + + } while (Status == STATUS_BUFFER_TOO_SMALL); + + if (NT_SUCCESS(Status)) + { + NtClose(FileHandle); + FileHandle = NULL; + + /* select the first stream and return the information */ + IData->pCurrent = IData->pFileStreamInfo; + InternalCopyStreamInfo(IData, + lpFindStreamData); + + /* all done */ + Status = STATUS_SUCCESS; + } + +Cleanup: + if (FileHandle != NULL) + { + NtClose(FileHandle); + } + + RtlFreeUnicodeString(&NtPathU); + + if (!NT_SUCCESS(Status)) + { + if (IHeader != NULL) + { + if (IData->pFileStreamInfo != NULL) + { + RtlFreeHeap(hProcessHeap, + 0, + IData->pFileStreamInfo); + } + + RtlFreeHeap(hProcessHeap, + 0, + IHeader); + } + + SetLastErrorByStatus(Status); + return INVALID_HANDLE_VALUE; + } + + return (HANDLE)IHeader; +} + + +/* + * @implemented + */ +BOOL +WINAPI +FindNextStreamW(IN HANDLE hFindStream, + OUT LPVOID lpFindStreamData) +{ + PKERNEL32_FIND_DATA_HEADER IHeader; + PKERNEL32_FIND_STREAM_DATA IData; + + IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindStream; + if (hFindStream == NULL || hFindStream == INVALID_HANDLE_VALUE || + IHeader->Type != StreamFind) + { + SetLastError (ERROR_INVALID_HANDLE); + return FALSE; + } + + IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); + + /* select next stream if possible */ + if (IData->pCurrent->NextEntryOffset != 0) + { + IData->pCurrent = (PFILE_STREAM_INFORMATION)((ULONG_PTR)IData->pFileStreamInfo + + IData->pCurrent->NextEntryOffset); + } + else + { + SetLastError(ERROR_HANDLE_EOF); + return FALSE; + } + + /* return the information */ + InternalCopyStreamInfo(IData, + lpFindStreamData); + + return TRUE; +} + + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2006-01-15 01:24:59 UTC (rev 20881) +++ trunk/reactos/lib/kernel32/kernel32.def 2006-01-15 03:11:31 UTC (rev 20882) @@ -243,9 +243,11 @@ FindFirstFileExA@24 FindFirstFileExW@24 FindFirstFileW@8 +FindFirstStreamW@16 FindNextChangeNotification@4 FindNextFileA@8 FindNextFileW@8 +FindNextStreamW@8 FindFirstVolumeA@8 FindFirstVolumeMountPointA@12 FindFirstVolumeMountPointW@12 _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-15 01:24:59 UTC (rev 20881) +++ trunk/reactos/w32api/include/winbase.h 2006-01-15 03:11:31 UTC (rev 20882) @@ -809,6 +809,15 @@ WCHAR cFileName[MAX_PATH]; WCHAR cAlternateFileName[14]; } WIN32_FIND_DATAW,*PWIN32_FIND_DATAW,*LPWIN32_FIND_DATAW; +#if (_WIN32_WINNT >= 0x0501) +typedef enum _STREAM_INFO_LEVELS { + FindStreamInfoStandard +} STREAM_INFO_LEVELS; +typedef struct _WIN32_FIND_STREAM_DATAW { + LARGE_INTEGER StreamSize; + WCHAR cStreamName[MAX_PATH + 36]; +} WIN32_FIND_STREAM_DATAW, *PWIN32_FIND_STREAM_DATAW, *LPWIN32_FIND_STREAM_DATAW; +#endif typedef struct _WIN32_STREAM_ID { DWORD dwStreamId; DWORD dwStreamAttributes; @@ -1288,6 +1297,9 @@ HANDLE WINAPI FindFirstFileW(LPCWSTR,LPWIN32_FIND_DATAW); HANDLE WINAPI FindFirstFileExA(LPCSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID ,DWORD); HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOI D,DWORD); +#if (_WIN32_WINNT >= 0x0501) +HANDLE WINAPI FindFirstStreamW(LPCWSTR,STREAM_INFO_LEVELS,LPVOID,DWORD); +#endif BOOL WINAPI FindFirstFreeAce(PACL,PVOID*); #if (_WIN32_WINNT >= 0x0500) HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD); @@ -1298,6 +1310,9 @@ BOOL WINAPI FindNextChangeNotification(HANDLE); BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW); +#if (_WIN32_WINNT >= 0x0501) +BOOL WINAPI FindNextStreamW(HANDLE,LPVOID); +#endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD); BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD); @@ -1988,6 +2003,9 @@ #ifdef UNICODE typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA; +#if (_WIN32_WINNT >= 0x0501) +typedef WIN32_FIND_STREAM_DATAW WIN32_FIND_STREAM_DATA,*LPWIN32_FIND_STREAM_DATA; +#endif typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; typedef ENUMRESLANGPROCW ENUMRESLANGPROC; typedef ENUMRESNAMEPROCW ENUMRESNAMEPROC;

18 years, 8 months

[mf] 20881: release mozctl_install_semaphore semaphore when the user doesn't want to download the mozilla control

by mf＠svn.reactos.org

release mozctl_install_semaphore semaphore when the user doesn't want to download the mozilla control Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2006-01-15 01:12:00 UTC (rev 20880) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2006-01-15 01:24:59 UTC (rev 20881) @@ -406,6 +406,7 @@ WCHAR buf[0x100]; static const WCHAR szTitle[] = { 'R','e','a','c','t','O','S',0 }; HANDLE hsem; + BOOL ret = TRUE; SetLastError( ERROR_SUCCESS ); hsem = CreateSemaphoreA( NULL, 0, 1, "mozctl_install_semaphore"); @@ -413,17 +414,18 @@ { LoadStringW( shdocvw_hinstance, 1001, buf, sizeof buf/sizeof(WCHAR) ); r = MessageBoxW(NULL, buf, szTitle, MB_YESNO | MB_ICONQUESTION); - if( r != IDYES ) - return FALSE; - - DialogBoxW(shdocvw_hinstance, MAKEINTRESOURCEW(100), 0, dlProc); + if( r == IDYES ) + DialogBoxW(shdocvw_hinstance, MAKEINTRESOURCEW(100), 0, dlProc); + else + ret = FALSE; } else WaitForSingleObject( hsem, INFINITE ); + ReleaseSemaphore( hsem, 1, NULL ); CloseHandle( hsem ); - - return TRUE; + + return ret; } static BOOL SHDOCVW_TryLoadMozillaControl(void)

18 years, 8 months

[royce] 20880: fix "line #=0" and "missing function name" bugs in rsym data. There's one issue this fix causes - apparently macros will have their file/line # reported, instead of the location they are being invoked, but this is a far cry better than before.

by royce＠svn.reactos.org

fix "line #=0" and "missing function name" bugs in rsym data. There's one issue this fix causes - apparently macros will have their file/line # reported, instead of the location they are being invoked, but this is a far cry better than before. Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2006-01-15 00:51:40 UTC (rev 20879) +++ trunk/reactos/tools/rsym.c 2006-01-15 01:12:00 UTC (rev 20880) @@ -141,9 +141,10 @@ PSTAB_ENTRY StabEntry; ULONG Count, i; ULONG_PTR Address, LastFunctionAddress; - int First; + int First = 1; char *Name; char FuncName[256]; + PROSSYM_ENTRY Current; StabEntry = StabSymbolsBase; Count = StabSymbolsLength / sizeof(STAB_ENTRY); @@ -161,11 +162,20 @@ fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); return 1; } + Current = *SymbolsBase; + memset ( Current, 0, sizeof(*Current) ); LastFunctionAddress = 0; - First = 1; for (i = 0; i < Count; i++) { + if ( 0 == LastFunctionAddress ) + { + Address = StabEntry[i].n_value - ImageBase; + } + else + { + Address = LastFunctionAddress + StabEntry[i].n_value; + } switch (StabEntry[i].n_type) { case N_SO: @@ -179,32 +189,37 @@ { continue; } - Address = StabEntry[i].n_value - ImageBase; - if (Address != (*SymbolsBase)[*SymbolsCount].Address && ! First) + if ( First || Address != Current->Address ) { - (*SymbolsCount)++; + if ( !First ) + { + memset ( ++Current, 0, sizeof(*Current) ); + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; } - (*SymbolsBase)[*SymbolsCount].Address = Address; - (*SymbolsBase)[*SymbolsCount].FileOffset = FindOrAddString((char *) StabStringsBase - + StabEntry[i].n_strx, - StringsLength, - StringsBase); - (*SymbolsBase)[*SymbolsCount].FunctionOffset = 0; - (*SymbolsBase)[*SymbolsCount].SourceLine = 0; - LastFunctionAddress = 0; + Current->FileOffset = FindOrAddString((char *)StabStringsBase + + StabEntry[i].n_strx, + StringsLength, + StringsBase); break; case N_FUN: - if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) /* line # 0 isn't valid */ + if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) { + LastFunctionAddress = 0; /* line # 0 = end of function */ continue; } - Address = StabEntry[i].n_value - ImageBase; - if (Address != (*SymbolsBase)[*SymbolsCount].Address && ! First) + if ( First || Address != Current->Address ) { - (*SymbolsCount)++; - (*SymbolsBase)[*SymbolsCount].FileOffset = (*SymbolsBase)[*SymbolsCount - 1].FileOffset; + if ( !First ) + memset ( ++Current, 0, sizeof(*Current) ); + else + First = 0; + Current->Address = Address; + Current->FileOffset = Current[-1].FileOffset; } - (*SymbolsBase)[*SymbolsCount].Address = Address; if (sizeof(FuncName) <= strlen((char *) StabStringsBase + StabEntry[i].n_strx)) { free(*SymbolsBase); @@ -217,36 +232,32 @@ { *Name = '\0'; } - (*SymbolsBase)[*SymbolsCount].FunctionOffset = FindOrAddString(FuncName, - StringsLength, - StringsBase); - (*SymbolsBase)[*SymbolsCount].SourceLine = 0; + Current->FunctionOffset = FindOrAddString(FuncName, + StringsLength, + StringsBase); + Current->SourceLine = 0; LastFunctionAddress = Address; break; case N_SLINE: - if (0 == LastFunctionAddress) + if ( First || Address != Current->Address ) { - Address = StabEntry[i].n_value - ImageBase; + if ( !First ) + { + memset ( ++Current, 0, sizeof(*Current) ); + Current->FileOffset = Current[-1].FileOffset; + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; } - else - { - Address = LastFunctionAddress + StabEntry[i].n_value; - } - if (Address != (*SymbolsBase)[*SymbolsCount].Address && ! First) - { - (*SymbolsCount)++; - (*SymbolsBase)[*SymbolsCount].FileOffset = (*SymbolsBase)[*SymbolsCount - 1].FileOffset; - (*SymbolsBase)[*SymbolsCount].FunctionOffset = (*SymbolsBase)[*SymbolsCount - 1].FunctionOffset; - } - (*SymbolsBase)[*SymbolsCount].Address = Address; - (*SymbolsBase)[*SymbolsCount].SourceLine = StabEntry[i].n_desc; + Current->SourceLine = StabEntry[i].n_desc; break; default: continue; } - First = 0; } - (*SymbolsCount)++; + *SymbolsCount = (Current - *SymbolsBase + 1); qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); @@ -265,6 +276,7 @@ PCOFF_SYMENT CoffEntry; char FuncName[256]; char *p; + PROSSYM_ENTRY Current; CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; Count = CoffSymbolsLength / sizeof(COFF_SYMENT); @@ -275,12 +287,13 @@ return 1; } *SymbolsCount = 0; + Current = *SymbolsBase; for (i = 0; i < Count; i++) { if (ISFCN(CoffEntry[i].e_type) || C_EXT == CoffEntry[i].e_sclass) { - (*SymbolsBase)[*SymbolsCount].Address = CoffEntry[i].e_value; + Current->Address = CoffEntry[i].e_value; if (0 < CoffEntry[i].e_scnum) { if (PEFileHeader->NumberOfSections < CoffEntry[i].e_scnum) @@ -290,9 +303,9 @@ CoffEntry[i].e_scnum, PEFileHeader->NumberOfSections); return 1; } - (*SymbolsBase)[*SymbolsCount].Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; + Current->Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; } - (*SymbolsBase)[*SymbolsCount].FileOffset = 0; + Current->FileOffset = 0; if (0 == CoffEntry[i].e.e.e_zeroes) { if (sizeof(FuncName) <= strlen((char *) CoffStringsBase + CoffEntry[i].e.e.e_offset)) @@ -316,15 +329,16 @@ *p = '\0'; } p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); - (*SymbolsBase)[*SymbolsCount].FunctionOffset = FindOrAddString(p, + Current->FunctionOffset = FindOrAddString(p, StringsLength, StringsBase); - (*SymbolsBase)[*SymbolsCount].SourceLine = 0; - (*SymbolsCount)++; + Current->SourceLine = 0; + memset ( ++Current, 0, sizeof(*Current) ); } i += CoffEntry[i].e_numaux; } + *SymbolsCount = (Current - *SymbolsBase + 1); qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); return 0;

18 years, 8 months

[mf] 20879: remove incorrect include directory

by mf＠svn.reactos.org

remove incorrect include directory Modified: trunk/reactos/subsys/system/explorer/explorer.xml _____ Modified: trunk/reactos/subsys/system/explorer/explorer.xml --- trunk/reactos/subsys/system/explorer/explorer.xml 2006-01-15 00:47:25 UTC (rev 20878) +++ trunk/reactos/subsys/system/explorer/explorer.xml 2006-01-15 00:51:40 UTC (rev 20879) @@ -1,10 +1,8 @@ <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings ="true"> - <linkerflag>-luuid</linkerflag> <linkerflag>-lstdc++</linkerflag> <linkerflag>-fexceptions</linkerflag> <include base="explorer">.</include> - <include base="ReactOS">include/expat</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="WIN32" />

18 years, 8 months

[mf] 20878: fix Expat includes

by mf＠svn.reactos.org

fix Expat includes Modified: trunk/reactos/lib/expat/expat.xml _____ Modified: trunk/reactos/lib/expat/expat.xml --- trunk/reactos/lib/expat/expat.xml 2006-01-15 00:45:06 UTC (rev 20877) +++ trunk/reactos/lib/expat/expat.xml 2006-01-15 00:47:25 UTC (rev 20878) @@ -1,6 +1,7 @@ <module name="expat" type="staticlibrary"> <include base="expat">.</include> <include base="expat">lib</include> + <include base="ReactOS">include/libs/expat</include> <define name="HAVE_EXPAT_CONFIG_H" /> <define name="__USE_W32API" /> <directory name="lib">

18 years, 8 months

[ion] 20877: Fix msvc warnings

by ion＠svn.reactos.org

Fix msvc warnings Modified: trunk/reactos/subsys/system/cacls/cacls.c _____ Modified: trunk/reactos/subsys/system/cacls/cacls.c --- trunk/reactos/subsys/system/cacls/cacls.c 2006-01-15 00:09:32 UTC (rev 20876) +++ trunk/reactos/subsys/system/cacls/cacls.c 2006-01-15 00:45:06 UTC (rev 20877) @@ -45,24 +45,28 @@ lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); /* Find the string table block */ - if ((hrSrc = FindResourceW(hInst, - lpName, - (LPWSTR)RT_STRING)) && - (hRes = LoadResource(hInst, - hrSrc)) && - (lpStr = LockResource(hRes))) + hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING); + if (hrSrc) { - UINT x; + hRes = LoadResource(hInst, hrSrc); + if (hRes) + { + lpStr = LockResource(hRes); + if (lpStr) + { + UINT x; - /* Find the string we're looking for */ - uID &= 0xF; /* position in the block, same as % 16 */ - for (x = 0; x < uID; x++) - { - lpStr += (*lpStr) + 1; + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } } - - /* Found the string */ - return (int)(*lpStr); } return -1; } @@ -85,10 +89,11 @@ if ((*lpTarget) != NULL) { INT Ret; - if (!(Ret = LoadString(hInst, - uID, - *lpTarget, - ln))) + Ret = LoadString(hInst, + uID, + *lpTarget, + ln); + if (!Ret) { HeapFree(GetProcessHeap(), 0, @@ -322,7 +327,7 @@ _tprintf(_T("%s\\%s:"), Domain, Name); - IndentAccess = _tcslen(Domain) + _tcslen(Name); + IndentAccess = (DWORD)_tcslen(Domain) + _tcslen(Name); } else { @@ -330,7 +335,7 @@ _tprintf(_T("%s:"), DisplayString); - IndentAccess = _tcslen(DisplayString); + IndentAccess = (DWORD)_tcslen(DisplayString); } /* print the ACE Flags */ @@ -503,9 +508,9 @@ #ifdef _UNICODE -int main(void) +int __cdecl main(void) #else -int _main (int argc, char *argv[]) +int __cdecl _main (int argc, char *argv[]) #endif { #ifdef _UNICODE

18 years, 8 months

[mf] 20876: Update XMLStorage to Expat 2.0

by mf＠svn.reactos.org

Update XMLStorage to Expat 2.0 Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2006-01-15 00:06:30 UTC (rev 20875) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2006-01-15 00:09:32 UTC (rev 20876) @@ -443,8 +443,8 @@ case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; -//#endif -//#if XML_MAJOR_VERSION>=2 +#endif +#if XML_MAJOR_VERSION>=2 /* Added in 2.0. */ case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS";

18 years, 8 months

[mf] 20875: update header files to Expat Version 2.0

by mf＠svn.reactos.org

update header files to Expat Version 2.0 Modified: trunk/reactos/include/libs/expat/expat.h Modified: trunk/reactos/include/libs/expat/expat_external.h _____ Modified: trunk/reactos/include/libs/expat/expat.h --- trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:16 UTC (rev 20874) +++ trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:30 UTC (rev 20875) @@ -905,9 +905,9 @@ was detected; otherwise the location is the location of the last parse event, as described above. */ -XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser); -XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser); -XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser); +XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser); +XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser); +XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser); /* Return the number of bytes in the current event. Returns 0 if the event is in an internal entity. @@ -1002,9 +1002,9 @@ releases. Micro is bumped with each release, and set to 0 with each change to major or minor version. */ -#define XML_MAJOR_VERSION 1 -#define XML_MINOR_VERSION 95 -#define XML_MICRO_VERSION 8 +#define XML_MAJOR_VERSION 2 +#define XML_MINOR_VERSION 0 +#define XML_MICRO_VERSION 0 #ifdef __cplusplus } _____ Modified: trunk/reactos/include/libs/expat/expat_external.h --- trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:16 UTC (rev 20874) +++ trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:30 UTC (rev 20875) @@ -65,6 +65,7 @@ #endif #endif /* not defined XML_STATIC */ + /* If we didn't define it above, define it away: */ #ifndef XMLIMPORT #define XMLIMPORT @@ -94,6 +95,19 @@ typedef char XML_LChar; #endif /* XML_UNICODE */ +#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +typedef __int64 XML_Index; +typedef unsigned __int64 XML_Size; +#else +typedef long long XML_Index; +typedef unsigned long long XML_Size; +#endif +#else +typedef long XML_Index; +typedef unsigned long XML_Size; +#endif /* XML_LARGE_SIZE */ + #ifdef __cplusplus } #endif

18 years, 8 months

[mf] 20874: update to Expat Version 2.0

by mf＠svn.reactos.org

update to Expat Version 2.0 Modified: trunk/reactos/lib/expat/COPYING Modified: trunk/reactos/lib/expat/Changes Modified: trunk/reactos/lib/expat/MANIFEST Modified: trunk/reactos/lib/expat/README Modified: trunk/reactos/lib/expat/configure.in Modified: trunk/reactos/lib/expat/doc/reference.html Modified: trunk/reactos/lib/expat/examples/elements.c Modified: trunk/reactos/lib/expat/examples/outline.c Modified: trunk/reactos/lib/expat/lib/internal.h Modified: trunk/reactos/lib/expat/lib/xmlparse.c Modified: trunk/reactos/lib/expat/lib/xmlrole.c Modified: trunk/reactos/lib/expat/lib/xmltok.c Modified: trunk/reactos/lib/expat/lib/xmltok.h Modified: trunk/reactos/lib/expat/lib/xmltok_impl.c Modified: trunk/reactos/lib/expat/make-release.sh Modified: trunk/reactos/lib/expat/tests/README.txt Modified: trunk/reactos/lib/expat/tests/benchmark/README.txt Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.c Modified: trunk/reactos/lib/expat/tests/runtests.c Modified: trunk/reactos/lib/expat/win32/MANIFEST.txt Modified: trunk/reactos/lib/expat/win32/README.txt Modified: trunk/reactos/lib/expat/win32/expat.iss Modified: trunk/reactos/lib/expat/xmlwf/codepage.c Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.c Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.h Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.c _____ Modified: trunk/reactos/lib/expat/COPYING --- trunk/reactos/lib/expat/COPYING 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/COPYING 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,6 +1,6 @@ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001, 2002, 2003 Expat maintainers. +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the _____ Modified: trunk/reactos/lib/expat/Changes --- trunk/reactos/lib/expat/Changes 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/Changes 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,9 +1,16 @@ -Release 1.95.9 TBD +Release 2.0.0 Wed Jan 11 2006 - We no longer use the "check" library for C unit testing; we always use the (partial) internal implementation of the API. - Report XML_NS setting via XML_GetFeatureList(). - Fixed headers for use from C++. - - Updated to use libtool 1.5.10 (the most recent). + - XML_GetCurrentLineNumber() and XML_GetCurrentColumnNumber() + now return unsigned integers. + - Added XML_LARGE_SIZE switch to enable 64-bit integers for + byte indexes and line/column numbers. + - Updated to use libtool 1.5.22 (the most recent). + - Added support for AmigaOS. + - Some mostly minor bug fixes. SF issues include: 1006708, + 1021776, 1023646, 1114960, 1156398, 1221160, 1271642. Release 1.95.8 Fri Jul 23 2004 - Major new feature: suspend/resume. Handlers can now request _____ Modified: trunk/reactos/lib/expat/MANIFEST --- trunk/reactos/lib/expat/MANIFEST 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/MANIFEST 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,3 +1,14 @@ +amiga/stdlib.c +amiga/launch.c +amiga/expat_vectors.c +amiga/expat_lib.c +amiga/expat.xml +amiga/README.txt +amiga/Makefile +amiga/include/proto/expat.h +amiga/include/libraries/expat.h +amiga/include/interfaces/expat.h +amiga/include/inline4/expat.h bcb5/README.txt bcb5/all_projects.bpg bcb5/elements.bpf @@ -55,6 +66,7 @@ examples/outline.c examples/outline.dsp lib/Makefile.MPW +lib/amigaconfig.h lib/ascii.h lib/asciitab.h lib/expat.dsp _____ Modified: trunk/reactos/lib/expat/README --- trunk/reactos/lib/expat/README 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/README 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,5 +1,5 @@ - Expat, Release 1.95.8 + Expat, Release 2.0.0 This is Expat, a C library for parsing XML, written by James Clark. Expat is a stream-oriented XML parser. This means that you register @@ -9,7 +9,7 @@ structures for which you may register handlers. Windows users should use the expat_win32bin package, which includes -both precompiled libraries and executalbes, and source code for +both precompiled libraries and executables, and source code for developers. Expat is free software. You may copy, distribute, and modify it under @@ -48,14 +48,20 @@ /home/me/mystuff/bin, you can tell configure about that with: ./configure --prefix=/home/me/mystuff + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + ./configure CPPFLAGS=-DXML_LARGE_SIZE + After running the configure script, the "make" command will build things and "make install" will install things into their proper -location. Note that you need to have write permission into the -directories into which things will be installed. +location. Have a look at the "Makefile" to learn about additional +"make" options. Note that you need to have write permission into +the directories into which things will be installed. If you are interested in building Expat to provide document -information in UTF-16 rather than the default UTF-8, following these +information in UTF-16 rather than the default UTF-8, follow these instructions: 1. For UTF-16 output as unsigned short (and version/error _____ Modified: trunk/reactos/lib/expat/configure.in --- trunk/reactos/lib/expat/configure.in 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/configure.in 2006-01-15 00:06:16 UTC (rev 20874) @@ -25,8 +25,8 @@ dnl GNU M4 to test it right now. define([expat_version], ifdef([__gnu__], [esyscmd(conftools/get-version.sh lib/expat.h)], - [1.95.x])) -AC_INIT(expat, expat_version, expat-bugs(a)mail.libexpat.org) + [2.0.x])) +AC_INIT(expat, expat_version, expat-bugs(a)libexpat.org) undefine([expat_version]) AC_CONFIG_SRCDIR(Makefile.in) @@ -44,7 +44,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=5 +LIBCURRENT=6 LIBREVISION=0 LIBAGE=5 _____ Modified: trunk/reactos/lib/expat/doc/reference.html --- trunk/reactos/lib/expat/doc/reference.html 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/doc/reference.html 2006-01-15 00:06:16 UTC (rev 20874) @@ -19,7 +19,7 @@ <td class="banner"><h1>The Expat XML Parser</h1></td> </tr> <tr> - <td class="releaseno">Release 1.95.8</td> + <td class="releaseno">Release 2.0.0</td> <td></td> </tr> </table> @@ -344,6 +344,16 @@ short</code> is used. Defining this implies <code>XML_UNICODE</code>.</dd> +<dt>XML_LARGE_SIZE</dt> +<dd>If defined, causes the <code>XML_Size</code> and <code>XML_Index</code> +integer types to be at least 64 bits in size. This is intended to support +processing of very large input streams, where the return values of +<code><a href="#XML_GetCurrentByteIndex" >XML_GetCurrentByteIndex</a></code>, +<code><a href="#XML_GetCurrentLineNumber" >XML_GetCurrentLineNumber</a></code> and +<code><a href="#XML_GetCurrentColumnNumber" >XML_GetCurrentColumnNumber</a></code> +could overflow. It may not be supported by all compilers, and is turned +off by default.</dd> + <dt>XML_CONTEXT_BYTES</dt> <dd>The number of input bytes of markup context which the parser will ensure are available for reporting via <code><a href= @@ -984,14 +994,22 @@ <p>To state the obvious: the three parsing functions <code><a href= "#XML_Parse" >XML_Parse</a></code>, <code><a href= "#XML_ParseBuffer"> XML_ParseBuffer</a></code> and <code><a href= "#XML_GetBuffer"> -XML_GetBuffer</a></code> must not be -called from within a handler unless they operate on a separate parser -instance, that is, one that did not call the handler. For example, it -is OK to call the parsing functions from within an -<code>XML_ExternalEntityRefHandler</code>, if they apply to the parser -created by <code><a href= "#XML_ExternalEntityParserCreate" +XML_GetBuffer</a></code> must not be called from within a handler +unless they operate on a separate parser instance, that is, one that +did not call the handler. For example, it is OK to call the parsing +functions from within an <code>XML_ExternalEntityRefHandler</code>, +if they apply to the parser created by +<code><a href= "#XML_ExternalEntityParserCreate" >XML_ExternalEntityParserCreate</a></code>.</p> +<p>Note: the <code>len</code> argument passed to these functions +should be considerably less than the maximum value for an integer, +as it could create an integer overflow situation if the added +lengths of a buffer and the unprocessed portion of the previous buffer +exceed the maximum integer value. Input data at the end of a buffer +will remain unprocessed if it is part of an XML token for which the +end is not part of that buffer.</p> + <pre class="fcndec" id="XML_Parse"> enum XML_Status XMLCALL XML_Parse(XML_Parser p, @@ -1201,10 +1219,11 @@ a return value.</p> <p>Your handlers will be receiving strings in arrays of type -<code>XML_Char</code>. This type is defined in expat.h as <code>char -*</code> and contains bytes encoding UTF-8. Note that you'll receive -them in this form independent of the original encoding of the -document.</p> +<code>XML_Char</code>. This type is conditionally defined in expat.h as +either <code>char</code>, <code>wchar_t</code> or <code>unsigned short</code>. +The former implies UTF-8 encoding, the latter two imply UTF-16 encoding. +Note that you'll receive them in this form independent of the original +encoding of the document.</p> <div class="handler"> <pre class="setter" id="XML_SetStartElementHandler"> @@ -1896,7 +1915,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentByteIndex"> -long XMLCALL +XML_Index XMLCALL XML_GetCurrentByteIndex(XML_Parser p); </pre> <div class="fcndef"> @@ -1907,7 +1926,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentLineNumber"> -int XMLCALL +XML_Size XMLCALL XML_GetCurrentLineNumber(XML_Parser p); </pre> <div class="fcndef"> @@ -1916,7 +1935,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentColumnNumber"> -int XMLCALL +XML_Size XMLCALL XML_GetCurrentColumnNumber(XML_Parser p); </pre> <div class="fcndef"> _____ Modified: trunk/reactos/lib/expat/examples/elements.c --- trunk/reactos/lib/expat/examples/elements.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/examples/elements.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -2,11 +2,22 @@ reads an XML document from standard input and writes a line with the name of each element to standard output indenting child elements by one tab stop more than their parent element. + It must be used with Expat compiled for UTF-8 output. */ #include <stdio.h> #include "expat.h" +#ifdef XML_LARGE_SIZE +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +#define XML_FMT_INT_MOD "I64" +#else +#define XML_FMT_INT_MOD "ll" +#endif +#else +#define XML_FMT_INT_MOD "l" +#endif + static void XMLCALL startElement(void *userData, const char *name, const char **atts) { @@ -25,8 +36,14 @@ *depthPtr -= 1; } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> int +amiga_main(int argc, char *argv[]) +#else +int main(int argc, char *argv[]) +#endif { char buf[BUFSIZ]; XML_Parser parser = XML_ParserCreate(NULL); @@ -39,7 +56,7 @@ done = len < sizeof(buf); if (XML_Parse(parser, buf, len, done) == XML_STATUS_ERROR) { fprintf(stderr, - "%s at line %d\n", + "%s at line %" XML_FMT_INT_MOD "u\n", XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser)); return 1; _____ Modified: trunk/reactos/lib/expat/examples/outline.c --- trunk/reactos/lib/expat/examples/outline.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/examples/outline.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -18,12 +18,23 @@ * * Read an XML document from standard input and print an element * outline on standard output. + * Must be used with Expat compiled for UTF-8 output. */ #include <stdio.h> #include <expat.h> +#ifdef XML_LARGE_SIZE +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +#define XML_FMT_INT_MOD "I64" +#else +#define XML_FMT_INT_MOD "ll" +#endif +#else +#define XML_FMT_INT_MOD "l" +#endif + #define BUFFSIZE 8192 char Buff[BUFFSIZE]; @@ -54,8 +65,14 @@ Depth--; } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> int +amiga_main(int argc, char *argv[]) +#else +int main(int argc, char *argv[]) +#endif { XML_Parser p = XML_ParserCreate(NULL); if (! p) { @@ -77,7 +94,7 @@ done = feof(stdin); if (XML_Parse(p, Buff, len, done) == XML_STATUS_ERROR) { - fprintf(stderr, "Parse error at line %d:\n%s\n", + fprintf(stderr, "Parse error at line %" XML_FMT_INT_MOD "u:\n%s\n", XML_GetCurrentLineNumber(p), XML_ErrorString(XML_GetErrorCode(p))); exit(-1); _____ Modified: trunk/reactos/lib/expat/lib/internal.h --- trunk/reactos/lib/expat/lib/internal.h 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/internal.h 2006-01-15 00:06:16 UTC (rev 20874) @@ -20,7 +20,7 @@ and therefore subject to change. */ -#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__) +#if defined(__GNUC__) && defined(__i386__) /* We'll use this version by default only where we know it helps. regparm() generates warnings on Solaris boxes. See SF bug #692878. _____ Modified: trunk/reactos/lib/expat/lib/xmlparse.c --- trunk/reactos/lib/expat/lib/xmlparse.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmlparse.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -12,11 +12,13 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #elif defined(HAVE_EXPAT_CONFIG_H) #include <expat_config.h> #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat.h> +#include "expat.h" #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX @@ -456,7 +458,7 @@ char *m_bufferEnd; /* allocated end of buffer */ const char *m_bufferLim; - long m_parseEndByteIndex; + XML_Index m_parseEndByteIndex; const char *m_parseEndPtr; XML_Char *m_dataBuf; XML_Char *m_dataBufEnd; @@ -1604,9 +1606,9 @@ if (len > bufferLim - bufferEnd) { /* FIXME avoid integer overflow */ - int neededSize = len + (bufferEnd - bufferPtr); + int neededSize = len + (int)(bufferEnd - bufferPtr); #ifdef XML_CONTEXT_BYTES - int keep = bufferPtr - buffer; + int keep = (int)(bufferPtr - buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; @@ -1615,7 +1617,7 @@ if (neededSize <= bufferLim - buffer) { #ifdef XML_CONTEXT_BYTES if (keep < bufferPtr - buffer) { - int offset = (bufferPtr - buffer) - keep; + int offset = (int)(bufferPtr - buffer) - keep; memmove(buffer, &buffer[offset], bufferEnd - bufferPtr + keep); bufferEnd -= offset; bufferPtr -= offset; @@ -1628,7 +1630,7 @@ } else { char *newBuf; - int bufferSize = bufferLim - bufferPtr; + int bufferSize = (int)(bufferLim - bufferPtr); if (bufferSize == 0) bufferSize = INIT_BUFFER_SIZE; do { @@ -1642,7 +1644,7 @@ bufferLim = newBuf + bufferSize; #ifdef XML_CONTEXT_BYTES if (bufferPtr) { - int keep = bufferPtr - buffer; + int keep = (int)(bufferPtr - buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; memcpy(newBuf, &bufferPtr[-keep], bufferEnd - bufferPtr + keep); @@ -1749,7 +1751,7 @@ return errorCode; } -long XMLCALL +XML_Index XMLCALL XML_GetCurrentByteIndex(XML_Parser parser) { if (eventPtr) @@ -1761,7 +1763,7 @@ XML_GetCurrentByteCount(XML_Parser parser) { if (eventEndPtr && eventPtr) - return eventEndPtr - eventPtr; + return (int)(eventEndPtr - eventPtr); return 0; } @@ -1770,15 +1772,15 @@ { #ifdef XML_CONTEXT_BYTES if (eventPtr && buffer) { - *offset = eventPtr - buffer; - *size = bufferEnd - buffer; + *offset = (int)(eventPtr - buffer); + *size = (int)(bufferEnd - buffer); return buffer; } #endif /* defined XML_CONTEXT_BYTES */ return (char *) 0; } -int XMLCALL +XML_Size XMLCALL XML_GetCurrentLineNumber(XML_Parser parser) { if (eventPtr && eventPtr >= positionPtr) { @@ -1788,7 +1790,7 @@ return position.lineNumber + 1; } -int XMLCALL +XML_Size XMLCALL XML_GetCurrentColumnNumber(XML_Parser parser) { if (eventPtr && eventPtr >= positionPtr) { @@ -2324,12 +2326,12 @@ XmlConvert(enc, &fromPtr, rawNameEnd, (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - convLen = toPtr - (XML_Char *)tag->buf; + convLen = (int)(toPtr - (XML_Char *)tag->buf); if (fromPtr == rawNameEnd) { tag->name.strLen = convLen; break; } - bufSize = (tag->bufEnd - tag->buf) << 1; + bufSize = (int)(tag->bufEnd - tag->buf) << 1; { char *temp = (char *)REALLOC(tag->buf, bufSize); if (temp == NULL) @@ -2517,12 +2519,12 @@ ICHAR *dataPtr = (ICHAR *)dataBuf; XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); } else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)end - (XML_Char *)s); + (int)((XML_Char *)end - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, end); @@ -2547,7 +2549,7 @@ XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); if (s == next) break; *eventPP = s; @@ -2556,7 +2558,7 @@ else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)next - (XML_Char *)s); + (int)((XML_Char *)next - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, next); @@ -2854,8 +2856,10 @@ nsAtts[j].hash = uriHash; nsAtts[j].uriName = s; - if (!--nPrefixes) + if (!--nPrefixes) { + i += 2; break; + } } else /* not prefixed */ ((XML_Char *)s)[-1] = 0; /* clear flag */ @@ -3125,7 +3129,7 @@ XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = next; characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); if (s == next) break; *eventPP = s; @@ -3134,7 +3138,7 @@ else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)next - (XML_Char *)s); + (int)((XML_Char *)next - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, next); @@ -3799,7 +3803,8 @@ */ #ifdef XML_DTD if (doctypeSysid || useForeignDTD) { - dtd->hasParamEntityRefs = XML_TRUE; /* when docTypeSysid == NULL */ + XML_Bool hadParamEntityRefs = dtd->hasParamEntityRefs; + dtd->hasParamEntityRefs = XML_TRUE; if (paramEntityParsing && externalEntityRefHandler) { ENTITY *entity = (ENTITY *)lookup(&dtd->paramEntities, externalSubsetName, @@ -3815,11 +3820,17 @@ entity->systemId, entity->publicId)) return XML_ERROR_EXTERNAL_ENTITY_HANDLING; - if (dtd->paramEntityRead && - !dtd->standalone && - notStandaloneHandler && - !notStandaloneHandler(handlerArg)) - return XML_ERROR_NOT_STANDALONE; + if (dtd->paramEntityRead) { + if (!dtd->standalone && + notStandaloneHandler && + !notStandaloneHandler(handlerArg)) + return XML_ERROR_NOT_STANDALONE; + } + /* if we didn't read the foreign DTD then this means that there + is no external subset and we must reset dtd->hasParamEntityRefs + */ + else if (!doctypeSysid) + dtd->hasParamEntityRefs = hadParamEntityRefs; /* end of DTD - no need to update dtd->keepProcessing */ } useForeignDTD = XML_FALSE; @@ -3836,6 +3847,7 @@ last chance to read the foreign DTD */ if (useForeignDTD) { + XML_Bool hadParamEntityRefs = dtd->hasParamEntityRefs; dtd->hasParamEntityRefs = XML_TRUE; if (paramEntityParsing && externalEntityRefHandler) { ENTITY *entity = (ENTITY *)lookup(&dtd->paramEntities, @@ -3851,11 +3863,17 @@ entity->systemId, entity->publicId)) return XML_ERROR_EXTERNAL_ENTITY_HANDLING; - if (dtd->paramEntityRead && - !dtd->standalone && - notStandaloneHandler && - !notStandaloneHandler(handlerArg)) - return XML_ERROR_NOT_STANDALONE; + if (dtd->paramEntityRead) { + if (!dtd->standalone && + notStandaloneHandler && + !notStandaloneHandler(handlerArg)) + return XML_ERROR_NOT_STANDALONE; + } + /* if we didn't read the foreign DTD then this means that there + is no external subset and we must reset dtd->hasParamEntityRefs + */ + else + dtd->hasParamEntityRefs = hadParamEntityRefs; /* end of DTD - no need to update dtd->keepProcessing */ } } @@ -3996,7 +4014,7 @@ next - enc->minBytesPerChar); if (declEntity) { declEntity->textPtr = poolStart(&dtd->entityValuePool); - declEntity->textLen = poolLength(&dtd->entityValuePool); + declEntity->textLen = (int)(poolLength(&dtd->entityValuePool)); poolFinish(&dtd->entityValuePool); if (entityDeclHandler) { *eventEndPP = s; @@ -4681,7 +4699,7 @@ if (result == XML_ERROR_NONE) { if (textEnd != next && ps_parsing == XML_SUSPENDED) { - entity->processed = next - textStart; + entity->processed = (int)(next - textStart); processor = internalEntityProcessor; } else { @@ -4727,7 +4745,7 @@ if (result != XML_ERROR_NONE) return result; else if (textEnd != next && ps_parsing == XML_SUSPENDED) { - entity->processed = next - (char *)entity->textPtr; + entity->processed = (int)(next - (char *)entity->textPtr); return result; } else { @@ -4861,9 +4879,8 @@ return XML_ERROR_NO_MEMORY; entity = (ENTITY *)lookup(&dtd->generalEntities, name, 0); poolDiscard(&temp2Pool); - /* first, determine if a check for an existing declaration is needed; - if yes, check that the entity exists, and that it is internal, - otherwise call the default handler (if called from content) + /* First, determine if a check for an existing declaration is needed; + if yes, check that the entity exists, and that it is internal. */ if (pool == &dtd->pool) /* are we called from prolog? */ checkEntityDecl = @@ -4882,13 +4899,16 @@ return XML_ERROR_ENTITY_DECLARED_IN_PE; } else if (!entity) { - /* cannot report skipped entity here - see comments on - skippedEntityHandler + /* Cannot report skipped entity here - see comments on + skippedEntityHandler. if (skippedEntityHandler) skippedEntityHandler(handlerArg, name, 0); */ + /* Cannot call the default handler because this would be + out of sync with the call to the startElementHandler. if ((pool == &tempPool) && defaultHandler) reportDefault(parser, enc, ptr, next); + */ break; } if (entity->open) { @@ -5188,12 +5208,12 @@ ICHAR *dataPtr = (ICHAR *)dataBuf; XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; - defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf); + defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); *eventPP = s; } while (s != end); } else - defaultHandler(handlerArg, (XML_Char *)s, (XML_Char *)end - (XML_Char *)s); + defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XML_Char *)s)); } @@ -6075,7 +6095,7 @@ } } if (pool->blocks && pool->start == pool->blocks->s) { - int blockSize = (pool->end - pool->start)*2; + int blockSize = (int)(pool->end - pool->start)*2; pool->blocks = (BLOCK *) pool->mem->realloc_fcn(pool->blocks, (offsetof(BLOCK, s) @@ -6089,7 +6109,7 @@ } else { BLOCK *tem; - int blockSize = pool->end - pool->start; + int blockSize = (int)(pool->end - pool->start); if (blockSize < INIT_BLOCK_SIZE) blockSize = INIT_BLOCK_SIZE; else _____ Modified: trunk/reactos/lib/expat/lib/xmlrole.c --- trunk/reactos/lib/expat/lib/xmlrole.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmlrole.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -8,13 +8,15 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat_external.h> +#include "expat_external.h" #include "internal.h" #include "xmlrole.h" #include "ascii.h" _____ Modified: trunk/reactos/lib/expat/lib/xmltok.c --- trunk/reactos/lib/expat/lib/xmltok.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -8,13 +8,15 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat_external.h> +#include "expat_external.h" #include "internal.h" #include "xmltok.h" #include "nametab.h" _____ Modified: trunk/reactos/lib/expat/lib/xmltok.h --- trunk/reactos/lib/expat/lib/xmltok.h 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok.h 2006-01-15 00:06:16 UTC (rev 20874) @@ -111,8 +111,8 @@ typedef struct position { /* first line and first column are 0 not 1 */ - unsigned long lineNumber; - unsigned long columnNumber; + XML_Size lineNumber; + XML_Size columnNumber; } POSITION; typedef struct { _____ Modified: trunk/reactos/lib/expat/lib/xmltok_impl.c --- trunk/reactos/lib/expat/lib/xmltok_impl.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok_impl.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -1714,7 +1714,7 @@ ptr += MINBPC(enc); break; default: - return ptr - start; + return (int)(ptr - start); } } } @@ -1750,7 +1750,7 @@ LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4) #undef LEAD_CASE case BT_LF: - pos->columnNumber = (unsigned)-1; + pos->columnNumber = (XML_Size)-1; pos->lineNumber++; ptr += MINBPC(enc); break; @@ -1759,7 +1759,7 @@ ptr += MINBPC(enc); if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); - pos->columnNumber = (unsigned)-1; + pos->columnNumber = (XML_Size)-1; break; default: ptr += MINBPC(enc); _____ Modified: trunk/reactos/lib/expat/make-release.sh --- trunk/reactos/lib/expat/make-release.sh 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/make-release.sh 2006-01-15 00:06:16 UTC (rev 20874) @@ -7,8 +7,8 @@ # Note: tagname may be HEAD to just grab the head revision (e.g. for testing) # -CVSROOT=':ext:cvs.libexpat.org:/cvsroot/expat' -#CVSROOT=':pserver:anonymous@cvs.libexpat.org:/cvsroot/expat' +#CVSROOT=':ext:cvs.libexpat.org:/cvsroot/expat' +CVSROOT=':pserver:anonymous@cvs.libexpat.org:/cvsroot/expat' if test $# != 1; then echo "USAGE: $0 tagname" _____ Modified: trunk/reactos/lib/expat/tests/README.txt --- trunk/reactos/lib/expat/tests/README.txt 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/README.txt 2006-01-15 00:06:16 UTC (rev 20874) @@ -3,12 +3,12 @@ are not expected to be useful examples of Expat usage; see the examples/ directory for that. -The Expat tests use the "Check" unit testing framework for C. More -information on Check can be found at: +The Expat tests use a partial internal implementation of the "Check" +unit testing framework for C. More information on Check can be found at: http://check.sourceforge.net/ -Check 0.8 must be installed before the unit tests can be compiled & run. +Expat must be built and installed before "make check" can be executed. Since both Check and this test suite are young, it can all change in a later version. _____ Modified: trunk/reactos/lib/expat/tests/benchmark/README.txt --- trunk/reactos/lib/expat/tests/benchmark/README.txt 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/benchmark/README.txt 2006-01-15 00:06:16 UTC (rev 20874) @@ -4,7 +4,7 @@ The command line arguments are: - -n ... optional; if supplied, then namespace processing is turned on + -n ... optional; if supplied, namespace processing is turned on <file name> ... name/path of test xml file <buffer size> ... size of processing buffer; the file is parsed in chunks of this size @@ -13,4 +13,4 @@ Returns: The time (in seconds) it takes to parse the test file, - averaged of the number of iterations. \ No newline at end of file + averaged over the number of iterations. \ No newline at end of file _____ Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.c --- trunk/reactos/lib/expat/tests/benchmark/benchmark.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/benchmark/benchmark.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -4,6 +4,12 @@ #include <time.h> #include "expat.h" +#ifdef XML_LARGE_SIZE +#define XML_FMT_INT_MOD "ll" +#else +#define XML_FMT_INT_MOD "l" +#endif + static void usage(const char *prog, int rc) { @@ -12,7 +18,13 @@ exit(rc); } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> +int +amiga_main(int argc, char *argv[]) +#else int main (int argc, char *argv[]) +#endif { XML_Parser parser; char *XMLBuf, *XMLBufEnd, *XMLBufPtr; @@ -77,7 +89,8 @@ else parseBufferSize = bufferSize; if (!XML_Parse (parser, XMLBufPtr, parseBufferSize, isFinal)) { - fprintf (stderr, "error '%s' at line %d character %d\n", + fprintf (stderr, "error '%s' at line %" XML_FMT_INT_MOD \ + "u character %" XML_FMT_INT_MOD "u\n", XML_ErrorString (XML_GetErrorCode (parser)), XML_GetCurrentLineNumber (parser), XML_GetCurrentColumnNumber (parser)); _____ Modified: trunk/reactos/lib/expat/tests/runtests.c --- trunk/reactos/lib/expat/tests/runtests.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/runtests.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -17,7 +17,16 @@ #include "chardata.h" #include "minicheck.h" +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> +#endif +#ifdef XML_LARGE_SIZE +#define XML_FMT_INT_MOD "ll" +#else +#define XML_FMT_INT_MOD "l" +#endif + static XML_Parser parser; @@ -45,7 +54,8 @@ { char buffer[1024]; sprintf(buffer, - "\n %s (line %d, offset %d)\n reported from %s, line %d", + "\n %s (line %" XML_FMT_INT_MOD "u, offset %"\ + XML_FMT_INT_MOD "u)\n reported from %s, line %d", XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser), XML_GetCurrentColumnNumber(parser), @@ -397,14 +407,15 @@ "<tag>\n" "\n" "\n</tag>"; - int lineno; + XML_Size lineno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR) xml_failure(parser); lineno = XML_GetCurrentLineNumber(parser); if (lineno != 4) { char buffer[100]; - sprintf(buffer, "expected 4 lines, saw %d", lineno); + sprintf(buffer, + "expected 4 lines, saw %" XML_FMT_INT_MOD "u", lineno); fail(buffer); } } @@ -414,14 +425,15 @@ START_TEST(test_column_number_after_parse) { char *text = "<tag></tag>"; - int colno; + XML_Size colno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR) xml_failure(parser); colno = XML_GetCurrentColumnNumber(parser); if (colno != 11) { char buffer[100]; - sprintf(buffer, "expected 11 columns, saw %d", colno); + sprintf(buffer, + "expected 11 columns, saw %" XML_FMT_INT_MOD "u", colno); fail(buffer); } } @@ -434,7 +446,9 @@ CharData *storage = (CharData *) userData; char buffer[100]; - sprintf(buffer, "<%s> at col:%d line:%d\n", name, + sprintf(buffer, + "<%s> at col:%" XML_FMT_INT_MOD "u line:%"\ + XML_FMT_INT_MOD "u\n", name, XML_GetCurrentColumnNumber(parser), XML_GetCurrentLineNumber(parser)); CharData_AppendString(storage, buffer); @@ -446,7 +460,9 @@ CharData *storage = (CharData *) userData; char buffer[100]; - sprintf(buffer, "</%s> at col:%d line:%d\n", name, + sprintf(buffer, + "</%s> at col:%" XML_FMT_INT_MOD "u line:%"\ + XML_FMT_INT_MOD "u\n", name, XML_GetCurrentColumnNumber(parser), XML_GetCurrentLineNumber(parser)); CharData_AppendString(storage, buffer); @@ -495,14 +511,14 @@ "<a>\n" " <b>\n" " </a>"; /* missing </b> */ - int lineno; + XML_Size lineno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR) fail("Expected a parse error"); lineno = XML_GetCurrentLineNumber(parser); if (lineno != 3) { char buffer[100]; - sprintf(buffer, "expected 3 lines, saw %d", lineno); + sprintf(buffer, "expected 3 lines, saw %" XML_FMT_INT_MOD "u", lineno); fail(buffer); } } @@ -515,14 +531,15 @@ "<a>\n" " <b>\n" " </a>"; /* missing </b> */ - int colno; + XML_Size colno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR) fail("Expected a parse error"); colno = XML_GetCurrentColumnNumber(parser); if (colno != 4) { char buffer[100]; - sprintf(buffer, "expected 4 columns, saw %d", colno); + sprintf(buffer, + "expected 4 columns, saw %" XML_FMT_INT_MOD "u", colno); [truncated at 1000 lines; 299 more skipped]

18 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006