Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 19266: fix memory leak in case of error
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

fix memory leak in case of error Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-16 15:14:31 UTC (rev 19265) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-16 15:53:16 UTC (rev 19266) @@ -66,6 +66,7 @@ FullInfPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!FullInfPathW) { + HeapFree(GetProcessHeap(), 0, HardwareIdW); SetLastError(ERROR_GEN_FAILURE); return FALSE; }

1 0

[hpoussin] 19265: Try to fix the problem some people reported (no keyboard and mouse at 3rd reboot)
by hpoussin＠svn.reactos.com 16 Nov '05

16 Nov '05

Try to fix the problem some people reported (no keyboard and mouse at 3rd reboot) Modified: trunk/reactos/media/inf/keyboard.inf _____ Modified: trunk/reactos/media/inf/keyboard.inf --- trunk/reactos/media/inf/keyboard.inf 2005-11-16 14:57:50 UTC (rev 19264) +++ trunk/reactos/media/inf/keyboard.inf 2005-11-16 15:14:31 UTC (rev 19265) @@ -53,7 +53,7 @@ [kbdclass_Service_Inst] ServiceType = 1 -StartType = 3 +StartType = 1 ErrorControl = 1 ServiceBinary = %12%\kbdclass.sys LoadOrderGroup = Keyboard Class

1 0

[cwittich] 19264: added UpdateDriverForPlugAndPlayDevicesA (untested)
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

added UpdateDriverForPlugAndPlayDevicesA (untested) Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-16 13:24:13 UTC (rev 19263) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-16 14:57:50 UTC (rev 19264) @@ -22,6 +22,68 @@ HINSTANCE hDllInstance; HANDLE hThread; +/* +* @unimplemented +*/ +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesW( + IN HWND hwndParent, + IN LPCWSTR HardwareId, + IN LPCWSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +/* +* @implemented +*/ +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesA( + IN HWND hwndParent, + IN LPCSTR HardwareId, + IN LPCSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + BOOL Result; + LPWSTR HardwareIdW = NULL; + LPWSTR FullInfPathW = NULL; + + int len = MultiByteToWideChar(CP_ACP, 0, HardwareId, -1, NULL, 0); + HardwareIdW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!HardwareIdW) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + MultiByteToWideChar(CP_ACP, 0, HardwareId, -1, HardwareIdW, len); + + len = MultiByteToWideChar(CP_ACP, 0, FullInfPath, -1, NULL, 0); + FullInfPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!FullInfPathW) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + MultiByteToWideChar(CP_ACP, 0, FullInfPath, -1, FullInfPathW, len); + + Result = UpdateDriverForPlugAndPlayDevicesW(hwndParent, + HardwareIdW, + FullInfPathW, + InstallFlags, + bRebootRequired); + + HeapFree(GetProcessHeap(), 0, HardwareIdW); + HeapFree(GetProcessHeap(), 0, FullInfPathW); + + return Result; +} + + static HFONT CreateTitleFont(VOID) { _____ Modified: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-11-16 13:24:13 UTC (rev 19263) +++ trunk/reactos/lib/newdev/stubs.c 2005-11-16 14:57:50 UTC (rev 19264) @@ -36,29 +36,6 @@ return FALSE; } -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesA( - IN HWND hwndParent, - IN LPCSTR HardwareId, - IN LPCSTR FullInfPath, - IN DWORD InstallFlags, - OUT PBOOL bRebootRequired OPTIONAL) -{ - UNIMPLEMENTED; - SetLastError(ERROR_GEN_FAILURE); - return FALSE; -} -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesW( - IN HWND hwndParent, - IN LPCWSTR HardwareId, - IN LPCWSTR FullInfPath, - IN DWORD InstallFlags, - OUT PBOOL bRebootRequired OPTIONAL) -{ - UNIMPLEMENTED; - SetLastError(ERROR_GEN_FAILURE); - return FALSE; -} +

1 0

[cwittich] 19263: fixed bug 791
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

fixed bug 791 Modified: trunk/reactos/tools/rbuild/project.cpp _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-16 11:24:41 UTC (rev 19262) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-16 13:24:13 UTC (rev 19263) @@ -227,6 +227,9 @@ } } + if (node == NULL) + node = head->subElements[0]; + throw InvalidBuildFileException ( node->location, "Document contains no 'project' tag." );

1 0

[gvg] 19262: Sebastian Gasiorek <zebasoftis@gmail.com>
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Sebastian Gasiorek <zebasoftis(a)gmail.com> fix for empty control panel applet Change NUM_APPLETS (2) to NUM_APPLETS (1) because there is only one applet. Fixes bug 965. Modified: trunk/reactos/lib/cpl/intl/intl.c _____ Modified: trunk/reactos/lib/cpl/intl/intl.c --- trunk/reactos/lib/cpl/intl/intl.c 2005-11-16 09:41:01 UTC (rev 19261) +++ trunk/reactos/lib/cpl/intl/intl.c 2005-11-16 11:24:41 UTC (rev 19262) @@ -31,7 +31,7 @@ #include "resource.h" -#define NUM_APPLETS (2) +#define NUM_APPLETS (1) LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);

1 0

[hpoussin] 19261: - Initialise DevInst field in SP_DEVINFO_DATA. This field can be sent to CM_* functions (code still commented out in SetupDiCreateDeviceInfoListExW)
by hpoussin＠svn.reactos.com 16 Nov '05

16 Nov '05

- Initialise DevInst field in SP_DEVINFO_DATA. This field can be sent to CM_* functions (code still commented out in SetupDiCreateDeviceInfoListExW) - Fix an error when setting LoadOrderGroup in registry - Some FIXME -> ERR changes Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-16 09:41:01 UTC (rev 19261) @@ -618,7 +618,10 @@ PVOID Reserved) { struct DeviceInfoSet *list; + LPWSTR UNCServerName = NULL; DWORD rc; + //CONFIGRET cr; + HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; TRACE("%p %p %S %p\n", ClassGuid, hwndParent, MachineName, Reserved); @@ -626,7 +629,7 @@ if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (HDEVINFO)INVALID_HANDLE_VALUE; + goto cleanup; } memset(list, 0, sizeof(struct DeviceInfoSet)); @@ -644,17 +647,59 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - HeapFree(GetProcessHeap(), 0, list); - return (HDEVINFO)INVALID_HANDLE_VALUE; + goto cleanup; } + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (strlenW(MachineName) + 3) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + strcpyW(UNCServerName + 2, MachineName); } else { + DWORD Size = MAX_PATH; list->HKLM = HKEY_LOCAL_MACHINE; + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (MAX_PATH + 2) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetComputerNameW(UNCServerName + 2, &Size)) + goto cleanup; } +#if 0 + UNCServerName[0] = UNCServerName[1] = '\\'; + cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); + if (cr != CR_SUCCESS) + { + switch (cr) + { + case CR_OUT_OF_MEMORY: rc = ERROR_NOT_ENOUGH_MEMORY; break; + case CR_INVALID_MACHINENAME: rc = ERROR_INVALID_COMPUTERNAME; break; + default: rc = ERROR_GEN_FAILURE; break; + } + SetLastError(rc); + goto cleanup; + } +#endif InitializeListHead(&list->DriverListHead); InitializeListHead(&list->ListHead); - return (HDEVINFO)list; + + ret = (HDEVINFO)list; + +cleanup: + if (ret == INVALID_HANDLE_VALUE) + { + if (list && list->HKLM != 0 && list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); + HeapFree(GetProcessHeap(), 0, list); + } + HeapFree(GetProcessHeap(), 0, UNCServerName); + return ret; } /*********************************************************************** @@ -691,12 +736,7 @@ memcpy(&DeviceInfoData->ClassGuid, &DevInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } @@ -1806,11 +1846,6 @@ &DevItf->InterfaceClassGuid, sizeof(GUID)); DeviceInterfaceData->Flags = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ DeviceInterfaceData->Reserved = (ULONG_PTR)DevItf; Found = TRUE; } @@ -1888,6 +1923,7 @@ } if (list->HKLM != HKEY_LOCAL_MACHINE) RegCloseKey(list->HKLM); + CM_Disconnect_Machine(list->hMachine); HeapFree(GetProcessHeap(), 0, list); return TRUE; } @@ -1997,6 +2033,7 @@ PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *list; BOOL ret = FALSE; TRACE("(%p, %p, %p, %ld, %p, %p): stub\n", DeviceInfoSet, @@ -2007,7 +2044,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -2041,12 +2078,7 @@ memcpy(&DeviceInfoData->ClassGuid, &deviceInterface->DeviceInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInterface->DeviceInfo; } ret = TRUE; @@ -2323,7 +2355,7 @@ default: { - FIXME("Property 0x%lx not implemented\n", Property); + ERR("Property 0x%lx not implemented\n", Property); SetLastError(ERROR_NOT_SUPPORTED); } } @@ -2472,7 +2504,7 @@ default: { - FIXME("Property 0x%lx not implemented\n", Property); + ERR("Property 0x%lx not implemented\n", Property); SetLastError(ERROR_NOT_SUPPORTED); } } @@ -3010,8 +3042,8 @@ DefaultHandler = SetupDiSelectBestCompatDrv; break; default: - FIXME("Install function %ld not implemented\n", InstallFunction); - SetLastError(ERROR_INVALID_PARAMETER); + ERR("Install function %lu not supported\n", InstallFunction); + SetLastError(ERROR_NOT_SUPPORTED); } InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); @@ -3809,7 +3841,6 @@ { struct DeviceInfoElement *deviceInfo; - /* FIXME: ClassGuid can be NULL */ if (CreateDeviceInfoElement(DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -3825,7 +3856,7 @@ else { memcpy(&DeviceInfoData->ClassGuid, ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; ret = TRUE; } @@ -4728,8 +4759,10 @@ return FALSE; } - /* FIXME: GUID_NULL is not allowed */ - if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL /* FIXME */, &deviceInfo)) + /* FIXME: try to get ClassGUID from registry, instead of + * sending GUID_NULL to CreateDeviceInfoElement + */ + if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL, &deviceInfo)) { RegCloseKey(hKey); return FALSE; @@ -4743,7 +4776,7 @@ if (ret && deviceInfo && DeviceInfoData) { memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; } } _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/install.c 2005-11-16 09:41:01 UTC (rev 19261) @@ -1252,13 +1252,11 @@ { GroupOrder[0] = 0; } + GroupOrder[0]++; if (flags & SPSVCINST_TAGTOFRONT) GroupOrder[1] = tagId; else - { - GroupOrder[0]++; GroupOrder[bufferSize / sizeof(DWORD)] = tagId; - } rc = RegSetValueExW( hGroupOrderListKey, _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-16 09:41:01 UTC (rev 19261) @@ -133,6 +133,7 @@ DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ + HMACHINE hMachine; /* Used in CM_* functions */ /* Reserved Field points to a struct DriverInfoElement */ SP_DEVINSTALL_PARAMS_W InstallParams;

1 0

[sedwards] 19260: remove windef.h inclusion. Its not needed and its non-standard
by sedwards＠svn.reactos.com 16 Nov '05

16 Nov '05

remove windef.h inclusion. Its not needed and its non-standard Modified: trunk/reactos/w32api/include/crt/excpt.h _____ Modified: trunk/reactos/w32api/include/crt/excpt.h --- trunk/reactos/w32api/include/crt/excpt.h 2005-11-16 05:39:32 UTC (rev 19259) +++ trunk/reactos/w32api/include/crt/excpt.h 2005-11-16 05:40:35 UTC (rev 19260) @@ -19,8 +19,6 @@ #include <_mingw.h> #endif -#include <windef.h> - /* * NOTE: The constants structs and typedefs below should be defined in the * Win32 API headers.

1 0

[sedwards] 19259: created crt public headers directory. Moved excpt.h there
by sedwards＠svn.reactos.com 16 Nov '05

16 Nov '05

created crt public headers directory. Moved excpt.h there Modified: trunk/reactos/ReactOS.xml Added: trunk/reactos/w32api/include/crt/ Added: trunk/reactos/w32api/include/crt/excpt.h Deleted: trunk/reactos/w32api/include/excpt.h _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-15 23:07:04 UTC (rev 19258) +++ trunk/reactos/ReactOS.xml 2005-11-16 05:39:32 UTC (rev 19259) @@ -36,6 +36,7 @@ <include>include/drivers</include> <include>include/subsys</include> <include>w32api/include</include> + <include>w32api/include/crt</include> <include>w32api/include/ddk</include> <directory name="apps"> _____ Copied: trunk/reactos/w32api/include/crt/excpt.h (from rev 19258, trunk/reactos/w32api/include/excpt.h) _____ Deleted: trunk/reactos/w32api/include/excpt.h --- trunk/reactos/w32api/include/excpt.h 2005-11-15 23:07:04 UTC (rev 19258) +++ trunk/reactos/w32api/include/excpt.h 2005-11-16 05:39:32 UTC (rev 19259) @@ -1,92 +0,0 @@ -/* - * excpt.h - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Support for operating system level structured exception handling. - * - * NOTE: This is very preliminary stuff. I am also pretty sure it is - * completely Intel specific. - * - */ - -#ifndef _EXCPT_H_ -#define _EXCPT_H_ - -/* All the headers include this file. */ -#if defined(__MINGW32__) -#include <_mingw.h> -#endif - -#include <windef.h> - -/* - * NOTE: The constants structs and typedefs below should be defined in the - * Win32 API headers. - */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -#ifndef RC_INVOKED - -typedef enum { - ExceptionContinueExecution, - ExceptionContinueSearch, - ExceptionNestedException, - ExceptionCollidedUnwind -} EXCEPTION_DISPOSITION; - - -/* - * End of stuff that should be in the Win32 API files. - */ - - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * The type of function that is expected as an exception handler to be - * installed with _try1. - */ -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) - (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); - - -/* - * A macro which installs the supplied exception handler. - * Push the pointer to the new handler onto the stack, - * then push the pointer to the old registration structure (at fs:0) - * onto the stack, then put a pointer to the new registration - * structure (i.e. the current stack pointer) at fs:0. - */ -#define __try1(pHandler) \ - __asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (pHandler)); - -/* - * A macro which (despite its name) *removes* an installed - * exception handler. Should be used only in conjunction with the above - * install routine __try1. - * Move the pointer to the old reg. struct (at the current stack - * position) to fs:0, replacing the pointer we installed above, - * then add 8 to the stack pointer to get rid of the space we - * used when we pushed on our new reg. struct above. Notice that - * the stack must be in the exact state at this point that it was - * after we did _try1 or this will smash things. - */ -#define __except1 \ - __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \ - : : : "%eax"); - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#endif /* _EXCPT_H_ not defined */

1 0

[fireball] 19258: Fix "Devices Parameters" subkey creation in a call to IoOpenDeviceRegistryKey()
by fireball＠svn.reactos.com 15 Nov '05

15 Nov '05

Fix "Devices Parameters" subkey creation in a call to IoOpenDeviceRegistryKey() Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-15 22:44:46 UTC (rev 19257) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-15 23:07:04 UTC (rev 19258) @@ -437,7 +437,7 @@ L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; static WCHAR ClassKeyName[] = L"Control\\Class\\"; static WCHAR EnumKeyName[] = L"Enum\\"; - static WCHAR DeviceParametersKeyName[] = L"Device Parameters\\"; + static WCHAR DeviceParametersKeyName[] = L"Device Parameters"; ULONG KeyNameLength; LPWSTR KeyNameBuffer; UNICODE_STRING KeyName;

1 0

[gedmurphy] 19257: Display more meaningful failure messages
by gedmurphy＠svn.reactos.com 15 Nov '05

15 Nov '05

Display more meaningful failure messages Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-15 22:35:15 UTC (rev 19256) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-15 22:44:46 UTC (rev 19257) @@ -32,6 +32,7 @@ #define _UNICODE + LPCTSTR GetNodeTypeName(UINT NodeType) { switch (NodeType) { @@ -104,6 +105,8 @@ ULONG netOutBufLen; PIP_ADDR_STRING pIPAddr = NULL; + DWORD ErrRet = 0; + /* assign memory for call to GetNetworkParams */ pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) ); netOutBufLen = sizeof(FIXED_INFO); @@ -126,15 +129,17 @@ pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); } - if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) + if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) { - _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + _tprintf(_T("GetAdaptersInfo failed : ")); + DoFormatMessage(ErrRet); return EXIT_FAILURE; } - if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR) + if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) { - _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError()); + _tprintf(_T("GetNetworkParams failed : ")); + DoFormatMessage(ErrRet); return EXIT_FAILURE; }

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