Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[hbirr] 14988: - Guard the copying to the IOSB.

by hbirr＠svn.reactos.com

- Guard the copying to the IOSB. - Do the main processing on success or if previous STATUS_PENDING was returned. Do not use some of the IRP and FO flags at this point. - Set all results before signaling the events. - Signal the FO event previous the user event. - Made the code a little bit shorter. Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-05 09:59:38 UTC (rev 14987) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-05 10:59:34 UTC (rev 14988) @@ -1222,6 +1222,8 @@ PFILE_OBJECT FileObject; PIRP Irp; PMDL Mdl, NextMdl; + PKEVENT UserEvent; + BOOLEAN SyncIrp; if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); @@ -1230,6 +1232,9 @@ Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); DPRINT("IoSecondStageCompletition, %x\n", Irp); + UserEvent = Irp->UserEvent; + SyncIrp = Irp->Flags & IRP_SYNCHRONOUS_API ? TRUE : FALSE; + /* Handle Buffered case first */ if (Irp->Flags & IRP_BUFFERED_IO) { @@ -1264,144 +1269,92 @@ } while (Mdl); } Irp->MdlAddress = NULL; - - if (Irp->UserIosb) + + /* Remove the IRP from the list of Thread Pending IRPs */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } + _SEH_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; - /* Check for Success but allow failure for Async IRPs */ - if (NT_SUCCESS(Irp->IoStatus.Status) || - (Irp->PendingReturned && - !(Irp->Flags & IRP_SYNCHRONOUS_API) && - (FileObject == NULL || FileObject->Flags & FO_SYNCHRONOUS_IO))) - { - - /* Check if there's an event */ - if (Irp->UserEvent) - { - /* Signal the Event */ - KeSetEvent(Irp->UserEvent, 0, FALSE); - - /* Check if we should signal the File Object Event as well */ - if (FileObject) - { - /* Dereference the Event if this is an ASYNC IRP */ - if (!Irp->Flags & IRP_SYNCHRONOUS_API) - { - ObDereferenceObject(Irp->UserEvent); - } - - /* If the File Object is SYNC, then we need to signal its event too */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); - - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - } - } - } - else if (FileObject) - { - /* Signal the File Object Instead */ - KeSetEvent(&FileObject->Event, 0, FALSE); - - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - } - - /* Remove the IRP from the list of Thread Pending IRPs */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - - /* Now call the User APC if one was requested */ - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) - { - KeInitializeApc(&Irp->Tail.Apc, - KeGetCurrentThread(), - CurrentApcEnvironment, - IoSecondStageCompletion_KernelApcRoutine, - IoSecondStageCompletion_RundownApcRoutine, - (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, - Irp->RequestorMode, - Irp->Overlay.AsynchronousParameters.UserApcContext); + if (FileObject) + { + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - IoSetIoCompletion(FileObject->CompletionContext->Port, - FileObject->CompletionContext->Key, - Irp->Overlay.AsynchronousParameters.UserApcContext, - Irp->IoStatus.Status, - Irp->IoStatus.Information, - FALSE); - } - else - { - /* Don't have anything, free it */ - IoFreeIrp(Irp); - } - - /* Dereference the File Object */ - if (FileObject) ObDereferenceObject(FileObject); - } - else - { - /* Remove the IRP from the list of Thread Pending IRPs */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - - /* Signal the Events only if PendingReturned and we have a File Object */ - if (FileObject && Irp->PendingReturned) - { - /* Check for SYNC IRP */ - if (Irp->Flags & IRP_SYNCHRONOUS_API) - { - - /* Signal our event if we have one */ - if (Irp->UserEvent) - { - KeSetEvent(Irp->UserEvent, 0, FALSE); - } - else - { - /* Signal the File's Event instead */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - } - else - { - /* We'll report the Status to the File Object, not the IRP */ - FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal the File Object ONLY if this was Async */ + if (UserEvent != &FileObject->Event) + { + /* Signal Event */ KeSetEvent(&FileObject->Event, 0, FALSE); - } - } + } + } + } - /* Dereference the Event if it's an ASYNC IRP on a File Object */ - if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) - { - if (Irp->UserEvent != &FileObject->Event) - { - ObDereferenceObject(Irp->UserEvent); - } - } - - /* Dereference the File Object */ - if (FileObject) ObDereferenceObject(FileObject); - - /* Free the IRP */ - IoFreeIrp(Irp); + /* Signal the user event, if one exist */ + if (UserEvent) + { + KeSetEvent(UserEvent, 0, FALSE); + } + + /* Now call the User APC if one was requested */ + if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) + { + KeInitializeApc(&Irp->Tail.Apc, + KeGetCurrentThread(), + CurrentApcEnvironment, + IoSecondStageCompletion_KernelApcRoutine, + IoSecondStageCompletion_RundownApcRoutine, + (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + Irp->RequestorMode, + Irp->Overlay.AsynchronousParameters.UserApcContext); + + KeInsertQueueApc(&Irp->Tail.Apc, + Irp->UserIosb, + NULL, + 2); + Irp = NULL; + } + else if (FileObject && FileObject->CompletionContext) + { + /* Call the IO Completion Port if we have one, instead */ + IoSetIoCompletion(FileObject->CompletionContext->Port, + FileObject->CompletionContext->Key, + Irp->Overlay.AsynchronousParameters.UserApcContext, + Irp->IoStatus.Status, + Irp->IoStatus.Information, + FALSE); + Irp = NULL; + } } + + if (Irp) + { + IoFreeIrp(Irp); + } + + if (FileObject) + { + /* Dereference the user event, if it is an event object */ + if (UserEvent && !SyncIrp && UserEvent != &FileObject->Event) + { + ObDereferenceObject(UserEvent); + } + + /* Dereference the File Object */ + ObDereferenceObject(FileObject); + } } /* EOF */

19 years, 4 months

[hpoussin] 14987: SVN maintenance:

by hpoussin＠svn.reactos.com

SVN maintenance: Delete wine_unicode.map Add *.map to ignore list Deleted: trunk/reactos/tools/unicode/wine_unicode.map Property changes on: trunk/reactos/tools/unicode ___________________________________________________________________ Name: svn:ignore - *.o *.a + *.o *.a *.map _____ Deleted: trunk/reactos/tools/unicode/wine_unicode.map --- trunk/reactos/tools/unicode/wine_unicode.map 2005-05-05 09:48:22 UTC (rev 14986) +++ trunk/reactos/tools/unicode/wine_unicode.map 2005-05-05 09:59:38 UTC (rev 14987) @@ -1,30 +0,0 @@ -WINE_1.0 -{ - global: - memicmpW; - snprintfW; - sprintfW; - strcmpiW; - strncmpiW; - strstrW; - strtolW; - strtoulW; - vsnprintfW; - vsprintfW; - wine_casemap_lower; - wine_casemap_upper; - wine_compare_string; - wine_cp_enum_table; - wine_cp_get_table; - wine_cp_mbstowcs; - wine_cp_wcstombs; - wine_cpsymbol_mbstowcs; - wine_cpsymbol_wcstombs; - wine_fold_string; - wine_get_sortkey; - wine_utf8_mbstowcs; - wine_utf8_wcstombs; - wine_wctype_table; - - local: *; -};

19 years, 4 months

[chorns] 14986: Copy wininet to branch

by chorns＠svn.reactos.com

Copy wininet to branch Added: branches/xmlbuildsystem/reactos/lib/wininet/ _____ Copied: branches/xmlbuildsystem/reactos/lib/wininet (from rev 14980, trunk/reactos/lib/wininet)

19 years, 4 months

[chorns] 14985: Delete wininet

by chorns＠svn.reactos.com

Delete wininet Deleted: branches/xmlbuildsystem/reactos/lib/wininet/

19 years, 4 months

[weiden] 14984: - fixed RegSetValueEx to take the null-terminating byte for strings into account when the caller forgot it

by weiden＠svn.reactos.com

- fixed RegSetValueEx to take the null-terminating byte for strings into account when the caller forgot it - capture the driver service name string in NtLoadDriver Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-05-05 00:07:27 UTC (rev 14983) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-05-05 02:46:17 UTC (rev 14984) @@ -3003,14 +3003,21 @@ pValueName = NULL; } - if ((dwType == REG_SZ) || - (dwType == REG_MULTI_SZ) || - (dwType == REG_EXPAND_SZ)) + if (((dwType == REG_SZ) || + (dwType == REG_MULTI_SZ) || + (dwType == REG_EXPAND_SZ)) && + (cbData != 0)) { + /* NT adds one if the caller forgot the NULL-termination character */ + if (lpData[cbData - 1] != '\0') + { + cbData++; + } + RtlInitAnsiString (&AnsiString, NULL); AnsiString.Buffer = (PSTR)lpData; - AnsiString.Length = cbData; + AnsiString.Length = cbData - 1; AnsiString.MaximumLength = cbData; RtlAnsiStringToUnicodeString (&Data, &AnsiString, @@ -3088,6 +3095,15 @@ RtlInitUnicodeString (&ValueName, L""); } pValueName = &ValueName; + + if (((dwType == REG_SZ) || + (dwType == REG_MULTI_SZ) || + (dwType == REG_EXPAND_SZ)) && + (cbData != 0) && (*(((PWCHAR)lpData) + (cbData / sizeof(WCHAR)) - 1) != L'\0')) + { + /* NT adds one if the caller forgot the NULL-termination character */ + cbData += sizeof(WCHAR); + } Status = NtSetValueKey (KeyHandle, pValueName, @@ -3118,51 +3134,41 @@ LPCSTR lpData, DWORD cbData) { - WCHAR SubKeyNameBuffer[MAX_PATH+1]; - UNICODE_STRING SubKeyName; - UNICODE_STRING Data; - ANSI_STRING AnsiString; - LONG DataSize; - LONG ErrorCode; + LONG ret; + HKEY hSubKey; + + if (dwType != REG_SZ) + { + return ERROR_INVALID_PARAMETER; + } + + if (lpSubKey != NULL && lpSubKey[0] != '\0') + { + ret = RegCreateKeyA(hKey, + lpSubKey, + &hSubKey); - if (lpData == NULL) - { - SetLastError (ERROR_INVALID_PARAMETER); - return ERROR_INVALID_PARAMETER; - } + if (ret != ERROR_SUCCESS) + { + return ret; + } + } + else + hSubKey = hKey; + + ret = RegSetValueExA(hSubKey, + NULL, + 0, + REG_SZ, + lpData, + strlen(lpData) + 1); + + if (hSubKey != hKey) + { + RegCloseKey(hSubKey); + } - RtlInitUnicodeString (&SubKeyName, NULL); - RtlInitUnicodeString (&Data, NULL); - if (lpSubKey != NULL && (strlen(lpSubKey) != 0)) - { - RtlInitAnsiString (&AnsiString, (LPSTR)lpSubKey); - SubKeyName.Buffer = &SubKeyNameBuffer[0]; - SubKeyName.MaximumLength = sizeof(SubKeyNameBuffer); - RtlAnsiStringToUnicodeString (&SubKeyName, &AnsiString, FALSE); - } - - DataSize = cbData * sizeof(WCHAR); - Data.MaximumLength = DataSize; - Data.Buffer = RtlAllocateHeap (ProcessHeap, - 0, - DataSize); - if (Data.Buffer == NULL) - { - SetLastError (ERROR_OUTOFMEMORY); - return ERROR_OUTOFMEMORY; - } - - ErrorCode = RegSetValueW (hKey, - (LPCWSTR)SubKeyName.Buffer, - dwType, - Data.Buffer, - DataSize); - - RtlFreeHeap (ProcessHeap, - 0, - Data.Buffer); - - return ErrorCode; + return ret; } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-05 00:07:27 UTC (rev 14983) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-05 02:46:17 UTC (rev 14984) @@ -1311,7 +1311,7 @@ IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("NtLoadDriver() failed (Status %lx)\n", Status); + DPRINT("IopLoadDriver() failed (Status %lx)\n", Status); #if 0 if (Service->ErrorControl == 1) { @@ -1783,42 +1783,66 @@ RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; UNICODE_STRING ServiceName; + UNICODE_STRING CapturedDriverServiceName; + KPROCESSOR_MODE PreviousMode; NTSTATUS Status; ULONG Type; PDEVICE_NODE DeviceNode; PMODULE_OBJECT ModuleObject; PDRIVER_OBJECT DriverObject; - LPWSTR Start; + WCHAR *cur; + + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); - DPRINT("NtLoadDriver('%wZ')\n", DriverServiceName); - /* * Check security privileges */ /* FIXME: Uncomment when privileges will be correctly implemented. */ #if 0 - if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, KeGetPreviousMode())) + if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) { DPRINT("Privilege not held\n"); return STATUS_PRIVILEGE_NOT_HELD; } #endif + Status = RtlCaptureUnicodeString(&CapturedDriverServiceName, + PreviousMode, + PagedPool, + FALSE, + DriverServiceName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); + RtlInitUnicodeString(&ImagePath, NULL); /* * Get the service name from the registry key name. */ + ASSERT(CapturedDriverServiceName.Length >= sizeof(WCHAR)); - Start = wcsrchr(DriverServiceName->Buffer, L'\\'); - if (Start == NULL) - Start = DriverServiceName->Buffer; - else - Start++; + ServiceName = CapturedDriverServiceName; + cur = CapturedDriverServiceName.Buffer + (CapturedDriverServiceName.Length / sizeof(WCHAR)) - 1; + while (CapturedDriverServiceName.Buffer != cur) + { + if(*cur == L'\\') + { + ServiceName.Buffer = cur + 1; + ServiceName.Length = CapturedDriverServiceName.Length - + (USHORT)((ULONG_PTR)ServiceName.Buffer - + (ULONG_PTR)CapturedDriverServiceName.Buffer); + break; + } + cur--; + } - RtlInitUnicodeString(&ServiceName, Start); - /* * Get service type. */ @@ -1836,13 +1860,13 @@ QueryTable[1].EntryContext = &ImagePath; Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - DriverServiceName->Buffer, QueryTable, NULL, NULL); + CapturedDriverServiceName.Buffer, QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); RtlFreeUnicodeString(&ImagePath); - return Status; + goto ReleaseCapturedString; } /* @@ -1854,10 +1878,10 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - return Status; + goto ReleaseCapturedString; } - DPRINT("FullImagePath: '%S'\n", ImagePath.Buffer); + DPRINT("FullImagePath: '%wZ'\n", &ImagePath); DPRINT("Type: %lx\n", Type); /* @@ -1868,7 +1892,8 @@ if (ModuleObject != NULL) { DPRINT("Image already loaded\n"); - return STATUS_IMAGE_ALREADY_LOADED; + Status = STATUS_IMAGE_ALREADY_LOADED; + goto ReleaseCapturedString; } /* @@ -1881,7 +1906,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); - return Status; + goto ReleaseCapturedString; } /* @@ -1894,19 +1919,14 @@ { DPRINT("LdrLoadModule() failed (Status %lx)\n", Status); IopFreeDeviceNode(DeviceNode); - return Status; + goto ReleaseCapturedString; } /* * Set a service name for the device node */ - Start = wcsrchr(DriverServiceName->Buffer, L'\\'); - if (Start == NULL) - Start = DriverServiceName->Buffer; - else - Start++; - RtlpCreateUnicodeString(&DeviceNode->ServiceName, Start, NonPagedPool); + RtlpCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer, NonPagedPool); /* * Initialize the driver module @@ -1925,10 +1945,15 @@ DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); LdrUnloadModule(ModuleObject); IopFreeDeviceNode(DeviceNode); - return Status; + goto ReleaseCapturedString; } IopInitializeDevice(DeviceNode, DriverObject); + +ReleaseCapturedString: + RtlReleaseCapturedUnicodeString(&CapturedDriverServiceName, + PreviousMode, + FALSE); return Status; }

19 years, 4 months

[weiden] 14983: only create handles with access rights needed for the operation

by weiden＠svn.reactos.com

only create handles with access rights needed for the operation Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-05-04 23:06:15 UTC (rev 14982) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-05-05 00:07:27 UTC (rev 14983) @@ -407,7 +407,7 @@ break; } Status = NtCreateKey (&LocalKeyHandle, - KEY_ALL_ACCESS, + KEY_CREATE_SUB_KEY, &LocalObjectAttributes, 0, NULL, @@ -575,7 +575,7 @@ 0, NULL, 0, - KEY_ALL_ACCESS, + MAXIMUM_ALLOWED, NULL, phkResult, NULL); @@ -597,7 +597,7 @@ 0, NULL, 0, - KEY_ALL_ACCESS, + MAXIMUM_ALLOWED, NULL, phkResult, NULL); @@ -1653,7 +1653,7 @@ return ERROR_SUCCESS; } - return RegOpenKeyExA( hKey, lpSubKey, 0, KEY_ALL_ACCESS, phkResult); + return RegOpenKeyExA( hKey, lpSubKey, 0, MAXIMUM_ALLOWED, phkResult); } @@ -1678,7 +1678,7 @@ *phkResult = hKey; return ERROR_SUCCESS; } - return RegOpenKeyExW(hKey, lpSubKey, 0, KEY_ALL_ACCESS, phkResult); + return RegOpenKeyExW(hKey, lpSubKey, 0, MAXIMUM_ALLOWED, phkResult); } @@ -2214,7 +2214,7 @@ return ERROR_OUTOFMEMORY; } - Status = NtQueryValueKey (hKey, + Status = NtQueryValueKey (KeyHandle, &ValueName, KeyValuePartialInformation, ValueInfo, @@ -2526,7 +2526,7 @@ KeyHandle, NULL); Status = NtOpenKey (&RealKey, - KEY_ALL_ACCESS, + KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { @@ -2641,7 +2641,7 @@ KeyHandle, NULL); Status = NtOpenKey (&RealKeyHandle, - KEY_ALL_ACCESS, + MAXIMUM_ALLOWED, &KeyObjectAttributes); if (!NT_SUCCESS(Status)) { @@ -3205,7 +3205,7 @@ KeyHandle, NULL); Status = NtOpenKey (&RealKey, - KEY_ALL_ACCESS, + KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) {

19 years, 4 months

[greatlrd] 14982: tinus

by greatlrd＠svn.reactos.com

tinus implement MouseResolution setting Me (Magnus Olsen) remove old psuax drv from hiveinst.inf and add tinus mouse drv settings add MouseResolution setting to reg Modified: trunk/reactos/bootdata/hiveinst.inf Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/mouse.c _____ Modified: trunk/reactos/bootdata/hiveinst.inf --- trunk/reactos/bootdata/hiveinst.inf 2005-05-04 22:32:43 UTC (rev 14981) +++ trunk/reactos/bootdata/hiveinst.inf 2005-05-04 23:06:15 UTC (rev 14982) @@ -24,7 +24,8 @@ ; ; PS/2 mouse port driver -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x000 00001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 + ; Serial mouse driver ;HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x 00000001 _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-04 22:32:43 UTC (rev 14981) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-04 23:06:15 UTC (rev 14982) @@ -583,6 +583,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRate ",0x00010001,0x00000060 HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseReso lution",0x00010001,0x00000003 ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000 _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-05-04 22:32:43 UTC (rev 14981) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-05-04 23:06:15 UTC (rev 14982) @@ -87,7 +87,7 @@ DWORD OverrideKeyboardSubtype; DWORD MouseResendStallTime; DWORD MouseSynchIn100ns; - DWORD MouseResolution; + DWORD MouseResolution; /* done */ DWORD NumberOfButtons; DWORD EnableWheelDetection; } I8042_SETTINGS, *PI8042_SETTINGS; _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-05-04 22:32:43 UTC (rev 14981) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-05-04 23:06:15 UTC (rev 14982) @@ -299,7 +299,9 @@ DevExt->MouseResetState = ExpectingFinalResolutionACK; return TRUE; case ExpectingFinalResolutionACK: - I8042IsrWritePortMouse(DevExt, 0x03); + I8042IsrWritePortMouse(DevExt, + DevExt->Settings.MouseResolution & 0xff); + DPRINT1("%x\n", DevExt->Settings.MouseResolution); DevExt->MouseResetState = ExpectingFinalResolutionValueACK; return TRUE; case ExpectingFinalResolutionValueACK:

19 years, 4 months

[weiden] 14981: prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes!

by weiden＠svn.reactos.com

prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes! Modified: trunk/reactos/subsys/system/userinit/userinit.c _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2005-05-04 22:21:55 UTC (rev 14980) +++ trunk/reactos/subsys/system/userinit/userinit.c 2005-05-04 22:32:43 UTC (rev 14981) @@ -105,8 +105,8 @@ } else { - LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, (LPTSTR) szMsg,sizeof(szMsg)); - MessageBox(0, szMsg, NULL, 0); + LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + MessageBox(0, szMsg, NULL, 0); } }

19 years, 4 months

[weiden] 14980: prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes!

by weiden＠svn.reactos.com

prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes! Modified: trunk/reactos/subsys/ntvdm/ntvdm.c _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.c --- trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-04 22:18:43 UTC (rev 14979) +++ trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-04 22:21:55 UTC (rev 14980) @@ -280,8 +280,8 @@ WCHAR PromptMsg[RC_STRING_MAX_SIZE]; CHAR InputBuffer[255]; - LoadString( GetModuleHandle(NULL), STRING_WelcomeMsg, (LPTSTR) WelcomeMsg,sizeof(WelcomeMsg)); - LoadString( GetModuleHandle(NULL), STRING_PromptMsg, (LPTSTR) PromptMsg ,sizeof(PromptMsg)); + LoadString( GetModuleHandle(NULL), STRING_WelcomeMsg, (LPTSTR) WelcomeMsg,sizeof(WelcomeMsg) / sizeof(WelcomeMsg[0])); + LoadString( GetModuleHandle(NULL), STRING_PromptMsg, (LPTSTR) PromptMsg ,sizeof(PromptMsg) / sizeof(PromptMsg[0])); AllocConsole(); SetConsoleTitleW(L"ntvdm");

19 years, 4 months

[weiden] 14979: correctly use tchar.h again and build a unicode version by default

by weiden＠svn.reactos.com

correctly use tchar.h again and build a unicode version by default Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/makefile _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-04 21:23:13 UTC (rev 14978) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-04 22:18:43 UTC (rev 14979) @@ -288,10 +288,9 @@ extern INT nDateFormat; extern TCHAR cTimeSeparator; extern INT nTimeFormat; -extern TCHAR aszDayNames[7][8]; extern TCHAR cThousandSeparator; extern TCHAR cDecimalSeparator; -extern INT nNumberGroups; +extern INT nNumberGroups; VOID InitLocale (VOID); VOID PrintDate (VOID); _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-04 21:23:13 UTC (rev 14978) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-04 22:18:43 UTC (rev 14979) @@ -917,7 +917,7 @@ { if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) temp[30 - c++] = cThousandSeparator; - temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); + temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); num.QuadPart /= 10; } @@ -1107,9 +1107,9 @@ */ TCHAR* getExt(const TCHAR* file) { - - TCHAR* tmp = _tcsrchr(file, _T('.')); - return tmp?tmp+1:""; + static TCHAR *NoExt = _T(""); + TCHAR* lastdot = _tcsrchr(file, _T('.')); + return (lastdot != NULL ? lastdot + 1 : NoExt); } /* @@ -1394,12 +1394,12 @@ /* at recursive mode we print full path of file */ _tcscpy(szFullName, lpCurPath); _tcscat(szFullName, ptrFiles[i]->cFileName); - ConOutPrintf("%s\n", szFullName); + ConOutPrintf(_T("%s\n"), szFullName); } else { /* if we are not in recursive mode we print the file names */ - ConOutPrintf("%s\n",ptrFiles[i]->cFileName); + ConOutPrintf(_T("%s\n"),ptrFiles[i]->cFileName); } } } @@ -1507,11 +1507,11 @@ break; case ORDER_EXTENSION: /* Order by extension name /o:e */ - iComp = _stricmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); + iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); break; case ORDER_NAME: /* Order by filename /o:n */ - iComp = _stricmp(lpFile1->cFileName, lpFile2->cFileName); + iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); break; case ORDER_TIME: /* Order by file's time /o:t */ _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-05-04 21:23:13 UTC (rev 14978) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-05-04 22:18:43 UTC (rev 14979) @@ -317,7 +317,7 @@ if (!dir) { LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf (szMsg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-05-04 21:23:13 UTC (rev 14978) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-05-04 22:18:43 UTC (rev 14979) @@ -21,157 +21,54 @@ TCHAR cDecimalSeparator; INT nDateFormat; INT nTimeFormat; -TCHAR aszDayNames[7][8]; INT nNumberGroups; VOID InitLocale (VOID) { -#ifdef LOCALE_WINDOWS TCHAR szBuffer[256]; - INT i; /* date settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, 256); - CharToOem (szBuffer, szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); cDateSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IDATE, szBuffer, 256); - nDateFormat = _ttoi (szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IDATE | LOCALE_RETURN_NUMBER, (LPTSTR)&nDateFormat, sizeof(nDateFormat) / sizeof(TCHAR)); /* time settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, 256); - CharToOem (szBuffer, szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); cTimeSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ITIME, szBuffer, 256); - nTimeFormat = _ttoi (szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ITIME | LOCALE_RETURN_NUMBER, (LPTSTR)&nTimeFormat, sizeof(nTimeFormat) / sizeof(TCHAR)); /* number settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, 256); - CharToOem (szBuffer, szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); cThousandSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, 256); - CharToOem (szBuffer, szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); cDecimalSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, 256); - nNumberGroups = _ttoi (szBuffer); - + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + nNumberGroups = _ttoi(szBuffer); +#if 0 /* days of week */ for (i = 0; i < 7; i++) { - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, 256); - CharToOem (szBuffer, szBuffer); + GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); _tcscpy (aszDayNames[(i+1)%7], szBuffer); /* little hack */ } #endif - -#ifdef LOCALE_GERMAN - LPTSTR names [7] = {_T("So"), _T("Mo"), _T("Di"), _T("Mi"), _T("Do"), _T("Fr"), _T("Sa")}; - INT i; - - /* date settings */ - cDateSeparator = '.'; - nDateFormat = 1; /* ddmmyy */ - - /* time settings */ - cTimeSeparator = ':'; - nTimeFormat = 1; /* 24 hour */ - - /* number settings */ - cThousandSeparator = '.'; - cDecimalSeparator = ','; - nNumberGroups = 3; - - /* days of week */ - for (i = 0; i < 7; i++) - _tcscpy(aszDayNames[i], names[i]); -#endif - -#ifdef LOCALE_DEFAULT - LPTSTR names [7] = {_T("Sun"), _T("Mon"), _T("Tue"), _T("Wed"), _T("Thu"), _T("Fri"), _T("Sat")}; - INT i; - - /* date settings */ - cDateSeparator = '-'; - nDateFormat = 0; /* mmddyy */ - - /* time settings */ - cTimeSeparator = ':'; - nTimeFormat = 0; /* 12 hour */ - - /* number settings */ - cThousandSeparator = ','; - cDecimalSeparator = '.'; - nNumberGroups = 3; - - /* days of week */ - for (i = 0; i < 7; i++) - _tcscpy (aszDayNames[i], names[i]); -#endif } VOID PrintDate (VOID) { -#ifdef __REACTOS__ - SYSTEMTIME st; - - GetLocalTime (&st); - - switch (nDateFormat) - { - case 0: /* mmddyy */ - default: - ConOutPrintf(_T("%s %02d%c%02d%c%04d"), - aszDayNames[st.wDayOfWeek], st.wMonth, cDateSeparator, st.wDay, cDateSeparator, st.wYear); - break; - - case 1: /* ddmmyy */ - ConOutPrintf(_T("%s %02d%c%02d%c%04d"), - aszDayNames[st.wDayOfWeek], st.wDay, cDateSeparator, st.wMonth, cDateSeparator, st.wYear); - break; - - case 2: /* yymmdd */ - ConOutPrintf(_T("%s %04d%c%02d%c%02d"), - aszDayNames[st.wDayOfWeek], st.wYear, cDateSeparator, st.wMonth, cDateSeparator, st.wDay); - break; - } -#else TCHAR szDate[32]; GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); ConOutPrintf(_T("%s"), szDate); -#endif } VOID PrintTime (VOID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; -#ifdef __REACTOS__ - SYSTEMTIME st; - - GetLocalTime(&st); - - LoadString(GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); - - switch (nTimeFormat) - { - case 0: /* 12 hour format */ - default: - ConOutPrintf(_T("%s %2d%c%02d%c%02d%c%02d%c\n"), szMsg, - (st.wHour == 0 ? 12 : (st.wHour <= 12 ? st.wHour : st.wHour - 12)), - cTimeSeparator, st.wMinute, cTimeSeparator, st.wSecond, cDecimalSeparator, - st.wMilliseconds / 10, (st.wHour <= 11 ? _T('a') : _T('p'))); - break; - - case 1: /* 24 hour format */ - ConOutPrintf(_T("%s %2d%c%02d%c%02d%c%02d\n"), szMsg, - st.wHour, cTimeSeparator, st.wMinute, cTimeSeparator, - st.wSecond, cDecimalSeparator, st.wMilliseconds / 10); - break; - } -#else TCHAR szTime[32]; GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, @@ -179,5 +76,4 @@ LoadString(GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(_T("%s: %s\n"), szMsg, szTime); -#endif } _____ Modified: trunk/reactos/subsys/system/cmd/makefile --- trunk/reactos/subsys/system/cmd/makefile 2005-05-04 21:23:13 UTC (rev 14978) +++ trunk/reactos/subsys/system/cmd/makefile 2005-05-04 22:18:43 UTC (rev 14979) @@ -18,7 +18,7 @@ TARGET_INSTALLDIR = system32 TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Wall -Werror \ - -I$(PATH_TO_TOP)/include/wine -D_WIN32_WINNT=0x0501 #-DUNICODE -D_UNICODE + -I$(PATH_TO_TOP)/include/wine -D_WIN32_WINNT=0x0501 -DUNICODE -D_UNICODE TARGET_OBJECTS = \ cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \

19 years, 4 months

← Newer
1
...
70
71
72
73
74
75
76
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005