Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 22698: * fix resource inconsistency (pointed out by Lohnegrim) * halfplemented reading console options
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Fri Jun 30 00:19:26 2006 New Revision: 22698 URL: http://svn.reactos.org/svn/reactos?rev=22698&view=rev Log: * fix resource inconsistency (pointed out by Lohnegrim) * halfplemented reading console options Modified: trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/console.rc trunk/reactos/dll/win32/console/options.c Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Fri Jun 30 00:19:26 2006 @@ -6,6 +6,8 @@ #include <windows.h> #include <commctrl.h> #include <cpl.h> +#include <tchar.h> +#include <stdio.h> #include "resource.h" typedef struct @@ -16,4 +18,18 @@ APPLET_PROC AppletProc; } APPLET, *PAPPLET; +typedef struct TAGConsoleInfo +{ + DWORD CursorSize; + DWORD NumberOfHistoryBuffers; + DWORD HistoryBufferSize; + DWORD HistoryNoDup; + DWORD FullScreen; + DWORD QuickEdit; + DWORD InsertMode; + +} ConsoleInfo, *PConsoleInfo; + +extern ConsoleInfo g_ConsoleInfo; + #endif /* CONSOLE_H__ */ Modified: trunk/reactos/dll/win32/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rc (original) +++ trunk/reactos/dll/win32/console/console.rc Fri Jun 30 00:19:26 2006 @@ -13,7 +13,7 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel Console Applet\0" -#define REACTOS_STR_INTERNAL_NAME "powercfg\0" +#define REACTOS_STR_INTERNAL_NAME "console\0" #define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Fri Jun 30 00:19:26 2006 @@ -10,6 +10,10 @@ #include "console.h" +ConsoleInfo g_ConsoleInfo; + +BOOLEAN InitializeOptionsDialog(); + INT_PTR CALLBACK OptionsProc( @@ -22,7 +26,7 @@ switch(uMsg) { case WM_INITDIALOG: - return TRUE; + return InitializeOptionsDialog(hwndDlg); default: break; @@ -30,3 +34,194 @@ return FALSE; } + +BOOL InitializeOptionsFromReg(TCHAR * Path) +{ + HKEY hKey; + HKEY hSubKey; + DWORD dwNumSubKeys = 0; + DWORD dwIndex; + DWORD dwValueName; + DWORD dwBufferSize; + TCHAR szValueName[MAX_PATH]; + BYTE szBuffer[MAX_PATH]; + + if ( RegOpenCurrentUser(KEY_READ, &hKey) != ERROR_SUCCESS ) + return FALSE; + + + if ( RegOpenKeyEx(hKey, Path, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + + for (dwIndex = 0; dwIndex < dwNumSubKeys; dwIndex++) + { + dwBufferSize = MAX_PATH; + dwValueName = MAX_PATH; + + if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, szBuffer, &dwBufferSize) != ERROR_SUCCESS) + break; + + if ( !_tcscmp(szValueName, _T("CursorSize")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + if ( val == 0x32) + g_ConsoleInfo.CursorSize = val; + else if ( val == 0x64 ) + g_ConsoleInfo.CursorSize = val; + } + else if ( !_tcscmp(szValueName, _T("NumberOfHistoryBuffers")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.NumberOfHistoryBuffers = val; + } + else if ( !_tcscmp(szValueName, _T("HistoryBufferSize")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.HistoryBufferSize = val; + } + else if ( !_tcscmp(szValueName, _T("HistoryNoDup")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.HistoryNoDup = val; + } + else if ( !_tcscmp(szValueName, _T("FullScreen")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.FullScreen = val; + } + else if ( !_tcscmp(szValueName, _T("QuickEdit")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.QuickEdit = val; + } + else if ( !_tcscmp(szValueName, _T("InsertMode")) ) + { + int val = _ttoi((TCHAR*)szBuffer); + g_ConsoleInfo.InsertMode = val; + } + } + + RegCloseKey(hKey); + RegCloseKey(hSubKey); + return TRUE; +} + +void +UpdateDialogElements(HWND hwndDlg) +{ + HWND hDlgCtrl; + TCHAR szBuffer[MAX_PATH]; + + /* update cursor size */ + if ( g_ConsoleInfo.CursorSize == 0 ) + { + /* small cursor */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else if ( g_ConsoleInfo.CursorSize == 0x32 ) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else if ( g_ConsoleInfo.CursorSize == 0x64 ) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + + /* update num buffers */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); + _stprintf(szBuffer, _T("%d"), g_ConsoleInfo.NumberOfHistoryBuffers); + SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); + + /* update buffer size */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); + _stprintf(szBuffer, _T("%d"), g_ConsoleInfo.HistoryBufferSize); + SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); + + /* update discard duplicates */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); + if ( g_ConsoleInfo.HistoryNoDup ) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + + /* update full/window screen */ + if ( g_ConsoleInfo.FullScreen ) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + } + else + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + } + + /* update quick edit */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); + if ( g_ConsoleInfo.QuickEdit ) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + + /* update insert mode */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); + if ( g_ConsoleInfo.InsertMode ) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); +} + + +BOOLEAN InitializeOptionsDialog(HWND hwndDlg) +{ + STARTUPINFO StartupInfo; + + GetStartupInfo(&StartupInfo); + + if ( StartupInfo.lpTitle ) + { + if ( InitializeOptionsFromReg(StartupInfo.lpTitle) ) + { + UpdateDialogElements(hwndDlg); + return TRUE; + } + //TODO + // + // Windows XP uses unexpanded environment vars to get path + // i.e. c:\windows\system32\cmd.exe + // becomes + // %SystemRoot%_system32_cmd.exe + + } + + return TRUE; +}

1 0

[ion] 22697: - Activate the Grim Reaper and remove a hard-coded bugcheck. This fixes random bugchecks and especially bugchecks on shutdown.
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 23:24:10 2006 New Revision: 22697 URL: http://svn.reactos.org/svn/reactos?rev=22697&view=rev Log: - Activate the Grim Reaper and remove a hard-coded bugcheck. This fixes random bugchecks and especially bugchecks on shutdown. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 23:24:10 2006 @@ -728,12 +728,7 @@ ObjectHeader->PointerCount); /* Check if the types match */ - if ((Type) && (ObjectType != Type)) - { - /* They don't; fail */ - DPRINT1("Type mismatch: %wZ, %wZ\n", &ObjectType->Name, &Type->Name); - return STATUS_OBJECT_TYPE_MISMATCH; - } + if ((Type) && (ObjectType != Type)) return STATUS_OBJECT_TYPE_MISMATCH; /* Check if this is a kernel handle */ if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jun 29 23:24:10 2006 @@ -163,7 +163,7 @@ PVOID NextObject; /* Start reaping */ - while((ReapObject = InterlockedExchangePointer(&ObpReaperList, NULL))) + while ((ReapObject = InterlockedExchangePointer(&ObpReaperList, NULL))) { /* Start deletion loop */ do @@ -176,7 +176,7 @@ /* Move to the next one */ ReapObject = NextObject; - } while(NextObject != NULL); + } while (NextObject); } } @@ -266,7 +266,6 @@ (StringLength == (MAXUSHORT - sizeof(UNICODE_NULL) + 1))) { /* PS: Please keep the checks above expanded for clarity */ - DPRINT1("Invalid String Length\n"); Status = STATUS_OBJECT_NAME_INVALID; } else @@ -305,7 +304,6 @@ else { /* Fail */ - DPRINT1("Out of Memory!\n"); Status = STATUS_INSUFFICIENT_RESOURCES; } } @@ -523,7 +521,7 @@ } /* Initialize the Object Name Info */ - if (HasNameInfo) + if (HasNameInfo) { NameInfo = (POBJECT_HEADER_NAME_INFO)Header; NameInfo->Name = *ObjectName; @@ -757,8 +755,17 @@ sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), KernelMode, (POBJECT_HEADER*)&Header); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Free the name and fail */ + ExFreePool(ObjectName.Buffer); + return Status; + } + + /* Setup the flags and name */ LocalObjectType = (POBJECT_TYPE)&Header->Body; + LocalObjectType->Name = ObjectName; + Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; /* Check if this is the first Object Type */ if (!ObTypeObjectType) @@ -778,13 +785,9 @@ LocalObjectType->Key = *(PULONG)Tag; } - /* Set it up */ + /* Set up the type information */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; - LocalObjectType->Name = *TypeName; LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; - - /* These two flags need to be manually set up */ - Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; /* Check if we have to maintain a type list */ if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 23:24:10 2006 @@ -122,7 +122,6 @@ Header->NextToFree); /* Queue the work item */ - KeBugCheck(0); ExQueueWorkItem(&ObpReaperWorkItem, DelayedWorkQueue); } } Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c Thu Jun 29 23:24:10 2006 @@ -151,9 +151,10 @@ } /* Get a pointer to it */ - if (!(HandleEntry = ExMapHandleToPointer(HandleTable, Handles[i]))) - { - DPRINT1("Invalid handle\n"); + HandleEntry = ExMapHandleToPointer(HandleTable, Handles[i]); + if (!HandleEntry) + { + /* Fail, handle is invalid */ Status = STATUS_INVALID_HANDLE; goto Quickie; }

1 0

[ion] 22696: - Fixes in ObCreateObjectType to pass Fireball's (and some of my own local) ob tests: - Fix a check in ObpFreeObject which was causing a bugcheck if the object had a handle database (fixes another kmtest failure/crash). - Verify parameters passed to ObCreateObjectType based on behaviour seen on Windows 2003 (I might've missed some, these are the ones I tested for). This fixes 2 of the kmtest failures. - Also make sure the object type's name doesn't have a slash in the name. - Also m
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 23:03:24 2006 New Revision: 22696 URL: http://svn.reactos.org/svn/reactos?rev=22696&view=rev Log: - Fixes in ObCreateObjectType to pass Fireball's (and some of my own local) ob tests: - Fix a check in ObpFreeObject which was causing a bugcheck if the object had a handle database (fixes another kmtest failure/crash). - Verify parameters passed to ObCreateObjectType based on behaviour seen on Windows 2003 (I might've missed some, these are the ones I tested for). This fixes 2 of the kmtest failures. - Also make sure the object type's name doesn't have a slash in the name. - Also make sure we don't allow creating two object types with the same name. - Also use our own local copy of the object name and copy it. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 23:03:24 2006 @@ -237,6 +237,8 @@ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); /* Dereference the object as well */ + ASSERT(ObjectHeader->Type); + ASSERT(ObjectHeader->PointerCount != 0xCCCCCCCC); if (!wcscmp(ObjectHeader->Type->Name.Buffer, L"Key")) { // Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jun 29 23:03:24 2006 @@ -73,7 +73,7 @@ } /* Check if a handle database was active */ - if ((HandleInfo) && (Header->Flags & OB_FLAG_SINGLE_PROCESS)) + if ((HandleInfo) && !(Header->Flags & OB_FLAG_SINGLE_PROCESS)) { /* Free it */ ExFreePool(HandleInfo->HandleCountDatabase); @@ -690,10 +690,69 @@ NTSTATUS Status; CHAR Tag[4]; OBP_LOOKUP_CONTEXT Context; + PWCHAR p; + ULONG i; + UNICODE_STRING ObjectName; + + /* Verify parameters */ + if (!(TypeName) || + !(TypeName->Length) || + !(ObjectTypeInitializer) || + (ObjectTypeInitializer->Length != sizeof(*ObjectTypeInitializer)) || + (ObjectTypeInitializer->InvalidAttributes & ~OBJ_VALID_ATTRIBUTES) || + (ObjectTypeInitializer->MaintainHandleCount && + (!(ObjectTypeInitializer->OpenProcedure) && + !ObjectTypeInitializer->CloseProcedure)) || + ((!ObjectTypeInitializer->UseDefaultObject) && + (ObjectTypeInitializer->PoolType != NonPagedPool))) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } + + /* Make sure the name doesn't have a separator */ + p = TypeName->Buffer; + i = TypeName->Length / sizeof(WCHAR); + while (i--) + { + /* Check for one and fail */ + if (*p++ == OBJ_NAME_PATH_SEPARATOR) return STATUS_OBJECT_NAME_INVALID; + } + + /* Check if we've already created the directory of types */ + if (ObpTypeDirectoryObject) + { + /* Then scan it to figure out if we've already created this type */ + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + if (ObpLookupEntryDirectory(ObpTypeDirectoryObject, + TypeName, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context)) + { + /* We have already created it, so fail */ + return STATUS_OBJECT_NAME_COLLISION; + } + } + + /* Now make a copy of the object name */ + ObjectName.Buffer = ExAllocatePoolWithTag(PagedPool, + TypeName->MaximumLength, + OB_NAME_TAG); + if (!ObjectName.Buffer) + { + /* Out of memory, fail */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set the length and copy the name */ + ObjectName.MaximumLength = TypeName->MaximumLength; + RtlCopyUnicodeString(&ObjectName, TypeName); /* Allocate the Object */ Status = ObpAllocateObject(NULL, - TypeName, + &ObjectName, ObTypeObjectType, sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), KernelMode, @@ -788,13 +847,6 @@ if (ObpTypeDirectoryObject) { /* Insert it into the Object Directory */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - ObpLookupEntryDirectory(ObpTypeDirectoryObject, - TypeName, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context); ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); ObReferenceObject(ObpTypeDirectoryObject); }

1 0

[janderwald] 22695: * compile console with pch support
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Thu Jun 29 22:19:51 2006 New Revision: 22695 URL: http://svn.reactos.org/svn/reactos?rev=22695&view=rev Log: * compile console with pch support Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/console.rbuild trunk/reactos/dll/win32/console/font.c trunk/reactos/dll/win32/console/layout.c trunk/reactos/dll/win32/console/options.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Thu Jun 29 22:19:51 2006 @@ -7,13 +7,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> -#include "resource.h" - +#include "console.h" INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Thu Jun 29 22:19:51 2006 @@ -7,11 +7,6 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include "resource.h" #include "console.h" #define NUM_APPLETS (1) Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Thu Jun 29 22:19:51 2006 @@ -1,5 +1,12 @@ #ifndef CONSOLE_H__ #define CONSOLE_H__ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" typedef struct { Modified: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (original) +++ trunk/reactos/dll/win32/console/console.rbuild Thu Jun 29 22:19:51 2006 @@ -16,4 +16,5 @@ <file>layout.c</file> <file>colors.c</file> <file>console.rc</file> + <pch>console.h</pch> </module> Modified: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (original) +++ trunk/reactos/dll/win32/console/font.c Thu Jun 29 22:19:51 2006 @@ -8,13 +8,7 @@ */ -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> -#include "resource.h" - +#include "console.h" INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Thu Jun 29 22:19:51 2006 @@ -7,13 +7,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> -#include "resource.h" - +#include "console.h" INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Thu Jun 29 22:19:51 2006 @@ -7,13 +7,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> -#include "resource.h" +#include "console.h" INT_PTR

1 0

[ion] 22694: - Add all .vcproj files to svn:ignore (I inadvertently left some out before).
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 22:15:09 2006 New Revision: 22694 URL: http://svn.reactos.org/svn/reactos?rev=22694&view=rev Log: - Add all .vcproj files to svn:ignore (I inadvertently left some out before). Modified: trunk/reactos/ (props changed) trunk/reactos/base/applications/cacls/ (props changed) trunk/reactos/base/applications/calc/ (props changed) trunk/reactos/base/applications/control/ (props changed) trunk/reactos/base/applications/devmgr/ (props changed) trunk/reactos/base/applications/games/solitaire/ (props changed) trunk/reactos/base/applications/games/winemine/ (props changed) trunk/reactos/base/applications/getfirefox/ (props changed) trunk/reactos/base/applications/hostname/ (props changed) trunk/reactos/base/applications/ibrowser/ (props changed) trunk/reactos/base/applications/imagesoft/ (props changed) trunk/reactos/base/applications/msconfig/ (props changed) trunk/reactos/base/applications/network/arp/ (props changed) trunk/reactos/base/applications/network/finger/ (props changed) trunk/reactos/base/applications/network/ftp/ (props changed) trunk/reactos/base/applications/network/ipconfig/ (props changed) trunk/reactos/base/applications/network/netstat/ (props changed) trunk/reactos/base/applications/network/ping/ (props changed) trunk/reactos/base/applications/network/route/ (props changed) trunk/reactos/base/applications/network/telnet/ (props changed) trunk/reactos/base/applications/network/tracert/ (props changed) trunk/reactos/base/applications/network/whois/ (props changed) trunk/reactos/base/applications/notepad/ (props changed) trunk/reactos/base/applications/regedit/ (props changed) trunk/reactos/base/applications/regedit/clb/ (props changed) trunk/reactos/base/applications/reporterror/ (props changed) trunk/reactos/base/applications/sc/ (props changed) trunk/reactos/base/applications/screensavers/cylfrac/ (props changed) trunk/reactos/base/applications/screensavers/matrix/ (props changed) trunk/reactos/base/applications/screenshot/ (props changed) trunk/reactos/base/applications/servman/ (props changed) trunk/reactos/base/applications/shutdown/ (props changed) trunk/reactos/base/applications/sndvol32/ (props changed) trunk/reactos/base/applications/taskmgr/ (props changed) trunk/reactos/base/applications/utils/ps/ (props changed) trunk/reactos/base/applications/utils/rosperf/ (props changed) trunk/reactos/base/applications/winefile/ (props changed) trunk/reactos/base/applications/wordpad/ (props changed) trunk/reactos/base/services/dhcp/ (props changed) trunk/reactos/base/services/eventlog/ (props changed) trunk/reactos/base/services/rpcss/ (props changed) trunk/reactos/base/services/tcpsvcs/ (props changed) trunk/reactos/base/services/umpnpmgr/ (props changed) trunk/reactos/base/setup/reactos/ (props changed) trunk/reactos/base/setup/setup/ (props changed) trunk/reactos/base/setup/usetup/ (props changed) trunk/reactos/base/setup/vmwinst/ (props changed) trunk/reactos/base/setup/welcome/ (props changed) trunk/reactos/base/shell/cmd/ (props changed) trunk/reactos/base/shell/cmd/tests/ (props changed) trunk/reactos/base/shell/explorer/ (props changed) trunk/reactos/base/shell/explorer/notifyhook/ (props changed) trunk/reactos/base/system/autochk/ (props changed) trunk/reactos/base/system/expand/ (props changed) trunk/reactos/base/system/format/ (props changed) trunk/reactos/base/system/lsass/ (props changed) trunk/reactos/base/system/msiexec/ (props changed) trunk/reactos/base/system/regsvr32/ (props changed) trunk/reactos/base/system/rundll32/ (props changed) trunk/reactos/base/system/services/ (props changed) trunk/reactos/base/system/smss/ (props changed) trunk/reactos/base/system/userinit/ (props changed) trunk/reactos/base/system/winlogon/ (props changed) trunk/reactos/boot/bootdata/bootcd/ (props changed) trunk/reactos/boot/bootdata/livecd/ (props changed) trunk/reactos/boot/freeldr/bootsect/ (props changed) trunk/reactos/boot/freeldr/fdebug/ (props changed) trunk/reactos/boot/freeldr/freeldr/ (props changed) trunk/reactos/boot/freeldr/freeldr/arch/i386/ (props changed) trunk/reactos/boot/freeldr/install/ (props changed) trunk/reactos/drivers/base/beep/ (props changed) trunk/reactos/drivers/base/blue/ (props changed) trunk/reactos/drivers/base/bootvid/ (props changed) trunk/reactos/drivers/base/debugout/ (props changed) trunk/reactos/drivers/base/green/ (props changed) trunk/reactos/drivers/base/null/ (props changed) trunk/reactos/drivers/base/parallel/ (props changed) trunk/reactos/drivers/base/ramdrv/ (props changed) trunk/reactos/drivers/base/serial/ (props changed) trunk/reactos/drivers/bus/acpi/ (props changed) trunk/reactos/drivers/bus/isapnp/ (props changed) trunk/reactos/drivers/bus/pci/ (props changed) trunk/reactos/drivers/bus/serenum/ (props changed) trunk/reactos/drivers/filesystems/cdfs/ (props changed) trunk/reactos/drivers/filesystems/fs_rec/ (props changed) trunk/reactos/drivers/filesystems/ms/ (props changed) trunk/reactos/drivers/filesystems/mup/ (props changed) trunk/reactos/drivers/filesystems/np/ (props changed) trunk/reactos/drivers/filesystems/ntfs/ (props changed) trunk/reactos/drivers/filesystems/vfat/ (props changed) trunk/reactos/drivers/input/i8042prt/ (props changed) trunk/reactos/drivers/input/kbdclass/ (props changed) trunk/reactos/drivers/input/mouclass/ (props changed) trunk/reactos/drivers/input/sermouse/ (props changed) trunk/reactos/drivers/multimedia/audio/mpu401/ (props changed) trunk/reactos/drivers/multimedia/audio/sndblst/ (props changed) trunk/reactos/drivers/multimedia/audio/sound/ (props changed) trunk/reactos/drivers/multimedia/portcls/ (props changed) trunk/reactos/drivers/network/afd/ (props changed) trunk/reactos/drivers/network/dd/ne2000/ (props changed) trunk/reactos/drivers/network/dd/pcnet/ (props changed) trunk/reactos/drivers/network/ndis/ (props changed) trunk/reactos/drivers/network/tcpip/ (props changed) trunk/reactos/drivers/network/tdi/ (props changed) trunk/reactos/drivers/network/wshtcpip/ (props changed) trunk/reactos/drivers/storage/atapi/ (props changed) trunk/reactos/drivers/storage/buslogic/ (props changed) trunk/reactos/drivers/storage/cdrom/ (props changed) trunk/reactos/drivers/storage/class2/ (props changed) trunk/reactos/drivers/storage/disk/ (props changed) trunk/reactos/drivers/storage/diskdump/ (props changed) trunk/reactos/drivers/storage/floppy/ (props changed) trunk/reactos/drivers/storage/pciide/ (props changed) trunk/reactos/drivers/storage/pciidex/ (props changed) trunk/reactos/drivers/storage/scsiport/ (props changed) trunk/reactos/drivers/test/csqtest/ (props changed) trunk/reactos/drivers/test/kmtest/ (props changed) trunk/reactos/drivers/usb/miniport/common/ (props changed) trunk/reactos/drivers/usb/miniport/sys/ (props changed) trunk/reactos/drivers/usb/miniport/usbohci/ (props changed) trunk/reactos/drivers/usb/miniport/usbuhci/ (props changed) trunk/reactos/drivers/usb/usbhub/ (props changed) trunk/reactos/drivers/usb/usbport/ (props changed) trunk/reactos/drivers/video/displays/framebuf/ (props changed) trunk/reactos/drivers/video/displays/vga/ (props changed) trunk/reactos/drivers/video/miniport/vbe/ (props changed) trunk/reactos/drivers/video/miniport/vga/ (props changed) trunk/reactos/drivers/video/miniport/xboxvmp/ (props changed) trunk/reactos/drivers/video/videoprt/ (props changed) trunk/reactos/hal/hal/ (props changed) trunk/reactos/hal/halx86/generic/ (props changed) trunk/reactos/hal/halx86/mp/ (props changed) trunk/reactos/hal/halx86/up/ (props changed) trunk/reactos/hal/halx86/xbox/ (props changed) trunk/reactos/lib/3rdparty/adns/ (props changed) trunk/reactos/lib/3rdparty/bzip2/ (props changed) trunk/reactos/lib/3rdparty/expat/ (props changed) trunk/reactos/lib/3rdparty/libxml2/ (props changed) trunk/reactos/lib/3rdparty/zlib/ (props changed) trunk/reactos/lib/crt/ (props changed) trunk/reactos/lib/drivers/chew/ (props changed) trunk/reactos/lib/drivers/csq/ (props changed) trunk/reactos/lib/drivers/ip/ (props changed) trunk/reactos/lib/drivers/oskittcp/ (props changed) trunk/reactos/lib/dxguid/ (props changed) trunk/reactos/lib/epsapi/ (props changed) trunk/reactos/lib/fslib/vfatlib/ (props changed) trunk/reactos/lib/fslib/vfatxlib/ (props changed) trunk/reactos/lib/inflib/ (props changed) trunk/reactos/lib/intrlck/ (props changed) trunk/reactos/lib/kjs/ (props changed) trunk/reactos/lib/libwine/ (props changed) trunk/reactos/lib/nt/ (props changed) trunk/reactos/lib/pseh/ (props changed) trunk/reactos/lib/recyclebin/ (props changed) trunk/reactos/lib/rossym/ (props changed) trunk/reactos/lib/rtl/ (props changed) trunk/reactos/lib/smlib/ (props changed) trunk/reactos/lib/string/ (props changed) trunk/reactos/lib/strmiids/ (props changed) trunk/reactos/lib/uuid/ (props changed) trunk/reactos/lib/wdmguid/ (props changed) trunk/reactos/regtests/kmtloader/ (props changed) trunk/reactos/regtests/regtests/ (props changed) trunk/reactos/regtests/shared/ (props changed) trunk/reactos/regtests/winetests/advapi32/ (props changed) trunk/reactos/regtests/winetests/comctl32/ (props changed) trunk/reactos/regtests/winetests/gdi32/ (props changed) trunk/reactos/regtests/winetests/icmp/ (props changed) trunk/reactos/regtests/winetests/kernel32/ (props changed) trunk/reactos/regtests/winetests/lz32/ (props changed) trunk/reactos/regtests/winetests/msvcrt/ (props changed) trunk/reactos/regtests/winetests/ntdll/ (props changed) trunk/reactos/regtests/winetests/powrprof/ (props changed) trunk/reactos/regtests/winetests/psapi/ (props changed) trunk/reactos/regtests/winetests/setupapi/ (props changed) trunk/reactos/regtests/winetests/shell32/ (props changed) trunk/reactos/regtests/winetests/shlwapi/ (props changed) trunk/reactos/regtests/winetests/user32/ (props changed) trunk/reactos/regtests/winetests/version/ (props changed) trunk/reactos/subsystems/ntvdm/ (props changed) trunk/reactos/subsystems/win32/csrss/ (props changed) trunk/reactos/subsystems/win32/csrss/win32csr/ (props changed) trunk/reactos/subsystems/win32/win32k/ (props changed) trunk/reactos/subsystems/win32/win32k/tests/ (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -31,3 +31,4 @@ reactos ros *.s +*.sln Propchange: trunk/reactos/base/applications/cacls/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/calc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/control/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -13,3 +13,4 @@ Debug Release GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/devmgr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/games/solitaire/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/games/winemine/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/getfirefox/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/hostname/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/ibrowser/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -31,3 +31,4 @@ start-gdb.bat libexpat.dll GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/imagesoft/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/base/applications/msconfig/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/arp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/finger/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/ftp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/ipconfig/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/netstat/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/ping/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/route/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/telnet/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/tracert/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/network/whois/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/notepad/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.o *.coff GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/regedit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/regedit/clb/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/reporterror/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.sym *.a GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/sc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/screensavers/cylfrac/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/base/applications/screensavers/matrix/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/base/applications/screenshot/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/base/applications/servman/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/shutdown/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/sndvol32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/taskmgr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -17,3 +17,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/utils/ps/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/utils/rosperf/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/applications/winefile/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -23,3 +23,4 @@ GNUmakefile doxy-doc *.chm +*.vcproj Propchange: trunk/reactos/base/applications/wordpad/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/base/services/dhcp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.a *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/base/services/eventlog/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.exe *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/services/rpcss/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.exe *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/services/tcpsvcs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/base/services/umpnpmgr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ pnp.h pnp_s.c GNUmakefile +*.vcproj Propchange: trunk/reactos/base/setup/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/setup/setup/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/setup/usetup/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/base/setup/vmwinst/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/setup/welcome/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/shell/cmd/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -17,3 +17,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/base/shell/cmd/tests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -17,3 +17,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/base/shell/explorer/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -37,3 +37,4 @@ old *.user *.zip +*.vcproj Propchange: trunk/reactos/base/shell/explorer/notifyhook/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -12,3 +12,4 @@ GNUmakefile Win32 *.user +*.vcproj Propchange: trunk/reactos/base/system/autochk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/expand/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.exe *.coff GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/format/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/lsass/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.map *.a GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/msiexec/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.a *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/regsvr32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/rundll32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/services/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ svcctl_s.c svcctl_s.h GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/smss/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/userinit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/base/system/winlogon/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/boot/bootdata/bootcd/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/boot/bootdata/livecd/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/boot/freeldr/bootsect/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ *.exe GNUmakefile +*.vcproj Propchange: trunk/reactos/boot/freeldr/fdebug/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ *.res *.exe +*.vcproj Propchange: trunk/reactos/boot/freeldr/freeldr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -3,3 +3,4 @@ *.exe *.sys GNUmakefile +*.vcproj Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ *.d +*.vcproj Propchange: trunk/reactos/boot/freeldr/install/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ *.exe GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/beep/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/blue/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/bootvid/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/debugout/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/green/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/null/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/parallel/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/ramdrv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/base/serial/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/bus/acpi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ acpi.coff objects GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/bus/isapnp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/bus/pci/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/bus/serenum/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/cdfs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/fs_rec/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/ms/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/mup/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/np/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/ntfs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/filesystems/vfat/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/input/i8042prt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/input/kbdclass/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/input/mouclass/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/input/sermouse/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/multimedia/audio/mpu401/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/multimedia/audio/sndblst/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/multimedia/audio/sound/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/multimedia/portcls/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/afd/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/dd/ne2000/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/dd/pcnet/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/ndis/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/tcpip/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/tdi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/network/wshtcpip/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/atapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/buslogic/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/cdrom/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/class2/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/disk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/diskdump/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/floppy/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/storage/pciide/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ GNUmakefile *.bak +*.vcproj Propchange: trunk/reactos/drivers/storage/pciidex/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ GNUmakefile *.bak +*.vcproj Propchange: trunk/reactos/drivers/storage/scsiport/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/test/csqtest/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -3,3 +3,4 @@ *.sys *.o *.map +*.vcproj Propchange: trunk/reactos/drivers/test/kmtest/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/drivers/usb/miniport/common/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/drivers/usb/miniport/sys/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.map *.tmp .*.d +*.vcproj Propchange: trunk/reactos/drivers/usb/miniport/usbohci/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/usb/miniport/usbuhci/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.tmp .*.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/usb/usbport/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.tmp .*.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/displays/framebuf/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ .*.d *.sys GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/displays/vga/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ .*.d *.sys GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/miniport/vbe/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/miniport/vga/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.sys *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/miniport/xboxvmp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.map .*.d GNUmakefile +*.vcproj Propchange: trunk/reactos/drivers/video/videoprt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ .*.d *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/hal/hal/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/hal/halx86/generic/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ *.o makefile +*.vcproj Propchange: trunk/reactos/hal/halx86/mp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/hal/halx86/up/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/hal/halx86/xbox/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/lib/3rdparty/adns/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ *.tmp* *.d makefile +*.vcproj Propchange: trunk/reactos/lib/3rdparty/bzip2/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/lib/3rdparty/expat/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -16,3 +16,4 @@ *.sym *.dll makefile +*.vcproj Propchange: trunk/reactos/lib/3rdparty/libxml2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/lib/3rdparty/zlib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.map hostobjs makefile +*.vcproj Propchange: trunk/reactos/lib/crt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,3 +1,4 @@ crt.a *.gch makefile +*.vcproj Propchange: trunk/reactos/lib/drivers/chew/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/lib/drivers/csq/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.o *.map makefile +*.vcproj Propchange: trunk/reactos/lib/drivers/ip/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ ip.a makefile +*.vcproj Propchange: trunk/reactos/lib/drivers/oskittcp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ oskittcp.a makefile +*.vcproj Propchange: trunk/reactos/lib/dxguid/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ dxguid.a makefile +*.vcproj Propchange: trunk/reactos/lib/epsapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ makefile +*.vcproj Propchange: trunk/reactos/lib/fslib/vfatlib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -3,3 +3,4 @@ *.o *.sym makefile +*.vcproj Propchange: trunk/reactos/lib/fslib/vfatxlib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ makefile +*.vcproj Propchange: trunk/reactos/lib/inflib/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/lib/intrlck/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/lib/kjs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.map *.tmp makefile +*.vcproj Propchange: trunk/reactos/lib/libwine/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.d *.map makefile +*.vcproj Propchange: trunk/reactos/lib/nt/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/lib/pseh/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -2,3 +2,4 @@ *.a *.d makefile +*.vcproj Propchange: trunk/reactos/lib/recyclebin/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -2,3 +2,4 @@ *.gch GNUMakefile Makefile +*.vcproj Propchange: trunk/reactos/lib/rossym/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -2,3 +2,4 @@ *.d *.o makefile +*.vcproj Propchange: trunk/reactos/lib/rtl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -5,3 +5,4 @@ *.map *.gch makefile +*.vcproj Propchange: trunk/reactos/lib/smlib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,3 +1,4 @@ *.d *.o makefile +*.vcproj Propchange: trunk/reactos/lib/string/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.sym *.map makefile +*.vcproj Propchange: trunk/reactos/lib/strmiids/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,2 +1,3 @@ strmiids.a makefile +*.vcproj Propchange: trunk/reactos/lib/uuid/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.map *.tmp makefile +*.vcproj Propchange: trunk/reactos/lib/wdmguid/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -11,3 +11,4 @@ *.pch *.map *.sys +*.vcproj Propchange: trunk/reactos/regtests/kmtloader/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/regtests/regtests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/shared/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -4,3 +4,4 @@ *.sym *.map makefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/advapi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/comctl32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/gdi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/icmp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/regtests/winetests/kernel32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/lz32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/regtests/winetests/msvcrt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/ntdll/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/powrprof/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/regtests/winetests/psapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/setupapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/shell32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/shlwapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/user32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/regtests/winetests/version/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -10,3 +10,4 @@ *.pch *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/subsystems/ntvdm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -6,3 +6,4 @@ *.sym *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/subsystems/win32/csrss/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -9,3 +9,4 @@ win32k.c *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -8,3 +8,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/subsystems/win32/win32k/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -11,3 +11,4 @@ *.a doxy-doc GNUmakefile +*.vcproj Propchange: trunk/reactos/subsystems/win32/win32k/tests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jun 29 22:15:09 2006 @@ -7,3 +7,4 @@ *.a *.pch GNUmakefile +*.vcproj

1 0

[janderwald] 22693: * add ReactOS Console configuration DLL
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Thu Jun 29 22:10:15 2006 New Revision: 22693 URL: http://svn.reactos.org/svn/reactos?rev=22693&view=rev Log: * add ReactOS Console configuration DLL Added: trunk/reactos/dll/win32/console/ (with props) trunk/reactos/dll/win32/console/colors.c (with props) trunk/reactos/dll/win32/console/console.c (with props) trunk/reactos/dll/win32/console/console.def (with props) trunk/reactos/dll/win32/console/console.h (with props) trunk/reactos/dll/win32/console/console.rbuild (with props) trunk/reactos/dll/win32/console/console.rc (with props) trunk/reactos/dll/win32/console/en.rc (with props) trunk/reactos/dll/win32/console/font.c (with props) trunk/reactos/dll/win32/console/layout.c (with props) trunk/reactos/dll/win32/console/options.c (with props) trunk/reactos/dll/win32/console/resource.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=226… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Jun 29 22:10:15 2006 @@ -19,6 +19,7 @@ <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> <property name="BASEADDRESS_MAIN" value="0x64f40000" /> <property name="BASEADDRESS_INTL" value="0x64fb0000" /> + <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> Propchange: trunk/reactos/dll/win32/console/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:10:15 2006 @@ -1,0 +1,11 @@ +*.coff +*.dll +*.d +*.a +*.o +*.sym +*.map +*.tmp +*.gch +GNUmakefile +*.vcproj Added: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (added) +++ trunk/reactos/dll/win32/console/colors.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,37 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/colors.c + * PURPOSE: displays colors dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +ColorsProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/colors.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/colors.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (added) +++ trunk/reactos/dll/win32/console/console.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,171 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/console.c + * PURPOSE: initialization of DLL + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "resource.h" +#include "console.h" + +#define NUM_APPLETS (1) + +LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FontProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK LayoutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ColorsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, InitApplet} +}; + +static void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + +/* Property Sheet Callback */ +int CALLBACK +PropSheetProc( + HWND hwndDlg, + UINT uMsg, + LPARAM lParam +) +{ + UNREFERENCED_PARAMETER(hwndDlg) + switch(uMsg) + { + case PSCB_BUTTONPRESSED: + switch(lParam) + { + case PSBTN_OK: /* OK */ + break; + case PSBTN_CANCEL: /* Cancel */ + break; + case PSBTN_APPLYNOW: /* Apply now */ + break; + case PSBTN_FINISH: /* Close */ + break; + default: + return FALSE; + } + break; + + case PSCB_INITIALIZED: + break; + } + return TRUE; +} + +/* First Applet */ +LONG APIENTRY +InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + PROPSHEETPAGE psp[5]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + INT i=0; + + UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + + memset(Caption, 0x0, sizeof(Caption)); + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszCaption = Caption; + psh.nPages = 4; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; + + InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet( + HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + int i = (int)lParam1; + + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + } + case CPL_DBLCLK: + { + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; + } + } + return FALSE; +} + + +BOOLEAN +WINAPI +DllMain( + HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved) + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} + Propchange: trunk/reactos/dll/win32/console/console.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/console.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/console.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.def (added) +++ trunk/reactos/dll/win32/console/console.def Thu Jun 29 22:10:15 2006 @@ -1,0 +1,6 @@ +LIBRARY console.dll + +EXPORTS +CPlApplet@16 + +; EOF Propchange: trunk/reactos/dll/win32/console/console.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (added) +++ trunk/reactos/dll/win32/console/console.h Thu Jun 29 22:10:15 2006 @@ -1,0 +1,12 @@ +#ifndef CONSOLE_H__ +#define CONSOLE_H__ + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +#endif /* CONSOLE_H__ */ Propchange: trunk/reactos/dll/win32/console/console.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (added) +++ trunk/reactos/dll/win32/console/console.rbuild Thu Jun 29 22:10:15 2006 @@ -1,0 +1,19 @@ +<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll"> + <importlibrary definition="console.def" /> + <include base="console">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>console.c</file> + <file>options.c</file> + <file>font.c</file> + <file>layout.c</file> + <file>colors.c</file> + <file>console.rc</file> +</module> Propchange: trunk/reactos/dll/win32/console/console.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rc (added) +++ trunk/reactos/dll/win32/console/console.rc Thu Jun 29 22:10:15 2006 @@ -1,0 +1,20 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/console.rc + * PURPOSE: main resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel Console Applet\0" +#define REACTOS_STR_INTERNAL_NAME "powercfg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" +#include <reactos/version.rc> + +#include "en.rc" Propchange: trunk/reactos/dll/win32/console/console.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/console.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (added) +++ trunk/reactos/dll/win32/console/en.rc Thu Jun 29 22:10:15 2006 @@ -1,0 +1,71 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/en.rc + * PURPOSE: English resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Options" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +GROUPBOX "Cursor Size", -1, 15, 15, 120, 70 +CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", 0x50010009, 25, 25, 90, 10 +CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", 0x50010009, 25, 40, 90, 10 +CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", 0x50010009, 25, 55, 90, 10 +GROUPBOX "Display Options", -1, 140, 15, 100, 70 +CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", 0x50010009, 150, 35, 70, 10 +CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", 0x50010009, 150, 50, 70, 10 +GROUPBOX "Command History:", -1, 15, 90, 120, 70 +LTEXT "&Buffer Size", -1, 25, 100, 60, 15 +EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 +LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15 +EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 +CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 + + +GROUPBOX "Edit Options", -1, 140, 90, 100, 70 +CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15 +CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15 +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Font" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Layout" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Colors" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configures console properties." +END Propchange: trunk/reactos/dll/win32/console/en.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/en.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (added) +++ trunk/reactos/dll/win32/console/font.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,38 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/font.c + * PURPOSE: displays font dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +FontProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/font.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/font.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (added) +++ trunk/reactos/dll/win32/console/layout.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,37 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/layout.c + * PURPOSE: displays layout dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +LayoutProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/layout.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/layout.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (added) +++ trunk/reactos/dll/win32/console/options.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,38 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/options.c + * PURPOSE: displays options dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +OptionsProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/options.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/options.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/resource… ============================================================================== --- trunk/reactos/dll/win32/console/resource.h (added) +++ trunk/reactos/dll/win32/console/resource.h Thu Jun 29 22:10:15 2006 @@ -1,0 +1,26 @@ +#ifndef RESOURCE_H__ +#define RESOURCE_H__ + +#define IDC_CPLICON 40 +#define IDS_CPLNAME 41 +#define IDS_CPLDESCRIPTION 42 + +#define IDD_PROPPAGEOPTIONS 100 +#define IDD_PROPPAGEFONT 101 +#define IDD_PROPPAGELAYOUT 102 +#define IDD_PROPPAGECOLORS 103 + +#define IDC_CHECK_QUICK_EDIT 200 +#define IDC_CHECK_INSERT_MODE 201 +#define IDC_CHECK_DISCARD_DUPLICATES 202 +#define IDC_EDIT_BUFFER_SIZE 203 +#define IDC_UPDOWN_BUFFER_SIZE 204 +#define IDC_EDIT_NUM_BUFFER 205 +#define IDC_UPDOWN_NUM_BUFFER 206 +#define IDC_RADIO_SMALL_CURSOR 207 +#define IDC_RADIO_MEDIUM_CURSOR 208 +#define IDC_RADIO_LARGE_CURSOR 209 +#define IDC_RADIO_DISPLAY_WINDOW 210 +#define IDC_RADIO_DISPLAY_FULL 211 + +#endif Propchange: trunk/reactos/dll/win32/console/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Thu Jun 29 22:10:15 2006 @@ -28,6 +28,9 @@ <directory name="cfgmgr32"> <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> </directory> +<directory name="console"> + <xi:include href="console/console.rbuild" /> +</directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.rbuild" /> </directory>

1 0

[ion] 22692: - Fix the last two Ob reference counting bugs: - Don't de-reference the object when duplicating it (not sure why this was left there). This fixes all the "misbehaving object: Event" messages in the console and fixes those regressions. - Don't reference the object when doing a lookup (not sure why this was there either). This made it impossible to kill named objects, since ObpDeleteNameCheck did a lookup before killing them, and the lookup ended up adding a reference. - Cm still need
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 22:07:53 2006 New Revision: 22692 URL: http://svn.reactos.org/svn/reactos?rev=22692&view=rev Log: - Fix the last two Ob reference counting bugs: - Don't de-reference the object when duplicating it (not sure why this was left there). This fixes all the "misbehaving object: Event" messages in the console and fixes those regressions. - Don't reference the object when doing a lookup (not sure why this was there either). This made it impossible to kill named objects, since ObpDeleteNameCheck did a lookup before killing them, and the lookup ended up adding a reference. - Cm still needs fixing! Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Thu Jun 29 22:07:53 2006 @@ -2329,12 +2329,28 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindNextForwardRunClear( + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, + IN PULONG StartingRunIndex +); + +NTSYSAPI VOID NTAPI RtlInitializeBitMap( IN PRTL_BITMAP BitMapHeader, IN PULONG BitMapBuffer, IN ULONG SizeOfBitMap +); + +NTSYSAPI +ULONG +NTAPI +RtlNumberOfSetBits( + IN PRTL_BITMAP BitMapHeader ); NTSYSAPI Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Jun 29 22:07:53 2006 @@ -220,9 +220,6 @@ /* Save the found object */ FoundObject = CurrentEntry->Object; if (!FoundObject) goto Quickie; - - /* Add a reference to the object */ - ObReferenceObject(FoundObject); } /* Check if the directory was unlocked (which means we locked it) */ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 22:07:53 2006 @@ -1382,7 +1382,6 @@ } /* Now create the handle */ - ObDereferenceObject(SourceObject); NewHandle = ExCreateHandle(HandleTable, &NewHandleEntry); if (!NewHandle) { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 29 22:07:53 2006 @@ -102,6 +102,7 @@ /* Check if we were inserted in a directory */ if (Directory) { + /* We were, so dereference the directory and the object as well */ ObDereferenceObject(Directory); ObDereferenceObject(Object); } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 22:07:53 2006 @@ -88,7 +88,7 @@ /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (Header->PointerCount <= Header->HandleCount) + if (Header->PointerCount < Header->HandleCount) { DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return; @@ -98,7 +98,7 @@ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - if(Header->HandleCount) + if (Header->HandleCount) { DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return;

1 0

[tretiakov] 22691: Fix thread synchronization, use critical sections. Rewrite some functions (optimize).
by tretiakov＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: tretiakov Date: Thu Jun 29 21:36:04 2006 New Revision: 22691 URL: http://svn.reactos.org/svn/reactos?rev=22691&view=rev Log: Fix thread synchronization, use critical sections. Rewrite some functions (optimize). Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Thu Jun 29 21:36:04 2006 @@ -22,7 +22,10 @@ HANDLE MyHeap = NULL; PLOGFILE SystemLog = NULL; PLOGFILE ApplicationLog = NULL; +PLOGFILE SecurityLog = NULL; BOOL onLiveCD = FALSE; // On livecd events will go to debug output only + +extern CRITICAL_SECTION LogListCs; VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) { @@ -65,6 +68,8 @@ return 1; } + InitializeCriticalSection(&LogListCs); + /* This will be fixed in near future */ @@ -103,7 +108,9 @@ StartServiceCtrlDispatcher(ServiceTable); + LogfClose(SystemLog); + DeleteCriticalSection(&LogListCs); HeapDestroy(MyHeap); return 0; Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Thu Jun 29 21:36:04 2006 @@ -8,7 +8,8 @@ #include "eventlog.h" -PLOGFILE _LogListHead = NULL; +PLOGFILE LogListHead = NULL; +CRITICAL_SECTION LogListCs; extern HANDLE MyHeap; BOOL LogfInitializeNew(PLOGFILE LogFile) @@ -292,107 +293,118 @@ return; } -PLOGFILE LogfListHead() -{ - return _LogListHead; -} - PLOGFILE LogfListItemByName(WCHAR *Name) { - PLOGFILE Item; - Item = LogfListHead(); - while(Item) - { + PLOGFILE Item, Ret = NULL; + + EnterCriticalSection(&LogListCs); + + for(Item = LogListHead; Item; Item = (PLOGFILE)Item->Next) if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) - return Item; - Item = (PLOGFILE)Item->Next; - } - return NULL; + { + Ret = Item; + break; + } + + LeaveCriticalSection(&LogListCs); + return Ret; } /* index starting from 1 */ INT LogfListItemIndexByName(WCHAR *Name) { PLOGFILE Item; - INT i = 1; - - Item = LogfListHead(); - - while(Item) - { + INT ret = 0, i = 1; + + EnterCriticalSection(&LogListCs); + + for(Item = LogListHead; Item; i++, Item = (PLOGFILE)Item->Next) if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) - return i; - Item = (PLOGFILE)Item->Next; - i++; - } - - return 0; + { + ret = i; + break; + } + + LeaveCriticalSection(&LogListCs); + return ret; } /* index starting from 1 */ PLOGFILE LogfListItemByIndex(INT Index) { INT i = 1; - PLOGFILE Item; - Item = LogfListHead(); - while(Item) + PLOGFILE Item = LogListHead; + + EnterCriticalSection(&LogListCs); + for(; Item && i<Index; Item = (PLOGFILE)Item->Next, i++); + LeaveCriticalSection(&LogListCs); + + return Item; +} + +INT LogfListItemCount() +{ + PLOGFILE Item = LogListHead; + INT i = 0; + + EnterCriticalSection(&LogListCs); + while(Item) { - if(i == Index) - return Item; - i++; - Item = (PLOGFILE)Item->Next; - } - return NULL; -} - -INT LogfListItemCount() -{ - PLOGFILE Item = NULL; - INT i = 1; - Item = LogfListHead(); - if(Item) - { - while(Item->Next) - { - i++; - Item = (PLOGFILE) Item->Next; - } - return i; - } - else return 0; + i++; + Item = (PLOGFILE) Item->Next; + } + LeaveCriticalSection(&LogListCs); + + return i; } VOID LogfListAddItem(PLOGFILE Item) { - PLOGFILE List; - - List = LogfListHead(); - - if(List) + EnterCriticalSection(&LogListCs); + + if(LogListHead) { + PLOGFILE List = LogListHead; + while(List->Next) List = (PLOGFILE)List->Next; + Item->Prev = (PVOID)List; Item->Next = NULL; - InterlockedExchange((PLONG)&List->Next, (LONG)Item); - } - else { + List->Next = Item; + } + else + { Item->Next = NULL; Item->Prev = NULL; - InterlockedExchange((PLONG)&_LogListHead, (LONG)Item); - } + LogListHead = Item; + } + + LeaveCriticalSection(&LogListCs); } VOID LogfListRemoveItem(PLOGFILE Item) { - if(Item->Prev) + PLOGFILE prev = (PLOGFILE)Item->Prev; + PLOGFILE next = (PLOGFILE)Item->Next; + + EnterCriticalSection(&LogListCs); + + if(prev && next) { - InterlockedExchange((PLONG)&((PLOGFILE)Item->Prev)->Next, - (LONG)Item->Next); - } - else { - InterlockedExchange((PLONG)&_LogListHead, (LONG)Item->Next); - } + prev->Next = next; + next->Prev = prev; + } + else if(next) + { + LogListHead = next; + next->Prev = NULL; + } + else if(prev) prev->Next = NULL; + else LogListHead = NULL; + + LeaveCriticalSection(&LogListCs); + } BOOL LogfReadEvent(PLOGFILE LogFile, @@ -562,7 +574,7 @@ ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber) -/* Returns NULL if nothing found. */ +/* Returns 0 if nothing found. */ { DWORD i; for(i = 0; i < LogFile->OffsetInfoNext; i++)

1 0

[turner] 22690: Unicode fixes and error checking.
by turner＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: turner Date: Thu Jun 29 19:08:10 2006 New Revision: 22690 URL: http://svn.reactos.org/svn/reactos?rev=22690&view=rev Log: Unicode fixes and error checking. Modified: trunk/reactos/base/shell/cmd/batch.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jun 29 19:08:10 2006 @@ -275,8 +275,17 @@ // // Allocate enough memory to hold the params and copy them over without modifications // - bc->raw_params = malloc(_tcslen(param)); - _tcscpy(bc->raw_params,param); + bc->raw_params = malloc((_tcslen(param)+1) * sizeof(TCHAR)); + if (bc->raw_params != NULL) + { + memset (bc->raw_params, 0, _tcslen(bc->raw_params) * sizeof(TCHAR)); + _tcscpy(bc->raw_params,param); + } + else + { + error_out_of_memory(); + return FALSE; + } #ifdef _DEBUG DebugPrintf (_T("Batch: returns TRUE\n"));

1 0

[janderwald] 22689: * fix building of win32k_test
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Thu Jun 29 18:39:53 2006 New Revision: 22689 URL: http://svn.reactos.org/svn/reactos?rev=22689&view=rev Log: * fix building of win32k_test Modified: trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/te… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild Thu Jun 29 18:39:53 2006 @@ -14,6 +14,8 @@ <library>regtests</library> <library>win32k_base</library> <library>pseh</library> + <library>freetype</library> + <library>ntoskrnl</library> <file>setup.c</file> <xi:include href="stubs.rbuild" /> </module>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs