Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 17527: implemented RegDeleteKeyValueA/W()
by weiden＠svn.reactos.com 24 Aug '05

24 Aug '05

implemented RegDeleteKeyValueA/W() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-08-24 23:07:51 UTC (rev 17526) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-08-24 23:29:51 UTC (rev 17527) @@ -473,6 +473,8 @@ RegCreateKeyW@12 RegDeleteKeyA@8 RegDeleteKeyW@8 +RegDeleteKeyValueA@12 +RegDeleteKeyValueW@12 RegDeleteValueA@8 RegDeleteValueW@8 ;RegDisablePredefinedCache _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-24 23:07:51 UTC (rev 17526) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-24 23:29:51 UTC (rev 17527) @@ -690,6 +690,119 @@ /*********************************************************************** * + * RegDeleteKeyValueW + * + * @implemented + */ +LONG STDCALL +RegDeleteKeyValueW(IN HKEY hKey, + IN LPCWSTR lpSubKey OPTIONAL, + IN LPCWSTR lpValueName OPTIONAL) +{ + UNICODE_STRING ValueName; + HANDLE KeyHandle, SubKeyHandle = NULL; + NTSTATUS Status; + + Status = MapDefaultKey(&KeyHandle, + hKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + if (lpSubKey != NULL) + { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)lpSubKey); + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + + Status = NtOpenKey(&SubKeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + } + + RtlInitUnicodeString(&ValueName, + (LPWSTR)lpValueName); + + Status = NtDeleteValueKey((SubKeyHandle != NULL) ? SubKeyHandle : KeyHandle, + &ValueName); + + if (SubKeyHandle != NULL) + { + NtClose(SubKeyHandle); + } + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; +} + + +/********************************************************************** ** + * RegDeleteKeyValueA + * + * @implemented + */ +LONG STDCALL +RegDeleteKeyValueA(IN HKEY hKey, + IN LPCSTR lpSubKey OPTIONAL, + IN LPCSTR lpValueName OPTIONAL) +{ + UNICODE_STRING SubKey, ValueName; + LONG Ret; + + if (lpSubKey != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKey, + (LPSTR)lpSubKey)) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + } + else + RtlInitUnicodeString(&SubKey, + NULL); + + if (lpValueName != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ValueName, + (LPSTR)lpValueName)) + { + RtlFreeUnicodeString(&SubKey); + return ERROR_NOT_ENOUGH_MEMORY; + } + } + else + RtlInitUnicodeString(&ValueName, + NULL); + + Ret = RegDeleteKeyValueW(hKey, + SubKey.Buffer, + SubKey.Buffer); + + RtlFreeUnicodeString(&SubKey); + RtlFreeUnicodeString(&ValueName); + + return Ret; +} + + +/********************************************************************** ** * RegDeleteValueA * * @implemented

1 0

[greatlrd] 17526: Implement start execute support for bat/cmd file. woking in windows
by greatlrd＠svn.reactos.com 24 Aug '05

24 Aug '05

Implement start execute support for bat/cmd file. woking in windows Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-08-24 23:05:07 UTC (rev 17525) +++ trunk/reactos/subsys/system/cmd/start.c 2005-08-24 23:07:51 UTC (rev 17526) @@ -24,6 +24,12 @@ TCHAR rest[CMDLINE_LENGTH]; TCHAR param[CMDLINE_LENGTH]; BOOL bWait = FALSE; + BOOL bBat = FALSE; + BOOL bCreate = FALSE; + TCHAR szFullCmdLine [CMDLINE_LENGTH]; + PROCESS_INFORMATION prci; + STARTUPINFO stui; + param[0] = _T('\0'); if (_tcsncmp (Rest, _T("/?"), 2) == 0) @@ -115,39 +121,61 @@ if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || !_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd"))) { + bBat = TRUE; + memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR)); + + /* FIXME : use comspec instead */ + if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) + { + error_bad_command (); + return 1; + } + + memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K "), 5 * sizeof(TCHAR)); + memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR)); + memcpy(&szFullCmdLine[1], &szFullCmdLine[2], _tcslen(szFullCmdLine) * sizeof(TCHAR)); + szFullCmdLine[0] = _T('\"'); + } + #ifdef _DEBUG DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest); #endif + - ConErrResPuts(STRING_START_ERROR1); - } - else - { - /* exec the program */ - TCHAR szFullCmdLine [CMDLINE_LENGTH]; - PROCESS_INFORMATION prci; - STARTUPINFO stui; - #ifdef _DEBUG DebugPrintf (_T("[EXEC: %s %s]\n"), szFullName, rest); #endif /* build command line for CreateProcess() */ - _tcscpy (szFullCmdLine, first); - if( param ) + if (bBat == FALSE) + { + _tcscpy (szFullCmdLine, first); + if( param ) { _tcscat(szFullCmdLine, _T(" ") ); _tcscat (szFullCmdLine, param); } + } /* fill startup info */ memset (&stui, 0, sizeof (STARTUPINFO)); stui.cb = sizeof (STARTUPINFO); stui.dwFlags = STARTF_USESHOWWINDOW; stui.wShowWindow = SW_SHOWDEFAULT; - - if (CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci)) + + if (bBat == TRUE) { + bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE, + CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + } + else + { + bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, + DETACHED_PROCESS, NULL, NULL, &stui, &prci); + + } + + if (bCreate) + { if (bWait) { DWORD dwExitCode; @@ -166,7 +194,7 @@ ErrorMessage(GetLastError (), _T("Error executing CreateProcess()!!\n")); } - } +// } return 0; }

1 0

[weiden] 17525: implemented IsThreadAFiber()
by weiden＠svn.reactos.com 24 Aug '05

24 Aug '05

implemented IsThreadAFiber() Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/lib/kernel32/thread/fiber.c _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-08-24 22:38:10 UTC (rev 17524) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-08-24 23:05:07 UTC (rev 17525) @@ -586,6 +586,7 @@ IsProcessInJob@12 IsProcessorFeaturePresent@4 IsSystemResumeAutomatic@0 +IsThreadAFiber@0 IsValidCodePage@4 IsValidLanguageGroup@8 IsValidLocale@8 _____ Modified: trunk/reactos/lib/kernel32/thread/fiber.c --- trunk/reactos/lib/kernel32/thread/fiber.c 2005-08-24 22:38:10 UTC (rev 17524) +++ trunk/reactos/lib/kernel32/thread/fiber.c 2005-08-24 23:05:07 UTC (rev 17525) @@ -235,6 +235,17 @@ MEM_RELEASE); } +/* + * @implemented + */ +BOOL +WINAPI +IsThreadAFiber(VOID) +{ + return NtCurrentTeb()->HasFiberData; +} + + __declspec(noreturn) VOID WINAPI

1 0

[royce] 17524: zero the entire buffer
by royce＠svn.reactos.com 24 Aug '05

24 Aug '05

zero the entire buffer Modified: trunk/reactos/subsys/system/hostname/hostname.c _____ Modified: trunk/reactos/subsys/system/hostname/hostname.c --- trunk/reactos/subsys/system/hostname/hostname.c 2005-08-24 21:54:13 UTC (rev 17523) +++ trunk/reactos/subsys/system/hostname/hostname.c 2005-08-24 22:38:10 UTC (rev 17524) @@ -35,7 +35,7 @@ TCHAR ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; - ZeroMemory (ComputerName, ComputerNameSize); + ZeroMemory (ComputerName, sizeof ComputerName ); if (GetComputerName(ComputerName, & ComputerNameSize)) { printf ("%s\n", ComputerName);

1 0

[weiden] 17523: install the registry keys before enabling the driver
by weiden＠svn.reactos.com 24 Aug '05

24 Aug '05

install the registry keys before enabling the driver Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-08-24 21:52:41 UTC (rev 17522) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-08-24 21:54:13 UTC (rev 17523) @@ -503,14 +503,7 @@ { if(DriverFilesFound) { - if(!AddVmwareRegistryEntries()) - { - WCHAR Msg[1024]; - LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR)); - MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); - return TRUE; - } + /* FIXME - check for existing registry entries! */ if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) { @@ -633,6 +626,11 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); + if(!AddVmwareRegistryEntries()) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0); + goto cleanup; + } if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) { PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0);

1 0

[navaraf] 17522: REVISON -> REVISION
by navaraf＠svn.reactos.com 24 Aug '05

24 Aug '05

REVISON -> REVISION Modified: trunk/reactos/drivers/video/videoprt/videoprt.c _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-08-24 21:40:01 UTC (rev 17521) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-08-24 21:52:41 UTC (rev 17522) @@ -539,7 +539,7 @@ if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) { - return STATUS_REVISON_MISMATCH; + return STATUS_REVISION_MISMATCH; } if (HwInitializationData->HwFindAdapter == NULL ||

1 0

[greatlrd] 17521: implemented "" remove for the start command. This makes 'start dir1\"dir2a dir2b"\dir3\foo.exe param' work change by Martin Rottensteiner 2005only@pianonote.at irc nick ravelo
by greatlrd＠svn.reactos.com 24 Aug '05

24 Aug '05

implemented "" remove for the start command. This makes 'start dir1\"dir2a dir2b"\dir3\foo.exe param' work change by Martin Rottensteiner 2005only(a)pianonote.at irc nick ravelo Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-08-24 21:29:24 UTC (rev 17520) +++ trunk/reactos/subsys/system/cmd/start.c 2005-08-24 21:40:01 UTC (rev 17521) @@ -17,13 +17,16 @@ #ifdef INCLUDE_CMD_START -INT cmd_start (LPTSTR first, LPTSTR rest) +INT cmd_start (LPTSTR First, LPTSTR Rest) { TCHAR szFullName[MAX_PATH]; + TCHAR first[CMDLINE_LENGTH]; + TCHAR rest[CMDLINE_LENGTH]; + TCHAR param[CMDLINE_LENGTH]; BOOL bWait = FALSE; - TCHAR *param; - - if (_tcsncmp (rest, _T("/?"), 2) == 0) + param[0] = _T('\0'); + + if (_tcsncmp (Rest, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_START_HELP1); return 0; @@ -31,6 +34,60 @@ nErrorLevel = 0; + if( !*Rest ) + { + // FIXME: use comspec instead + Rest = _T("cmd"); + } + + _tcscpy(rest,Rest); + + /* Parsing the command that gets called by start, and it's parameters */ + if(!_tcschr(rest,_T('\"'))) + { + INT i = 0; + INT count = _tcslen(rest); + + /* find the end of the command and start of the args */ + for(i = 0; i < count; i++) + { + if(rest[i] == _T(' ')) + { + _tcscpy(param,&rest[i]); + rest[i] = _T('\0'); + break; + } + } + } + else + { + INT i = 0; + INT count = _tcslen(rest); + BOOL bInside = FALSE; + + /* find the end of the command and put the arguments in param */ + for(i = 0; i < count; i++) + { + if(rest[i] == _T('\"')) + bInside = !bInside; + if((rest[i] == _T(' ')) && !bInside) + { + _tcscpy(param,&rest[i]); + rest[i] = _T('\0'); + break; + } + } + i = 0; + /* remove any slashes */ + while(i < count) + { + if(rest[i] == _T('\"')) + memmove(&rest[i],&rest[i + 1], _tcslen(&rest[i]) * sizeof(TCHAR)); + else + i++; + } + } + /* check for a drive change */ if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) { @@ -45,22 +102,9 @@ return 0; } - - if( !*rest ) - { - // FIXME: use comspec instead - rest = _T("cmd"); - } - + /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ - param = _tcschr( rest, _T(' ') ); // skip program name to reach parameters - if( param ) - { - *param = 0; - param++; - } - if (!SearchForExecutable (rest, szFullName)) { error_bad_command ();

1 0

[navaraf] 17520: Fix a memory leak if VideoPortInitialize is called more than once from the same miniport.
by navaraf＠svn.reactos.com 24 Aug '05

24 Aug '05

Fix a memory leak if VideoPortInitialize is called more than once from the same miniport. Replace STDCALL with NTAPI. Modified: trunk/reactos/drivers/video/videoprt/agp.c Modified: trunk/reactos/drivers/video/videoprt/ddc.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dma.c Modified: trunk/reactos/drivers/video/videoprt/event.c Modified: trunk/reactos/drivers/video/videoprt/int10.c Modified: trunk/reactos/drivers/video/videoprt/interrupt.c Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/services.c Modified: trunk/reactos/drivers/video/videoprt/spinlock.c Modified: trunk/reactos/drivers/video/videoprt/timer.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.h _____ Modified: trunk/reactos/drivers/video/videoprt/agp.c --- trunk/reactos/drivers/video/videoprt/agp.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/agp.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -91,7 +91,7 @@ } -BOOLEAN STDCALL +BOOLEAN NTAPI IntAgpCommitPhysical( IN PVOID HwDeviceExtension, IN PVOID PhysicalContext, @@ -123,7 +123,7 @@ return NT_SUCCESS(Status); } -VOID STDCALL +VOID NTAPI IntAgpFreePhysical( IN PVOID HwDeviceExtension, IN PVOID PhysicalContext, @@ -151,7 +151,7 @@ } } -VOID STDCALL +VOID NTAPI IntAgpReleasePhysical( IN PVOID HwDeviceExtension, IN PVOID PhysicalContext) @@ -180,7 +180,7 @@ ExFreePool(AgpMapping); } -PHYSICAL_ADDRESS STDCALL +PHYSICAL_ADDRESS NTAPI IntAgpReservePhysical( IN PVOID HwDeviceExtension, IN ULONG Pages, @@ -245,7 +245,7 @@ } -PVOID STDCALL +PVOID NTAPI IntAgpCommitVirtual( IN PVOID HwDeviceExtension, IN PVOID VirtualContext, @@ -327,7 +327,7 @@ return BaseAddress; } -VOID STDCALL +VOID NTAPI IntAgpFreeVirtual( IN PVOID HwDeviceExtension, IN PVOID VirtualContext, @@ -381,7 +381,7 @@ } } -VOID STDCALL +VOID NTAPI IntAgpReleaseVirtual( IN PVOID HwDeviceExtension, IN PVOID VirtualContext) @@ -415,7 +415,7 @@ ExFreePool(VirtualMapping); } -PVOID STDCALL +PVOID NTAPI IntAgpReserveVirtual( IN PVOID HwDeviceExtension, IN HANDLE ProcessHandle, @@ -475,7 +475,7 @@ } -BOOLEAN STDCALL +BOOLEAN NTAPI IntAgpSetRate( IN PVOID HwDeviceExtension, IN ULONG Rate) @@ -492,7 +492,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI IntAgpGetInterface( IN PVOID HwDeviceExtension, IN OUT PINTERFACE Interface) _____ Modified: trunk/reactos/drivers/video/videoprt/ddc.c --- trunk/reactos/drivers/video/videoprt/ddc.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/ddc.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -168,7 +168,7 @@ * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI VideoPortDDCMonitorHelper( PVOID HwDeviceExtension, PVOID I2CFunctions, _____ Modified: trunk/reactos/drivers/video/videoprt/dispatch.c --- trunk/reactos/drivers/video/videoprt/dispatch.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/dispatch.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -25,8 +25,8 @@ /* EXTERNAL FUNCTIONS *********************************************************/ -VOID STDCALL HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); -VOID STDCALL HalReleaseDisplayOwnership(); +VOID NTAPI HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); +VOID NTAPI HalReleaseDisplayOwnership(); /* GLOBAL VARIABLES ***********************************************************/ @@ -38,7 +38,7 @@ * Reset display to blue screen */ -BOOLEAN STDCALL +BOOLEAN NTAPI IntVideoPortResetDisplayParameters(ULONG Columns, ULONG Rows) { PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; @@ -63,7 +63,7 @@ return FALSE; } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) @@ -96,7 +96,7 @@ * PASSIVE_LEVEL */ -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchOpen( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -166,7 +166,7 @@ * PASSIVE_LEVEL */ -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -198,7 +198,7 @@ * PASSIVE_LEVEL */ -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -264,7 +264,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortPnPStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -352,7 +352,7 @@ NTSTATUS -STDCALL +NTAPI IntVideoPortForwardIrpAndWaitCompletionRoutine( PDEVICE_OBJECT Fdo, PIRP Irp, @@ -368,7 +368,7 @@ NTSTATUS -STDCALL +NTAPI IntVideoPortForwardIrpAndWait(PDEVICE_OBJECT DeviceObject, PIRP Irp) { KEVENT Event; @@ -390,7 +390,7 @@ } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -442,7 +442,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -459,7 +459,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortDispatchPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -467,7 +467,7 @@ return STATUS_NOT_IMPLEMENTED; } -VOID STDCALL +VOID NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject) { } _____ Modified: trunk/reactos/drivers/video/videoprt/dma.c --- trunk/reactos/drivers/video/videoprt/dma.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/dma.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -29,7 +29,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI VideoPortAllocateCommonBuffer( IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter, @@ -49,7 +49,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortReleaseCommonBuffer( IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter, @@ -70,7 +70,7 @@ * @unimplemented */ -VOID STDCALL +VOID NTAPI VideoPortPutDmaAdapter( IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter) @@ -82,7 +82,7 @@ * @unimplemented */ -PVP_DMA_ADAPTER STDCALL +PVP_DMA_ADAPTER NTAPI VideoPortGetDmaAdapter( IN PVOID HwDeviceExtension, IN PVP_DEVICE_DESCRIPTION VpDeviceExtension) _____ Modified: trunk/reactos/drivers/video/videoprt/event.c --- trunk/reactos/drivers/video/videoprt/event.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/event.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -29,7 +29,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortCreateEvent( IN PVOID HwDeviceExtension, IN ULONG EventFlag, @@ -59,7 +59,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortDeleteEvent( IN PVOID HwDeviceExtension, IN PEVENT Event) @@ -72,7 +72,7 @@ * @implemented */ -LONG STDCALL +LONG NTAPI VideoPortSetEvent( IN PVOID HwDeviceExtension, IN PEVENT Event) @@ -84,7 +84,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortClearEvent( IN PVOID HwDeviceExtension, IN PEVENT Event) @@ -96,7 +96,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortWaitForSingleObject( IN PVOID HwDeviceExtension, IN PVOID Object, _____ Modified: trunk/reactos/drivers/video/videoprt/int10.c --- trunk/reactos/drivers/video/videoprt/int10.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/int10.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -26,7 +26,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VP_STATUS STDCALL +VP_STATUS NTAPI IntInt10AllocateBuffer( IN PVOID Context, OUT PUSHORT Seg, @@ -74,7 +74,7 @@ return NO_ERROR; } -VP_STATUS STDCALL +VP_STATUS NTAPI IntInt10FreeBuffer( IN PVOID Context, IN USHORT Seg, @@ -97,7 +97,7 @@ return Status; } -VP_STATUS STDCALL +VP_STATUS NTAPI IntInt10ReadMemory( IN PVOID Context, IN USHORT Seg, @@ -121,7 +121,7 @@ return NO_ERROR; } -VP_STATUS STDCALL +VP_STATUS NTAPI IntInt10WriteMemory( IN PVOID Context, IN USHORT Seg, @@ -145,7 +145,7 @@ return NO_ERROR; } -VP_STATUS STDCALL +VP_STATUS NTAPI IntInt10CallBios( IN PVOID Context, IN OUT PINT10_BIOS_ARGUMENTS BiosArguments) @@ -200,7 +200,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortInt10( IN PVOID HwDeviceExtension, IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) _____ Modified: trunk/reactos/drivers/video/videoprt/interrupt.c --- trunk/reactos/drivers/video/videoprt/interrupt.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/interrupt.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -25,7 +25,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -BOOLEAN STDCALL +BOOLEAN NTAPI IntVideoPortInterruptRoutine( IN struct _KINTERRUPT *Interrupt, IN PVOID ServiceContext) @@ -38,7 +38,7 @@ &DeviceExtension->MiniPortDeviceExtension); } -BOOLEAN STDCALL +BOOLEAN NTAPI IntVideoPortSetupInterrupt( IN PDEVICE_OBJECT DeviceObject, IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, @@ -105,7 +105,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortEnableInterrupt(IN PVOID HwDeviceExtension) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; @@ -127,7 +127,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortDisableInterrupt(IN PVOID HwDeviceExtension) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; _____ Modified: trunk/reactos/drivers/video/videoprt/resource.c --- trunk/reactos/drivers/video/videoprt/resource.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/resource.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -25,7 +25,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortMapPhysicalMemory( IN HANDLE Process, IN PHYSICAL_ADDRESS PhysicalAddress, @@ -76,7 +76,7 @@ } -PVOID STDCALL +PVOID NTAPI IntVideoPortMapMemory( IN PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension, IN PHYSICAL_ADDRESS IoAddress, @@ -231,7 +231,7 @@ return NULL; } -VOID STDCALL +VOID NTAPI IntVideoPortUnmapMemory( IN PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension, IN PVOID MappedAddress) @@ -283,7 +283,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI VideoPortGetDeviceBase( IN PVOID HwDeviceExtension, IN PHYSICAL_ADDRESS IoAddress, @@ -304,7 +304,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortFreeDeviceBase( IN PVOID HwDeviceExtension, IN PVOID MappedAddress) @@ -319,7 +319,7 @@ * @unimplemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortMapBankedMemory( IN PVOID HwDeviceExtension, IN PHYSICAL_ADDRESS PhysicalAddress, @@ -341,7 +341,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortMapMemory( IN PVOID HwDeviceExtension, IN PHYSICAL_ADDRESS PhysicalAddress, @@ -371,7 +371,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortUnmapMemory( IN PVOID HwDeviceExtension, IN PVOID VirtualAddress, @@ -390,7 +390,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortGetAccessRanges( IN PVOID HwDeviceExtension, IN ULONG NumRequestedResources, @@ -579,7 +579,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortVerifyAccessRanges( IN PVOID HwDeviceExtension, IN ULONG NumAccessRanges, @@ -659,7 +659,7 @@ * @unimplemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortGetDeviceData( IN PVOID HwDeviceExtension, IN VIDEO_DEVICE_DATA_TYPE DeviceDataType, @@ -675,7 +675,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI VideoPortAllocatePool( IN PVOID HwDeviceExtension, IN VP_POOL_TYPE PoolType, @@ -690,7 +690,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortFreePool( IN PVOID HwDeviceExtension, IN PVOID Ptr) @@ -702,7 +702,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortAllocateBuffer( IN PVOID HwDeviceExtension, IN ULONG Size, @@ -717,7 +717,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortReleaseBuffer( IN PVOID HwDeviceExtension, IN PVOID Ptr) @@ -730,7 +730,7 @@ * @unimplemented */ -PVOID STDCALL +PVOID NTAPI VideoPortLockBuffer( IN PVOID HwDeviceExtension, IN PVOID BaseAddress, @@ -745,7 +745,7 @@ * @unimplemented */ -VOID STDCALL +VOID NTAPI VideoPortUnlockBuffer( IN PVOID HwDeviceExtension, IN PVOID Mdl) @@ -757,7 +757,7 @@ * @unimplemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortSetTrappedEmulatorPorts( IN PVOID HwDeviceExtension, IN ULONG NumAccessRanges, @@ -772,7 +772,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI VideoPortGetBusData( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -807,7 +807,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI VideoPortSetBusData( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, _____ Modified: trunk/reactos/drivers/video/videoprt/services.c --- trunk/reactos/drivers/video/videoprt/services.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/services.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -23,19 +23,19 @@ #include "videoprt.h" -VOID STDCALL +VOID NTAPI IntInterfaceReference(PVOID Context) { /* Do nothing */ } -VOID STDCALL +VOID NTAPI IntInterfaceDereference(PVOID Context) { /* Do nothing */ } -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortQueryServices( IN PVOID HwDeviceExtension, IN VIDEO_PORT_SERVICES ServicesType, @@ -89,7 +89,7 @@ return ERROR_INVALID_FUNCTION; } -BOOLEAN STDCALL +BOOLEAN NTAPI VideoPortGetAgpServices( IN PVOID HwDeviceExtension, OUT PVIDEO_PORT_AGP_SERVICES AgpServices) _____ Modified: trunk/reactos/drivers/video/videoprt/spinlock.c --- trunk/reactos/drivers/video/videoprt/spinlock.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/spinlock.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -27,7 +27,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortCreateSpinLock( IN PVOID HwDeviceExtension, OUT PSPIN_LOCK *SpinLock) @@ -44,7 +44,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortDeleteSpinLock( IN PVOID HwDeviceExtension, IN PSPIN_LOCK SpinLock) @@ -58,7 +58,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortAcquireSpinLock( IN PVOID HwDeviceExtension, IN PSPIN_LOCK SpinLock, @@ -72,7 +72,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortAcquireSpinLockAtDpcLevel( IN PVOID HwDeviceExtension, IN PSPIN_LOCK SpinLock) @@ -85,7 +85,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortReleaseSpinLock( IN PVOID HwDeviceExtension, IN PSPIN_LOCK SpinLock, @@ -99,7 +99,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortReleaseSpinLockFromDpcLevel( IN PVOID HwDeviceExtension, IN PSPIN_LOCK SpinLock) _____ Modified: trunk/reactos/drivers/video/videoprt/timer.c --- trunk/reactos/drivers/video/videoprt/timer.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/timer.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -25,7 +25,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VOID STDCALL +VOID NTAPI IntVideoPortTimerRoutine( IN PDEVICE_OBJECT DeviceObject, IN PVOID ServiceContext) @@ -38,7 +38,7 @@ &DeviceExtension->MiniPortDeviceExtension); } -BOOLEAN STDCALL +BOOLEAN NTAPI IntVideoPortSetupTimer( IN PDEVICE_OBJECT DeviceObject, IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension) @@ -73,7 +73,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortStartTimer(IN PVOID HwDeviceExtension) { DPRINT("VideoPortStartTimer\n"); @@ -84,7 +84,7 @@ * @implemented */ -VOID STDCALL +VOID NTAPI VideoPortStopTimer(IN PVOID HwDeviceExtension) { DPRINT("VideoPortStopTimer\n"); _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-08-24 20:34:50 UTC (rev 17519) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-08-24 21:29:24 UTC (rev 17520) @@ -30,7 +30,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) @@ -38,7 +38,7 @@ return STATUS_SUCCESS; } -PVOID STDCALL +PVOID NTAPI IntVideoPortImageDirectoryEntryToData( PVOID BaseAddress, ULONG Directory) @@ -60,7 +60,7 @@ return (PVOID)((ULONG_PTR)BaseAddress + Va); } -PVOID STDCALL +PVOID NTAPI IntVideoPortGetProcAddress( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) @@ -116,7 +116,7 @@ return NULL; } -VOID STDCALL +VOID NTAPI IntVideoPortDeferredRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -128,7 +128,7 @@ ((PMINIPORT_DPC_ROUTINE)SystemArgument1)(HwDeviceExtension, SystemArgument2); } -ULONG STDCALL +ULONG NTAPI IntVideoPortAllocateDeviceNumber(VOID) { NTSTATUS Status; @@ -163,7 +163,7 @@ return DeviceNumber; } -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( IN PDRIVER_OBJECT DriverObject, IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, @@ -308,7 +308,7 @@ /* FIXME: we have to detach the device object in IntVideoPortFindAdapter if it fails */ -NTSTATUS STDCALL +NTSTATUS NTAPI IntVideoPortFindAdapter( IN PDRIVER_OBJECT DriverObject, IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, @@ -518,7 +518,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI VideoPortInitialize( IN PVOID Context1, IN PVOID Context2, @@ -534,10 +534,26 @@ DPRINT("VideoPortInitialize\n"); /* + * As a first thing do parameter checks. + */ + + if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) + { + return STATUS_REVISON_MISMATCH; + } + + if (HwInitializationData->HwFindAdapter == NULL || + HwInitializationData->HwInitialize == NULL || + HwInitializationData->HwStartIO == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* * NOTE: * The driver extension can be already allocated in case that we were * called by legacy driver and failed detecting device. Some miniport - * drivers in that case adjust parameters and calls VideoPortInitialize + * drivers in that case adjust parameters and call VideoPortInitialize * again. */ @@ -554,6 +570,34 @@ { return Status; } + + /* + * Save the registry path. This should be done only once even if + * VideoPortInitialize is called multiple times. + */ + + if (RegistryPath->Length != 0) + { + DriverExtension->RegistryPath.Length = 0; + DriverExtension->RegistryPath.MaximumLength = + RegistryPath->Length + sizeof(UNICODE_NULL); + DriverExtension->RegistryPath.Buffer = + ExAllocatePoolWithTag( + PagedPool, + DriverExtension->RegistryPath.MaximumLength, + TAG('U', 'S', 'T', 'R')); + if (DriverExtension->RegistryPath.Buffer == NULL) + { + RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyUnicodeString(&DriverExtension->RegistryPath, RegistryPath); + } + else + { + RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); + } } /* @@ -563,9 +607,9 @@ RtlCopyMemory( &DriverExtension->InitializationData, HwInitializationData, - min(sizeof(VIDEO_HW_INITIALIZATION_DATA), - HwInitializationData->HwInitDataSize)); - if (sizeof(VIDEO_HW_INITIALIZATION_DATA) > HwInitializationData->HwInitDataSize) + HwInitializationData->HwInitDataSize); + if (HwInitializationData->HwInitDataSize < + sizeof(VIDEO_HW_INITIALIZATION_DATA)) { RtlZeroMemory((PVOID)((ULONG_PTR)&DriverExtension->InitializationData + HwInitializationData->HwInitDataSize), @@ -574,27 +618,6 @@ } DriverExtension->HwContext = HwContext; - /* we can't use RtlDuplicateUnicodeString because only ntdll exposes it... */ - if (RegistryPath->Length != 0) - { - DriverExtension->RegistryPath.Length = 0; - DriverExtension->RegistryPath.MaximumLength = RegistryPath->Length + sizeof(UNICODE_NULL); - DriverExtension->RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, - DriverExtension->RegistryPath.MaximumLength, - TAG('U', 'S', 'T', 'R')); - if (DriverExtension->RegistryPath.Buffer == NULL) - { - RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyUnicodeString(&DriverExtension->RegistryPath, RegistryPath); - } - else - { - RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); - } - switch (HwInitializationData->HwInitDataSize) { /* @@ -675,7 +698,7 @@ * @unimplemented */ -VOID STDCALL +VOID NTAPI VideoPortLogError( IN PVOID HwDeviceExtension, IN PVIDEO_REQUEST_PACKET Vrp OPTIONAL, @@ -694,7 +717,7 @@ * @implemented */ -UCHAR STDCALL +UCHAR NTAPI VideoPortGetCurrentIrql(VOID) { return KeGetCurrentIrql(); @@ -707,7 +730,7 @@ PMINIPORT_GET_REGISTRY_ROUTINE HwGetRegistryRoutine; } QUERY_REGISTRY_CALLBACK_CONTEXT, *PQUERY_REGISTRY_CALLBACK_CONTEXT; -static NTSTATUS STDCALL +static NTSTATUS NTAPI QueryRegistryCallback( IN PWSTR ValueName, IN ULONG ValueType, @@ -732,7 +755,7 @@ * @unimplemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortGetRegistryParameters( IN PVOID HwDeviceExtension, IN PWSTR ParameterName, @@ -780,7 +803,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortSetRegistryParameters( IN PVOID HwDeviceExtension, IN PWSTR ValueName, @@ -802,7 +825,7 @@ * @implemented */ -VP_STATUS STDCALL +VP_STATUS NTAPI VideoPortGetVgaStatus( IN PVOID HwDeviceExtension, OUT PULONG VgaStatus) @@ -830,7 +853,7 @@ * @implemented */ -PVOID STDCALL +PVOID NTAPI VideoPortGetRomImage( IN PVOID HwDeviceExtension, IN PVOID Unused1, @@ -888,7 +911,7 @@ * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI VideoPortScanRom( IN PVOID HwDeviceExtension, IN PUCHAR RomBase, @@ -922,7 +945,7 @@ * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI VideoPortSynchronizeExecution( IN PVOID HwDeviceExtension, IN VIDEO_SYNCHRONIZE_PRIORITY Priority, @@ -972,7 +995,7 @@ * @implemented */ [truncated at 1000 lines; 261 more skipped]

1 0

[hpoussin] 17519: Cleanup i8042prt.h
by hpoussin＠svn.reactos.com 24 Aug '05

24 Aug '05

Cleanup i8042prt.h Remove $Id$ tags Replace Win32 types by their kernel counterparts (DWORD -> ULONG, ...) Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c Modified: trunk/reactos/drivers/input/i8042prt/registry.c Property changes on: trunk/reactos/drivers/input/i8042prt/README.txt ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-24 20:34:50 UTC (rev 17519) @@ -10,11 +10,9 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> - +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #include "i8042prt.h" @@ -34,18 +32,18 @@ /* * FUNCTION: Write data to a port, waiting first for it to become ready */ -BOOLEAN I8042Write(PDEVICE_EXTENSION DevExt, int addr, BYTE data) +BOOLEAN I8042Write(PDEVICE_EXTENSION DevExt, PUCHAR addr, UCHAR data) { ULONG ResendIterations = DevExt->Settings.PollingIterations; - while ((KBD_IBF & READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT)) && + while ((KBD_IBF & READ_PORT_UCHAR(I8042_CTRL_PORT)) && (ResendIterations--)) { KeStallExecutionProcessor(50); } if (ResendIterations) { - WRITE_PORT_UCHAR((PUCHAR)addr,data); + WRITE_PORT_UCHAR(addr,data); DPRINT("Sent %x to %x\n", data, addr); return TRUE; } @@ -56,7 +54,7 @@ /* * FUNCTION: Write data to a port, without waiting first */ -static BOOLEAN I8042WriteNoWait(PDEVICE_EXTENSION DevExt, int addr, BYTE data) +static BOOLEAN I8042WriteNoWait(PDEVICE_EXTENSION DevExt, int addr, UCHAR data) { WRITE_PORT_UCHAR((PUCHAR)addr,data); DPRINT("Sent %x to %x\n", data, addr); @@ -67,10 +65,10 @@ /* * FUNCTION: Read data from port 0x60 */ -NTSTATUS I8042ReadData(BYTE *Data) +NTSTATUS I8042ReadData(UCHAR *Data) { - BYTE Status; - Status=READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT); + UCHAR Status; + Status=READ_PORT_UCHAR(I8042_CTRL_PORT); // If data is available if ((Status & KBD_OBF)) { @@ -84,16 +82,16 @@ return STATUS_UNSUCCESSFUL; } -NTSTATUS I8042ReadStatus(BYTE *Status) +NTSTATUS I8042ReadStatus(UCHAR *Status) { - Status[0]=READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT); + Status[0]=READ_PORT_UCHAR(I8042_CTRL_PORT); return STATUS_SUCCESS; } /* * FUNCTION: Read data from port 0x60 */ -NTSTATUS I8042ReadDataWait(PDEVICE_EXTENSION DevExt, BYTE *Data) +NTSTATUS I8042ReadDataWait(PDEVICE_EXTENSION DevExt, UCHAR *Data) { ULONG Counter = DevExt->Settings.PollingIterations; NTSTATUS Status; @@ -112,7 +110,7 @@ VOID I8042Flush() { - BYTE Ignore; + UCHAR Ignore; while (STATUS_SUCCESS == I8042ReadData(&Ignore)) { ; /* drop */ @@ -141,7 +139,7 @@ { NTSTATUS Status; UCHAR Ack; - UINT ResendIterations = DevExt->Settings.ResendIterations + 1; + ULONG ResendIterations = DevExt->Settings.ResendIterations + 1; do { if (Port) @@ -311,7 +309,7 @@ VOID I8042PacketDpc(PDEVICE_EXTENSION DevExt) { - BOOL FinishIrp = FALSE; + BOOLEAN FinishIrp = FALSE; NTSTATUS Result = STATUS_INTERNAL_ERROR; /* Shouldn't happen */ KIRQL Irql; @@ -512,7 +510,7 @@ { NTSTATUS Status; UCHAR Value = 0; - UINT Counter; + ULONG Counter; DevExt->MouseExists = FALSE; DevExt->KeyboardExists = FALSE; Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-24 20:34:50 UTC (rev 17519) @@ -1,51 +1,19 @@ #ifndef _I8042DRV_H #define _I8042DRV_H -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> +#include <ntddk.h> +#include <kbdmou.h> +#include <ntdd8042.h> + +#ifdef _MSC_VER + #define STDCALL + #define DDKAPI +#endif + #define KEYBOARD_IRQ 1 #define MOUSE_IRQ 12 #define KBD_BUFFER_SIZE 32 -// should be in ntdd8042.h - -typedef VOID DDKAPI -(*KEYBOARD_CLASS_SERVICE_CALLBACK) ( - IN PDEVICE_OBJECT DeviceObject, - IN PKEYBOARD_INPUT_DATA InputDataStart, - IN PKEYBOARD_INPUT_DATA InputDataEnd, - IN OUT PULONG InputDataConsumed -); - -/* I'm not actually sure if this is in the ddk, would seem logical */ -typedef VOID DDKAPI -(*MOUSE_CLASS_SERVICE_CALLBACK) ( - IN PDEVICE_OBJECT DeviceObject, - IN PMOUSE_INPUT_DATA InputDataStart, - IN PMOUSE_INPUT_DATA InputDataEnd, - IN OUT PULONG InputDataConsumed -); - -typedef struct _CONNECT_DATA { - PDEVICE_OBJECT ClassDeviceObject; - PVOID ClassService; -} CONNECT_DATA, *PCONNECT_DATA; - -#define IOCTL_INTERNAL_KEYBOARD_CONNECT \ - CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS) - -#define IOCTL_INTERNAL_MOUSE_CONNECT \ - CTL_CODE(FILE_DEVICE_MOUSE, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS) - -/* For some bizarre reason, these are different from the defines in - * w32api. I'm quite sure these are correct though, needs to be checked - * against the ddk - */ -#define KEYBOARD_SCROLL_LOCK_ON 0x01 -#define KEYBOARD_NUM_LOCK_ON 0x02 -#define KEYBOARD_CAPS_LOCK_ON 0x04 - #define WHEEL_DELTA 120 /*----------------------------------------------------- @@ -77,21 +45,21 @@ /* TODO: part of this should be in the _ATTRIBUTES structs instead */ typedef struct _I8042_SETTINGS { - DWORD Headless; /* done */ - DWORD CrashScroll; - DWORD CrashSysRq; /* done */ - DWORD ReportResetErrors; - DWORD PollStatusIterations; /* done */ - DWORD ResendIterations; /* done */ - DWORD PollingIterations; - DWORD PollingIterationsMaximum; - DWORD OverrideKeyboardType; - DWORD OverrideKeyboardSubtype; - DWORD MouseResendStallTime; - DWORD MouseSynchIn100ns; /* done */ - DWORD MouseResolution; /* done */ - DWORD NumberOfButtons; - DWORD EnableWheelDetection; + ULONG Headless; /* done */ + ULONG CrashScroll; + ULONG CrashSysRq; /* done */ + ULONG ReportResetErrors; + ULONG PollStatusIterations; /* done */ + ULONG ResendIterations; /* done */ + ULONG PollingIterations; + ULONG PollingIterationsMaximum; + ULONG OverrideKeyboardType; + ULONG OverrideKeyboardSubtype; + ULONG MouseResendStallTime; + ULONG MouseSynchIn100ns; /* done */ + ULONG MouseResolution; /* done */ + ULONG NumberOfButtons; + ULONG EnableWheelDetection; } I8042_SETTINGS, *PI8042_SETTINGS; typedef enum _I8042_MOUSE_TYPE @@ -178,7 +146,7 @@ I8042_MOUSE_TYPE MouseType; OUTPUT_PACKET Packet; - UINT PacketResends; + ULONG PacketResends; BOOLEAN PacketComplete; NTSTATUS PacketResult; UCHAR PacketBuffer[16]; @@ -228,8 +196,8 @@ * Keyboard controller ports */ -#define I8042_DATA_PORT 0x60 -#define I8042_CTRL_PORT 0x64 +#define I8042_DATA_PORT ((PUCHAR)0x60) +#define I8042_CTRL_PORT ((PUCHAR)0x64) /* @@ -295,11 +263,11 @@ #define MOUSE_NACK 0xFE /* i8042prt.c */ -NTSTATUS I8042ReadData(BYTE *Data); +NTSTATUS I8042ReadData(UCHAR *Data); -NTSTATUS I8042ReadStatus(BYTE *Status); +NTSTATUS I8042ReadStatus(UCHAR *Status); -NTSTATUS I8042ReadDataWait(PDEVICE_EXTENSION DevExt, BYTE *Data); +NTSTATUS I8042ReadDataWait(PDEVICE_EXTENSION DevExt, UCHAR *Data); VOID I8042Flush(); @@ -326,7 +294,7 @@ VOID STDCALL I8042SendHookWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); -BOOLEAN I8042Write(PDEVICE_EXTENSION DevExt, int addr, BYTE data); +BOOLEAN I8042Write(PDEVICE_EXTENSION DevExt, PUCHAR addr, UCHAR data); /* keyboard.c */ VOID STDCALL I8042IsrWritePortKbd(PVOID Context, @@ -382,12 +350,12 @@ USHORT Mask); VOID STDCALL I8042MouseHandle(PDEVICE_EXTENSION DevExt, - BYTE Output); + UCHAR Output); BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt); BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt); /* ps2pp.c */ -VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, BYTE Input); +VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input); #endif // _KEYBOARD_H_ Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.h ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.rc ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-08-24 20:34:50 UTC (rev 17519) @@ -11,18 +11,16 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> - +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #include "i8042prt.h" /* GLOBALS *******************************************************************/ -static BYTE TypematicTable[] = { +static UCHAR TypematicTable[] = { 0x00, 0x00, 0x00, 0x05, 0x08, 0x0B, 0x0D, 0x0F, 0x10, 0x12, /* 0-9 */ 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1A, /* 10-19 */ 0x1B, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E }; @@ -87,12 +85,12 @@ BOOLEAN STDCALL I8042InterruptServiceKbd(struct _KINTERRUPT *Interrupt, VOID * Context) { - BYTE Output; - BYTE PortStatus; + UCHAR Output; + UCHAR PortStatus; NTSTATUS Status; PDEVICE_EXTENSION DevExt = (PDEVICE_EXTENSION) Context; BOOLEAN HookContinue = FALSE, HookReturn; - UINT Iterations = 0; + ULONG Iterations = 0; KEYBOARD_INPUT_DATA *InputData = DevExt->KeyboardBuffer + DevExt->KeysInBuffer; @@ -228,7 +226,7 @@ if (!DevExt->KeyboardData.ClassService) return; - ((KEYBOARD_CLASS_SERVICE_CALLBACK) DevExt->KeyboardData.ClassService)( + ((PSERVICE_CALLBACK_ROUTINE) DevExt->KeyboardData.ClassService)( DevExt->KeyboardData.ClassDeviceObject, DevExt->KeyboardBuffer, DevExt->KeyboardBuffer + KeysInBufferCopy, @@ -240,9 +238,9 @@ } /* You have to send the rate/delay in a somewhat awkward format */ -static USHORT I8042GetTypematicByte(USHORT Rate, USHORT Delay) +static UCHAR I8042GetTypematicByte(USHORT Rate, USHORT Delay) { - USHORT ret; + UCHAR ret; if (Rate < 3) { ret = 0x0; @@ -630,7 +628,7 @@ { NTSTATUS Status; UCHAR Value; - UINT RetryCount = 10; + ULONG RetryCount = 10; DPRINT("Detecting keyboard\n"); @@ -713,6 +711,7 @@ /* debug stuff */ VOID STDCALL KdpServiceDispatcher(ULONG Code, PVOID Context1, PVOID Context2); +#define EnterDebugger ((PVOID)0x25) static VOID STDCALL I8042DebugWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) @@ -727,5 +726,10 @@ if (!Key) return; - KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Key, NULL); +#ifdef __REACTOS__ + /* We hope kernel would understand this. If + * that's not the case, nothing would happen. + */ + KdpServiceDispatcher(TAG('R', 'o', 's', ' '), EnterDebugger, NULL); +#endif /* __REACTOS__ */ } Property changes on: trunk/reactos/drivers/input/i8042prt/keyboard.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-24 20:34:50 UTC (rev 17519) @@ -11,11 +11,9 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> - +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #include "i8042prt.h" @@ -147,7 +145,7 @@ DevExt->MouseExists = FALSE; DevExt->MouseState = MouseIdle; DPRINT1("Mouse returned bad reset reply part two: " - "%x (expected 0)\n", Value); + "%x (expected 0)\n", *Value); } return TRUE; case ExpectingGetDeviceIdACK: @@ -312,7 +310,7 @@ return TRUE; case ExpectingSetSamplingRateACK: I8042IsrWritePortMouse(DevExt, - DevExt->MouseAttributes.SampleRate); + (UCHAR)DevExt->MouseAttributes.SampleRate); DevExt->MouseResetState++; return TRUE; case ExpectingSetSamplingRateValueACK: @@ -328,7 +326,7 @@ return TRUE; case ExpectingFinalResolutionACK: I8042IsrWritePortMouse(DevExt, - DevExt->Settings.MouseResolution & 0xff); + (UCHAR)(DevExt->Settings.MouseResolution & 0xff)); DPRINT("%x\n", DevExt->Settings.MouseResolution); DevExt->MouseResetState = ExpectingFinalResolutionValueACK; return TRUE; @@ -383,7 +381,7 @@ { PMOUSE_INPUT_DATA MouseInput = DevExt->MouseBuffer + DevExt->MouseInBuffer; - USHORT NewButtonData = MouseInput->RawButtons & Mask; + USHORT NewButtonData = (USHORT)(MouseInput->RawButtons & Mask); USHORT ButtonDiff = (NewButtonData ^ DevExt->MouseButtonState) & Mask; /* Note that the defines are such: @@ -404,7 +402,7 @@ } VOID STDCALL I8042MouseHandle(PDEVICE_EXTENSION DevExt, - BYTE Output) + UCHAR Output) { PMOUSE_INPUT_DATA MouseInput = DevExt->MouseBuffer + DevExt->MouseInBuffer; @@ -515,10 +513,10 @@ BOOLEAN STDCALL I8042InterruptServiceMouse(struct _KINTERRUPT *Interrupt, VOID *Context) { - BYTE Output, PortStatus; + UCHAR Output, PortStatus; NTSTATUS Status; PDEVICE_EXTENSION DevExt = (PDEVICE_EXTENSION) Context; - UINT Iterations = 0; + ULONG Iterations = 0; do { Status = I8042ReadStatus(&PortStatus); @@ -616,7 +614,7 @@ if (!DevExt->MouseData.ClassService) return; - ((MOUSE_CLASS_SERVICE_CALLBACK) DevExt->MouseData.ClassService)( + ((PSERVICE_CALLBACK_ROUTINE) DevExt->MouseData.ClassService)( DevExt->MouseData.ClassDeviceObject, DevExt->MouseBuffer, DevExt->MouseBuffer + MouseInBufferCopy, Property changes on: trunk/reactos/drivers/input/i8042prt/mouse.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c --- trunk/reactos/drivers/input/i8042prt/ps2pp.c 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c 2005-08-24 20:34:50 UTC (rev 17519) @@ -9,17 +9,15 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> - +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #include "i8042prt.h" -VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, BYTE Input) +VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input) { UCHAR PktType; PMOUSE_INPUT_DATA MouseInput = DevExt->MouseBuffer + Property changes on: trunk/reactos/drivers/input/i8042prt/ps2pp.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____ Modified: trunk/reactos/drivers/input/i8042prt/registry.c --- trunk/reactos/drivers/input/i8042prt/registry.c 2005-08-24 20:06:54 UTC (rev 17518) +++ trunk/reactos/drivers/input/i8042prt/registry.c 2005-08-24 20:34:50 UTC (rev 17519) @@ -11,11 +11,9 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntddkbd.h> -#include <ddk/ntdd8042.h> - +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #include "i8042prt.h" @@ -38,24 +36,24 @@ NTSTATUS Status; - DWORD DefaultHeadless = 0; - DWORD DefaultCrashScroll = 0; - DWORD DefaultCrashSysRq = 0; - DWORD DefaultReportResetErrors = 0; - DWORD DefaultPollStatusIterations = 1; - DWORD DefaultResendIterations = 3; - DWORD DefaultPollingIterations = 12000; - DWORD DefaultPollingIterationsMaximum = 12000; - DWORD DefaultKeyboardDataQueueSize = 100; - DWORD DefaultOverrideKeyboardType = 0; - DWORD DefaultOverrideKeyboardSubtype = 0; - DWORD DefaultMouseDataQueueSize = 100; - DWORD DefaultMouseResendStallTime = 1000; - DWORD DefaultMouseSynchIn100ns = 20000000; - DWORD DefaultMouseResolution = 3; - DWORD DefaultSampleRate = 60; - DWORD DefaultNumberOfButtons = 2; - DWORD DefaultEnableWheelDetection = 1; + ULONG DefaultHeadless = 0; + ULONG DefaultCrashScroll = 0; + ULONG DefaultCrashSysRq = 0; + ULONG DefaultReportResetErrors = 0; + ULONG DefaultPollStatusIterations = 1; + ULONG DefaultResendIterations = 3; + ULONG DefaultPollingIterations = 12000; + ULONG DefaultPollingIterationsMaximum = 12000; + ULONG DefaultKeyboardDataQueueSize = 100; + ULONG DefaultOverrideKeyboardType = 0; + ULONG DefaultOverrideKeyboardSubtype = 0; + ULONG DefaultMouseDataQueueSize = 100; + ULONG DefaultMouseResendStallTime = 1000; + ULONG DefaultMouseSynchIn100ns = 20000000; + ULONG DefaultMouseResolution = 3; + ULONG DefaultSampleRate = 60; + ULONG DefaultNumberOfButtons = 2; + ULONG DefaultEnableWheelDetection = 1; RtlInitUnicodeString(&ParametersPath, NULL); ParametersPath.MaximumLength = (wcslen(RegistryPath) * @@ -212,15 +210,15 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("Can't read registry: %x\n", Status); /* Actually, the defaults are not set when the function * fails, as would happen during setup, so you have to * set them manually anyway... */ RTL_QUERY_REGISTRY_TABLE *Current = Parameters; + DPRINT1 ("Can't read registry: %x\n", Status); while (Current->Name) { - *((DWORD *)Current->EntryContext) = - *((DWORD *)Current->DefaultData); + *((PULONG)Current->EntryContext) = + *((PULONG)Current->DefaultData); Current++; } DPRINT1 ("Manually set defaults\n"); Property changes on: trunk/reactos/drivers/input/i8042prt/registry.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision

1 0

[royce] 17518: added some verbosity
by royce＠svn.reactos.com 24 Aug '05

24 Aug '05

added some verbosity standardized back on printf from cout fixed loop variable conflict Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-24 19:58:07 UTC (rev 17517) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-24 20:06:54 UTC (rev 17518) @@ -61,7 +61,7 @@ string filename = ProjectNode.name + ".dsw"; - cout << "Creating MSVC project: " << filename << endl; + printf ( "Creating MSVC workspace: %s\n", filename.c_str() ); ProcessModules(); @@ -69,7 +69,7 @@ if ( !m_dswFile ) { - cout << "Could not open file." << endl; + printf ( "Could not create file '%s'.\n", filename.c_str() ); return; } _generate_wine_dsw ( m_dswFile ); @@ -101,7 +101,7 @@ // The MSVC build still needs the mingw backend. //ProcessModules(); - cout << "Done." << endl << endl; + printf ( "Done.\n" ); /*cout << "Don't expect the MSVC backend to work yet. "<< endl << endl; _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-24 19:58:07 UTC (rev 17517) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-24 20:06:54 UTC (rev 17518) @@ -20,6 +20,7 @@ const bool wine = false; string dsp_file = DspFileName(module); + printf ( "Creating MSVC project: '%s'\n", dsp_file.c_str() ); FILE* OUT = fopen ( dsp_file.c_str(), "w" ); vector<string> imports; @@ -553,9 +554,9 @@ fprintf ( OUT, "\n" ); fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\n" ); - for ( i = 0; i < source_files.size(); i++ ) + for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { - string source_file = DosSeparator(source_files[i]); + string source_file = DosSeparator(source_files[isrcfile]); if ( strncmp ( source_file.c_str(), ".\\", 2 ) ) {

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