Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[mjmartin] 41018: - eventlog.h: Add CurrentRecord to EventSource struct as each EventLog handle must keep track of current record. - LogfInitializeNew/LogfInitializeExisting: Set LogFile MaxSize to just under 5k and add a FIXME to read value from registry. TODO. - LogfReadEvent: Change return value to DWORD so that errors can be passed back and last error can be set from caller(advapi32). Change RecordNumber parameter to pointer so that it can be returned and saved in rpc's handle for the EventL

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed May 20 17:07:19 2009 New Revision: 41018 URL: http://svn.reactos.org/svn/reactos?rev=41018&view=rev Log: - eventlog.h: Add CurrentRecord to EventSource struct as each EventLog handle must keep track of current record. - LogfInitializeNew/LogfInitializeExisting: Set LogFile MaxSize to just under 5k and add a FIXME to read value from registry. TODO. - LogfReadEvent: Change return value to DWORD so that errors can be passed back and last error can be set from caller(advapi32). Change RecordNumber parameter to pointer so that it can be returned and saved in rpc's handle for the EventLog. RecordNumber of 0 can only be used with flag EVENTLOG_SEQUENTIAL READ. Set BytesRead and BytesNeeded to 0 as caller expects those values for any failure. - LogfWriteData: Implement record overwriting when the LogFile has reached MaxSize. - Implement LogfGetCurrentRecord. - Code not active yet, will be with upcoming changes to base\services\eventlog\rpc.c. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Wed May 20 17:07:19 2009 @@ -94,6 +94,7 @@ typedef struct { PLOGFILE LogFile; + ULONG CurrentRecord; WCHAR *Name; } EVENTSOURCE, *PEVENTSOURCE; @@ -114,9 +115,9 @@ VOID LogfListRemoveItem(PLOGFILE Item); -BOOL LogfReadEvent(PLOGFILE LogFile, +DWORD LogfReadEvent(PLOGFILE LogFile, DWORD Flags, - DWORD RecordNumber, + DWORD * RecordNumber, DWORD BufSize, PBYTE Buffer, DWORD * BytesRead, @@ -138,6 +139,8 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile); DWORD LogfGetOldestRecord(PLOGFILE LogFile); + +DWORD LogfGetCurrentRecord(PLOGFILE LogFile); ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed May 20 17:07:19 2009 @@ -33,7 +33,9 @@ LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; - + /* FIXME: Read MaxSize from registry for this LogFile. + But for now limit EventLog size to just under 5K. */ + LogFile->Header.MaxSize = 5000; LogFile->Header.Signature = LOGFILE_SIGNATURE; if (!WriteFile(LogFile->hFile, &LogFile->Header, @@ -227,6 +229,10 @@ LogFile->Header.CurrentRecordNumber = dwRecordsNumber + 1; LogFile->Header.OldestRecordNumber = dwRecordsNumber ? 1 : 0; // FIXME + /* FIXME: Read MaxSize from registry for this LogFile. + But for now limit EventLog size to just under 5K. */ + LogFile->Header.MaxSize = 5000; + if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { @@ -509,9 +515,9 @@ LeaveCriticalSection(&LogFileListCs); } -BOOL LogfReadEvent(PLOGFILE LogFile, +DWORD LogfReadEvent(PLOGFILE LogFile, DWORD Flags, - DWORD RecordNumber, + DWORD * RecordNumber, DWORD BufSize, PBYTE Buffer, DWORD * BytesRead, @@ -521,46 +527,51 @@ DWORD dwBufferUsage = 0, dwRecNum; if (Flags & EVENTLOG_FORWARDS_READ && Flags & EVENTLOG_BACKWARDS_READ) - return FALSE; + return ERROR_INVALID_PARAMETER; if (!(Flags & EVENTLOG_FORWARDS_READ) && !(Flags & EVENTLOG_BACKWARDS_READ)) - return FALSE; + return ERROR_INVALID_PARAMETER; if (!Buffer || !BytesRead || !BytesNeeded) - return FALSE; - - dwRecNum = RecordNumber; + return ERROR_INVALID_PARAMETER; + + if ((*RecordNumber==0) && !(EVENTLOG_SEQUENTIAL_READ)) + { + return ERROR_INVALID_PARAMETER; + } + + dwRecNum = *RecordNumber; EnterCriticalSection(&LogFile->cs); + + *BytesRead = 0; + *BytesNeeded = 0; + dwOffset = LogfOffsetByNumber(LogFile, dwRecNum); if (!dwOffset) { LeaveCriticalSection(&LogFile->cs); - return FALSE; + return ERROR_HANDLE_EOF; } if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + DPRINT1("SetFilePointer() failed!\n"); + goto Done; + } + + if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + goto Done; + } + + if (dwRecSize > BufSize) + { + *BytesNeeded = dwRecSize; LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) - { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - if (dwRecSize > BufSize) - { - *BytesRead = 0; - *BytesNeeded = dwRecSize; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + return ERROR_INSUFFICIENT_BUFFER; } if (SetFilePointer(LogFile->hFile, @@ -568,21 +579,19 @@ NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, Buffer, dwRecSize, &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } dwBufferUsage += dwRead; - while (dwBufferUsage < BufSize) + while (dwBufferUsage <= BufSize) { if (Flags & EVENTLOG_FORWARDS_READ) dwRecNum++; @@ -596,9 +605,8 @@ if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, @@ -607,9 +615,8 @@ &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } if (dwBufferUsage + dwRecSize > BufSize) @@ -620,9 +627,8 @@ NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("SetFilePointer() failed!\n"); + goto Done; } if (!ReadFile(LogFile->hFile, @@ -631,25 +637,33 @@ &dwRead, NULL)) { - DPRINT1("ReadFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; + DPRINT1("ReadFile() failed!\n"); + goto Done; } dwBufferUsage += dwRead; } *BytesRead = dwBufferUsage; + * RecordNumber = dwRecNum; LeaveCriticalSection(&LogFile->cs); - return TRUE; + return ERROR_SUCCESS; + +Done: + DPRINT1("LogfReadEvent failed with %x\n",GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return GetLastError(); } BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) { DWORD dwWritten; + DWORD dwRead; SYSTEMTIME st; EVENTLOGEOF EofRec; - + PEVENTLOGRECORD RecBuf; + LARGE_INTEGER logFileSize; + ULONG RecOffSet; if (!Buffer) return FALSE; @@ -657,6 +671,72 @@ SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); EnterCriticalSection(&LogFile->cs); + + if (!GetFileSizeEx(LogFile->hFile, &logFileSize)) + { + return FALSE; + } + + /* If the size of the file is over MaxSize */ + if ((logFileSize.QuadPart + BufSize)> LogFile->Header.MaxSize) + { + RecBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(EVENTLOGRECORD)); + /* Determine how many records need to be overwritten */ + while (TRUE) + { + DPRINT("EventLogFile has reached maximume size\n"); + + if (!RecBuf) + { + DPRINT1("Failed to allocate buffer for OldestRecord!\n"); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + /* Get the oldest record data */ + RecOffSet = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); + if (SetFilePointer(LogFile->hFile, + RecOffSet, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (!ReadFile(LogFile->hFile, RecBuf, sizeof(EVENTLOGRECORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed!\n"); + HeapFree(GetProcessHeap(), 0, RecBuf); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (RecBuf->Reserved != LOGFILE_SIGNATURE) + { + DPRINT1("LogFile corrupt!\n"); + return FALSE; + } + + LogFile->Header.OldestRecordNumber++; + + /* Check the size of the record as the record adding may be larger */ + if (RecBuf->Length >= BufSize) + { + DPRINT1("Record will fit\n"); + LogFile->Header.StartOffset = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); + break; + } + else + { + DPRINT1("Record wont fit\n"); + } + } + HeapFree(GetProcessHeap(), 0, RecBuf); + } if (SetFilePointer(LogFile->hFile, LogFile->Header.EndOffset, @@ -758,6 +838,11 @@ DWORD LogfGetOldestRecord(PLOGFILE LogFile) { return LogFile->Header.OldestRecordNumber; +} + +DWORD LogfGetCurrentRecord(PLOGFILE LogFile) +{ + return LogFile->Header.CurrentRecordNumber; } BOOL LogfAddOffsetInformation(PLOGFILE LogFile, ULONG ulNumber, ULONG ulOffset)

15 years, 7 months

[cwittich] 41017: re-add missing LANGID definition

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed May 20 17:05:24 2009 New Revision: 41017 URL: http://svn.reactos.org/svn/reactos?rev=41017&view=rev Log: re-add missing LANGID definition Modified: trunk/reactos/dll/win32/msi/msiserver.idl Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Wed May 20 17:05:24 2009 @@ -29,6 +29,7 @@ typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; +typedef WORD LANGID; cpp_quote("#endif") [

15 years, 7 months

[cwittich] 41016: sync msi with wine 1.1.21

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed May 20 16:59:23 2009 New Revision: 41016 URL: http://svn.reactos.org/svn/reactos?rev=41016&view=rev Log: sync msi with wine 1.1.21 Added: trunk/reactos/dll/win32/msi/msi_Ro.rc (with props) Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/cond.tab.h trunk/reactos/dll/win32/msi/cond.y trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/delete.c trunk/reactos/dll/win32/msi/distinct.c trunk/reactos/dll/win32/msi/insert.c trunk/reactos/dll/win32/msi/join.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_De.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.tab.h trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/dll/win32/msi/where.c trunk/reactos/include/psdk/msi.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/cond.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.h?r… Modified: trunk/reactos/dll/win32/msi/cond.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.y?rev=4… Modified: trunk/reactos/dll/win32/msi/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev… Modified: trunk/reactos/dll/win32/msi/distinct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r… Modified: trunk/reactos/dll/win32/msi/insert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev… Modified: trunk/reactos/dll/win32/msi/join.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/join.c?rev=4… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=41… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=4… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_De.rc?re… Added: trunk/reactos/dll/win32/msi/msi_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ro.rc?re… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev… Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.h?re… Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=41… Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… Modified: trunk/reactos/dll/win32/msi/update.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev… Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=… Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=410…

15 years, 7 months

[dchapyshev] 41015: - Add check of params for NtGetWriteWatch/NtResetWriteWatch (from Wine) - Set Granularity to PAGE_SIZE Fixes crash in kernel32 virtual test

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed May 20 15:08:08 2009 New Revision: 41015 URL: http://svn.reactos.org/svn/reactos?rev=41015&view=rev Log: - Add check of params for NtGetWriteWatch/NtResetWriteWatch (from Wine) - Set Granularity to PAGE_SIZE Fixes crash in kernel32 virtual test Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=41015… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Wed May 20 15:08:08 2009 @@ -434,6 +434,9 @@ return (FALSE); } +/* + * @unimplemented + */ NTSTATUS NTAPI NtGetWriteWatch(IN HANDLE ProcessHandle, @@ -444,16 +447,42 @@ OUT PULONG EntriesInUserAddressArray, OUT PULONG Granularity) { + if (!EntriesInUserAddressArray || !Granularity) + { + return STATUS_ACCESS_VIOLATION; + } + + if (!*EntriesInUserAddressArray || !RegionSize) + { + return STATUS_INVALID_PARAMETER; + } + + if (!UserAddressArray) + { + return STATUS_ACCESS_VIOLATION; + } + + /* HACK: Set granularity to PAGE_SIZE */ + *Granularity = PAGE_SIZE; + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } +/* + * @unimplemented + */ NTSTATUS NTAPI NtResetWriteWatch(IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN ULONG RegionSize) { + if (!RegionSize) + { + return STATUS_INVALID_PARAMETER; + } + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

15 years, 7 months

[dchapyshev] 41014: - Fix crash in gdi32 bitmap winetest

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed May 20 11:51:22 2009 New Revision: 41014 URL: http://svn.reactos.org/svn/reactos?rev=41014&view=rev Log: - Fix crash in gdi32 bitmap winetest Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed May 20 11:51:22 2009 @@ -74,7 +74,6 @@ PLONG compr, PLONG size ) { - if (header->biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; @@ -467,6 +466,8 @@ UINT cjBmpScanSize; PVOID pvSafeBits = NULL; HBITMAP hBmp; + + if (!Header) return 0; pConvertedInfo = ConvertBitmapInfo(Data, ColorUse, &ConvertedInfoSize, FALSE);

15 years, 7 months

[cgutman] 41013: - Implement NdisGetFirstBufferFromPacketSafe and NdisCopyFromPacketToPacketSafe

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed May 20 07:31:46 2009 New Revision: 41013 URL: http://svn.reactos.org/svn/reactos?rev=41013&view=rev Log: - Implement NdisGetFirstBufferFromPacketSafe and NdisCopyFromPacketToPacketSafe Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Wed May 20 07:31:46 2009 @@ -963,6 +963,40 @@ } } +/* + * @implemented + */ +VOID +EXPORT +NdisGetFirstBufferFromPacketSafe( + IN PNDIS_PACKET _Packet, + OUT PNDIS_BUFFER *_FirstBuffer, + OUT PVOID *_FirstBufferVA, + OUT PUINT _FirstBufferLength, + OUT PUINT _TotalBufferLength, + IN MM_PAGE_PRIORITY Priority) +{ + PNDIS_BUFFER Buffer; + + Buffer = _Packet->Private.Head; + *_FirstBuffer = Buffer; + + if (Buffer != NULL) { + *_FirstBufferLength = MmGetMdlByteCount(Buffer); + *_FirstBufferVA = MmGetSystemAddressForMdlSafe(Buffer, Priority); + Buffer = Buffer->Next; + } else { + *_FirstBufferLength = 0; + *_FirstBufferVA = NULL; + } + + *_TotalBufferLength = *_FirstBufferLength; + + while (Buffer != NULL) { + *_TotalBufferLength += MmGetMdlByteCount(Buffer); + Buffer = Buffer->Next; + } +} /* * @implemented @@ -1207,4 +1241,83 @@ NDIS_SET_PACKET_CANCEL_ID(Packet, CancelId); } +/* + * @implemented + */ +VOID +EXPORT +NdisCopyFromPacketToPacketSafe( + IN PNDIS_PACKET Destination, + IN UINT DestinationOffset, + IN UINT BytesToCopy, + IN PNDIS_PACKET Source, + IN UINT SourceOffset, + OUT PUINT BytesCopied, + IN MM_PAGE_PRIORITY Priority) +{ + PNDIS_BUFFER SrcBuffer; + PNDIS_BUFFER DstBuffer; + PUCHAR DstData, SrcData; + UINT DstSize, SrcSize; + UINT Count, Total; + + *BytesCopied = 0; + + /* Skip DestinationOffset bytes in the destination packet */ + NdisGetFirstBufferFromPacketSafe(Destination, &DstBuffer, (PVOID*)&DstData, &DstSize, &Total, Priority); + if (!DstData || SkipToOffset(DstBuffer, DestinationOffset, &DstData, &DstSize) == 0xFFFFFFFF) + return; + + /* Skip SourceOffset bytes in the source packet */ + NdisGetFirstBufferFromPacketSafe(Source, &SrcBuffer, (PVOID*)&SrcData, &SrcSize, &Total, Priority); + if (!SrcData || SkipToOffset(SrcBuffer, SourceOffset, &SrcData, &SrcSize) == 0xFFFFFFFF) + return; + + /* Copy the data */ + for (Total = 0;;) { + /* Find out how many bytes we can copy at one time */ + if (BytesToCopy < SrcSize) + Count = BytesToCopy; + else + Count = SrcSize; + if (DstSize < Count) + Count = DstSize; + + RtlCopyMemory(DstData, SrcData, Count); + + Total += Count; + BytesToCopy -= Count; + if (BytesToCopy == 0) + break; + + DstSize -= Count; + if (DstSize == 0) { + /* No more bytes in destination buffer. Proceed to + the next buffer in the destination buffer chain */ + NdisGetNextBuffer(DstBuffer, &DstBuffer); + if (!DstBuffer) + break; + + NdisQueryBufferSafe(DstBuffer, (PVOID)&DstData, &DstSize, Priority); + if (!DstData) + break; + } + + SrcSize -= Count; + if (SrcSize == 0) { + /* No more bytes in source buffer. Proceed to + the next buffer in the source buffer chain */ + NdisGetNextBuffer(SrcBuffer, &SrcBuffer); + if (!SrcBuffer) + break; + + NdisQueryBufferSafe(SrcBuffer, (PVOID)&SrcData, &SrcSize, Priority); + if (!SrcData) + break; + } + } + + *BytesCopied = Total; +} + /* EOF */

15 years, 7 months

[cgutman] 41012: - Implement NdisGetPoolFromPacket, NdisPacketSize, NdisGetPacketCancelId, and NdisSetPacketCancelId

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed May 20 07:20:57 2009 New Revision: 41012 URL: http://svn.reactos.org/svn/reactos?rev=41012&view=rev Log: - Implement NdisGetPoolFromPacket, NdisPacketSize, NdisGetPacketCancelId, and NdisSetPacketCancelId Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Wed May 20 07:20:57 2009 @@ -1161,4 +1161,50 @@ *Status = NDIS_STATUS_SUCCESS; } +/* + * @implemented + */ +NDIS_HANDLE +EXPORT +NdisGetPoolFromPacket( + IN PNDIS_PACKET Packet) +{ + return Packet->Private.Pool; +} + +/* + * @implemented + */ +UINT +EXPORT +NdisPacketSize( + IN UINT ProtocolReservedSize) +{ + return sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedSize; +} + +/* + * @implemented + */ +PVOID +EXPORT +NdisGetPacketCancelId( + IN PNDIS_PACKET Packet) +{ + return NDIS_GET_PACKET_CANCEL_ID(Packet); +} + +/* + * @implemented + */ +VOID +EXPORT +NdisSetPacketCancelId( + IN PNDIS_PACKET Packet, + IN PVOID CancelId) +{ + NDIS_SET_PACKET_CANCEL_ID(Packet, CancelId); +} + /* EOF */

15 years, 7 months

[cgutman] 41011: - Store the MTU in the packet extension for use during segmentation by miniport drivers

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed May 20 07:10:49 2009 New Revision: 41011 URL: http://svn.reactos.org/svn/reactos?rev=41011&view=rev Log: - Store the MTU in the packet extension for use during segmentation by miniport drivers Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed May 20 07:10:49 2009 @@ -600,6 +600,7 @@ UINT Size; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context; KIRQL OldIrql; + UINT PacketLength; TI_DbgPrint(DEBUG_DATALINK, ("Called( NdisPacket %x, Offset %d, Adapter %x )\n", @@ -677,6 +678,14 @@ ((PCHAR)LinkAddress)[4] & 0xff, ((PCHAR)LinkAddress)[5] & 0xff)); } + + NdisQueryPacketLength(NdisPacket, &PacketLength); + + if (Adapter->MTU < PacketLength) { + /* This is NOT a pointer. MSDN explicitly says so. */ + NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket, + TcpLargeSendPacketInfo) = (PVOID)((ULONG)Adapter->MTU); + } TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql ); TI_DbgPrint(MID_TRACE, ("NdisSend\n"));

15 years, 7 months

[jimtabor] 41010: - GetMouseMovePointsEx is a direct call to kernel space. Move and sorted initial code.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 20 06:20:48 2009 New Revision: 41010 URL: http://svn.reactos.org/svn/reactos?rev=41010&view=rev Log: - GetMouseMovePointsEx is a direct call to kernel space. Move and sorted initial code. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Wed May 20 06:20:48 2009 @@ -14,37 +14,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -/* - * @unimplemented - */ -int -WINAPI -GetMouseMovePointsEx( - UINT cbSize, - LPMOUSEMOVEPOINT lppt, - LPMOUSEMOVEPOINT lpptBuf, - int nBufPoints, - DWORD resolution) -{ - if((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return -1; - } - - if(!lppt || !lpptBuf) - { - SetLastError(ERROR_NOACCESS); - return -1; - } - - UNIMPLEMENTED; - - SetLastError(ERROR_POINT_NOT_FOUND); - return -1; -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Wed May 20 06:20:48 2009 @@ -331,7 +331,7 @@ @ stdcall GetMessageW(ptr long long long) @ stdcall GetMonitorInfoA(long ptr) @ stdcall GetMonitorInfoW(long ptr) -@ stdcall GetMouseMovePointsEx(long ptr ptr long long) # Direct call NtUserGetMouseMovePointsEx +@ stdcall GetMouseMovePointsEx(long ptr ptr long long) NtUserGetMouseMovePointsEx @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) ; @ stub GetNextQueueWindow Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Wed May 20 06:20:48 2009 @@ -305,25 +305,28 @@ int nBufPoints, DWORD resolution) { + UserEnterExclusive(); + + if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return -1; + } + + _SEH2_TRY + { + ProbeForRead(lppt, cbSize, 1); + ProbeForWrite(lpptBuf, cbSize, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + SetLastWin32Error(ERROR_NOACCESS); + } + _SEH2_END; + /* - if (cbSize != sizeof (MOUSEMOVEPOINT) - { - SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); - return GMMP_ERR_POINT_NOT_FOUND; - } - - if (!lppt) - { - SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); - return GMMP_ERR_POINT_NOT_FOUND; - } - - if (!lpptBuf) - { - SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); - return GMMP_ERR_POINT_NOT_FOUND; - } - + Call a subfunction of GetMouseMovePointsEx! switch(resolution) { case GMMP_USE_DISPLAY_POINTS: @@ -335,8 +338,8 @@ } */ UNIMPLEMENTED - - return 0; + UserLeave(); + return -1; }

15 years, 7 months

[tkreuzer] 41009: mswsock: remove the old def file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 20 06:00:05 2009 New Revision: 41009 URL: http://svn.reactos.org/svn/reactos?rev=41009&view=rev Log: mswsock: remove the old def file Removed: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.def (removed) @@ -1,39 +1,0 @@ -; $Id$ -; -; MSWSOCK.DLL - Windows Sockets 2 DLL - -LIBRARY mswsock.dll - -EXPORTS -ServiceMain@8 @0 -SvchostPushServiceGlobals@4 @1 -AcceptEx@32 @2 -EnumProtocolsA@12 @3 -EnumProtocolsW@12 @4 -GetAcceptExSockaddrs@32 @5 -GetAddressByNameA@40 @6 -GetAddressByNameW@40 @7 -GetNameByTypeA@12 @8 -GetNameByTypeW@12 @9 -GetServiceA@28 @10 -GetServiceW@28 @11 -GetTypeByNameA@8 @12 -GetTypeByNameW@8 @13 -MigrateWinsockConfiguration@12 @14 -NPLoadNameSpaces@12 @15 -NSPStartup@8 @16 -SetServiceA@24 @17 -SetServiceW@24 @18 -StartWsdpService@0 @19 -StopWsdpService@0 @20 -TransmitFile@28 @21 -WSARecvEx@16 @22 -WSPStartup@76 @23 -dn_expand@20 @24 -getnetbyname@4 @25 -inet_network@4 @26 -rcmd@24 @27 -rexec@24 @28 -rresvport@4 @29 -s_perror@4 @30 -sethostname@8 @31

15 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
51
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 May 2009