Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23010: Don't change PortData pointer, as it is allocated memory, and so, it is easier to free it when needed.
by hpoussin＠svn.reactos.org 11 Jul '06

11 Jul '06

Author: hpoussin Date: Tue Jul 11 17:38:59 2006 New Revision: 23010 URL: http://svn.reactos.org/svn/reactos?rev=23010&view=rev Log: Don't change PortData pointer, as it is allocated memory, and so, it is easier to free it when needed. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Tue Jul 11 17:38:59 2006 @@ -370,6 +370,11 @@ DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); + if (!DeviceExtension->PortData) + { + ExFreePool(DeviceNameU.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags |= DO_BUFFERED_IO; /* FIXME: Why is it needed for 1st stage setup? */ Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -509,13 +514,12 @@ * Move the input data from the port data queue to our class data * queue. */ - RtlMoveMemory( - ClassDeviceExtension->PortData, + RtlCopyMemory( + &ClassDeviceExtension->PortData[ClassDeviceExtension->InputCount], (PCHAR)DataStart, sizeof(KEYBOARD_INPUT_DATA) * ReadSize); - /* Move the pointer and counter up */ - ClassDeviceExtension->PortData += ReadSize; + /* Move the counter up */ ClassDeviceExtension->InputCount += ReadSize; (*ConsumedCount) += ReadSize; @@ -681,6 +685,8 @@ return STATUS_SUCCESS; cleanup: + if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); if (DeviceExtension) { if (DeviceExtension->LowerDevice) @@ -717,19 +723,18 @@ Status = FillOneEntry( DeviceObject, Irp, - DeviceExtension->PortData - DeviceExtension->InputCount); + &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); if (NT_SUCCESS(Status)) { if (DeviceExtension->InputCount > 1) { RtlMoveMemory( - DeviceExtension->PortData - DeviceExtension->InputCount, - DeviceExtension->PortData - DeviceExtension->InputCount + 1, + &DeviceExtension->PortData[1], + &DeviceExtension->PortData[0], (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); } - DeviceExtension->PortData--; DeviceExtension->InputCount--; DeviceExtension->ReadIsPending = FALSE; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Tue Jul 11 17:38:59 2006 @@ -347,6 +347,11 @@ DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(MOUSE_INPUT_DATA)); + if (!DeviceExtension->PortData) + { + ExFreePool(DeviceNameU.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -485,13 +490,12 @@ * Move the input data from the port data queue to our class data * queue. */ - RtlMoveMemory( - ClassDeviceExtension->PortData, + RtlCopyMemory( + &ClassDeviceExtension->PortData[ClassDeviceExtension->InputCount], (PCHAR)DataStart, sizeof(MOUSE_INPUT_DATA) * ReadSize); - /* Move the pointer and counter up */ - ClassDeviceExtension->PortData += ReadSize; + /* Move the counter up */ ClassDeviceExtension->InputCount += ReadSize; (*ConsumedCount) += ReadSize; @@ -657,6 +661,8 @@ return STATUS_SUCCESS; cleanup: + if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); if (DeviceExtension) { if (DeviceExtension->LowerDevice) @@ -693,19 +699,18 @@ Status = FillOneEntry( DeviceObject, Irp, - DeviceExtension->PortData - DeviceExtension->InputCount); + &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); if (NT_SUCCESS(Status)) { if (DeviceExtension->InputCount > 1) { RtlMoveMemory( - DeviceExtension->PortData - DeviceExtension->InputCount, - DeviceExtension->PortData - DeviceExtension->InputCount + 1, + &DeviceExtension->PortData[1], + &DeviceExtension->PortData[0], (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); } - DeviceExtension->PortData--; DeviceExtension->InputCount--; DeviceExtension->ReadIsPending = FALSE;

1 0

[hpoussin] 23009: [FORMATTING] Replace tabs by spaces. No code change
by hpoussin＠svn.reactos.org 11 Jul '06

11 Jul '06

Author: hpoussin Date: Tue Jul 11 17:01:00 2006 New Revision: 23009 URL: http://svn.reactos.org/svn/reactos?rev=23009&view=rev Log: [FORMATTING] Replace tabs by spaces. No code change Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Tue Jul 11 17:01:00 2006 @@ -158,27 +158,27 @@ VOID STDCALL ScreenSaverThreadMain(PVOID StartContext) { - KEVENT Event; - LARGE_INTEGER Timeout; - LARGE_INTEGER DelayTimer; - LARGE_INTEGER CurrentTime; - LARGE_INTEGER DiffTimeMouse; - LARGE_INTEGER DiffTimeKeyboard; - UINT ScreenSaverTimeOut = 0; - BOOL nPreviousState = FALSE; - NTSTATUS Status; - - - KeSetPriorityThread(&PsGetCurrentThread()->Tcb, - LOW_REALTIME_PRIORITY + 3); - - KeQuerySystemTime(&MouseInputCurrentTime); - KeQuerySystemTime(&KeyboardInputCurrentTime); - - DelayTimer.QuadPart = -10000000LL; /* 1 second timeout */ - - for(;;) - { + KEVENT Event; + LARGE_INTEGER Timeout; + LARGE_INTEGER DelayTimer; + LARGE_INTEGER CurrentTime; + LARGE_INTEGER DiffTimeMouse; + LARGE_INTEGER DiffTimeKeyboard; + UINT ScreenSaverTimeOut = 0; + BOOL nPreviousState = FALSE; + NTSTATUS Status; + + + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, + LOW_REALTIME_PRIORITY + 3); + + KeQuerySystemTime(&MouseInputCurrentTime); + KeQuerySystemTime(&KeyboardInputCurrentTime); + + DelayTimer.QuadPart = -10000000LL; /* 1 second timeout */ + + for(;;) + { DPRINT("Screen Saver auto start Thread Waiting for start event\n"); Status = KeWaitForSingleObject(&InputThreadsStart, 0, @@ -186,61 +186,61 @@ TRUE, NULL); DPRINT("Screen Saver auto start Thread Starting...\n"); - while(InputThreadsRunning) - { - - IntSystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &ScreenSaverTimeOut, 0); - IntSystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &nPreviousState, 0); - - Timeout.QuadPart = ((LONGLONG)ScreenSaverTimeOut) * 10000000LL; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DelayTimer); - - if(Status == STATUS_ALERTED && !InputThreadsRunning) + while(InputThreadsRunning) + { + + IntSystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &ScreenSaverTimeOut, 0); + IntSystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &nPreviousState, 0); + + Timeout.QuadPart = ((LONGLONG)ScreenSaverTimeOut) * 10000000LL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DelayTimer); + + if(Status == STATUS_ALERTED && !InputThreadsRunning) { break; - } + } if(!NT_SUCCESS(Status)) { DPRINT1("Win32K: Failed to read from Screen Saver auto thread.\n"); return; //(Status); } - + KeQuerySystemTime(&CurrentTime); - DiffTimeMouse.QuadPart = CurrentTime.QuadPart - MouseInputCurrentTime.QuadPart; - DiffTimeKeyboard.QuadPart = CurrentTime.QuadPart - KeyboardInputCurrentTime.QuadPart; - - if ( (DiffTimeMouse.QuadPart >= Timeout.QuadPart) && - (DiffTimeKeyboard.QuadPart >= Timeout.QuadPart) && - (nPreviousState == FALSE)) - { - BOOL nPreviousState = FALSE; - DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); - DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); - DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); - - CSR_API_MESSAGE Request; - CsrInit(); - Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); - Request.Data.StartScreenSaver.Start = TRUE; - co_CsrNotifyScreenSaver(&Request ); - - IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - } - - if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) && - (DiffTimeKeyboard.QuadPart < Timeout.QuadPart) && - (nPreviousState == TRUE)) - { + DiffTimeMouse.QuadPart = CurrentTime.QuadPart - MouseInputCurrentTime.QuadPart; + DiffTimeKeyboard.QuadPart = CurrentTime.QuadPart - KeyboardInputCurrentTime.QuadPart; + + if ( (DiffTimeMouse.QuadPart >= Timeout.QuadPart) && + (DiffTimeKeyboard.QuadPart >= Timeout.QuadPart) && + (nPreviousState == FALSE)) + { + BOOL nPreviousState = FALSE; + DPRINT("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); + DPRINT(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); + + CSR_API_MESSAGE Request; + CsrInit(); + Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); + Request.Data.StartScreenSaver.Start = TRUE; + co_CsrNotifyScreenSaver(&Request ); + + IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + } + + if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) && + (DiffTimeKeyboard.QuadPart < Timeout.QuadPart) && + (nPreviousState == TRUE)) + { IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - } - - - } - DPRINT("Screen Saver auto start Thread Stopped...\n"); - } + } + + + } + DPRINT("Screen Saver auto start Thread Stopped...\n"); + } } @@ -263,7 +263,7 @@ KEVENT Event; DueTime.QuadPart = (LONGLONG)(-10000000); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); Status = NtOpenFile(&MouseDeviceHandle, FILE_ALL_ACCESS, &MouseObjectAttributes, @@ -319,8 +319,8 @@ } DPRINT("MouseEvent\n"); - KeQuerySystemTime(&MouseInputCurrentTime); - + KeQuerySystemTime(&MouseInputCurrentTime); + UserEnterExclusive(); ProcessMouseInputData(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); @@ -531,7 +531,7 @@ KEVENT Event; DueTime.QuadPart = (LONGLONG)(-10000000); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); Status = NtOpenFile(&KeyboardDeviceHandle, FILE_ALL_ACCESS, &KeyboardObjectAttributes, @@ -589,10 +589,10 @@ HWND hWnd; int id; - DPRINT("KeyInput @ %08x\n", &KeyInput); + DPRINT("KeyInput @ %08x\n", &KeyInput); Status = NtReadFile (KeyboardDeviceHandle, - NULL, + NULL, NULL, NULL, &Iosb, @@ -629,7 +629,7 @@ return; //(Status); } - KeQuerySystemTime(&KeyboardInputCurrentTime); + KeQuerySystemTime(&KeyboardInputCurrentTime); /* Update modifier state */ fsModifiers = IntKeyboardGetModifiers(&KeyInput); @@ -878,7 +878,7 @@ InitInputImpl(VOID) { NTSTATUS Status; - + KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); Status = PsCreateSystemThread(&KeyboardThreadHandle,

1 0

[winesync] 23008: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: winesync Date: Tue Jul 11 01:39:10 2006 New Revision: 23008 URL: http://svn.reactos.org/svn/reactos?rev=23008&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc Tue Jul 11 01:39:10 2006 @@ -17,12 +17,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "CryptoAPI Library\0" +#define REACTOS_STR_INTERNAL_NAME "crypt32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "crypt32.dll\0" + #include "windef.h" #include "winbase.h" #include "winuser.h" #include "cryptres.h" -#include "version.rc" +#include <reactos/version.rc> #include "crypt32_De.rc" #include "crypt32_En.rc"

1 0

[winesync] 23007: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: winesync Date: Tue Jul 11 01:32:49 2006 New Revision: 23007 URL: http://svn.reactos.org/svn/reactos?rev=23007&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc Tue Jul 11 01:32:49 2006 @@ -17,18 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "CryptoAPI Library\0" -#define REACTOS_STR_INTERNAL_NAME "crypt32\0" -#define REACTOS_STR_ORIGINAL_FILENAME "crypt32.dll\0" - #include "windef.h" #include "winbase.h" #include "winuser.h" #include "cryptres.h" -#include <reactos/version.rc> +#include "version.rc" #include "crypt32_De.rc" #include "crypt32_En.rc"

1 0

[winesync] 23006: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: winesync Date: Tue Jul 11 01:25:32 2006 New Revision: 23006 URL: http://svn.reactos.org/svn/reactos?rev=23006&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/protectdata.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Tue Jul 11 01:25:32 2006 @@ -731,12 +731,16 @@ } if (*pdwFlags & CERT_STORE_REVOCATION_FLAG) { - PCCRL_CONTEXT crl = CertFindCRLInStore(pSubject->hCertStore, - pSubject->dwCertEncodingType, 0, CRL_FIND_ISSUED_BY, pSubject, NULL); - + DWORD flags = 0; + PCCRL_CONTEXT crl = CertGetCRLFromStore(pSubject->hCertStore, pSubject, + NULL, &flags); + + /* FIXME: what if the CRL has expired? */ if (crl) { - FIXME("check CRL for subject\n"); + if (CertVerifyCRLRevocation(pSubject->dwCertEncodingType, + pSubject->pCertInfo, 1, (PCRL_INFO *)&crl->pCrlInfo)) + *pdwFlags &= CERT_STORE_REVOCATION_FLAG; } else *pdwFlags |= CERT_STORE_NO_CRL_FLAG; Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Tue Jul 11 01:25:32 2006 @@ -107,7 +107,7 @@ }; /* this is used to check if an incoming structure was built by Wine */ -static const char * crypt_magic_str = "Wine Crypt32 ok"; +static const char crypt_magic_str[] = "Wine Crypt32 ok"; /* debugging tool to print strings of hex chars */ static const char * @@ -835,8 +835,8 @@ DWORD dwFlags, DATA_BLOB* pDataOut) { + static const WCHAR empty_str[1]; BOOL rc = FALSE; - HCRYPTPROV hProv; struct protect_data_t protect_data; HCRYPTHASH hHash; @@ -861,7 +861,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr=(WCHAR[]){'\0'}; + szDataDescr = empty_str; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

1 0

[fireball] 23005: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for adding UNIMPLEMENTE
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Tue Jul 11 01:03:26 2006 New Revision: 23005 URL: http://svn.reactos.org/svn/reactos?rev=23005&view=rev Log: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for adding UNIMPLEMENTED macros in the code. Name.c unlocked because the implementations of functions are trivial and in fact could be derived from their names. Not documented functions will be further reviewed. Modified: trunk/reactos/ntoskrnl/fs/context.c trunk/reactos/ntoskrnl/fs/mcb.c trunk/reactos/ntoskrnl/fs/name.c (contents, props changed) trunk/reactos/ntoskrnl/fs/notify.c trunk/reactos/ntoskrnl/fs/oplock.c trunk/reactos/ntoskrnl/fs/pool.c trunk/reactos/ntoskrnl/fs/tunnel.c trunk/reactos/ntoskrnl/fs/unc.c trunk/reactos/ntoskrnl/fs/util.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/fs/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/context.c?rev=… Modified: trunk/reactos/ntoskrnl/fs/mcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/mcb.c?rev=2300… Modified: trunk/reactos/ntoskrnl/fs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/name.c?rev=230… Modified: trunk/reactos/ntoskrnl/fs/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/notify.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/oplock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/oplock.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/pool.c?rev=230… Modified: trunk/reactos/ntoskrnl/fs/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/tunnel.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/unc.c?rev=2300… Modified: trunk/reactos/ntoskrnl/fs/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/util.c?rev=230…

1 0

[greatlrd] 23004: fixing broken asm code. tcslen, wsclen did not check if the string was null or not. Adding a NULL pointer check. This make user32 test working and alot other apps.
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Tue Jul 11 00:02:12 2006 New Revision: 23004 URL: http://svn.reactos.org/svn/reactos?rev=23004&view=rev Log: fixing broken asm code. tcslen, wsclen did not check if the string was null or not. Adding a NULL pointer check. This make user32 test working and alot other apps. Modified: trunk/reactos/lib/string/i386/tcslen.h Modified: trunk/reactos/lib/string/i386/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/string/i386/tcslen.h?r… ============================================================================== --- trunk/reactos/lib/string/i386/tcslen.h (original) +++ trunk/reactos/lib/string/i386/tcslen.h Tue Jul 11 00:02:12 2006 @@ -9,6 +9,9 @@ push %edi mov 0x8(%esp), %edi xor %eax, %eax + test %edi,%edi + jz _tcslen_end + mov $-1, %ecx cld @@ -18,6 +21,8 @@ dec %ecx mov %ecx, %eax + +_tcslen_end: pop %edi ret

1 0

[greatlrd] 23003: Fixing two user mode crash for menu. Do not try reading from NULL pointer and compare the value. This let me come bit futer with user32_winetest.exe, but we still have some user mode crash with menu.
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 23:32:24 2006 New Revision: 23003 URL: http://svn.reactos.org/svn/reactos?rev=23003&view=rev Log: Fixing two user mode crash for menu. Do not try reading from NULL pointer and compare the value. This let me come bit futer with user32_winetest.exe, but we still have some user mode crash with menu. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jul 10 23:32:24 2006 @@ -4488,10 +4488,13 @@ HeapFree(GetProcessHeap(),0, mii.dwTypeData); } /* Item beginning with a backspace is a help item */ - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; + if (lpNewItem != NULL) + { + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } } mii.fMask |= MIIM_TYPE; mii.dwTypeData = (LPSTR)lpNewItem; @@ -4579,14 +4582,18 @@ } else { - /*if(mii.dwTypeData != NULL) + /* + if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - }*/ - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; + } */ + if (lpNewItem != NULL) + { + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } } mii.fMask |= MIIM_TYPE; mii.dwTypeData = (LPWSTR)lpNewItem;

1 0

[mbosma] 23002: Last parameter of IoQueryVolumeInformation is not optional.
by mbosma＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: mbosma Date: Mon Jul 10 22:24:02 2006 New Revision: 23002 URL: http://svn.reactos.org/svn/reactos?rev=23002&view=rev Log: Last parameter of IoQueryVolumeInformation is not optional. Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Mon Jul 10 22:24:02 2006 @@ -902,7 +902,7 @@ NTSTATUS Status; ULONG SectorSize; LARGE_INTEGER FileOffset; - ULONG Length; + ULONG Length, ReturnedLength; Status = MmspRequestPages(PageCount, Pages, Consumer); if (!NT_SUCCESS(Status)) @@ -942,7 +942,7 @@ FileFsSizeInformation, sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + &ReturnedLength); if (NT_SUCCESS(tmpStatus)) { @@ -4164,13 +4164,13 @@ ULONG Flags; ULONG OldNrSegments; NTSTATUS Status; - ULONG i; + ULONG i, ReturnedLength; Status = IoQueryVolumeInformation(FileObject, FileFsSizeInformation, sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + &ReturnedLength); if (!NT_SUCCESS(Status)) { return Status;

1 0

[cwittich] 23001: -get rid of DllMain@12 because MSVC defaults to_DllMainCRTStartup@12 when using CRT
by cwittich＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: cwittich Date: Mon Jul 10 22:16:28 2006 New Revision: 23001 URL: http://svn.reactos.org/svn/reactos?rev=23001&view=rev Log: -get rid of DllMain@12 because MSVC defaults to_DllMainCRTStartup@12 when using CRT Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jul 10 22:16:28 2006 @@ -449,7 +449,14 @@ if (module.GetEntryPoint(false) == "0") fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); else - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); + { + // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 + // when using CRT + if (module.GetEntryPoint(false) == "DllMain@12") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false).c_str ()); + } fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); @@ -486,6 +493,12 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + if (configuration.VSProjectVersion == "8.00") + { + fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); + } fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); fprintf ( OUT, "\t\t\t<Tool\r\n" );

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