Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

by gvg＠svn.reactos.com

Set eol-style Property changes on: trunk/reactos/include/idl/eventlogrpc.idl ___________________________________________________________________ Name: svn:eol-style + native

18 years, 12 months

[gvg] 17940: Saveliy Tretiakov <saveliyt@mail.ru>:

by gvg＠svn.reactos.com

Saveliy Tretiakov <saveliyt(a)mail.ru>: EventLog changes - Implement basic file operations (WindowsNT compatible file format) - Write events from lpc port to System Log (to read these events, open \ReactOS\system32\config\SysEvent.evt in Windows EventViewer) - RPC server (stubs) Added: trunk/reactos/include/idl/eventlogrpc.idl Modified: trunk/reactos/include/idl/idl.xml Modified: trunk/reactos/services/eventlog/eventlog.c Modified: trunk/reactos/services/eventlog/eventlog.h Modified: trunk/reactos/services/eventlog/eventlog.xml Added: trunk/reactos/services/eventlog/file.c Modified: trunk/reactos/services/eventlog/logport.c Added: trunk/reactos/services/eventlog/rpc.c _____ Added: trunk/reactos/include/idl/eventlogrpc.idl --- trunk/reactos/include/idl/eventlogrpc.idl 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/include/idl/eventlogrpc.idl 2005-09-20 07:58:28 UTC (rev 17940) @@ -0,0 +1,237 @@ +/* + * Copyright (c) 2005 Saveliy Tretiakov (saveliyt(a)mail.ru) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +[ + uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), + version(0.0), + pointer_default(unique), + explicit_handle +] + +interface eventlog +{ + /* + cpp_quote("#if 0") + typedef [handle, unique] wchar_t *LPWSTR; + typedef [handle, unique] char *LPSTR; + cpp_quote("#endif") + typedef [context_handle] void *LOGHANDLE; + typedef LOGHANDLE *PLOGHANDLE; + typedef unsigned int NTSTATUS; + + typedef struct _UNICODE_STRING { + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength)] wchar_t *Buffer; + } UNICODE_STRING, *PUNICODE_STRING; + + typedef struct _ANSI_STRING { + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength)] char *Buffer; + } ANSI_STRING, *PANSI_STRING; + */ + + #define LPWSTR wchar_t* + #define LPSTR char* + #define LOGHANDLE unsigned char* + #define PLOGHANDLE int* + #define NTSTATUS long + + /* Function 0 */ + NTSTATUS EventLogClearW( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] wchar_t *BackupName); + + /* Function 1 */ + NTSTATUS EventLogBackupW( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] wchar_t *FileName); + + /* Function 2 */ + NTSTATUS EventLogClose( + handle_t BindingHandle, + [in,out] PLOGHANDLE Handle); + + /* Function 3 */ + NTSTATUS EventLogUnregSrc( + handle_t BindingHandle, + [in,out] PLOGHANDLE Handle); + + /* Function 4 */ + NTSTATUS EventLogRecordsNumber( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [out] unsigned long *RecordsNumber); + + /* Function 5 */ + NTSTATUS EventLogGetOldestRec( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [out] unsigned long *OldestRecNumber); + + /* FIXME */ + NTSTATUS Unknown6(handle_t BindingHandle); + + /* Function 7 */ + NTSTATUS EventLogOpenW( + handle_t BindingHandle, + [in] LPWSTR ServerName, + [in] wchar_t *FileName, + [in] wchar_t *NullStr, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle ); + + /* Function 8 */ + NTSTATUS EventLogRegSrcW( + handle_t BindingHandle, + [in] LPWSTR ServerName, + [in] wchar_t *LogName, + [in] wchar_t *NullStr, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle); + + /* Function 9 */ + NTSTATUS EventLogOpenBackupW( + handle_t BindingHandle, + [in] LPWSTR ServerName, + [in] wchar_t *BackupName, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle); + + /* Function 10 */ + NTSTATUS EventLogReadW( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] unsigned long Flags, + [in] unsigned long Offset, + [in] unsigned long BufSize, + [out,size_is(BufSize)] unsigned char *Buffer, + [out] unsigned long *BytesRead, + [out] unsigned long *BytesNeeded); + + /* Function 11 */ + NTSTATUS EventLogReportEventW( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] unsigned long Time, + [in] unsigned short Type, + [in] unsigned short Category, + [in] unsigned long ID, + [in] unsigned short NumStrings, + [in] unsigned long DataSize, + [in] wchar_t *ComputerName, + [in] unsigned char *SID, + [in] wchar_t *Strings, + [in,size_is(DataSize)] unsigned char *Data, + [in] unsigned short Flags); + + /* Function 12 */ + NTSTATUS EventLogClearA( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] char *BackupName); + + /* Function 13 */ + NTSTATUS EventLogBackupA( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] char *BackupName); + + /* Function 14 */ + NTSTATUS EventLogOpenA( + handle_t BindingHandle, + [in] LPSTR ServerName, + [in] char *LogName, + [in] char *NullStr, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle); + + /* Function 15 */ + NTSTATUS EventLogRegSrcA( + handle_t BindingHandle, + [in] LPSTR ServerName, + [in] char *LogName, + [in] char *NullStr, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle); + + + /* Function 16 */ + NTSTATUS EventLogOpenBackupA( + handle_t BindingHandle, + [in] LPSTR ServerName, + [in] char *BackupName, + [in] unsigned long MajorVer, + [in] unsigned long MinorVer, + [out] PLOGHANDLE Handle); + + /* Function 17 */ + NTSTATUS EventLogReadA( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] unsigned long Flags, + [in] unsigned long Offset, + [in] unsigned long BufSize, + [out,size_is(BufSize)] unsigned char *Buffer, + [out] unsigned long *BytesRead, + [out] unsigned long *BytesNeeded); + + /* Function 18 */ + NTSTATUS EventLogReportEventA( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] unsigned long Time, + [in] unsigned short Type, + [in] unsigned short Category, + [in] unsigned long ID, + [in] unsigned short NumStrings, + [in] unsigned long DataSize, + [in] char *ComputerName, + [in] unsigned char *SID, + [in] char* Strings, + [in,size_is(DataSize)] unsigned char *Data, + [in] unsigned short Flags); + + /* FIXME */ + NTSTATUS Unknown19(handle_t BindingHandle); + + /* FIXME */ + NTSTATUS Unknown20(handle_t BindingHandle); + + /* FIXME */ + NTSTATUS Unknown21(handle_t BindingHandle); + + /* Function 22 */ + NTSTATUS EventLogGetInfo( + handle_t BindingHandle, + [in] LOGHANDLE Handle, + [in] unsigned long InfoLevel, + [out,size_is(BufSize)] unsigned char *Buffer, + [in] unsigned long BufSize, + [out] unsigned long *BytesNeeded); + +} + _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/include/idl/idl.xml 2005-09-20 07:58:28 UTC (rev 17940) @@ -23,4 +23,16 @@ <define name="_X86_" /> <file switches="-o">svcctl.idl</file> </module> +<module name="eventlog_server" type="rpcserver"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="-o">eventlogrpc.idl</file> +</module> +<module name="eventlog_client" type="rpcclient"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="-o">eventlogrpc.idl</file> +</module> </group> _____ Modified: trunk/reactos/services/eventlog/eventlog.c --- trunk/reactos/services/eventlog/eventlog.c 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/services/eventlog/eventlog.c 2005-09-20 07:58:28 UTC (rev 17940) @@ -1,83 +1,211 @@ /* - * ReactOS kernel - * Copyright (C) 2002, 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/eventlog/eventlog.c * PURPOSE: Event logging service - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Saveliy Tretiakov (saveliyt(a)mail.ru) + * Eric Kohl */ -/* INCLUDES *****************************************************************/ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - #include "eventlog.h" -#define NDEBUG -#include <debug.h> +VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv); - -VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv); - - -/* GLOBALS ******************************************************************/ - SERVICE_TABLE_ENTRY ServiceTable[2] = { {L"EventLog", (LPSERVICE_MAIN_FUNCTION)ServiceMain}, {NULL, NULL} }; +HANDLE MyHeap = NULL; +PLOGFILE SystemLog = NULL; -/* FUNCTIONS *****************************************************************/ +VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) +{ + HANDLE hThread; + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE) + PortThreadRoutine, + NULL, + 0, + NULL); + + if(!hThread) DPRINT("Can't create PortThread\n"); + else CloseHandle(hThread); + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE) + RpcThreadRoutine, + NULL, + 0, + NULL); -VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) + if(!hThread) DPRINT("Can't create RpcThread\n"); + else CloseHandle(hThread); +} + + +int main(int argc, char *argv[]) { - DPRINT("ServiceMain() called\n"); + WCHAR SysLogPath[MAX_PATH]; + MyHeap = HeapCreate(0, 1024*256, 0); - if (StartPortThread() == FALSE) - { - DPRINT("StartPortThread() failed\n"); - } + if(MyHeap==NULL) + { + DbgPrint("EventLog: FATAL ERROR, can't create heap.\n"); + return 1; + } + + /* + This will be fixed in near future + */ + + GetWindowsDirectory(SysLogPath, MAX_PATH); + lstrcat(SysLogPath, L"\\system32\\config\\SysEvent.evt"); - DPRINT("ServiceMain() done\n"); + SystemLog = LogfCreate(L"System", SysLogPath); + + if(SystemLog == NULL) + { + DbgPrint("EventLog: FATAL ERROR, can't create %S\n", SysLogPath); + HeapDestroy(MyHeap); + return 1; + } + + StartServiceCtrlDispatcher(ServiceTable); + + LogfClose(SystemLog); + HeapDestroy(MyHeap); + + return 0; } +VOID EventTimeToSystemTime(DWORD EventTime, + SYSTEMTIME *pSystemTime) +{ + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + FILETIME ftLocal; + union { + FILETIME ft; + ULONGLONG ll; + } u1970, uUCT; + + uUCT.ft.dwHighDateTime = 0; + uUCT.ft.dwLowDateTime = EventTime; + SystemTimeToFileTime(&st1970, &u1970.ft); + uUCT.ll = uUCT.ll * 10000000 + u1970.ll; + FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); + FileTimeToSystemTime(&ftLocal, pSystemTime); +} -int -main(int argc, char *argv[]) +VOID SystemTimeToEventTime(SYSTEMTIME *pSystemTime, + DWORD *pEventTime) { - DPRINT("main() called\n"); + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + union { + FILETIME ft; + ULONGLONG ll; + } Time, u1970; - StartServiceCtrlDispatcher(ServiceTable); + SystemTimeToFileTime(pSystemTime, &Time.ft); + SystemTimeToFileTime(&st1970, &u1970.ft); + *pEventTime = (Time.ll - u1970.ll) / 10000000; +} - DPRINT("main() done\n"); +VOID PRINT_HEADER(PFILE_HEADER header) +{ + DPRINT("SizeOfHeader=%d\n",header->SizeOfHeader); + DPRINT("Signature=0x%x\n",header->Signature); + DPRINT("MajorVersion=%d\n",header->MajorVersion); + DPRINT("MinorVersion=%d\n",header->MinorVersion); + DPRINT("FirstRecordOffset=%d\n",header->FirstRecordOffset); + DPRINT("EofOffset=0x%x\n",header->EofOffset); + DPRINT("NextRecord=%d\n",header->NextRecord); + DPRINT("OldestRecord=%d\n",header->OldestRecord); + DPRINT("unknown1=0x%x\n",header->unknown1); + DPRINT("unknown2=0x%x\n",header->unknown2); + DPRINT("SizeOfHeader2=%d\n",header->SizeOfHeader2); + DPRINT("Flags: "); + if(header->Flags & LOGFILE_FLAG1)DPRINT("LOGFILE_FLAG1 "); + if(header->Flags & LOGFILE_FLAG2)DPRINT("| LOGFILE_FLAG2 "); + if(header->Flags & LOGFILE_FLAG3)DPRINT("| LOGFILE_FLAG3 "); + if(header->Flags & LOGFILE_FLAG4)DPRINT("| LOGFILE_FLAG4"); + DPRINT("\n"); +} - ExitThread(0); +VOID PRINT_RECORD(PEVENTLOGRECORD pRec) +{ + UINT i; + WCHAR *str; + SYSTEMTIME time; + + DPRINT("Length=%d\n", pRec->Length ); + DPRINT("Reserved=0x%x\n", pRec->Reserved ); + DPRINT("RecordNumber=%d\n", pRec->RecordNumber ); + + EventTimeToSystemTime(pRec->TimeGenerated, &time); + DPRINT("TimeGenerated=%d.%d.%d %d:%d:%d\n", + time.wDay, time.wMonth, time.wYear, + time.wHour, time.wMinute, time.wSecond); - return 0; + EventTimeToSystemTime(pRec->TimeWritten, &time); + DPRINT("TimeWritten=%d.%d.%d %d:%d:%d\n", + time.wDay, time.wMonth, time.wYear, + time.wHour, time.wMinute, time.wSecond); + + DPRINT("EventID=%d\n", pRec->EventID ); + + switch(pRec->EventType) + { + case EVENTLOG_ERROR_TYPE: + DPRINT("EventType = EVENTLOG_ERROR_TYPE\n"); + break; + case EVENTLOG_WARNING_TYPE: + DPRINT("EventType = EVENTLOG_WARNING_TYPE\n"); + break; + case EVENTLOG_INFORMATION_TYPE: + DPRINT("EventType = EVENTLOG_INFORMATION_TYPE\n"); + break; + case EVENTLOG_AUDIT_SUCCESS: + DPRINT("EventType = EVENTLOG_AUDIT_SUCCESS\n"); + break; + case EVENTLOG_AUDIT_FAILURE: + DPRINT("EventType = EVENTLOG_AUDIT_FAILURE\n"); + break; + default: + DPRINT("EventType = %x\n"); + } + + DPRINT("NumStrings=%d\n", pRec->NumStrings ); + DPRINT("EventCategory=%d\n", pRec->EventCategory); + DPRINT("ReservedFlags=0x%x\n", pRec->ReservedFlags); + DPRINT("ClosingRecordNumber=%d\n", pRec->ClosingRecordNumber); + DPRINT("StringOffset=%d\n", pRec->StringOffset); + DPRINT("UserSidLength=%d\n", pRec->UserSidLength); + DPRINT("UserSidOffset=%d\n", pRec->UserSidOffset); + DPRINT("DataLength=%d\n", pRec->DataLength); + DPRINT("DataOffset=%d\n", pRec->DataOffset); + + DPRINT("SourceName: %S\n", (WCHAR *)(((PBYTE)pRec)+sizeof(EVENTLOGRECORD))); + i = (lstrlenW((WCHAR *)(((PBYTE)pRec)+sizeof(EVENTLOGRECORD)))+1)*sizeof(WCHAR); + DPRINT("ComputerName: %S\n", (WCHAR *)(((PBYTE)pRec)+sizeof(EVENTLOGRECORD)+i)); + + if(pRec->StringOffset < pRec->Length && pRec->NumStrings){ + DPRINT("Strings:\n"); + str = (WCHAR*)(((PBYTE)pRec)+pRec->StringOffset); + for(i = 0; i < pRec->NumStrings; i++) + { + DPRINT("[%d] %S\n", i, str); + str = str+lstrlenW(str)+1; + } + } + + DPRINT("Length2=%d\n", *(PDWORD)(((PBYTE)pRec)+pRec->Length-4)); } -/* EOF */ + + _____ Modified: trunk/reactos/services/eventlog/eventlog.h --- trunk/reactos/services/eventlog/eventlog.h 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/services/eventlog/eventlog.h 2005-09-20 07:58:28 UTC (rev 17940) @@ -1,17 +1,329 @@ - +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: eventlog.h + * PURPOSE: Event logging service + * PROGRAMMER: Saveliy Tretiakov (saveliyt(a)mail.ru) + */ + #ifndef __EVENTLOG_H__ #define __EVENTLOG_H__ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <debug.h> +#include "eventlogrpc_s.h" + typedef struct _IO_ERROR_LPC { PORT_MESSAGE Header; IO_ERROR_LOG_MESSAGE Message; } IO_ERROR_LPC, *PIO_ERROR_LPC; -BOOL -StartPortThread(VOID); +#define LOGHANDLE unsigned char* +#define PLOGHANDLE int* +#define MAJORVER 1 +#define MINORVER 1 +/* + * Our file format will be compatible with NT's + */ + +#define LOGFILE_SIGNATURE 0x654c664c + +/* + * FIXME + * Flags used in logfile header + */ +#define LOGFILE_FLAG1 1 +#define LOGFILE_FLAG2 2 +#define LOGFILE_FLAG3 4 +#define LOGFILE_FLAG4 8 + +typedef struct { + DWORD SizeOfHeader; + DWORD Signature; + DWORD MajorVersion; + DWORD MinorVersion; + DWORD FirstRecordOffset; + DWORD EofOffset; + DWORD NextRecord; + DWORD OldestRecord; + DWORD unknown1; + DWORD Flags; + DWORD unknown2; + DWORD SizeOfHeader2; +} FILE_HEADER, *PFILE_HEADER; + +typedef struct { + DWORD Size1; + DWORD Ones; // Must be 0x11111111 + DWORD Twos; // Must be 0x22222222 + DWORD Threes; // Must be 0x33333333 + DWORD Fours; // Must be 0x44444444 + DWORD StartOffset; + DWORD EndOffset; + DWORD NextRecordNumber; + DWORD OldestRecordNumber; + DWORD Size2; +} EOF_RECORD, *PEOF_RECORD; + +typedef struct { + ULONG EventNumber; + ULONG EventOffset; +} EVENT_OFFSET_INFO, *PEVENT_OFFSET_INFO; + +typedef struct { + HANDLE hFile; + FILE_HEADER Header; + WCHAR *LogName; + WCHAR *FileName; + CRITICAL_SECTION cs; + PEVENT_OFFSET_INFO OffsetInfo; + ULONG OffsetInfoSize; + ULONG OffsetInfoNext; + PVOID Next; + PVOID Prev; +} LOGFILE, *PLOGFILE; + + +/* file.c */ +PLOGFILE LogfListHead(); + +INT LogfListItemCount(); + +PLOGFILE LogfListItemByIndex(INT Index); + +PLOGFILE LogfListItemByName(WCHAR *Name); + +VOID LogfListAddItem(PLOGFILE Item); + +VOID LogfListRemoveItem(PLOGFILE Item); + +BOOL LogfReadEvent(PLOGFILE LogFile, + DWORD Flags, + DWORD RecordNumber, + DWORD BufSize, + PBYTE Buffer, + DWORD *BytesRead, + DWORD *BytesNeeded); + +BOOL LogfWriteData(PLOGFILE LogFile, + DWORD BufSize, + PBYTE Buffer); + +PLOGFILE LogfCreate(WCHAR *LogName, + WCHAR *FileName); + +VOID LogfClose(PLOGFILE LogFile); + +BOOL LogfInitializeNew(PLOGFILE LogFile); + +BOOL LogfInitializeExisting(PLOGFILE LogFile); + +DWORD LogfGetOldestRecord(PLOGFILE LogFile); + +ULONG LogfOffsetByNumber(PLOGFILE LogFile, + DWORD RecordNumber); + +BOOL LogfAddOffsetInformation(PLOGFILE LogFile, + ULONG ulNumber, + ULONG ulOffset); + +DWORD LogfBuildNewRecord(PBYTE Buffer, + DWORD dwRecordNumber, + WORD wType, + WORD wCategory, + DWORD dwEventId, + LPCWSTR SourceName, + LPCWSTR ComputerName, + DWORD dwSidLength, + PSID lpUserSid, + WORD wNumStrings, + WCHAR *lpStrings, + DWORD dwDataSize, + LPVOID lpRawData); + +/* eventlog.c */ +VOID PRINT_HEADER(PFILE_HEADER header); + +VOID PRINT_RECORD(PEVENTLOGRECORD pRec); + +VOID EventTimeToSystemTime(DWORD EventTime, + SYSTEMTIME *SystemTime); + +VOID SystemTimeToEventTime(SYSTEMTIME *pSystemTime, + DWORD *pEventTime); + +/* logport.c */ +NTSTATUS STDCALL PortThreadRoutine(PVOID Param); + +NTSTATUS InitLogPort(VOID); + +NTSTATUS ProcessPortMessage(VOID); + +/* rpc.c */ +DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter); + +NTSTATUS EventLogClearW( + handle_t BindingHandle, + LOGHANDLE Handle, + wchar_t *BackupName); + +NTSTATUS EventLogBackupW( + handle_t BindingHandle, + LOGHANDLE Handle, + wchar_t *FileName); + +NTSTATUS EventLogClose( + handle_t BindingHandle, + PLOGHANDLE Handle); + +NTSTATUS EventLogUnregSrc( + handle_t BindingHandle, + PLOGHANDLE Handle); + +NTSTATUS EventLogRecordsNumber( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long *RecordsNumber); + +NTSTATUS EventLogGetOldestRec( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long *OldestRecNumber); + +NTSTATUS Unknown6(handle_t BindingHandle); + +NTSTATUS EventLogOpenW( + handle_t BindingHandle, + LPWSTR ServerName, + wchar_t *FileName, + wchar_t *NullStr, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogRegSrcW( + handle_t BindingHandle, + LPWSTR ServerName, + wchar_t *LogName, + wchar_t *NullStr, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogOpenBackupW( + handle_t BindingHandle, + LPWSTR ServerName, + wchar_t *BackupName, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogReadW( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long Flags, + unsigned long Offset, + unsigned long BufSize, + unsigned char *Buffer, + unsigned long *BytesRead, + unsigned long *BytesNeeded); + +NTSTATUS EventLogReportEventW( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long Time, + unsigned short Type, + unsigned short Category, + unsigned long ID, + unsigned short NumStrings, + unsigned long DataSize, + wchar_t *ComputerName, + unsigned char *SID, + wchar_t *Strings, + unsigned char *Data, + unsigned short Flags); + +NTSTATUS EventLogClearA( + handle_t BindingHandle, + LOGHANDLE Handle, + char *BackupName); + +NTSTATUS EventLogBackupA( + handle_t BindingHandle, + LOGHANDLE Handle, + char *BackupName); + +NTSTATUS EventLogOpenA( + handle_t BindingHandle, + LPSTR ServerName, + char *LogName, + char *NullStr, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogRegSrcA( + handle_t BindingHandle, + LPSTR ServerName, + char *LogName, + char *NullStr, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogOpenBackupA( + handle_t BindingHandle, + LPSTR ServerName, + char *BackupName, + unsigned long MajorVer, + unsigned long MinorVer, + PLOGHANDLE Handle); + +NTSTATUS EventLogReadA( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long Flags, + unsigned long Offset, + unsigned long BufSize, + unsigned char *Buffer, + unsigned long *BytesRead, + unsigned long *BytesNeeded); + +NTSTATUS EventLogReportEventA( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long Time, + unsigned short Type, + unsigned short Category, + unsigned long ID, + unsigned short NumStrings, + unsigned long DataSize, + char *ComputerName, + unsigned char *SID, + char* Strings, + unsigned char *Data, + unsigned short Flags); + +NTSTATUS Unknown19(handle_t BindingHandle); + +NTSTATUS Unknown20(handle_t BindingHandle); + +NTSTATUS Unknown21(handle_t BindingHandle); + +NTSTATUS EventLogGetInfo( + handle_t BindingHandle, + LOGHANDLE Handle, + unsigned long InfoLevel, + unsigned char *Buffer, + unsigned long BufSize, + unsigned long *BytesNeeded); + + + #endif /* __EVENTLOG_H__ */ -/* EOF */ _____ Modified: trunk/reactos/services/eventlog/eventlog.xml --- trunk/reactos/services/eventlog/eventlog.xml 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/services/eventlog/eventlog.xml 2005-09-20 07:58:28 UTC (rev 17940) @@ -1,12 +1,17 @@ <module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe"> <include base="eventlog">.</include> + <include base="eventlog_server">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> + <library>eventlog_server</library> + <library>rpcrt4</library> <file>eventlog.c</file> <file>logport.c</file> <file>eventlog.rc</file> + <file>rpc.c</file> + <file>file.c</file> </module> _____ Added: trunk/reactos/services/eventlog/file.c --- trunk/reactos/services/eventlog/file.c 2005-09-20 07:37:45 UTC (rev 17939) +++ trunk/reactos/services/eventlog/file.c 2005-09-20 07:58:28 UTC (rev 17940) @@ -0,0 +1,684 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: services/eventlog/file.c + * PURPOSE: Event logging service + * PROGRAMMER: Saveliy Tretiakov (saveliyt(a)mail.ru) + */ + +#include "eventlog.h" + +PLOGFILE _LogListHead = NULL; +extern HANDLE MyHeap; + +BOOL LogfInitializeNew(PLOGFILE LogFile) +{ + DWORD dwWritten; + EOF_RECORD EofRec; + + ZeroMemory(&LogFile->Header, sizeof(FILE_HEADER)); + SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); + SetEndOfFile(LogFile->hFile); + + LogFile->Header.SizeOfHeader = sizeof(FILE_HEADER); + LogFile->Header.SizeOfHeader2 = sizeof(FILE_HEADER); + LogFile->Header.FirstRecordOffset = sizeof(FILE_HEADER); + LogFile->Header.EofOffset = sizeof(FILE_HEADER); + LogFile->Header.MajorVersion = MAJORVER; + LogFile->Header.MinorVersion = MINORVER; + LogFile->Header.NextRecord = 1; + + LogFile->Header.Signature = LOGFILE_SIGNATURE; + WriteFile(LogFile->hFile, + &LogFile->Header, + sizeof(FILE_HEADER), + &dwWritten, + NULL); + + EofRec.Ones = 0x11111111; + EofRec.Twos = 0x22222222; + EofRec.Threes = 0x33333333; + EofRec.Fours = 0x44444444; + EofRec.Size1 = sizeof(EOF_RECORD); + EofRec.Size2 = sizeof(EOF_RECORD); + EofRec.NextRecordNumber = LogFile->Header.NextRecord; + EofRec.OldestRecordNumber = LogFile->Header.OldestRecord; + EofRec.StartOffset = LogFile->Header.FirstRecordOffset; + EofRec.EndOffset = LogFile->Header.EofOffset; + + WriteFile(LogFile->hFile, &EofRec, sizeof(EOF_RECORD), &dwWritten, NULL); + + FlushFileBuffers(LogFile->hFile); + + return TRUE; +} + +BOOL LogfInitializeExisting(PLOGFILE LogFile) +{ + DWORD dwRead; + DWORD dwRecordsNumber = 0; + DWORD dwRecSize, dwRecSign, dwFilePointer; + PDWORD pdwRecSize2; + PEVENTLOGRECORD RecBuf; + + SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); + ReadFile(LogFile->hFile, + &LogFile->Header, + sizeof(FILE_HEADER), + &dwRead, NULL); + + if(dwRead != sizeof(FILE_HEADER)) + { + DPRINT("EventLog: Invalid file %S.\n", LogFile->FileName); + return LogfInitializeNew(LogFile); + } + + if(LogFile->Header.SizeOfHeader != sizeof(FILE_HEADER) || + LogFile->Header.SizeOfHeader2 != sizeof(FILE_HEADER)) + { + DPRINT("EventLog: Invalid header size in %S.\n", LogFile->FileName); + return LogfInitializeNew(LogFile); + } + + if(LogFile->Header.Signature != LOGFILE_SIGNATURE) + { + DPRINT("EventLog: Invalid signature %x in %S.\n", + LogFile->Header.Signature, + LogFile->FileName); + return LogfInitializeNew(LogFile); + } + + if(LogFile->Header.EofOffset > GetFileSize(LogFile->hFile, NULL)+1) + { + DPRINT("EventLog: Invalid eof offset %x in %S.\n", + LogFile->Header.EofOffset, + LogFile->FileName); + return LogfInitializeNew(LogFile); + } + + for(;;) + { + dwFilePointer = SetFilePointer(LogFile->hFile, + 0, + NULL, + FILE_CURRENT); + + ReadFile(LogFile->hFile, [truncated at 1000 lines; 1352 more skipped]

18 years, 12 months

[gvg] 17939: Bletch <npwoods@mess.org>:

by gvg＠svn.reactos.com

Bletch <npwoods(a)mess.org>: .lnk files (and other files with hidden file extension) got one character truncated off the resulting filename. Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-09-19 23:00:25 UTC (rev 17938) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-09-20 07:37:45 UTC (rev 17939) @@ -230,8 +230,7 @@ if (type._neverShowExt && !dont_hide_ext) { int len = ext - entry->_data.cFileName; entry->_display_name = (LPTSTR) malloc((len+1)*sizeof(TCHAR)); - lstrcpyn(entry->_display_name, entry->_data.cFileName, len); - entry->_display_name[len] = TEXT('\0'); + lstrcpyn(entry->_display_name, entry->_data.cFileName, len + 1); } if (is_exe_file(ext))

18 years, 12 months

[royce] 17938: hack fix to pass % to set/a unmolested

by royce＠svn.reactos.com

hack fix to pass % to set/a unmolested Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 22:00:01 UTC (rev 17937) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 23:00:25 UTC (rev 17938) @@ -1075,9 +1075,10 @@ LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; + LPCTSTR tmp; BOOL bEchoThisLine; + BOOL bSubstitute; - do { /* if no batch input then... */ @@ -1091,10 +1092,15 @@ bEchoThisLine = FALSE; } + /* skip leading blanks */ + while ( _istspace(*ip) ) + ++ip; + cp = commandline; + bSubstitute = TRUE; while (*ip) { - if (*ip == _T('%')) + if (bSubstitute && *ip == _T('%')) { switch (*++ip) { @@ -1259,6 +1265,71 @@ if (_istcntrl (*ip)) *ip = _T(' '); *cp++ = *ip++; + + /* HACK HACK HACK check whether bSubstitute needs to be toggled */ + *cp = 0; + tmp = commandline; + tmp += _tcsspn(tmp,_T(" \t")); + /* first we find and skip and pre-redirections... */ + while ( _tcschr(_T("<>"),*tmp) + || !_tcsncmp(tmp,_T("1>"),2) + || !_tcsncmp(tmp,_T("2>"),2) ) + { + if ( _istdigit(*tmp) ) + tmp += 2; + else + tmp++; + tmp += _tcsspn(tmp,_T(" \t")); + if ( *tmp == _T('\"') ) + { + tmp = _tcschr(tmp+1,_T('\"')); + if ( tmp ) + ++tmp; + } + else + tmp = _tcspbrk(tmp,_T(" \t")); + tmp += _tcsspn(tmp,_T(" \t")); + } + /* we should now be pointing to the actual command + * (if there is one yet)*/ + if ( tmp ) + { + /* if we're currently substituting ( which is default ) + * check to see if we've parsed out a set/a. if so, we + * need to disable substitution until we come across a + * redirection */ + if ( bSubstitute ) + { + /* look for set /a */ + if ( !_tcsnicmp(tmp,_T("set"),3) ) + { + tmp += 3; + tmp += _tcsspn(tmp,_T(" \t")); + if ( !_tcsnicmp(tmp,_T("/a"),2) ) + bSubstitute = FALSE; + } + } + /* if we're not currently substituting, it means we're + * already inside a set /a. now we need to look for + * a redirection in order to turn redirection back on */ + else + { + /* look for redirector of some kind after the command */ + while ( (tmp = _tcspbrk ( tmp, _T("^<>|") )) ) + { + if ( *tmp == _T('^') ) + { + if ( _tcschr(_T("<>|&"), *++tmp ) ) + ++tmp; + } + else + { + bSubstitute = TRUE; + break; + } + } + } + } } *cp = _T('\0'); @@ -1385,8 +1456,8 @@ GetVersionEx (&osvi); /* Some people like to run ReactOS cmd.exe on Win98, it helps in the - build process. So don't link implicitly against ntdll.dll, load it - dynamically instead */ + * build process. So don't link implicitly against ntdll.dll, load it + * dynamically instead */ if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {

19 years

[royce] 17937: reformat code

by royce＠svn.reactos.com

reformat code Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 21:11:41 UTC (rev 17936) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-19 22:00:01 UTC (rev 17937) @@ -137,7 +137,7 @@ * * 06-jul-2005 (Magnus Olsen <magnus(a)greatlord.com>) * translate '%errorlevel%' to the internal value. - * Add proper memmory alloc ProcessInput, the error + * Add proper memmory alloc ProcessInput, the error * handling for memmory handling need to be improve */ @@ -199,8 +199,9 @@ return TRUE; } - Status = NtQueryInformationProcessPtr(Process, ProcessBasicInformation, - &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); + Status = NtQueryInformationProcessPtr ( + Process, ProcessBasicInformation, + &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); if (! NT_SUCCESS(Status)) { #ifdef _DEBUG @@ -208,8 +209,9 @@ #endif return TRUE; } - Status = NtReadVirtualMemoryPtr(Process, Info.PebBaseAddress, &ProcessPeb, - sizeof(PEB), &BytesRead); + Status = NtReadVirtualMemoryPtr ( + Process, Info.PebBaseAddress, &ProcessPeb, + sizeof(PEB), &BytesRead); if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) { #ifdef _DEBUG @@ -230,24 +232,24 @@ #endif typedef HINSTANCE (WINAPI *MYEX)( - HWND hwnd, - LPCTSTR lpOperation, - LPCTSTR lpFile, - LPCTSTR lpParameters, - LPCTSTR lpDirectory, - INT nShowCmd + HWND hwnd, + LPCTSTR lpOperation, + LPCTSTR lpFile, + LPCTSTR lpParameters, + LPCTSTR lpDirectory, + INT nShowCmd ); static BOOL RunFile(LPTSTR filename) { - HMODULE hShell32; - MYEX hShExt; - HINSTANCE ret; + HMODULE hShell32; + MYEX hShExt; + HINSTANCE ret; #ifdef _DEBUG - DebugPrintf (_T("RunFile(%s)\n"), filename); + DebugPrintf (_T("RunFile(%s)\n"), filename); #endif hShell32 = LoadLibrary(_T("SHELL32.DLL")); if (!hShell32) @@ -297,9 +299,9 @@ { TCHAR *szFullName=NULL; TCHAR *first = NULL; - TCHAR *rest = NULL; - TCHAR *full = NULL; - TCHAR *dot = NULL; + TCHAR *rest = NULL; + TCHAR *full = NULL; + TCHAR *dot = NULL; TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; @@ -307,56 +309,56 @@ DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); #endif - /* we need biger buffer that First, Rest, Full are already - need rewrite some code to use realloc when it need instead + /* we need biger buffer that First, Rest, Full are already + need rewrite some code to use realloc when it need instead of add 512bytes extra */ - first = malloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); + first = malloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); if (first == NULL) { - error_out_of_memory(); - return ; + error_out_of_memory(); + return ; } - rest = malloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); + rest = malloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); if (rest == NULL) { - free (first); - error_out_of_memory(); - return ; + free (first); + error_out_of_memory(); + return ; } - full = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); + full = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (full == NULL) { - free (first); - free (rest); - error_out_of_memory(); - return ; + free (first); + free (rest); + error_out_of_memory(); + return ; } szFullName = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (full == NULL) { - free (first); - free (rest); - free (full); - error_out_of_memory(); - return ; + free (first); + free (rest); + free (full); + error_out_of_memory(); + return ; } /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ if(!_tcschr(Full,_T('\"'))) - { + { _tcscpy(first,First); _tcscpy(rest,Rest); _tcscpy(full,Full); } else { - UINT i = 0; + UINT i = 0; BOOL bInside = FALSE; rest[0] = _T('\0'); full[0] = _T('\0'); @@ -409,8 +411,8 @@ if (!working) ConErrResPuts (STRING_FREE_ERROR1); free (first); - free (rest); - free (full); + free (rest); + free (full); free (szFullName); return; @@ -435,7 +437,7 @@ GetConsoleTitle (szWindowTitle, MAX_PATH); /* check if this is a .BAT or .CMD file */ - dot = _tcsrchr (szFullName, _T('.')); + dot = _tcsrchr (szFullName, _T('.')); if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { #ifdef _DEBUG @@ -507,19 +509,20 @@ } } // restore console mode - SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_PROCESSED_INPUT ); + SetConsoleMode ( + GetStdHandle( STD_INPUT_HANDLE ), + ENABLE_PROCESSED_INPUT ); } /* Get code page if it has been change */ InputCodePage= GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - SetConsoleTitle (szWindowTitle); + OutputCodePage = GetConsoleOutputCP(); + SetConsoleTitle (szWindowTitle); - free(first); - free(rest); - free(full); - free (szFullName); + free(first); + free(rest); + free(full); + free (szFullName); } @@ -549,11 +552,11 @@ com = malloc( (_tcslen(line) +512)*sizeof(TCHAR) ); if (com == NULL) { - error_out_of_memory(); - return; + error_out_of_memory(); + return; } - cp = com; + cp = com; /* Skip over initial white space */ while (_istspace (*line)) line++; @@ -589,9 +592,9 @@ /* if(_tcslen(com) > MAX_PATH) { - error_bad_command(); - free(com); - return; + error_bad_command(); + free(com); + return; } */ @@ -641,7 +644,7 @@ } } } - free(com); + free(com); } @@ -732,8 +735,8 @@ nRedirFlags |= ERROR_APPEND; _tcscpy(err, bc->Err); } - + /* Set up the initial conditions ... */ /* preserve STDIN, STDOUT and STDERR handles */ hOldConIn = GetStdHandle (STD_INPUT_HANDLE); @@ -746,10 +749,10 @@ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); - /* Set up pipe for the standard input handler */ + /* Set up pipe for the standard input handler */ hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -760,7 +763,7 @@ } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; @@ -777,19 +780,19 @@ while (num-- > 1) { SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* Create unique temporary file name */ + + /* Create unique temporary file name */ GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]); - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); /* Set current stdout to temporary file */ hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, &sa, TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); - - if (hFile[1] == INVALID_HANDLE_VALUE) - { + + if (hFile[1] == INVALID_HANDLE_VALUE) + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); return; @@ -822,8 +825,8 @@ _tcscpy (szFileName[0], szFileName[1]); *szFileName[1] = _T('\0'); - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); /* open new stdin file */ hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa, @@ -840,37 +843,37 @@ /* Final output to here */ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* we need make sure the LastError msg is zero before calling CreateFile */ - SetLastError(0); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); + + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); - - if (hFile == INVALID_HANDLE_VALUE) + + if (hFile == INVALID_HANDLE_VALUE) { - INT size = _tcslen(out)-1; - - if (out[size] != _T(':')) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); - return; - } - - out[size]=_T('\0'); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, - (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); + INT size = _tcslen(out)-1; - if (hFile == INVALID_HANDLE_VALUE) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); - return; - } - + if (out[size] != _T(':')) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + + out[size]=_T('\0'); + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, + (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + } if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) @@ -1074,7 +1077,7 @@ LPTSTR cp; BOOL bEchoThisLine; - + do { /* if no batch input then... */ @@ -1091,7 +1094,7 @@ cp = commandline; while (*ip) { - if (*ip == _T('%')) + if (*ip == _T('%')) { switch (*++ip) { @@ -1128,134 +1131,131 @@ if ((tp != NULL) && (tp <= _tcschr(ip, _T(' ')) - 1)) { - INT size = 512; + INT size = 512; TCHAR *evar; *tp = _T('\0'); - /* FIXME: Correct error handling when it can not alloc memmory */ - - /* %CD% */ - if (_tcsicmp(ip,_T("cd")) ==0) - { - TCHAR szPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szPath); - cp = _stpcpy (cp, szPath); - } - /* %TIME% */ - else if (_tcsicmp(ip,_T("time")) ==0) - { - TCHAR szTime[40]; - SYSTEMTIME t; - GetSystemTime(&t); + /* FIXME: Correct error handling when it can not alloc memmory */ - _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); - cp = _stpcpy (cp, szTime); - } - - /* %DATE% */ - else if (_tcsicmp(ip,_T("date")) ==0) - { - TCHAR szDate[40]; + /* %CD% */ + if (_tcsicmp(ip,_T("cd")) ==0) + { + TCHAR szPath[MAX_PATH]; + GetCurrentDirectory (MAX_PATH, szPath); + cp = _stpcpy (cp, szPath); + } + /* %TIME% */ + else if (_tcsicmp(ip,_T("time")) ==0) + { + TCHAR szTime[40]; + SYSTEMTIME t; + GetSystemTime(&t); + + _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); + cp = _stpcpy (cp, szTime); + } - GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - cp = _stpcpy (cp, _T(" ")); - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - } + /* %DATE% */ + else if (_tcsicmp(ip,_T("date")) ==0) + { + TCHAR szDate[40]; - /* %RANDOM% */ - else if (_tcsicmp(ip,_T("random")) ==0) - { - TCHAR szRand[40]; - /* Get random number */ - _itot(rand(),szRand,10); - cp = _stpcpy (cp, szRand); - } - - /* %CMDCMDLINE% */ - else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) - { - TCHAR *pargv; - /* Get random number */ - pargv = GetCommandLine(); - cp = _stpcpy (cp, pargv); - } + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); + cp = _stpcpy (cp, szDate); + cp = _stpcpy (cp, _T(" ")); + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); + cp = _stpcpy (cp, szDate); + } - /* %CMDEXTVERSION% */ - else if (_tcsicmp(ip,_T("cmdextversion")) ==0) - { - TCHAR szVER[40]; - /* Set version number to 2 */ - _itot(2,szVER,10); - cp = _stpcpy (cp, szVER); - } - - /* %ERRORLEVEL% */ - else if (_tcsicmp(ip,_T("errorlevel")) ==0) - { - evar = malloc ( size * sizeof(TCHAR)); - if (evar==NULL) - return 1; + /* %RANDOM% */ + else if (_tcsicmp(ip,_T("random")) ==0) + { + TCHAR szRand[40]; + /* Get random number */ + _itot(rand(),szRand,10); + cp = _stpcpy (cp, szRand); + } - memset(evar,0,512 * sizeof(TCHAR)); - _itot(nErrorLevel,evar,10); - cp = _stpcpy (cp, evar); + /* %CMDCMDLINE% */ + else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) + { + TCHAR *pargv; + /* Get random number */ + pargv = GetCommandLine(); + cp = _stpcpy (cp, pargv); + } - free(evar); - } - else - { - evar = malloc ( 512 * sizeof(TCHAR)); - if (evar==NULL) - return 1; - SetLastError(0); - size = GetEnvironmentVariable (ip, evar, 512); - if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) - { - /* if no env var is found you must - continue with what was input*/ - cp = _stpcpy (cp, _T("%")); - cp = _stpcpy (cp, ip); - cp = _stpcpy (cp, _T("%")); - } - else - { - if (size > 512) - { - evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar==NULL) - { - return 1; - } - size = GetEnvironmentVariable (ip, evar, size); - } + /* %CMDEXTVERSION% */ + else if (_tcsicmp(ip,_T("cmdextversion")) ==0) + { + TCHAR szVER[40]; + /* Set version number to 2 */ + _itot(2,szVER,10); + cp = _stpcpy (cp, szVER); + } - if (size) - { - cp = _stpcpy (cp, evar); - } - } + /* %ERRORLEVEL% */ + else if (_tcsicmp(ip,_T("errorlevel")) ==0) + { + evar = malloc ( size * sizeof(TCHAR)); + if (evar==NULL) + return 1; - free(evar); - } - + memset(evar,0,512 * sizeof(TCHAR)); + _itot(nErrorLevel,evar,10); + cp = _stpcpy (cp, evar); + + free(evar); + } + else + { + evar = malloc ( 512 * sizeof(TCHAR)); + if (evar==NULL) + return 1; + SetLastError(0); + size = GetEnvironmentVariable (ip, evar, 512); + if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + /* if no env var is found you must + continue with what was input*/ + cp = _stpcpy (cp, _T("%")); + cp = _stpcpy (cp, ip); + cp = _stpcpy (cp, _T("%")); + } + else + { + if (size > 512) + { + evar = realloc(evar,size * sizeof(TCHAR) ); + if (evar==NULL) + { + return 1; + } + size = GetEnvironmentVariable (ip, evar, size); + } + + if (size) + { + cp = _stpcpy (cp, evar); + } + } + + free(evar); + } + ip = tp + 1; } else { *cp++ = _T('%'); - } - + } + break; } continue; } - - - if (_istcntrl (*ip)) *ip = _T(' '); *cp++ = *ip++; @@ -1264,10 +1264,10 @@ *cp = _T('\0'); /* strip trailing spaces */ - while ((--cp >= commandline) && _istspace (*cp)); + while ((--cp >= commandline) && _istspace (*cp)); *(cp + 1) = _T('\0'); - + /* JPP 19980807 */ /* Echo batch file line */ if (bEchoThisLine) @@ -1379,7 +1379,7 @@ //INT len; //TCHAR *ptr, *cmdLine; - + /* get version information */ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx (&osvi); @@ -1421,11 +1421,11 @@ hOut = GetStdHandle (STD_OUTPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE); - /* Set EnvironmentVariable PROMPT if it does not exists any env value. - for you can change the EnvirommentVariable for prompt before cmd start + /* Set EnvironmentVariable PROMPT if it does not exists any env value. + for you can change the EnvirommentVariable for prompt before cmd start this patch are not 100% right, if it does not exists a PROMPT value cmd should use $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ - if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0) + if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0) SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); @@ -1636,45 +1636,45 @@ #ifdef _UNICODE PWCHAR * _CommandLineToArgvW(PWCHAR lpCmdLine, int *pNumArgs) { - PWCHAR * argvw = NULL; - PWCHAR ptr = lpCmdLine; - PWCHAR str; - int len; - int NumArgs; + PWCHAR * argvw = NULL; + PWCHAR ptr = lpCmdLine; + PWCHAR str; + int len; + int NumArgs; - NumArgs = 0; + NumArgs = 0; - while(lpCmdLine && *lpCmdLine) - { - while (iswspace(*lpCmdLine)) lpCmdLine++; - if (*lpCmdLine) - { - if ((NumArgs % 10)==0) - { - PWCHAR * old_argvw = argvw; - argvw = malloc((NumArgs + 10) * sizeof(PWCHAR)); - memcpy(argvw, old_argvw, NumArgs * sizeof(PWCHAR)); - free(old_argvw); - } - ptr = wcschr(lpCmdLine, L' '); - if (ptr) - { - len = ptr - lpCmdLine; - } - else - { - len = wcslen(lpCmdLine); - } - str = malloc((len + 1) * sizeof(WCHAR)); - memcpy(str, lpCmdLine, len * sizeof(WCHAR)); - str[len] = 0; - argvw[NumArgs]=str; - NumArgs++; - lpCmdLine = ptr; - } - } - *pNumArgs = NumArgs; - return argvw; + while(lpCmdLine && *lpCmdLine) + { + while (iswspace(*lpCmdLine)) lpCmdLine++; + if (*lpCmdLine) + { + if ((NumArgs % 10)==0) + { + PWCHAR * old_argvw = argvw; + argvw = malloc((NumArgs + 10) * sizeof(PWCHAR)); + memcpy(argvw, old_argvw, NumArgs * sizeof(PWCHAR)); + free(old_argvw); + } + ptr = wcschr(lpCmdLine, L' '); + if (ptr) + { + len = ptr - lpCmdLine; + } + else + { + len = wcslen(lpCmdLine); + } + str = malloc((len + 1) * sizeof(WCHAR)); + memcpy(str, lpCmdLine, len * sizeof(WCHAR)); + str[len] = 0; + argvw[NumArgs]=str; + NumArgs++; + lpCmdLine = ptr; + } + } + *pNumArgs = NumArgs; + return argvw; } #endif #endif @@ -1688,53 +1688,51 @@ int _main (int argc, char *argv[]) #endif { - TCHAR startPath[MAX_PATH]; - CONSOLE_SCREEN_BUFFER_INFO Info; - INT nExitCode; + TCHAR startPath[MAX_PATH]; + CONSOLE_SCREEN_BUFFER_INFO Info; + INT nExitCode; #ifdef _UNICODE - PWCHAR * argv; - int argc=0; + PWCHAR * argv; + int argc=0; #ifdef __REACTOS__ - argv = _CommandLineToArgvW(GetCommandLineW(), &argc); + argv = _CommandLineToArgvW(GetCommandLineW(), &argc); #else - argv = CommandLineToArgvW(GetCommandLineW(), &argc); + argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif #endif - - GetCurrentDirectory(MAX_PATH,startPath); - _tchdir(startPath); - SetFileApisToOEM(); - InputCodePage= 0; - OutputCodePage = 0; + GetCurrentDirectory(MAX_PATH,startPath); + _tchdir(startPath); - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) - { - ConErrFormatMessage(GetLastError()); - return(1); - } - wColor = Info.wAttributes; - wDefColor = wColor; + SetFileApisToOEM(); + InputCodePage= 0; + OutputCodePage = 0; - InputCodePage= GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - CMD_ModuleHandle = GetModuleHandle(NULL); - - /* check switches on command-line */ - Initialize(argc, argv); + hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) + { + ConErrFormatMessage(GetLastError()); + return(1); + } + wColor = Info.wAttributes; + wDefColor = wColor; - /* call prompt routine */ - nExitCode = ProcessInput(FALSE); + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); + CMD_ModuleHandle = GetModuleHandle(NULL); - - /* do the cleanup */ - Cleanup(argc, argv); + /* check switches on command-line */ + Initialize(argc, argv); - - return(nExitCode); + /* call prompt routine */ + nExitCode = ProcessInput(FALSE); + + /* do the cleanup */ + Cleanup(argc, argv); + + return(nExitCode); } /* EOF */

19 years

[gvg] 17936: - Add ctrl support to (most) keyboard layouts. Only tested for kbdus, added

by gvg＠svn.reactos.com

- Add ctrl support to (most) keyboard layouts. Only tested for kbdus, added to a few other I was confident about. Still to do: kbddv, kbdgr, kbdru, kbdsg - Prevent access outside array in TryToTranslateChar - Revert r17830, it handles ctrl keys at the wrong location This fixes bug 763. Modified: trunk/reactos/lib/keyboard/kbdbe/kbdbe.c Modified: trunk/reactos/lib/keyboard/kbdda/kbdda.c Modified: trunk/reactos/lib/keyboard/kbddv/kbddv.c Modified: trunk/reactos/lib/keyboard/kbdes/kbdes.c Modified: trunk/reactos/lib/keyboard/kbdfr/kbdfr.c Modified: trunk/reactos/lib/keyboard/kbdse/kbdse.c Modified: trunk/reactos/lib/keyboard/kbduk/kbduk.c Modified: trunk/reactos/lib/keyboard/kbdus/kbdus.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/lib/keyboard/kbdbe/kbdbe.c --- trunk/reactos/lib/keyboard/kbdbe/kbdbe.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdbe/kbdbe.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -180,37 +180,6 @@ { '8', NOCAPS, {'!', '8'} }, { VK_OEM_2, NOCAPS, {')', 0xB0} }, - /* First letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'Z', CAPS, {'z', 'Z'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - - /* Second letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - { 'M', CAPS, {'m', 'M'} }, - - /* Third letter row */ - { 'W', CAPS, {'w', 'W'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - /* Specials */ { VK_OEM_COMMA, CAPS, {',', '?'} }, { VK_OEM_PERIOD, CAPS, {';', '.'} }, @@ -228,6 +197,33 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, /* Legacy (telnet-style) ascii escapes */ { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f} }, //0x1f unit separator { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, @@ -242,6 +238,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ { '1', NOCAPS, {'&', '1', WCH_NONE, '|' } }, { '2', NOCAPS, {0xE9, '2', WCH_NONE, '@' } }, @@ -257,7 +254,7 @@ { VK_OEM_7, NOCAPS, {0xF9, '%', WCH_NONE, WCH_DEAD} }, { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, _____ Modified: trunk/reactos/lib/keyboard/kbdda/kbdda.c --- trunk/reactos/lib/keyboard/kbdda/kbdda.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdda/kbdda.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -173,35 +173,7 @@ { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ { VK_OEM_PLUS, NOCAPS, {'+', '?'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* ? */ - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ï */ @@ -222,6 +194,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, @@ -248,11 +248,11 @@ { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} }, { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, - { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbddv/kbddv.c --- trunk/reactos/lib/keyboard/kbddv/kbddv.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbddv/kbddv.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -143,35 +143,6 @@ { '8', NOCAPS, {'8', '*'} }, { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, - /* First letter row */ - { 'P', CAPS, {'p', 'P'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'L', CAPS, {'l', 'L'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'E', CAPS, {'e', 'E'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'S', CAPS, {'s', 'S'} }, - /* Third letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'M', CAPS, {'m', 'M'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'Z', CAPS, {'z', 'Z'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -205,6 +176,35 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, _____ Modified: trunk/reactos/lib/keyboard/kbdes/kbdes.c --- trunk/reactos/lib/keyboard/kbdes/kbdes.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdes/kbdes.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -249,36 +249,7 @@ { '8', NOCAPS, {'8', '('} }, { '9', NOCAPS, {'9', ')'} }, { '0', NOCAPS, {'0', '='} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - //La E tiene 3 estados - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, { VK_OEM_3, CAPS, {0x00F1, 0x00D1} }, // ±Ð - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, /* Specials */ /* Ctrl-_ generates ES */ @@ -303,6 +274,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, { 0,0 } @@ -315,7 +314,7 @@ { '2', NOCAPS, {'2', '"', WCH_NONE, '@'} }, // 2"@ { '3', NOCAPS, {'3', 0x00B7, WCH_NONE, '#'} }, // 3À# { '6', NOCAPS, {'6', '&', WCH_NONE, 0x00AC} }, // 6&¼ - { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20AC} }, // eEÇ + { 'E', CAPS, {'e', 'E', 0x05, 0x20AC} }, // eEÇ { VK_OEM_PLUS, NOCAPS, {'+', '*', WCH_NONE, 0x005d} }, // +*] { VK_OEM_2, NOCAPS, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // þÃ} _____ Modified: trunk/reactos/lib/keyboard/kbdfr/kbdfr.c --- trunk/reactos/lib/keyboard/kbdfr/kbdfr.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdfr/kbdfr.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -162,35 +162,6 @@ //{ '8', NOCAPS, {'_', '8'} }, //{ '9', NOCAPS, {'þ', '9'} }, //{ '0', NOCAPS, {'Ó', '0'} }, - /* First letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'Z', CAPS, {'z', 'Z'} }, - //{ 'E', CAPS, {'e', 'E'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - { 'M', CAPS, {'m', 'M'} }, - /* Third letter row */ - { 'W', CAPS, {'w', 'W'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -214,6 +185,34 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ { VK_OEM_102, 0, {'<', '>', 0x1c /* FS */} }, { VK_OEM_6, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE} }, @@ -234,7 +233,7 @@ { '9' , 1, {'þ', '9', WCH_NONE, '^'} }, { '0' , 1, {'Ó', '0', WCH_NONE, '@'} }, { VK_OEM_PLUS,0, {'=', '+', WCH_NONE, '}'} }, - { 'E' , 1, {'e', 'E', WCH_NONE, 'Ç' /* euro */} }, + { 'E' , 1, {'e', 'E', 0x05, 'Ç' /* euro */} }, { VK_OEM_1, 0, {'$', 'ú', WCH_NONE, 'ñ'} }, { VK_OEM_4, 0, {')', '?', WCH_NONE, ']'} }, { 0, 0 } _____ Modified: trunk/reactos/lib/keyboard/kbdse/kbdse.c --- trunk/reactos/lib/keyboard/kbdse/kbdse.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdse/kbdse.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -176,35 +176,6 @@ /* The numbers */ { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ - - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, /* Specials */ { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD} }, @@ -226,6 +197,33 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + /* Legacy (telnet-style) ascii escapes */ {VK_OEM_6, CAPS, {0xe5,0xc5, 0x1d /* GS */} }, { VK_OEM_5, NOCAPS, {0xa7,0xbd, 0x1c /* FS */} }, @@ -253,9 +251,9 @@ { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, { VK_OEM_PLUS ,NOCAPS, {'+', '?', WCH_NONE, '\\'} }, - { 'E', CAPS, {'e', 'E' , WCH_NONE, 0x00ac} }, + { 'E', CAPS, {'e', 'E' , 0x05, 0x00ac} }, { VK_OEM_1 ,NOCAPS, {0xa8, '^', 0x001d, '~'} }, - { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, {VK_OEM_102, NOCAPS, {'<', '>' ,0x001c,'|'} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbduk/kbduk.c --- trunk/reactos/lib/keyboard/kbduk/kbduk.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbduk/kbduk.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -146,32 +146,7 @@ { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, { VK_OEM_1 ,NOCAPS, {';', ':'} }, - - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, { VK_OEM_COMMA, NOCAPS, {',', '<'} }, { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, { VK_OEM_2, NOCAPS, {'/', '?'} }, @@ -201,6 +176,30 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-Shift */ + + /* The alphabet */ + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e} }, @@ -220,11 +219,11 @@ ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { /* Normal, Shifted, Ctrl, Sh-Ctrl,Sh-Alt,Ctl-Alt,Ctl-Sh-Alt */ - { 'E', CAPS, {'e', 'E', WCH_NONE, WCH_NONE, 0x00e9, 0x00c9} }, - { 'U', CAPS, {'u', 'U', WCH_NONE, WCH_NONE, 0x00fa, 0x00da} }, - { 'I', CAPS, {'i', 'I', WCH_NONE, WCH_NONE, 0x00ed, 0x00cd} }, - { 'O', CAPS, {'o', 'O', WCH_NONE, WCH_NONE, 0x00f3, 0x00d3} }, - { 'A', CAPS, {'a', 'A', WCH_NONE, WCH_NONE, 0x00e1, 0x00c1} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05, 0x00e9, 0x00c9} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15, 0x00fa, 0x00da} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09, 0x00ed, 0x00cd} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f, 0x00f3, 0x00d3} }, + { 'A', CAPS, {'a', 'A', 0x01, 0x01, 0x00e1, 0x00c1} }, { 0, 0 } }; _____ Modified: trunk/reactos/lib/keyboard/kbdus/kbdus.c --- trunk/reactos/lib/keyboard/kbdus/kbdus.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/lib/keyboard/kbdus/kbdus.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -143,35 +143,6 @@ { '8', NOCAPS, {'8', '*'} }, { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, - /* First letter row */ - { 'Q', CAPS, {'q', 'Q'} }, - { 'W', CAPS, {'w', 'W'} }, - { 'E', CAPS, {'e', 'E'} }, - { 'R', CAPS, {'r', 'R'} }, - { 'T', CAPS, {'t', 'T'} }, - { 'Y', CAPS, {'y', 'Y'} }, - { 'U', CAPS, {'u', 'U'} }, - { 'I', CAPS, {'i', 'I'} }, - { 'O', CAPS, {'o', 'O'} }, - { 'P', CAPS, {'p', 'P'} }, - /* Second letter row */ - { 'A', CAPS, {'a', 'A'} }, - { 'S', CAPS, {'s', 'S'} }, - { 'D', CAPS, {'d', 'D'} }, - { 'F', CAPS, {'f', 'F'} }, - { 'G', CAPS, {'g', 'G'} }, - { 'H', CAPS, {'h', 'H'} }, - { 'J', CAPS, {'j', 'J'} }, - { 'K', CAPS, {'k', 'K'} }, - { 'L', CAPS, {'l', 'L'} }, - /* Third letter row */ - { 'Z', CAPS, {'z', 'Z'} }, - { 'X', CAPS, {'x', 'X'} }, - { 'C', CAPS, {'c', 'C'} }, - { 'V', CAPS, {'v', 'V'} }, - { 'B', CAPS, {'b', 'B'} }, - { 'N', CAPS, {'n', 'N'} }, - { 'M', CAPS, {'m', 'M'} }, /* Specials */ /* Ctrl-_ generates US */ @@ -205,6 +176,35 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + /* Legacy Ascii generators */ { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -516,7 +516,7 @@ ModifierState |= fsModifiers; if (ModifierState == fsModifiers && - (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN || fsModifiers == MOD_CONTROL)) + (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN)) { /* First send out special notifications * (For alt, the message that turns on accelerator @@ -637,31 +637,7 @@ else msg.message = WM_SYSKEYUP; } - else if (ModifierState & MOD_CONTROL) - { - if(NextKeyInput.MakeCode == 0x2E)/* Ctrl-C */ - { - DPRINT1("Ctrl-C pressed\n"); - /* FIXME: this seems wrong! this bypass hotkeys and all and the winhellos CRTL+C hotkey test - dont work (anymore) */ - co_MsqPostKeyboardMessage(WM_COPY,0,0); - continue; - } - else if(NextKeyInput.MakeCode == 0x2F) /* Ctrl-V */ - { - DPRINT1("Ctrl-V pressed\n"); - co_MsqPostKeyboardMessage(WM_PASTE,0,0); - continue; - } - else - { - DPRINT1("Ctrl with unknown combination %04x\n",NextKeyInput.MakeCode); - if (!(KeyInput.Flags & KEY_BREAK)) - msg.message = WM_KEYDOWN; - else - msg.message = WM_KEYUP; - } - }else + else { if (!(KeyInput.Flags & KEY_BREAK)) msg.message = WM_KEYDOWN; _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-19 20:01:29 UTC (rev 17935) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-19 21:11:41 UTC (rev 17936) @@ -261,7 +261,7 @@ [ModBits ^ ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0)]; - if( CapsMod > keyLayout->pVkToWcharTable[nMod].nModifications ) + if( CapsMod >= keyLayout->pVkToWcharTable[nMod].nModifications ) { DWORD MaxBit = 1; while( MaxBit <

19 years

[hbirr] 17935: - Read more information from the registry about the disks detected by the bios.

by hbirr＠svn.reactos.com

- Read more information from the registry about the disks detected by the bios. - Fixed the detection of disks with a signature of zero (in AddDiskToList). - Update always the partition table if the modified flag is set. - Create an unique disk signature. - Declared some registry query structures in cmtype.h. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/system/usetup/partlist.h _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/include/ndk/cmtypes.h 2005-09-19 20:01:29 UTC (rev 17935) @@ -174,6 +174,116 @@ WCHAR Name[1]; } KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; +#else + +typedef struct _REG_DELETE_KEY_INFORMATION +{ + PVOID Object; +} REG_DELETE_KEY_INFORMATION, *PREG_DELETE_KEY_INFORMATION; + +typedef struct _REG_SET_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + ULONG TitleIndex; + ULONG Type; + PVOID Data; + ULONG DataSize; +} REG_SET_VALUE_KEY_INFORMATION, *PREG_SET_VALUE_KEY_INFORMATION; + +typedef struct _REG_DELETE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; +} REG_DELETE_VALUE_KEY_INFORMATION, *PREG_DELETE_VALUE_KEY_INFORMATION; + +typedef struct _REG_SET_INFORMATION_KEY_INFORMATION +{ + PVOID Object; + KEY_SET_INFORMATION_CLASS KeySetInformationClass; + PVOID KeySetInformation; + ULONG KeySetInformationLength; +} REG_SET_INFORMATION_KEY_INFORMATION, *PREG_SET_INFORMATION_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_KEY_INFORMATION, *PREG_ENUMERATE_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_VALUE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_VALUE_KEY_INFORMATION, *PREG_ENUMERATE_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_KEY_INFORMATION +{ + PVOID Object; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_KEY_INFORMATION, *PREG_QUERY_KEY_INFORMATION; + +typedef struct _REG_QUERY_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_VALUE_KEY_INFORMATION, *PREG_QUERY_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PKEY_VALUE_ENTRY ValueEntries; + ULONG EntryCount; + PVOID ValueBuffer; + PULONG BufferLength; + PULONG RequiredBufferLength; +} REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION, *PREG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION; + +typedef struct _REG_PRE_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_CREATE_KEY_INFORMATION; + +typedef struct _REG_POST_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_CREATE_KEY_INFORMATION, *PREG_POST_CREATE_KEY_INFORMATION; + +typedef struct _REG_PRE_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_OPEN_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_OPEN_KEY_INFORMATION, *PREG_POST_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPERATION_INFORMATION +{ + PVOID Object; + NTSTATUS Status; +} REG_POST_OPERATION_INFORMATION,*PREG_POST_OPERATION_INFORMATION; + #endif typedef struct _PLUGPLAY_EVENT_BLOCK @@ -275,5 +385,151 @@ WCHAR BusName[MAX_BUS_NAME]; } PLUGPLAY_BUS_INSTANCE, *PPLUGPLAY_BUS_INSTANCE; +#ifdef NTOS_MODE_USER + +#include <pshpack1.h> +typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR { + UCHAR Type; + UCHAR ShareDisposition; + USHORT Flags; + union { + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Generic; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Port; + struct { + ULONG Level; + ULONG Vector; + ULONG Affinity; + } Interrupt; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length; + } Memory; + struct { + ULONG Channel; + ULONG Port; + ULONG Reserved1; + } Dma; + struct { + ULONG Data[3]; + } DevicePrivate; + struct { + ULONG Start; + ULONG Length; + ULONG Reserved; + } BusNumber; + struct { + ULONG DataSize; + ULONG Reserved1; + ULONG Reserved2; + } DeviceSpecificData; + } u; +} CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR; + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Type */ + +#define CmResourceTypeNull 0 +#define CmResourceTypePort 1 +#define CmResourceTypeInterrupt 2 +#define CmResourceTypeMemory 3 +#define CmResourceTypeDma 4 +#define CmResourceTypeDeviceSpecific 5 +#define CmResourceTypeBusNumber 6 +#define CmResourceTypeMaximum 7 +#define CmResourceTypeNonArbitrated 128 +#define CmResourceTypeConfigData 128 +#define CmResourceTypeDevicePrivate 129 +#define CmResourceTypePcCardConfig 130 +#define CmResourceTypeMfCardConfig 131 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.ShareDisposition */ + +typedef enum _CM_SHARE_DISPOSITION { + CmResourceShareUndetermined, + CmResourceShareDeviceExclusive, + CmResourceShareDriverExclusive, + CmResourceShareShared +} CM_SHARE_DISPOSITION; + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypePort */ + +#define CM_RESOURCE_PORT_MEMORY 0x0000 +#define CM_RESOURCE_PORT_IO 0x0001 +#define CM_RESOURCE_PORT_10_BIT_DECODE 0x0004 +#define CM_RESOURCE_PORT_12_BIT_DECODE 0x0008 +#define CM_RESOURCE_PORT_16_BIT_DECODE 0x0010 +#define CM_RESOURCE_PORT_POSITIVE_DECODE 0x0020 +#define CM_RESOURCE_PORT_PASSIVE_DECODE 0x0040 +#define CM_RESOURCE_PORT_WINDOW_DECODE 0x0080 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeInterrupt */ + +#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 +#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeMemory */ + +#define CM_RESOURCE_MEMORY_READ_WRITE 0x0000 +#define CM_RESOURCE_MEMORY_READ_ONLY 0x0001 +#define CM_RESOURCE_MEMORY_WRITE_ONLY 0x0002 +#define CM_RESOURCE_MEMORY_PREFETCHABLE 0x0004 +#define CM_RESOURCE_MEMORY_COMBINEDWRITE 0x0008 +#define CM_RESOURCE_MEMORY_24 0x0010 +#define CM_RESOURCE_MEMORY_CACHEABLE 0x0020 + +/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeDma */ + +#define CM_RESOURCE_DMA_8 0x0000 +#define CM_RESOURCE_DMA_16 0x0001 +#define CM_RESOURCE_DMA_32 0x0002 +#define CM_RESOURCE_DMA_8_AND_16 0x0004 +#define CM_RESOURCE_DMA_BUS_MASTER 0x0008 +#define CM_RESOURCE_DMA_TYPE_A 0x0010 +#define CM_RESOURCE_DMA_TYPE_B 0x0020 +#define CM_RESOURCE_DMA_TYPE_F 0x0040 + +typedef struct _CM_PARTIAL_RESOURCE_LIST { + USHORT Version; + USHORT Revision; + ULONG Count; + CM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptors[1]; +} CM_PARTIAL_RESOURCE_LIST, *PCM_PARTIAL_RESOURCE_LIST; + +typedef struct _CM_FULL_RESOURCE_DESCRIPTOR { + INTERFACE_TYPE InterfaceType; + ULONG BusNumber; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; +} CM_FULL_RESOURCE_DESCRIPTOR, *PCM_FULL_RESOURCE_DESCRIPTOR; + +typedef struct _CM_RESOURCE_LIST { + ULONG Count; + CM_FULL_RESOURCE_DESCRIPTOR List[1]; +} CM_RESOURCE_LIST, *PCM_RESOURCE_LIST; + +typedef struct _CM_INT13_DRIVE_PARAMETER { + USHORT DriveSelect; + ULONG MaxCylinders; + USHORT SectorsPerTrack; + USHORT MaxHeads; + USHORT NumberDrives; +} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER; + +typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA +{ + ULONG BytesPerSector; + ULONG NumberOfCylinders; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; +} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; + +#include <poppack.h> + #endif +#endif + _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-09-19 20:01:29 UTC (rev 17935) @@ -424,28 +424,19 @@ NTSTATUS STDCALL -DiskQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) +DiskIdentifierQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { - PLIST_ENTRY ListHead = (PLIST_ENTRY)Context; - PULONG GlobalDiskCount = (PULONG)EntryContext; - PBIOSDISKENTRY BiosDiskEntry; + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; UNICODE_STRING NameU; if (ValueType == REG_SZ && - ValueLength == 20 * sizeof(WCHAR)) + ValueLength == 20 * sizeof(WCHAR)) { - BiosDiskEntry = RtlAllocateHeap(ProcessHeap, 0, sizeof(BIOSDISKENTRY)); - if (BiosDiskEntry == NULL) - { - return STATUS_NO_MEMORY; - } - BiosDiskEntry->DiskNumber = (*GlobalDiskCount)++; - NameU.Buffer = (PWCHAR)ValueData; NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Checksum); @@ -453,38 +444,118 @@ NameU.Buffer = (PWCHAR)ValueData + 9; RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Signature); - InsertTailList(ListHead, &BiosDiskEntry->ListEntry); + return STATUS_SUCCESS; } + return STATUS_UNSUCCESSFUL; +} - return STATUS_SUCCESS; +NTSTATUS +STDCALL +DiskConfigurationDataQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + + if (ValueType == REG_FULL_RESOURCE_DESCRIPTOR && + ValueLength == sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) + { + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + /* FIXME: + * Is this 'paranoia' check correct ? + */ + if (FullResourceDescriptor->InterfaceType != InterfaceTypeUndefined || + FullResourceDescriptor->BusNumber != 0 || + FullResourceDescriptor->PartialResourceList.Count != 1 || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type != CmResourceTypeDeviceSpecific || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.Devi ceSpecificData.DataSize != sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) + { + return STATUS_UNSUCCESSFUL; + } + DiskGeometry = (PCM_DISK_GEOMETRY_DEVICE_DATA)(FullResourceDescriptor + 1); + BiosDiskEntry->DiskGeometry = *DiskGeometry; + + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; } +NTSTATUS +STDCALL +SystemConfigurationDataQueryRoutine(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_INT13_DRIVE_PARAMETER* Int13Drives = (PCM_INT13_DRIVE_PARAMETER*)Context; + + if (ValueType == REG_FULL_RESOURCE_DESCRIPTOR && + ValueLength >= sizeof (CM_FULL_RESOURCE_DESCRIPTOR) && + (ValueLength - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) % sizeof(CM_INT13_DRIVE_PARAMETER) == 0) + { + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + if (FullResourceDescriptor->InterfaceType != InterfaceTypeUndefined || + FullResourceDescriptor->BusNumber != -1 || + FullResourceDescriptor->PartialResourceList.Count != 1 || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type != CmResourceTypeDeviceSpecific) + { + return STATUS_UNSUCCESSFUL; + } + *Int13Drives = RtlAllocateHeap(ProcessHeap, 0, ValueLength - sizeof (CM_FULL_RESOURCE_DESCRIPTOR)); + if (*Int13Drives == NULL) + { + return STATUS_NO_MEMORY; + } + memcpy(*Int13Drives, FullResourceDescriptor + 1, ValueLength - sizeof (CM_FULL_RESOURCE_DESCRIPTOR)); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; + +} #define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapt er" STATIC VOID EnumerateBiosDiskEntries(PPARTLIST PartList) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; WCHAR Name[100]; ULONG AdapterCount; - ULONG ControllerCount; ULONG DiskCount; NTSTATUS Status; - ULONG GlobalDiskCount=0; + PCM_INT13_DRIVE_PARAMETER Int13Drives; + PBIOSDISKENTRY BiosDiskEntry; - memset(QueryTable, 0, sizeof(QueryTable)); - QueryTable[0].Name = L"Identifier"; - QueryTable[0].QueryRoutine = DiskQueryRoutine; - QueryTable[0].EntryContext = (PVOID)&GlobalDiskCount; + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = SystemConfigurationDataQueryRoutine; + Int13Drives = NULL; + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + &QueryTable[1], + (PVOID)&Int13Drives, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query the 'Configuration Data' key in '\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System', status=%lx\n", Status); + return; + } + AdapterCount = 0; while (1) { swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (!NT_SUCCESS(Status)) @@ -495,54 +566,93 @@ swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (NT_SUCCESS(Status)) { - ControllerCount = 0; while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu", ROOT_NAME, AdapterCount, ControllerCount); + swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (!NT_SUCCESS(Status)) { - break; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral", ROOT_NAME, AdapterCount, ControllerCount); + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, - &QueryTable[1], + &QueryTable[2], NULL, NULL); if (NT_SUCCESS(Status)) { + QueryTable[0].Name = L"Identifier"; + QueryTable[0].QueryRoutine = DiskIdentifierQueryRoutine; + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; DiskCount = 0; while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, ControllerCount, DiskCount); + BiosDiskEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); + if (BiosDiskEntry == NULL) + { + break; + } + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, - (PVOID)&PartList->BiosDiskListHead, + (PVOID)BiosDiskEntry, NULL); if (!NT_SUCCESS(Status)) { + RtlFreeHeap(ProcessHeap, 0, BiosDiskEntry); break; } + BiosDiskEntry->DiskNumber = DiskCount; + BiosDiskEntry->Recognized = FALSE; + + if (DiskCount < Int13Drives[0].NumberDrives) + { + BiosDiskEntry->Int13DiskData = Int13Drives[DiskCount]; + } + else + { + DPRINT1("Didn't find int13 drive datas for disk %u\n", DiskCount); + } + + + InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); + + DPRINT("DiskNumber: %d\n", BiosDiskEntry->DiskNumber); + DPRINT("Signature: %08x\n", BiosDiskEntry->Signature); + DPRINT("Checksum: %08x\n", BiosDiskEntry->Checksum); + DPRINT("BytesPerSector: %d\n", BiosDiskEntry->DiskGeometry.BytesPerSector); + DPRINT("NumberOfCylinders: %d\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); + DPRINT("NumberOfHeads: %d\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); + DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); + DPRINT("MaxCylinders: %d\n", BiosDiskEntry->Int13DiskData.MaxCylinders); + DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); + DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); + DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); + DiskCount++; } } - ControllerCount++; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } } AdapterCount++; } + RtlFreeHeap(ProcessHeap, 0, Int13Drives); } static VOID @@ -656,19 +766,32 @@ DiskEntry->Checksum = Checksum; DiskEntry->Signature = Signature; + if (Signature == 0) + { + /* If we have no signature, set the disk to dirty. WritePartitionsToDisk creates a new signature */ + DiskEntry->Modified = TRUE; + } DiskEntry->BiosFound = FALSE; ListEntry = List->BiosDiskListHead.Flink; while(ListEntry != &List->BiosDiskListHead) { BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); + /* FIXME: + * Compare the size from bios and the reported size from driver. + * If we have more than one disk with a zero or with the same signatur + * we must create new signatures and reboot. After the reboot, + * it is possible to identify the disks. + */ if (BiosDiskEntry->Signature == Signature && - BiosDiskEntry->Checksum == Checksum) + BiosDiskEntry->Checksum == Checksum && + !BiosDiskEntry->Recognized) { if (!DiskEntry->BiosFound) { DiskEntry->BiosDiskNumber = BiosDiskEntry->DiskNumber; DiskEntry->BiosFound = TRUE; + BiosDiskEntry->Recognized = TRUE; } else { @@ -2162,7 +2285,8 @@ WCHAR DstPath[MAX_PATH]; UNICODE_STRING Name; HANDLE FileHandle; - PDISKENTRY DiskEntry; + PDISKENTRY DiskEntry1; + PDISKENTRY DiskEntry2; PPARTENTRY PartEntry; PLIST_ENTRY Entry1; PLIST_ENTRY Entry2; @@ -2179,16 +2303,16 @@ Entry1 = List->DiskListHead.Flink; while (Entry1 != &List->DiskListHead) { - DiskEntry = CONTAINING_RECORD (Entry1, - DISKENTRY, - ListEntry); + DiskEntry1 = CONTAINING_RECORD (Entry1, + DISKENTRY, + ListEntry); - if (DiskEntry->Modified == TRUE) + if (DiskEntry1->Modified == TRUE) { /* Count partitioned entries */ PartitionCount = 0; - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) + Entry2 = DiskEntry1->PartListHead.Flink; + while (Entry2 != &DiskEntry1->PartListHead) { PartEntry = CONTAINING_RECORD (Entry2, PARTENTRY, @@ -2200,50 +2324,44 @@ Entry2 = Entry2->Flink; } - - if (PartitionCount > 0) - { + if (PartitionCount == 0) + { + DriveLayoutSize = sizeof (DRIVE_LAYOUT_INFORMATION) + + ((4 - 1) * sizeof (PARTITION_INFORMATION)); + } + else + { DriveLayoutSize = sizeof (DRIVE_LAYOUT_INFORMATION) + ((PartitionCount - 1) * sizeof (PARTITION_INFORMATION)); - DriveLayout = (PDRIVE_LAYOUT_INFORMATION)RtlAllocateHeap (ProcessHeap, - 0, - DriveLayoutSize); - if (DriveLayout == NULL) - { - DPRINT1 ("RtlAllocateHeap() failed\n"); - return FALSE; - } + } + DriveLayout = (PDRIVE_LAYOUT_INFORMATION)RtlAllocateHeap (ProcessHeap, + 0, + DriveLayoutSize); + if (DriveLayout == NULL) + { + DPRINT1 ("RtlAllocateHeap() failed\n"); + return FALSE; + } - RtlZeroMemory (DriveLayout, - DriveLayoutSize); + RtlZeroMemory (DriveLayout, + DriveLayoutSize); - DriveLayout->PartitionCount = PartitionCount; - if (DiskEntry->Signature == 0) + if (PartitionCount == 0) + { + /* delete all partitions in the mbr */ + DriveLayout->PartitionCount = 4; + for (Index = 0; Index < 4; Index++) { - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&DiskEntry->Signature; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - /* FIXME: - * check for an existing signature - */ - + DriveLayout->PartitionEntry[Index].RewritePartition = TRUE; } - - DriveLayout->Signature = DiskEntry->Signature; + } + else + { + DriveLayout->PartitionCount = PartitionCount; Index = 0; - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) + Entry2 = DiskEntry1->PartListHead.Flink; + while (Entry2 != &DiskEntry1->PartListHead) { PartEntry = CONTAINING_RECORD (Entry2, PARTENTRY, @@ -2258,74 +2376,127 @@ Entry2 = Entry2->Flink; } + } + if (DiskEntry1->Signature == 0) + { + LARGE_INTEGER SystemTime; + TIME_FIELDS TimeFields; + PUCHAR Buffer; + Buffer = (PUCHAR)&DiskEntry1->Signature; - swprintf (DstPath, - L"\\Device\\Harddisk%d\\Partition0", - DiskEntry->DiskNumber); - RtlInitUnicodeString (&Name, - DstPath); - InitializeObjectAttributes (&ObjectAttributes, - &Name, - 0, - NULL, - NULL); + while (1) + { + NtQuerySystemTime (&SystemTime); + RtlTimeToTimeFields (&SystemTime, &TimeFields); - Status = NtOpenFile (&FileHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("NtOpenFile() failed (Status %lx)\n", Status); - return FALSE; - } + Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); + Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); + Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); + Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - Status = NtDeviceIoControlFile (FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_DISK_SET_DRIVE_LAYOUT, - DriveLayout, - DriveLayoutSize, - NULL, - 0); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("NtDeviceIoControlFile() failed (Status %lx)\n", Status); - NtClose (FileHandle); - return FALSE; - } + if (DiskEntry1->Signature == 0) + { + continue; + } - RtlFreeHeap (ProcessHeap, - 0, - DriveLayout); + /* check if the signature already exist */ + /* FIXME: + * Check also signatures from disks, which are + * not visible (bootable) by the bios. + */ + Entry2 = List->DiskListHead.Flink; + while (Entry2 != &List->DiskListHead) + { + DiskEntry2 = CONTAINING_RECORD(Entry2, DISKENTRY, ListEntry); + if (DiskEntry1 != DiskEntry2 && + DiskEntry1->Signature == DiskEntry2->Signature) + { + break; + } + Entry2 = Entry2->Flink; + } + if (Entry2 == &List->DiskListHead) + { + break; + } + } + + /* set one partition entry to dirty, this will update the signature */ + DriveLayout->PartitionEntry[0].RewritePartition = TRUE; + } + + DriveLayout->Signature = DiskEntry1->Signature; + + + swprintf (DstPath, + L"\\Device\\Harddisk%d\\Partition0", + DiskEntry1->DiskNumber); + RtlInitUnicodeString (&Name, + DstPath); + InitializeObjectAttributes (&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile (&FileHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("NtOpenFile() failed (Status %lx)\n", Status); + return FALSE; + } + + Status = NtDeviceIoControlFile (FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_SET_DRIVE_LAYOUT, + DriveLayout, + DriveLayoutSize, + NULL, + 0); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("NtDeviceIoControlFile() failed (Status %lx)\n", Status); NtClose (FileHandle); + return FALSE; + } - /* Install MBR code if the disk is new */ - if (DiskEntry->NewDisk == TRUE) - { - wcscpy (SrcPath, SourceRootPath.Buffer); - wcscat (SrcPath, L"\\loader\\dosmbr.bin"); + RtlFreeHeap (ProcessHeap, + 0, + DriveLayout); - DPRINT1 ("Install MBR bootcode: %S ==> %S\n", - SrcPath, DstPath); + NtClose (FileHandle); - /* Install MBR bootcode */ - Status = InstallMbrBootCodeToDisk (SrcPath, - DstPath); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); - return FALSE; - } + /* Install MBR code if the disk is new */ + if (DiskEntry1->NewDisk == TRUE && + DiskEntry1->BiosDiskNumber == 0) + { + wcscpy (SrcPath, SourceRootPath.Buffer); + wcscat (SrcPath, L"\\loader\\dosmbr.bin"); - DiskEntry->NewDisk = FALSE; - } + DPRINT ("Install MBR bootcode: %S ==> %S\n", + SrcPath, DstPath); + + /* Install MBR bootcode */ + Status = InstallMbrBootCodeToDisk (SrcPath, + DstPath); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n", + Status); + return FALSE; + } + + DiskEntry1->NewDisk = FALSE; } } _____ Modified: trunk/reactos/subsys/system/usetup/partlist.h --- trunk/reactos/subsys/system/usetup/partlist.h 2005-09-19 15:16:00 UTC (rev 17934) +++ trunk/reactos/subsys/system/usetup/partlist.h 2005-09-19 20:01:29 UTC (rev 17935) @@ -74,6 +74,9 @@ ULONG DiskNumber; ULONG Signature; ULONG Checksum; + BOOLEAN Recognized; + CM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + CM_INT13_DRIVE_PARAMETER Int13DiskData; } BIOSDISKENTRY, *PBIOSDISKENTRY;

19 years

[navaraf] 17934: Remove accidently commited debug code.

by navaraf＠svn.reactos.com

Remove accidently commited debug code. Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:15:22 UTC (rev 17933) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:16:00 UTC (rev 17934) @@ -136,17 +136,6 @@ //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); metrics.cbSize = sizeof(TBMETRICS); - metrics.dwMask = TBMF_PAD | TBMF_BARPAD | TBMF_BUTTONSPACING; - SendMessage(_htoolbar, TB_GETMETRICS, 0, (LPARAM)&metrics); - { - FILE *f = fopen("test.txt", "w"); - fprintf(f, "Pad: %d, %d\nBarPad: %d, %d\nBS: %d, %d\n", - metrics.cxPad, metrics.cyPad, - metrics.cxBarPad, metrics.cyBarPad, - metrics.cxButtonSpacing, metrics.cyButtonSpacing); - fclose(f); - } - metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0;

19 years

[navaraf] 17933: Fix the taskbar button resizing to account for button spacing.

by navaraf＠svn.reactos.com

Fix the taskbar button resizing to account for button spacing. Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 12:21:52 UTC (rev 17932) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-19 15:15:22 UTC (rev 17933) @@ -136,6 +136,17 @@ //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); metrics.cbSize = sizeof(TBMETRICS); + metrics.dwMask = TBMF_PAD | TBMF_BARPAD | TBMF_BUTTONSPACING; + SendMessage(_htoolbar, TB_GETMETRICS, 0, (LPARAM)&metrics); + { + FILE *f = fopen("test.txt", "w"); + fprintf(f, "Pad: %d, %d\nBarPad: %d, %d\nBS: %d, %d\n", + metrics.cxPad, metrics.cyPad, + metrics.cxBarPad, metrics.cyBarPad, + metrics.cxButtonSpacing, metrics.cyButtonSpacing); + fclose(f); + } + metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0; @@ -562,7 +573,7 @@ if (btns > 0) { int bar_width = ClientRect(_hwnd).right; - int btn_width = bar_width / btns; + int btn_width = (bar_width / btns) - 3; if (btn_width < TASKBUTTONWIDTH_MIN) btn_width = TASKBUTTONWIDTH_MIN;

19 years

[navaraf] 17932: - Fix region deleting and ownership for DCEs.

by navaraf＠svn.reactos.com

- Fix region deleting and ownership for DCEs. - Fix uninitialized hDC variable in painting code :) Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-19 12:21:52 UTC (rev 17932) @@ -112,7 +112,7 @@ /*************** WINDC.C ***************/ INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc); +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint); HDC FASTCALL UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -259,11 +259,14 @@ { if (Window->UpdateRegion) { + hDC = UserGetDCEx(Window, Window->UpdateRegion, + DCX_CACHE | DCX_USESTYLE | + DCX_INTERSECTRGN | DCX_KEEPCLIPRGN); if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) { Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; } - UserReleaseDC(Window, hDC); + UserReleaseDC(Window, hDC, FALSE); } } } @@ -829,7 +832,7 @@ RETURN(FALSE); } - UserReleaseDC(Window, lPs->hdc); + UserReleaseDC(Window, lPs->hdc, TRUE); UserRefObjectCo(Window); co_UserShowCaret(Window); @@ -1295,7 +1298,7 @@ if (hDC) { UserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate); - UserReleaseDC(Window, hDC); + UserReleaseDC(Window, hDC, FALSE); } /* _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -118,7 +118,7 @@ if (NULL == defaultDCstate) { defaultDCstate = NtGdiGetDCState(Dce->hDC); - GDIOBJ_SetOwnership(defaultDCstate, NULL); + DC_SetOwnership(defaultDCstate, NULL); } GDIOBJ_SetOwnership(Dce->Self, NULL); DC_SetOwnership(Dce->hDC, NULL); @@ -193,7 +193,6 @@ } else if (Dce->hClipRgn != NULL) { - GDIOBJ_SetOwnership(Dce->hClipRgn, PsGetCurrentProcess()); NtGdiDeleteObject(Dce->hClipRgn); } @@ -204,7 +203,7 @@ } STATIC INT FASTCALL -DceReleaseDC(DCE* dce) +DceReleaseDC(DCE* dce, BOOL EndPaint) { if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_DCEEMPTY | DCX_DCEBUSY))) { @@ -214,7 +213,7 @@ /* restore previous visible region */ if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) && - (dce->DCXFlags & DCX_CACHE) ) + ((dce->DCXFlags & DCX_CACHE) || EndPaint)) { DceDeleteClipRgn(dce); } @@ -463,23 +462,27 @@ } Dce->hwndCurrent = (Window ? Window->hSelf : NULL); - Dce->DCXFlags = DcxFlags | DCX_DCEBUSY; + Dce->DCXFlags = Flags | DCX_DCEBUSY; if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) { - NtGdiDeleteObject(ClipRegion); + if (Flags & DCX_KEEPCLIPRGN) + NtGdiDeleteObject(ClipRegion); ClipRegion = NULL; } +#if 0 if (NULL != Dce->hClipRgn) { DceDeleteClipRgn(Dce); Dce->hClipRgn = NULL; } +#endif if (0 != (Flags & DCX_INTERSECTUPDATE) && NULL == ClipRegion) { Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; + Dce->DCXFlags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; ClipRegion = Window->UpdateRegion; } @@ -488,18 +491,15 @@ if (!(Flags & DCX_WINDOW)) { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } else { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } } else if (ClipRegion != NULL) { Dce->hClipRgn = ClipRegion; - GDIOBJ_SetOwnership(Dce->hClipRgn, NULL); } DceSetDrawable(Window, Dce->hDC, Flags, UpdateClipOrigin); @@ -583,7 +583,7 @@ INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc) +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) { DCE *dce; INT nRet = 0; @@ -599,7 +599,7 @@ if (dce && (dce->DCXFlags & DCX_DCEBUSY)) { - nRet = DceReleaseDC(dce); + nRet = DceReleaseDC(dce, EndPaint); } return nRet; @@ -615,7 +615,7 @@ DPRINT("Enter NtUserReleaseDC\n"); UserEnterExclusive(); - RETURN(UserReleaseDC(NULL, hDc)); + RETURN(UserReleaseDC(NULL, hDc, FALSE)); CLEANUP: DPRINT("Leave NtUserReleaseDC, ret=%i\n",_ret_); @@ -650,7 +650,6 @@ } NtGdiDeleteDC(dce->hDC); - GDIOBJ_SetOwnership(dce->hClipRgn, PsGetCurrentProcess()); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(dce->hClipRgn); @@ -703,7 +702,7 @@ * (for 1.0?). */ DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); - DceReleaseDC(pDCE); + DceReleaseDC(pDCE, FALSE); } pDCE->DCXFlags &= DCX_CACHE; @@ -715,12 +714,12 @@ } } -void FASTCALL +VOID FASTCALL DceEmptyCache() { while (FirstDce != NULL) { - DceFreeDCE(FirstDce, TRUE); + FirstDce = DceFreeDCE(FirstDce, TRUE); } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -1189,7 +1189,7 @@ CopyRect.bottom - CopyRect.top, Dc, CopyRect.left + (OldWindowRect.left - NewWindowRect.left), CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY); - UserReleaseDC(Window, Dc); + UserReleaseDC(Window, Dc, FALSE); IntValidateParent(Window, CopyRgn); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-09-19 10:39:26 UTC (rev 17931) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-09-19 12:21:52 UTC (rev 17932) @@ -122,7 +122,7 @@ else DC_UnlockDc(dc); } - UserReleaseDC(Wnd,hDC); + UserReleaseDC(Wnd,hDC, FALSE); } return TRUE; }

19 years

← Newer
1
...
22
23
24
25
26
27
28
...
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 September 2005