Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 18001: Make TAB+ debug combos work again. Based on bugfix by Andrew Munger.

by ion＠svn.reactos.com

Make TAB+ debug combos work again. Based on bugfix by Andrew Munger. Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-09-23 06:25:38 UTC (rev 18000) +++ trunk/reactos/bootdata/hivesys.inf 2005-09-23 06:32:47 UTC (rev 18001) @@ -487,6 +487,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Ke yboard Port" HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 ;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000 0000,"i8042prt" ;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00 000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" ;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x0000 0000,"i8042prt" _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-09-23 06:25:38 UTC (rev 18000) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-09-23 06:32:47 UTC (rev 18001) @@ -730,6 +730,6 @@ /* We hope kernel would understand this. If * that's not the case, nothing would happen. */ - KdpServiceDispatcher(TAG('R', 'o', 's', ' '), EnterDebugger, NULL); + KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Key, NULL); #endif /* __REACTOS__ */ }

18 years, 12 months

[ion] 18000: Fix exception handling/PSEH. Fixes bug 797.

by ion＠svn.reactos.com

Fix exception handling/PSEH. Fixes bug 797. Modified: trunk/reactos/lib/rtl/i386/except.s Modified: trunk/reactos/lib/rtl/i386/exception.c _____ Modified: trunk/reactos/lib/rtl/i386/except.s --- trunk/reactos/lib/rtl/i386/except.s 2005-09-23 06:06:20 UTC (rev 17999) +++ trunk/reactos/lib/rtl/i386/except.s 2005-09-23 06:25:38 UTC (rev 18000) @@ -109,7 +109,7 @@ mov [ebx+CONTEXT_EBP], eax /* And get ESP */ - mov eax, [ebp+8] + lea eax, [ebp+8] mov [ebx+CONTEXT_ESP], eax /* Return to the caller */ _____ Modified: trunk/reactos/lib/rtl/i386/exception.c --- trunk/reactos/lib/rtl/i386/exception.c 2005-09-23 06:06:20 UTC (rev 17999) +++ trunk/reactos/lib/rtl/i386/exception.c 2005-09-23 06:25:38 UTC (rev 18000) @@ -56,12 +56,12 @@ EXCEPTION_DISPOSITION ReturnValue; ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; - DPRINT1("RtlDispatchException(): %p, %p \n", ExceptionRecord, Context); + DPRINT("RtlDispatchException(): %p, %p \n", ExceptionRecord, Context); /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); RegistrationFrame = RtlpGetExceptionList(); - DPRINT1("RegistrationFrame is 0x%X\n", RegistrationFrame); + DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame); /* Now loop every frame */ while (RegistrationFrame != EXCEPTION_CHAIN_END) @@ -92,20 +92,20 @@ } /* Check if logging is enabled */ - DPRINT1("Checking for logging\n"); + DPRINT("Checking for logging\n"); RtlpCheckLogException(ExceptionRecord, Context, RegistrationFrame, sizeof(*RegistrationFrame)); /* Call the handler */ - DPRINT1("Executing handler: %p\n", RegistrationFrame->Handler); + DPRINT("Executing handler: %p\n", RegistrationFrame->Handler); ReturnValue = RtlpExecuteHandlerForException(ExceptionRecord, RegistrationFrame, Context, &DispatcherContext, RegistrationFrame->Handler); - DPRINT1("Handler returned: %lx\n", ReturnValue); + DPRINT("Handler returned: %lx\n", ReturnValue); /* Check if this is a nested frame */ if (RegistrationFrame == NestedFrame) @@ -128,7 +128,7 @@ ExceptionRecord2.NumberParameters = 0; /* Raise the exception */ - DPRINT1("Non-continuable\n"); + DPRINT("Non-continuable\n"); RtlRaiseException(&ExceptionRecord2); } else @@ -147,6 +147,7 @@ } else if (ReturnValue == ExceptionContinueSearch) { + /* Do nothing */ } else { @@ -165,7 +166,7 @@ } /* Unhandled, return false */ - DPRINT1("FALSE\n"); + DPRINT("FALSE\n"); return FALSE; } @@ -187,7 +188,7 @@ ULONG_PTR RegistrationFrameEnd; CONTEXT LocalContext; PCONTEXT Context; - DPRINT1("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame); + DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame); /* Get the current stack limits */ RtlpGetStackLimits(&StackLow, &StackHigh); @@ -227,13 +228,13 @@ RtlpCaptureContext(Context); /* Pop the current arguments off */ - LocalContext.Esp += sizeof(RegistrationFrame) + - sizeof(ReturnAddress) + - sizeof(ExceptionRecord) + - sizeof(ReturnValue); + Context->Esp += sizeof(RegistrationFrame) + + sizeof(ReturnAddress) + + sizeof(ExceptionRecord) + + sizeof(ReturnValue); /* Set the new value for EAX */ - LocalContext.Eax = (ULONG)EaxValue; + Context->Eax = (ULONG)EaxValue; /* Get the current frame */ RegistrationFrame2 = RtlpGetExceptionList(); @@ -241,7 +242,7 @@ /* Now loop every frame */ while (RegistrationFrame2 != EXCEPTION_CHAIN_END) { - DPRINT1("RegistrationFrame is 0x%X\n", RegistrationFrame2); + DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame2); /* If this is the target */ if (RegistrationFrame2 == RegistrationFrame) @@ -297,19 +298,18 @@ else { /* Call the handler */ - DPRINT1("Executing unwind handler: %p\n", RegistrationFrame2->Handler); + DPRINT("Executing unwind handler: %p\n", RegistrationFrame2->Handler); ReturnValue = RtlpExecuteHandlerForUnwind(ExceptionRecord, RegistrationFrame2, Context, &DispatcherContext, RegistrationFrame2->Handler); - DPRINT1("Handler returned: %lx\n", ReturnValue); + DPRINT("Handler returned: %lx\n", ReturnValue); /* Handle the dispositions */ if (ReturnValue == ExceptionContinueSearch) { - /* Get out of here */ - break; + /* Do nothing */ } else if (ReturnValue == ExceptionCollidedUnwind) {

18 years, 12 months

[sedwards] 17999: Stefan Huehner <stefan@huehner.org>

by sedwards＠svn.reactos.com

Stefan Huehner <stefan(a)huehner.org> Fix more -Wstrict-prototypes warnings. Modified: trunk/reactos/subsys/system/notepad/dialog.h _____ Modified: trunk/reactos/subsys/system/notepad/dialog.h --- trunk/reactos/subsys/system/notepad/dialog.h 2005-09-23 06:04:44 UTC (rev 17998) +++ trunk/reactos/subsys/system/notepad/dialog.h 2005-09-23 06:06:20 UTC (rev 17999) @@ -51,7 +51,7 @@ VOID DIALOG_TimeDate(VOID); /* utility functions */ -VOID ShowLastError(); +VOID ShowLastError(void); BOOL FileExists(LPCWSTR szFilename); BOOL DoCloseFile(void); void DoOpenFile(LPCWSTR szFileName);

18 years, 12 months

[sedwards] 17998: Dmitry Timoshkov <dmitry@codeweavers.com> Fix the usage of COLOR_xxx constants in the place of the window's class hbrBackground.

by sedwards＠svn.reactos.com

Dmitry Timoshkov <dmitry(a)codeweavers.com> Fix the usage of COLOR_xxx constants in the place of the window's class hbrBackground. Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-23 06:02:23 UTC (rev 17997) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-23 06:04:44 UTC (rev 17998) @@ -345,7 +345,7 @@ class.hInstance = Globals.hInstance; class.hIcon = LoadIcon(0, IDI_APPLICATION); class.hCursor = LoadCursor(0, IDC_ARROW); - class.hbrBackground = (HBRUSH)(COLOR_WINDOW); + class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); class.lpszClassName = className;

18 years, 12 months

[sedwards] 17997: Kevin Koltzau <kevin@plop.org> Enable/disable menu items based on edit control state.

by sedwards＠svn.reactos.com

Kevin Koltzau <kevin(a)plop.org> Enable/disable menu items based on edit control state. Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-23 05:58:27 UTC (rev 17996) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-23 06:02:23 UTC (rev 17997) @@ -114,6 +114,27 @@ } /*********************************************************************** + * Enable/disable items on the menu based on control state + */ +static VOID NOTEPAD_InitMenuPopup(HMENU menu, int index) +{ + int enable; + + EnableMenuItem(menu, CMD_UNDO, + SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); + EnableMenuItem(menu, CMD_PASTE, + IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); + enable = SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); + enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; + EnableMenuItem(menu, CMD_CUT, enable); + EnableMenuItem(menu, CMD_COPY, enable); + EnableMenuItem(menu, CMD_DELETE, enable); + + EnableMenuItem(menu, CMD_SELECT_ALL, + GetWindowTextLength(Globals.hEdit) ? MF_ENABLED : MF_GRAYED); +} + +/********************************************************************** * * * NOTEPAD_WndProc */ @@ -178,6 +199,10 @@ DoOpenFile(szFileName); break; } + + case WM_INITMENUPOPUP: + NOTEPAD_InitMenuPopup((HMENU)wParam, lParam); + break; default: return DefWindowProc(hWnd, msg, wParam, lParam);

18 years, 12 months

[sedwards] 17996: Kevin Koltzau <kevin@plop.org> Handle notepad log feature.

by sedwards＠svn.reactos.com

Kevin Koltzau <kevin(a)plop.org> Handle notepad log feature. Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-23 05:54:46 UTC (rev 17995) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-23 05:58:27 UTC (rev 17996) @@ -271,11 +271,13 @@ void DoOpenFile(LPCWSTR szFileName) { + static const WCHAR dotlog[] = { '.','L','O','G',0 }; HANDLE hFile; LPSTR pTemp; LPWSTR pTemp2 = NULL; DWORD size; DWORD dwNumRead; + WCHAR log[5]; LPWSTR p; LPBYTE p2; int iCodePage; @@ -375,6 +377,18 @@ SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); + + /* If the file starts with .LOG, add a time/date at the end and set cursor after + * See http://support.microsoft.com/?kbid=260563 + */ + if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmp(log, dotlog)) + { + static const WCHAR lfW[] = { '\r','\n',0 }; + SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + DIALOG_EditTimeDate(); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + } SetFileName(szFileName); UpdateWindowCaption();

18 years, 12 months

[sedwards] 17995: Lauri Tulmin <lauri_@ut.ee> implement word wrap

by sedwards＠svn.reactos.com

Lauri Tulmin <lauri_(a)ut.ee> implement word wrap Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-23 03:50:03 UTC (rev 17994) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-23 05:54:46 UTC (rev 17995) @@ -720,6 +720,32 @@ VOID DIALOG_EditWrap(VOID) { + static const WCHAR editW[] = { 'e','d','i','t',0 }; + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | + ES_AUTOVSCROLL | ES_MULTILINE; + RECT rc; + DWORD size; + LPWSTR pTemp; + + size = GetWindowTextLength(Globals.hEdit) + 1; + pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!pTemp) + { + ShowLastError(); + return; + } + GetWindowText(Globals.hEdit, pTemp, size); + DestroyWindow(Globals.hEdit); + GetClientRect(Globals.hMainWnd, &rc); + if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; + Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, + 0, 0, rc.right, rc.bottom, Globals.hMainWnd, + NULL, Globals.hInstance, NULL); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SetWindowTextW(Globals.hEdit, pTemp); + SetFocus(Globals.hEdit); + HeapFree(GetProcessHeap(), 0, pTemp); + Globals.bWrapLongLines = !Globals.bWrapLongLines; CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED));

18 years, 12 months

[amunger] 17994: Properly return status in iphplapi, and don't close the file handle before we use it in getNumInterfacesInt.

by amunger＠svn.reactos.com

Properly return status in iphplapi, and don't close the file handle before we use it in getNumInterfacesInt. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-23 00:05:38 UTC (rev 17993) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-23 03:50:03 UTC (rev 17994) @@ -166,8 +166,10 @@ &allocationSizeForEntityArray, NULL ); - if( !NT_SUCCESS(status) ) { - return status; + if(!status) + { + DPRINT("IOCTL Failed\n"); + return STATUS_UNSUCCESSFUL; } arraySize = allocationSizeForEntityArray; @@ -195,9 +197,10 @@ HeapFree( GetProcessHeap(), 0, entitySet ); entitySet = 0; - if( !NT_SUCCESS(status) ) { - DPRINT("TdiGetSetOfThings() => %08x\n", (int)status); - return status; + if(!status) + { + DPRINT("IOCTL Failed\n"); + return STATUS_UNSUCCESSFUL; } DPRINT("TdiGetSetOfThings(): Array changed size: %d -> %d.\n", @@ -241,10 +244,11 @@ &returnSize, NULL ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", status); - return status; - } else TRACE("Success.\n"); + if(!status) + { + DPRINT("IOCTL Failed\n"); + return STATUS_UNSUCCESSFUL; + } DPRINT("TdiGetMibForIfEntity() => {\n" " if_index ....................... %x\n" @@ -339,7 +343,7 @@ DPRINT("TdiGetEntityType() => %08x %08x\n", *type, status); - return status; + return (status ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile, @@ -425,8 +429,6 @@ return 0; } - closeTcpFile( tcpFile ); - for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && (!onlyNonLoopback || @@ -437,6 +439,8 @@ DPRINT("getNumInterfaces: success: %d %d %08x\n", onlyNonLoopback, numInterfaces, status ); + closeTcpFile( tcpFile ); + tdiFreeThingSet( entitySet ); return numInterfaces;

18 years, 12 months

[weiden] 17993: mark ZwDuplicateToken as NTSYSAPI. thx to alex

by weiden＠svn.reactos.com

mark ZwDuplicateToken as NTSYSAPI. thx to alex Modified: trunk/reactos/include/ndk/zwfuncs.h _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-22 23:50:38 UTC (rev 17992) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-23 00:05:38 UTC (rev 17993) @@ -1090,7 +1090,7 @@ OUT PHANDLE NewTokenHandle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwDuplicateToken(

18 years, 12 months

[weiden] 17992: some Nt vs. Zw fixes; these functions shouldn't be used in ntoskrnl but since they're shared there's a chance they could be used

by weiden＠svn.reactos.com

some Nt vs. Zw fixes; these functions shouldn't be used in ntoskrnl but since they're shared there's a chance they could be used Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/process.c _____ Modified: trunk/reactos/lib/rtl/path.c --- trunk/reactos/lib/rtl/path.c 2005-09-22 23:46:20 UTC (rev 17991) +++ trunk/reactos/lib/rtl/path.c 2005-09-22 23:50:38 UTC (rev 17992) @@ -266,7 +266,7 @@ NULL, NULL); - Status = NtOpenFile (&handle, + Status = ZwOpenFile (&handle, SYNCHRONIZE | FILE_TRAVERSE, &Attr, &iosb, @@ -281,12 +281,12 @@ } /* don't keep the directory handle open on removable media */ - if (NT_SUCCESS(NtQueryVolumeInformationFile( handle, &iosb, &device_info, + if (NT_SUCCESS(ZwQueryVolumeInformationFile( handle, &iosb, &device_info, sizeof(device_info), FileFsDeviceInformation )) && (device_info.Characteristics & FILE_REMOVABLE_MEDIA)) { DPRINT1("don't keep the directory handle open on removable media\n"); - NtClose( handle ); + ZwClose( handle ); handle = 0; } @@ -302,7 +302,7 @@ 0, MAX_PATH*sizeof(WCHAR)+sizeof(ULONG)); - Status = NtQueryInformationFile(handle, + Status = ZwQueryInformationFile(handle, &iosb, filenameinfo, MAX_PATH*sizeof(WCHAR)+sizeof(ULONG), @@ -357,7 +357,7 @@ if (cd->Handle) - NtClose(cd->Handle); + ZwClose(cd->Handle); cd->Handle = handle; /* append trailing \ if missing */ @@ -961,7 +961,7 @@ CurDir.Handle, NULL); - Status = NtQueryAttributesFile (&Attr, &Info); + Status = ZwQueryAttributesFile (&Attr, &Info); RtlFreeUnicodeString(&NtFileName); _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-09-22 23:46:20 UTC (rev 17991) +++ trunk/reactos/lib/rtl/process.c 2005-09-22 23:50:38 UTC (rev 17992) @@ -325,7 +325,7 @@ ULONG Cookie; NTSTATUS Status; - Status = NtQueryInformationProcess(NtCurrentProcess(), + Status = ZwQueryInformationProcess(NtCurrentProcess(), ProcessCookie, &Cookie, sizeof(Cookie),

18 years, 12 months

← Newer
1
...
16
17
18
19
20
21
22
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005