Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 41594: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:37:25 2009 New Revision: 41594 URL: http://svn.reactos.org/svn/reactos?rev=41594&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Tue Jun 23 19:37:25 2009 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

[cfinck] 41593: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:34:47 2009 New Revision: 41593 URL: http://svn.reactos.org/svn/reactos?rev=41593&view=rev Log: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20. Modified: branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c Modified: branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c [iso-8859-1] Tue Jun 23 19:34:47 2009 @@ -4162,7 +4162,9 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - goto do_default; + if (wParam) + ME_RewrapRepaint(editor); + return 0; case WM_SIZE: { RECT clientRect;

1 0

[cfinck] 41592: - Change the version to 0.3.10 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:27:12 2009 New Revision: 41592 URL: http://svn.reactos.org/svn/reactos?rev=41592&view=rev Log: - Change the version to 0.3.10 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop Modified: branches/ros-branch-0_3_10/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_10/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_10/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/boot/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","DragFullWindows",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 Modified: branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); Modified: branches/ros-branch-0_3_10/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_10/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/include/reactos/version.h [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 10 #define COPYRIGHT_YEAR "2009" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[cfinck] 41591: Merge 41526
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:20:22 2009 New Revision: 41591 URL: http://svn.reactos.org/svn/reactos?rev=41591&view=rev Log: Merge 41526 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/dll/win32/wininet/cookie.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/dialogs.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/ftp.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/http.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.h branches/ros-branch-0_3_10/reactos/dll/win32/wininet/netconnection.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/urlcache.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/utility.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.rbuild branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.spec branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/ (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/rbuild_helper.cpp (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/rbuild_helper.rbuild (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/log2lines.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/log2lines.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w…

1 0

[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

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