Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 73783: [WIN32KNT_APITEST]: -Make sure that NtUserUnregisterClass works when it gets the versioned class name. Show that NtUserFindWindowEx needs the non versioned class name.
by gadamopoulos＠svn.reactos.org 12 Feb '17

12 Feb '17

Author: gadamopoulos Date: Sun Feb 12 12:11:18 2017 New Revision: 73783 URL: http://svn.reactos.org/svn/reactos?rev=73783&view=rev Log: [WIN32KNT_APITEST]: -Make sure that NtUserUnregisterClass works when it gets the versioned class name. Show that NtUserFindWindowEx needs the non versioned class name. Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c [iso-8859-1] Sun Feb 12 12:11:18 2017 @@ -61,6 +61,7 @@ /* LARGE_STRING for NtUserCreateWindowEx */ LARGE_STRING l_dummy = {14, 32, 0, L"DummyMe"}; + LARGE_STRING l_empty = {0, 0, 0, L""}; LARGE_STRING l_wndName = {32, 32, 0, L""}; LARGE_STRING l_cls = {cls.Length, 32, 0, cls.Buffer}; LARGE_STRING l_ver_cls = {ver_cls.Length, 32, 0, ver_cls.Buffer}; @@ -181,6 +182,8 @@ /* Check what return GetClassLong */ TEST(GetClassLong(hwnd, GCW_ATOM) == atom); + + TEST(NtUserFindWindowEx(NULL, NULL, &cls, (UNICODE_STRING*)&l_empty, 0) == hwnd); /* Finally destroy it */ DestroyWindow(hwnd); @@ -245,4 +248,8 @@ TEST(NtUserUnregisterClass(&another_cls, hinst, &outClsMnu) != 0); TEST(NtUserUnregisterClass(&menu, hinst, &outClsMnu) == 0); -} + /* Make sure that the classes got destroyed */ + TEST(NtUserGetWOWClass(hinst, &cls) == 0); + TEST(NtUserGetWOWClass(hinst, &ver_cls) == 0); + TEST(NtUserGetWOWClass(hinst, &another_cls) == 0); +}

1 0

[pschweitzer] 73782: [SMSS] Remove useless nullptr check
by pschweitzer＠svn.reactos.org 12 Feb '17

12 Feb '17

Author: pschweitzer Date: Sun Feb 12 08:49:53 2017 New Revision: 73782 URL: http://svn.reactos.org/svn/reactos?rev=73782&view=rev Log: [SMSS] Remove useless nullptr check Modified: trunk/reactos/base/system/smss/smsubsys.c Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… ============================================================================== --- trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] Sun Feb 12 08:49:53 2017 @@ -500,7 +500,7 @@ { RemoveEntryList(&NewSubsystem->Entry); NtSetEvent(NewSubsystem->Event, 0); - if (NewSubsystem) SmpDereferenceSubsystem(NewSubsystem); + SmpDereferenceSubsystem(NewSubsystem); } /* Finally, we're all done! */

1 0

[pschweitzer] 73781: [SERVMAN] Remove duplicated condition
by pschweitzer＠svn.reactos.org 12 Feb '17

12 Feb '17

Author: pschweitzer Date: Sun Feb 12 08:42:03 2017 New Revision: 73781 URL: http://svn.reactos.org/svn/reactos?rev=73781&view=rev Log: [SERVMAN] Remove duplicated condition Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c [iso-8859-1] Sun Feb 12 08:42:03 2017 @@ -314,7 +314,7 @@ case IDC_LOGON_INTERACTIVE: if (HIWORD(wParam) == BN_CLICKED) { - if (pLogonData->bInitialized && pLogonData->bInitialized) + if (pLogonData->bInitialized) { pLogonData->bAccountChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg);

1 0

[pschweitzer] 73780: [FASTFAT] Remove useless assignement
by pschweitzer＠svn.reactos.org 12 Feb '17

12 Feb '17

Author: pschweitzer Date: Sun Feb 12 08:25:42 2017 New Revision: 73780 URL: http://svn.reactos.org/svn/reactos?rev=73780&view=rev Log: [FASTFAT] Remove useless assignement Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Feb 12 08:25:42 2017 @@ -1428,7 +1428,7 @@ PVFAT_IRP_CONTEXT IrpContext) { FILE_INFORMATION_CLASS FileInformationClass; - PVFATFCB FCB = NULL; + PVFATFCB FCB; NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; @@ -1554,7 +1554,7 @@ PVFAT_IRP_CONTEXT IrpContext) { FILE_INFORMATION_CLASS FileInformationClass; - PVFATFCB FCB = NULL; + PVFATFCB FCB; NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer;

1 0

[tfaber] 73779: [IP] - Handle chained pbuf structures in TCPSendDataCallback CORE-10715
by tfaber＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: tfaber Date: Sat Feb 11 23:13:45 2017 New Revision: 73779 URL: http://svn.reactos.org/svn/reactos?rev=73779&view=rev Log: [IP] - Handle chained pbuf structures in TCPSendDataCallback CORE-10715 Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ip/transpo… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat Feb 11 23:13:45 2017 @@ -15,6 +15,8 @@ IP_PACKET Packet; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; + ULONG Length; + ULONG TotalLength; /* The caller frees the pbuf struct */ @@ -39,7 +41,7 @@ { return ERR_RTE; } - + NdisStatus = AllocatePacketWithBuffer(&Packet.NdisPacket, NULL, p->tot_len); if (NdisStatus != NDIS_STATUS_SUCCESS) { @@ -49,19 +51,22 @@ GetDataPtr(Packet.NdisPacket, 0, (PCHAR*)&Packet.Header, &Packet.TotalSize); Packet.MappedHeader = TRUE; - if (p->tot_len != p->len || - Packet.TotalSize != p->len) + ASSERT(Packet.TotalSize == p->tot_len); + + TotalLength = p->tot_len; + Length = 0; + while (Length < TotalLength) { - DbgPrint("TCPSendDataCallback: tot_len = %u, len = %u, TotalSize = %u\n", - p->tot_len, p->len, Packet.TotalSize); - ASSERT(p->tot_len == p->len); - ASSERT(Packet.TotalSize == p->len); + ASSERT(p->len <= TotalLength - Length); + ASSERT(p->tot_len == TotalLength - Length); + RtlCopyMemory((PCHAR)Packet.Header + Length, p->payload, p->len); + Length += p->len; + p = p->next; } - - RtlCopyMemory(Packet.Header, p->payload, p->len); + ASSERT(Length == TotalLength); Packet.HeaderSize = sizeof(IPv4_HEADER); - Packet.TotalSize = p->tot_len; + Packet.TotalSize = TotalLength; Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; @@ -77,9 +82,9 @@ { #if 0 ULONG OperationalStatus; - + GetInterfaceConnectionStatus(IF, &OperationalStatus); - + if (OperationalStatus == MIB_IF_OPER_STATUS_OPERATIONAL) netif_set_link_up(IF->TCPContext); else

1 0

[pschweitzer] 73778: [FASTFAT] In case of an error while trying to verify the volume, only return STATUS_WRONG_VOLUME is raw mounts are allowed
by pschweitzer＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: pschweitzer Date: Sat Feb 11 20:26:33 2017 New Revision: 73778 URL: http://svn.reactos.org/svn/reactos?rev=73778&view=rev Log: [FASTFAT] In case of an error while trying to verify the volume, only return STATUS_WRONG_VOLUME is raw mounts are allowed Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Feb 11 20:26:33 2017 @@ -622,11 +622,14 @@ FATINFO FatInfo; BOOLEAN RecognizedFS; PDEVICE_EXTENSION DeviceExt; + BOOLEAN AllowRaw; DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; DeviceExt = DeviceToVerify->DeviceExtension; + AllowRaw = BooleanFlagOn(IrpContext->Stack->Flags, SL_ALLOW_RAW_MOUNT); + Status = VfatBlockDeviceIoControl(DeviceExt->StorageDevice, IOCTL_DISK_CHECK_VERIFY, NULL, @@ -637,14 +640,15 @@ if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) { DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status); - Status = STATUS_WRONG_VOLUME; + Status = (AllowRaw ? STATUS_WRONG_VOLUME : Status); } else { Status = VfatHasFileSystem(DeviceExt->StorageDevice, &RecognizedFS, &FatInfo, TRUE); if (!NT_SUCCESS(Status) || RecognizedFS == FALSE) { - Status = STATUS_WRONG_VOLUME; + if (NT_SUCCESS(Status) || AllowRaw) + Status = STATUS_WRONG_VOLUME; } else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO))) {

1 0

[pschweitzer] 73777: [FASTFAT] Remove useless assignement
by pschweitzer＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: pschweitzer Date: Sat Feb 11 18:33:47 2017 New Revision: 73777 URL: http://svn.reactos.org/svn/reactos?rev=73777&view=rev Log: [FASTFAT] Remove useless assignement Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Feb 11 18:33:47 2017 @@ -618,7 +618,7 @@ PVFAT_IRP_CONTEXT IrpContext) { PDEVICE_OBJECT DeviceToVerify; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; FATINFO FatInfo; BOOLEAN RecognizedFS; PDEVICE_EXTENSION DeviceExt;

1 0

[khornicek] 73776: [REGEDIT] - Fix a possible null pointer dereference. CID 731448 - Check string length before copying into a fixed size buffer. CID 515207 - Bail out of _CmdWndProc if keyPath is ...
by khornicek＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: khornicek Date: Sat Feb 11 16:02:49 2017 New Revision: 73776 URL: http://svn.reactos.org/svn/reactos?rev=73776&view=rev Log: [REGEDIT] - Fix a possible null pointer dereference. CID 731448 - Check string length before copying into a fixed size buffer. CID 515207 - Bail out of _CmdWndProc if keyPath is null. CID 1102164 - Use strsafe functions. CID 1102477 Modified: trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Sat Feb 11 16:02:49 2017 @@ -1079,7 +1079,7 @@ editValueName = valueName; lRet = RegQueryValueExW(hKey, valueName, 0, &type, 0, &valueDataLen); - if (lRet != ERROR_SUCCESS && (!wcscmp(valueName, L"") || valueName == NULL)) + if (lRet != ERROR_SUCCESS && (valueName == NULL || !valueName[0])) { lRet = ERROR_SUCCESS; /* Allow editing of (Default) values which don't exist */ type = REG_SZ; Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Sat Feb 11 16:02:49 2017 @@ -150,6 +150,9 @@ if (DoEvents()) return FALSE; + if(wcslen(pszSubKey) >= _countof(szSubKey)) + return FALSE; + wcscpy(szSubKey, pszSubKey); hSubKey = NULL; Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sat Feb 11 16:02:49 2017 @@ -1125,11 +1125,13 @@ keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); valueName = GetValueName(g_pChildWnd->hListWnd, -1); - if (keyPath) - { - lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, regsam, &hKey); - if (lRet != ERROR_SUCCESS) hKey = 0; - } + + if (!keyPath) + return TRUE; + + lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, regsam, &hKey); + if (lRet != ERROR_SUCCESS) + hKey = 0; switch (LOWORD(wParam)) { Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Sat Feb 11 16:02:49 2017 @@ -20,6 +20,7 @@ */ #include "regedit.h" +#include <strsafe.h> const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; @@ -129,11 +130,14 @@ rootName = get_root_key_name(hRootKey); /* Load "My Computer" string and complete it */ - LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)); - wcscat(szBuffer, L"\\"); wcscat(szBuffer, rootName); - wcscat(szBuffer, L"\\"); wcscat(szBuffer, keyPath); - - RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE)szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); + if (LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)) && + SUCCEEDED(StringCbCatW(szBuffer, sizeof(szBuffer), L"\\")) && + SUCCEEDED(StringCbCatW(szBuffer, sizeof(szBuffer), rootName)) && + SUCCEEDED(StringCbCatW(szBuffer, sizeof(szBuffer), L"\\")) && + SUCCEEDED(StringCbCatW(szBuffer, sizeof(szBuffer), keyPath))) + { + RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE)szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); + } } /* Get statusbar settings */

1 0

[tfaber] 73775: [CRT] - Add missing _sgdt declaration in intrin.h
by tfaber＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: tfaber Date: Sat Feb 11 15:55:56 2017 New Revision: 73775 URL: http://svn.reactos.org/svn/reactos?rev=73775&view=rev Log: [CRT] - Add missing _sgdt declaration in intrin.h Modified: trunk/reactos/sdk/include/crt/intrin.h Modified: trunk/reactos/sdk/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/intrin.h?r… ============================================================================== --- trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] Sat Feb 11 15:55:56 2017 @@ -125,6 +125,7 @@ unsigned __int64 __readpmc(unsigned long); unsigned long __segmentlimit(unsigned long); void __sidt(void *); +void _sgdt(void *); void __stosb(unsigned char *, unsigned char, size_t); void __stosd(unsigned long *, unsigned long, size_t); void __stosw(unsigned short *, unsigned short, size_t);

1 0

[tfaber] 73774: [IP] - Apparently MIN_TRACE isn't enough to get printed... CORE-10715
by tfaber＠svn.reactos.org 11 Feb '17

11 Feb '17

Author: tfaber Date: Sat Feb 11 13:36:05 2017 New Revision: 73774 URL: http://svn.reactos.org/svn/reactos?rev=73774&view=rev Log: [IP] - Apparently MIN_TRACE isn't enough to get printed... CORE-10715 Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ip/transpo… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat Feb 11 13:36:05 2017 @@ -52,9 +52,8 @@ if (p->tot_len != p->len || Packet.TotalSize != p->len) { - TI_DbgPrint(MIN_TRACE, - ("TCPSendDataCallback tot_len = %u, len = %u, TotalSize = %u\n", - p->tot_len, p->len, Packet.TotalSize)); + DbgPrint("TCPSendDataCallback: tot_len = %u, len = %u, TotalSize = %u\n", + p->tot_len, p->len, Packet.TotalSize); ASSERT(p->tot_len == p->len); ASSERT(Packet.TotalSize == p->len); }

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