Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cgutman] 41590: - Fix the order of checks
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 18:51:50 2009 New Revision: 41590 URL: http://svn.reactos.org/svn/reactos?rev=41590&view=rev Log: - Fix the order of checks Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Jun 23 18:51:50 2009 @@ -703,7 +703,7 @@ str = ParameterValue->ParameterData.StringData; } - while (str.Buffer[j] != '\0' && j < str.Length) j++; + while (j < str.Length && str.Buffer[j] != '\0') j++; *NetworkAddressLength = (UINT)((j/2)+0.5);

1 0

[cgutman] 41589: - We only need 11 chars to hold our 32-bit integer and the trailing NULL char - Make sure we don't overread our buffer
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 18:47:48 2009 New Revision: 41589 URL: http://svn.reactos.org/svn/reactos?rev=41589&view=rev Log: - We only need 11 chars to hold our 32-bit integer and the trailing NULL char - Make sure we don't overread our buffer Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Jun 23 18:47:48 2009 @@ -65,7 +65,7 @@ ULONG ParameterType; ULONG DataSize; PVOID Data; - WCHAR Buff[25]; + WCHAR Buff[11]; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -86,6 +86,7 @@ ParameterValue->ParameterData.IntegerData, (ParameterValue->ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) { + NDIS_DbgPrint(MIN_TRACE, ("RtlIntegerToUnicodeString failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -674,7 +675,7 @@ if (ParameterValue->ParameterType == NdisParameterInteger) { - WCHAR Buff[25]; + WCHAR Buff[11]; NDIS_DbgPrint(MAX_TRACE, ("Read integer data %lx\n", ParameterValue->ParameterData.IntegerData)); @@ -702,7 +703,7 @@ str = ParameterValue->ParameterData.StringData; } - while (str.Buffer[j] != '\0') j++; + while (str.Buffer[j] != '\0' && j < str.Length) j++; *NetworkAddressLength = (UINT)((j/2)+0.5);

1 0

[cfinck] 41588: Branch for 0.3.10 from r41446
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 18:22:46 2009 New Revision: 41588 URL: http://svn.reactos.org/svn/reactos?rev=41588&view=rev Log: Branch for 0.3.10 from r41446 Added: branches/ros-branch-0_3_10/ - copied from r41446, trunk/

1 0

[cgutman] 41587: - Move NDIS_VERSION into ndissys.h and use it for NdisGetVersion also
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 18:09:59 2009 New Revision: 41587 URL: http://svn.reactos.org/svn/reactos?rev=41587&view=rev Log: - Move NDIS_VERSION into ndissys.h and use it for NdisGetVersion also Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Tue Jun 23 18:09:59 2009 @@ -27,6 +27,9 @@ #ifndef EXPORT #define EXPORT NTAPI #endif + +/* the version of NDIS we claim to be */ +#define NDIS_VERSION 0x00050001 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define NDIS_TAG 0x4e4d4953 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Jun 23 18:09:59 2009 @@ -33,7 +33,6 @@ #include "ndissys.h" -#define NDIS_VERSION 0x00050001 /* the version of NDIS we claim to be to miniport drivers */ #define PARAMETERS_KEY L"Parameters" /* The parameters subkey under the device-specific key */ /* Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Tue Jun 23 18:09:59 2009 @@ -515,7 +515,7 @@ { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - return (UINT) 0x501; + return NDIS_VERSION; } /*

1 0

[cgutman] 41586: - Fix adapter failure if a network address of invalid length is specified
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 18:00:49 2009 New Revision: 41586 URL: http://svn.reactos.org/svn/reactos?rev=41586&view=rev Log: - Fix adapter failure if a network address of invalid length is specified Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Tue Jun 23 18:00:49 2009 @@ -373,7 +373,7 @@ NdisCloseConfiguration(ConfigurationHandle); } - if (Status != NDIS_STATUS_SUCCESS) + if (Status != NDIS_STATUS_SUCCESS || RegNetworkAddressLength != DRIVER_LENGTH_OF_ADDRESS) { int i; for (i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++)

1 0

[cgutman] 41585: - Fix a crash when reading the network address from the registry - Fixes bug 4634
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 17:58:56 2009 New Revision: 41585 URL: http://svn.reactos.org/svn/reactos?rev=41585&view=rev Log: - Fix a crash when reading the network address from the registry - Fixes bug 4634 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Jun 23 17:58:56 2009 @@ -662,6 +662,7 @@ NDIS_STRING Keyword; UINT *IntArray = 0; UINT i,j = 0; + NDIS_STRING str; NdisInitUnicodeString(&Keyword, L"NetworkAddress"); NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); @@ -672,11 +673,41 @@ return; } - while (ParameterValue->ParameterData.StringData.Buffer[j] != '\0') j++; - + if (ParameterValue->ParameterType == NdisParameterInteger) + { + WCHAR Buff[25]; + + NDIS_DbgPrint(MAX_TRACE, ("Read integer data %lx\n", + ParameterValue->ParameterData.IntegerData)); + + str.Buffer = Buff; + str.MaximumLength = (USHORT)sizeof(Buff); + str.Length = 0; + + *Status = RtlIntegerToUnicodeString(ParameterValue->ParameterData.IntegerData, + 10, + &str); + + if (*Status != NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("RtlIntegerToUnicodeString failed (%x)\n", *Status)); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NDIS_DbgPrint(MAX_TRACE, ("Converted integer data into %wZ\n", &str)); + } + else + { + ASSERT(ParameterValue->ParameterType == NdisParameterString); + str = ParameterValue->ParameterData.StringData; + } + + while (str.Buffer[j] != '\0') j++; + *NetworkAddressLength = (UINT)((j/2)+0.5); - if (j == 0) + if ((*NetworkAddressLength) == 0) { NDIS_DbgPrint(MIN_TRACE,("Empty NetworkAddress registry entry.\n")); *Status = NDIS_STATUS_FAILURE; @@ -708,8 +739,8 @@ /* convert from string to bytes */ for(i=0; i<(*NetworkAddressLength); i++) { - IntArray[i] = (UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i]) << 4) + - UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i+1]); + IntArray[i] = (UnicodeToHexByte((str.Buffer)[2*i]) << 4) + + UnicodeToHexByte((str.Buffer)[2*i+1]); } *NetworkAddress = IntArray;

1 0

[cwittich] 41584: sync urlmon with wine 1.1.24
by cwittich＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cwittich Date: Tue Jun 23 17:37:11 2009 New Revision: 41584 URL: http://svn.reactos.org/svn/reactos?rev=41584&view=rev Log: sync urlmon with wine 1.1.24 Modified: trunk/reactos/dll/win32/urlmon/bindctx.c Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] Tue Jun 23 17:37:11 2009 @@ -386,7 +386,7 @@ TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); if(!This->http_negotiate2) - return E_FAIL; + return E_NOTIMPL; return IHttpNegotiate2_GetRootSecurityId(This->http_negotiate2, pbSecurityId, pcbSecurityId, dwReserved);

1 0

[cgutman] 41583: - Fix adapter failure when a network address is not specified in the registry - As a bonus, it also fixes OID_802_3_PERMANENT_ADDRESS
by cgutman＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cgutman Date: Tue Jun 23 16:41:14 2009 New Revision: 41583 URL: http://svn.reactos.org/svn/reactos?rev=41583&view=rev Log: - Fix adapter failure when a network address is not specified in the registry - As a bonus, it also fixes OID_802_3_PERMANENT_ADDRESS Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Tue Jun 23 16:41:14 2009 @@ -266,9 +266,9 @@ for (i = 0; i < 16; i++) Adapter->SAPROM[i] = Buffer[i * 2]; - /* Copy the station address */ + /* Copy the permanent address */ NdisMoveMemory( - (PVOID)&Adapter->StationAddress, + (PVOID)&Adapter->PermanentAddress, (PVOID)&Adapter->SAPROM, DRIVER_LENGTH_OF_ADDRESS);

1 0

[cwittich] 41582: sync ntdll rtlstr winetest with wine 1.1.24
by cwittich＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cwittich Date: Tue Jun 23 16:02:58 2009 New Revision: 41582 URL: http://svn.reactos.org/svn/reactos?rev=41582&view=rev Log: sync ntdll rtlstr winetest with wine 1.1.24 Modified: trunk/rostests/winetests/ntdll/rtlstr.c Modified: trunk/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlstr.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] Tue Jun 23 16:02:58 2009 @@ -89,7 +89,7 @@ { WCHAR* buffer; DWORD len = MultiByteToWideChar( CP_ACP, 0, p, -1, NULL, 0 ); - buffer = malloc( len * sizeof(WCHAR) ); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, p, -1, buffer, len ); return buffer; } @@ -191,7 +191,7 @@ UNICODE_STRING uni; NTSTATUS result; - teststring2 = malloc((TESTSTRING2_LEN + 1) * sizeof(WCHAR)); + teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); teststring2[TESTSTRING2_LEN] = '\0'; @@ -293,7 +293,7 @@ "pRtlInitUnicodeString(&uni, 0) sets Buffer to %p, expected %p\n", uni.Buffer, NULL); - free(teststring2); + HeapFree(GetProcessHeap(), 0, teststring2); } @@ -1357,14 +1357,15 @@ test_num, str2int[test_num].str, str2int[test_num].base, result, str2int[test_num].result, str2int[test_num].alternative); if (result == STATUS_SUCCESS) - ok(value == str2int[test_num].value, + ok(value == str2int[test_num].value || + broken(str2int[test_num].str[0] == '\0' && str2int[test_num].base == 16), /* nt4 */ "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) assigns value %d, expected: %d\n", test_num, str2int[test_num].str, str2int[test_num].base, value, str2int[test_num].value); else ok(value == 0xdeadbeef || value == 0 /* vista */, "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) assigns value %d, expected 0 or deadbeef\n", test_num, str2int[test_num].str, str2int[test_num].base, value); - free(wstr); + HeapFree(GetProcessHeap(), 0, wstr); } wstr = AtoW(str2int[1].str); @@ -1404,7 +1405,7 @@ "didn't return expected value (test c): expected: %d, got: %d\n", 1, value); /* w2k: uni.Length = 0 returns value 11234567 instead of 0 */ - free(wstr); + HeapFree(GetProcessHeap(), 0, wstr); }

1 0

[cwittich] 41581: sync crypt32_winetest with wine 1.1.24
by cwittich＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cwittich Date: Tue Jun 23 15:47:46 2009 New Revision: 41581 URL: http://svn.reactos.org/svn/reactos?rev=41581&view=rev Log: sync crypt32_winetest with wine 1.1.24 Modified: trunk/rostests/winetests/crypt32/encode.c trunk/rostests/winetests/crypt32/oid.c Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… ============================================================================== --- trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] Tue Jun 23 15:47:46 2009 @@ -5843,7 +5843,8 @@ * I doubt an app depends on that. */ ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT || OSS_MORE_INPUT /* Win9x */), + GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_MORE_INPUT /* Win9x */), "Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, or OSS_MORE_INPUT, got %x\n", GetLastError()); ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, Modified: trunk/rostests/winetests/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/oid.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/oid.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/oid.c [iso-8859-1] Tue Jun 23 15:47:46 2009 @@ -384,7 +384,7 @@ static const char func[] = "CertDllOpenStoreProv"; char buf[MAX_PATH]; BOOL ret; - long rc; + LSTATUS rc; HKEY key; ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL); @@ -419,7 +419,7 @@ ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); sprintf(buf, fmt, 0, func); rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key); - ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc); + ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %d\n", rc); if (rc == 0) { static const CHAR dllA[] = "Dll"; @@ -432,7 +432,7 @@ size = sizeof(dllBuf) / sizeof(dllBuf[0]); rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size); ok(rc == 0, - "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc); + "Expected Dll value to exist, RegQueryValueExA failed: %d\n", rc); ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n", type); /* bogusDll was registered first, so that should be first */ ptr = dllBuf;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009