Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[greatlrd] 15238: Fix two spelling error

by greatlrd＠svn.reactos.com

Fix two spelling error thx dnordenberg to notice them Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-12 11:54:08 UTC (rev 15237) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-12 16:44:39 UTC (rev 15238) @@ -360,7 +360,7 @@ STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ - /E No eror messages.\n\ + /E No error messages.\n\ /N Nothing.\n\ /P Prompts for confirmation before renaming each file.\n\ (Not implemented yet!)\n\ @@ -416,7 +416,7 @@ /S Split time. Return stopwatch split\n\ time without changing its value\n\ /n Specifiy the stopwach number.\n\ - Stopwaches avaliable are 0 to 10\n\ + Stopwaches avaliable are 0 to 9\n\ If it is not specified default is 1\n\ /Fn Format for output\n\ n can be:\n\

19 years, 4 months

[ion] 15237: Small fix.

by ion＠svn.reactos.com

Small fix. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-05-12 05:01:23 UTC (rev 15236) +++ trunk/reactos/ntoskrnl/io/device.c 2005-05-12 11:54:08 UTC (rev 15237) @@ -1201,8 +1201,11 @@ /* Set some extra settings */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = PreviousMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = UserApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = UserApcContext; StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp);

19 years, 4 months

[greatlrd] 15236: really small optimze remove lenvalu * sizeof(WCHAR) so it doing it only one time

by greatlrd＠svn.reactos.com

really small optimze remove lenvalu * sizeof(WCHAR) so it doing it only one time Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 04:17:43 UTC (rev 15235) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 05:01:23 UTC (rev 15236) @@ -107,9 +107,9 @@ } wsprintf(value, L"%04X", (DWORD)lcid); - lenvalue = wcslen(value); + lenvalue = wcslen(value) * sizeof(WCHAR); - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, lenvalue); RegCloseKey(localeKey); // Set language @@ -118,8 +118,8 @@ if (ret != ERROR_SUCCESS) return; - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); + RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, lenvalue ); + RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, lenvalue ); RegCloseKey(langKey); }

19 years, 4 months

[ion] 15235: cleanup NtDeviceIoControlFile a bit...remove some redundant stuff

by ion＠svn.reactos.com

cleanup NtDeviceIoControlFile a bit...remove some redundant stuff Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-05-12 03:00:49 UTC (rev 15234) +++ trunk/reactos/ntoskrnl/io/device.c 2005-05-12 04:17:43 UTC (rev 15235) @@ -1104,114 +1104,123 @@ /* * @implemented */ -NTSTATUS STDCALL -NtDeviceIoControlFile (IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferLength OPTIONAL, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferLength OPTIONAL) +NTSTATUS +STDCALL +NtDeviceIoControlFile(IN HANDLE DeviceHandle, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, + IN PVOID UserApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG IoControlCode, + IN PVOID InputBuffer, + IN ULONG InputBufferLength OPTIONAL, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength OPTIONAL) { - NTSTATUS Status; - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - PIO_STACK_LOCATION StackPtr; - PKEVENT EventObject; - KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; + PKEVENT EventObject = NULL; + BOOLEAN LocalEvent; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - DPRINT("NtDeviceIoControlFile(DeviceHandle %x Event %x UserApcRoutine %x " - "UserApcContext %x IoStatusBlock %x IoControlCode %x " - "InputBuffer %x InputBufferLength %x OutputBuffer %x " - "OutputBufferLength %x)\n", - DeviceHandle,Event,UserApcRoutine,UserApcContext,IoStatusBlock, - IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, - OutputBufferLength); + DPRINT("NtDeviceIoControlFile(DeviceHandle %x Event %x UserApcRoutine %x " + "UserApcContext %x IoStatusBlock %x IoControlCode %x " + "InputBuffer %x InputBufferLength %x OutputBuffer %x " + "OutputBufferLength %x)\n", + DeviceHandle,Event,UserApcRoutine,UserApcContext,IoStatusBlock, + IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, + OutputBufferLength); - if (IoStatusBlock == NULL) - return STATUS_ACCESS_VIOLATION; + if (IoStatusBlock == NULL) return STATUS_ACCESS_VIOLATION; - PreviousMode = ExGetPreviousMode(); + /* Check granted access against the access rights from IoContolCode */ + Status = ObReferenceObjectByHandle(DeviceHandle, + (IoControlCode >> 14) & 0x3, + IoFileObjectType, + PreviousMode, + (PVOID *) &FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; - /* Check granted access against the access rights from IoContolCode */ - Status = ObReferenceObjectByHandle (DeviceHandle, - (IoControlCode >> 14) & 0x3, - IoFileObjectType, - PreviousMode, - (PVOID *) &FileObject, - NULL); - if (!NT_SUCCESS(Status)) + /* Check for an event */ + if (Event) { - return Status; + /* Reference it */ + Status = ObReferenceObjectByHandle(Event, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&EventObject, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject (FileObject); + return Status; + } + + /* Clear it */ + KeClearEvent(EventObject); } - if (Event != NULL) + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { - Status = ObReferenceObjectByHandle (Event, - SYNCHRONIZE, - ExEventObjectType, - PreviousMode, - (PVOID*)&EventObject, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (FileObject); - return Status; - } - } - else - { - EventObject = &FileObject->Event; - KeResetEvent (EventObject); - } + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } - DeviceObject = FileObject->DeviceObject; + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + LocalEvent = TRUE; + } - Irp = IoBuildDeviceIoControlRequest (IoControlCode, - DeviceObject, - InputBuffer, - InputBufferLength, - OutputBuffer, - OutputBufferLength, - FALSE, - EventObject, - IoStatusBlock); + /* Build the IRP */ + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceObject, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + FALSE, + EventObject, + IoStatusBlock); - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; + /* Set some extra settings */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->Overlay.AsynchronousParameters.UserApcRoutine = UserApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = UserApcContext; - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - StackPtr->DeviceObject = DeviceObject; - StackPtr->Parameters.DeviceIoControl.InputBufferLength = InputBufferLength; - StackPtr->Parameters.DeviceIoControl.OutputBufferLength = OutputBufferLength; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) { - Status = KeWaitForSingleObject (EventObject, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - if (Status != STATUS_WAIT_0) - { - /* Wait failed. */ - return Status; - } - - Status = IoStatusBlock->Status; + if (!LocalEvent) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } } - return Status; + /* Return the Status */ + return Status; } /* EOF */

19 years, 4 months

[bpalmer] 15234: Remove old DJGPP NTVDM patch files.

by bpalmer＠svn.reactos.com

Remove old DJGPP NTVDM patch files. Deleted: trunk/reactos/boot/freeldr/ntvdmpat.c Deleted: trunk/reactos/boot/freeldr/readme _____ Deleted: trunk/reactos/boot/freeldr/ntvdmpat.c --- trunk/reactos/boot/freeldr/ntvdmpat.c 2005-05-12 02:57:13 UTC (rev 15233) +++ trunk/reactos/boot/freeldr/ntvdmpat.c 2005-05-12 03:00:49 UTC (rev 15234) @@ -1,85 +0,0 @@ -/* Copyright (C) 2000 CW Sandmann (sandmann(a)clio.rice.edu) 1206 Braelinn, Sugar Land, TX 77479 */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <fcntl.h> -#ifdef GO32 -#include <unistd.h> -#else -#include <io.h> -#endif - -char view_only = 0; -const char *client_patch_code; -char buffer[20480]; -unsigned long search_base = 0x4c800L; -int f; - -char oldpatch[] = {0x3b, 0x05, 0xac, 0xe6 }; -char newpatch[] = {0x3b, 0x05, 0x58, 0x5e }; - -void patch_image(char *filename) -{ - int i,size; - - view_only = 0; - f = open(filename, O_RDWR | O_BINARY); - if (f < 0) { - f = open(filename, O_RDONLY | O_BINARY); - if (f < 0) { - perror(filename); - return; - } - view_only = 1; - } - - lseek(f, search_base, SEEK_SET); - size = read(f, buffer, sizeof(buffer)); - - client_patch_code = NULL; - for(i=0; i<size && !client_patch_code; i++) - if(!memcmp(buffer+i,oldpatch,sizeof(oldpatch))) - client_patch_code = (buffer+i); - - if(!client_patch_code) { - printf("Old patch string not found in %s!\n",filename); - } else { - lseek(f, search_base+i-1, SEEK_SET); /* Ready to update */ - if(!view_only) { - write(f, newpatch, sizeof(newpatch)); - printf("%s patched\n",filename); - } else - printf("%s patchable (not changed, readonly)\n",filename); - } - close(f); - return; -} - -int main(int argc, char **argv) -{ - int i; - char filename[256]; - char buf1[256]; - char file2[256]; - - if (argc != 1) { /* If they specify names, patch them, exit */ - for(i=1; i<argc; i++) - patch_image(argv[i]); - return 0; - } - - fprintf(stderr, "This image patches Windows 2000 NTVDM to fix nesting DPMI bug.\n"); - - strcpy(filename,getenv("SYSTEMROOT")); - strcpy(file2,filename); - strcat(filename,"\\system32\\ntvdm.exe"); - strcat(file2,"\\system32\\dllcache\\ntvdm.exe"); - - sprintf(buf1,"copy %s %s\\system32\\ntvdm.ori",filename,getenv("SYSTEMROOT")); - printf("%s\n",buf1); - system(buf1); - - patch_image(file2); - patch_image(filename); - return 0; -} _____ Deleted: trunk/reactos/boot/freeldr/readme --- trunk/reactos/boot/freeldr/readme 2005-05-12 02:57:13 UTC (rev 15233) +++ trunk/reactos/boot/freeldr/readme 2005-05-12 03:00:49 UTC (rev 15234) @@ -1,18 +0,0 @@ -Perform at your own risk. - -Directions for patching NTVDM on Windows 2000 - -1) Start a Command Prompt Window -2) Start Task Manager. Sort by Name. If NTVDM.EXE is a task End Process. -3) Execute NTVDMPAT.EXE from this ZIP file. - -Notes: - With no arguments the executable patches both the DLLCACHE (for system file - protection) and the version in SYSTEM32. The image is a Win32 executable - (launching a DJGPP image will require NTVDM, locking the DLL so it can't - be patched). It saves the old version into NTVDM.ORI if you want to go - back. If you specify arguments on the command line it will patch the - executables you specify instead of automating the process (if you want to - do the archives/patches/moves yourself). Good luck. - - Source included if you want to hack your own version.

19 years, 4 months

[bpalmer] 15233: Support getting the boot drive from the BIOS or the value in the BPB.

by bpalmer＠svn.reactos.com

Support getting the boot drive from the BIOS or the value in the BPB. Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm _____ Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm --- trunk/reactos/boot/freeldr/bootsect/fat.asm 2005-05-11 20:58:40 UTC (rev 15232) +++ trunk/reactos/boot/freeldr/bootsect/fat.asm 2005-05-12 02:57:13 UTC (rev 15233) @@ -73,7 +73,7 @@ NumberOfHeads dw 2 HiddenSectors dd 0 TotalSectorsBig dd 0 -BootDrive db 0 +BootDrive db 0xff Reserved db 0 ExtendSig db 29h SerialNumber dd 00000000h @@ -89,6 +89,9 @@ mov es,ax ; Make ES correct + cmp BYTE [BYTE bp+BootDrive],BYTE 0xff ; If they have specified a boot drive then use it + jne GetDriveParameters + mov [BYTE bp+BootDrive],dl ; Save the boot drive

19 years, 4 months

[chorns] 15232: Generate static libraries in intermediate directory

by chorns＠svn.reactos.com

Generate static libraries in intermediate directory Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-11 20:45:48 UTC (rev 15231) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-11 20:58:40 UTC (rev 15232) @@ -113,6 +113,15 @@ return generatedFilesDirectory + SSEP + file; } +/*static*/ Directory* +MingwModuleHandler::GetTargetDirectoryTree ( + const Module& module ) +{ + if ( module.type == StaticLibrary ) + return backend->intermediateDirectory; + return backend->outputDirectory; +} + /*static*/ string MingwModuleHandler::GetTargetFilename ( const Module& module, @@ -120,7 +129,7 @@ { string target = PassThruCacheDirectory ( NormalizeFilename ( module.GetPath () ), - backend->outputDirectory ); + backend->intermediateDirectory ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -136,7 +145,7 @@ { string target = PassThruCacheDirectory ( NormalizeFilename ( module.GetDependencyPath () ), - backend->outputDirectory ); + backend->intermediateDirectory ); if ( pclean_files ) { string_list& clean_files = *pclean_files; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-11 20:45:48 UTC (rev 15231) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-11 20:58:40 UTC (rev 15232) @@ -28,6 +28,9 @@ const std::string &f, Directory* directoryTree ); + static Directory* GetTargetDirectoryTree ( + const Module& module ); + static std::string GetTargetFilename ( const Module& module, string_list* pclean_files );

19 years, 4 months

[ion] 15231: Fix incorrect call to ntopenprocess

by ion＠svn.reactos.com

Fix incorrect call to ntopenprocess Modified: trunk/reactos/lib/kernel32/process/session.c _____ Modified: trunk/reactos/lib/kernel32/process/session.c --- trunk/reactos/lib/kernel32/process/session.c 2005-05-11 20:04:48 UTC (rev 15230) +++ trunk/reactos/lib/kernel32/process/session.c 2005-05-11 20:45:48 UTC (rev 15231) @@ -61,7 +61,7 @@ } ClientId.UniqueProcess = (HANDLE)dwProcessId; - ClientId.UniqueThread = INVALID_HANDLE_VALUE; + ClientId.UniqueThread = 0; InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);

19 years, 4 months

[weiden] 15230: remove explicit bugcheck in NtOpenProcess when the caller supplies a thread CID of -1, looks like this was added for debug purpose and accidently committed.

by weiden＠svn.reactos.com

remove explicit bugcheck in NtOpenProcess when the caller supplies a thread CID of -1, looks like this was added for debug purpose and accidently committed. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-05-11 19:15:36 UTC (rev 15229) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-05-11 20:04:48 UTC (rev 15230) @@ -874,7 +874,6 @@ if (ClientId->UniqueThread) { /* Get the Process */ - if (ClientId->UniqueThread == (HANDLE)-1) KEBUGCHECK(0); DPRINT("Opening by Thread ID: %x\n", ClientId->UniqueThread); Status = PsLookupProcessThreadByCid(ClientId, &Process,

19 years, 4 months

[mf] 15229: Synchronisation with ibrowser source code

by mf＠svn.reactos.com

Synchronisation with ibrowser source code Modified: trunk/reactos/subsys/system/explorer/shell/webchild.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/webchild.cpp --- trunk/reactos/subsys/system/explorer/shell/webchild.cpp 2005-05-11 19:13:20 UTC (rev 15228) +++ trunk/reactos/subsys/system/explorer/shell/webchild.cpp 2005-05-11 19:15:36 UTC (rev 15229) @@ -1,5 +1,5 @@ /* - * Copyright 2004 Martin Fuchs + * Copyright 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -302,8 +302,7 @@ String WebChildWindow::jump_to_int(LPCTSTR url) { + _navigator.goto_url(url); -//@@ - - return String(); + return url; }

19 years, 4 months

← Newer
1
...
45
46
47
48
49
50
51
...
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