Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[pschweitzer] 36730: Protect notifications initialization stuff using PSEH
by pschweitzer＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: pschweitzer Date: Sun Oct 12 03:09:30 2008 New Revision: 36730 URL: http://svn.reactos.org/svn/reactos?rev=36730&view=rev Log: Protect notifications initialization stuff using PSEH Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Oct 12 03:09:30 2008 @@ -584,11 +584,20 @@ } VolumeFcb->Flags |= VCB_IS_DIRTY; + Status = STATUS_SUCCESS; + /* Initialize notify sync */ - InitializeListHead(&(DeviceExt->NotifyList)); - FsRtlNotifyInitializeSync(&(DeviceExt->NotifySync)); - - Status = STATUS_SUCCESS; + _SEH_TRY + { + InitializeListHead(&(DeviceExt->NotifyList)); + FsRtlNotifyInitializeSync(&(DeviceExt->NotifySync)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + ByeBye: if (!NT_SUCCESS(Status))

1 0

[pschweitzer] 36729: Fixed build...
by pschweitzer＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: pschweitzer Date: Sun Oct 12 03:01:00 2008 New Revision: 36729 URL: http://svn.reactos.org/svn/reactos?rev=36729&view=rev Log: Fixed build... Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun Oct 12 03:01:00 2008 @@ -263,7 +263,7 @@ FsRtlNotifyFilterReportChange FsRtlNotifyFullChangeDirectory@40 FsRtlNotifyFullReportChange -FsRtlNotifyInitializeSync +FsRtlNotifyInitializeSync@4 FsRtlNotifyReportChange FsRtlNotifyUninitializeSync@4 FsRtlNotifyVolumeEvent

1 0

[pschweitzer] 36728: Let's initialize notifications in fastfat
by pschweitzer＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: pschweitzer Date: Sun Oct 12 02:48:29 2008 New Revision: 36728 URL: http://svn.reactos.org/svn/reactos?rev=36728&view=rev Log: Let's initialize notifications in fastfat Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Oct 12 02:48:29 2008 @@ -585,10 +585,8 @@ VolumeFcb->Flags |= VCB_IS_DIRTY; /* Initialize notify sync */ -#if 0 InitializeListHead(&(DeviceExt->NotifyList)); FsRtlNotifyInitializeSync(&(DeviceExt->NotifySync)); -#endif Status = STATUS_SUCCESS; ByeBye:

1 0

[pschweitzer] 36727: Fix FsRtlNotifyInitializeSync implementation Thanks to Alex and James
by pschweitzer＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: pschweitzer Date: Sun Oct 12 02:46:20 2008 New Revision: 36727 URL: http://svn.reactos.org/svn/reactos?rev=36727&view=rev Log: Fix FsRtlNotifyInitializeSync implementation Thanks to Alex and James Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Sun Oct 12 02:46:20 2008 @@ -14,16 +14,9 @@ typedef struct _INT_NOTIFY_SYNC { - ULONG Unknown0; - ULONG Unknown1; - ULONG Unknown2; - USHORT Unknown3; - USHORT Unknown4; - ULONG Unknown5; - LIST_ENTRY Unknown6; - ULONG Unknown7; - ULONG Unknown8; - ULONG Unknown9; + FAST_MUTEX FastMutex; + ULONG_PTR OwningThread; + ULONG OwnerCount; } INT_NOTIFY_SYNC, * PINT_NOTIFY_SYNC; /* PUBLIC FUNCTIONS **********************************************************/ @@ -387,15 +380,9 @@ *NotifySync = NULL; IntNotifySync = FsRtlAllocatePoolWithTag(NonPagedPool, sizeof(INT_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); - IntNotifySync->Unknown1 = 0; - IntNotifySync->Unknown2 = 0; - IntNotifySync->Unknown5 = 0; - IntNotifySync->Unknown0 = 1; - IntNotifySync->Unknown3 = 1; - IntNotifySync->Unknown4 = 4; - InitializeListHead(&(IntNotifySync->Unknown6)); - IntNotifySync->Unknown8 = 0; - IntNotifySync->Unknown9 = 0; + ExInitializeFastMutex(&(IntNotifySync->FastMutex)); + IntNotifySync->OwningThread = 0; + IntNotifySync->OwnerCount = 0; *NotifySync = IntNotifySync; }

1 0

[sserapion] 36726: Stub setjmp and longjmp on freetype. This hack should be removed.
by sserapion＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: sserapion Date: Sun Oct 12 02:17:20 2008 New Revision: 36726 URL: http://svn.reactos.org/svn/reactos?rev=36726&view=rev Log: Stub setjmp and longjmp on freetype. This hack should be removed. Added: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ (with props) branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s (with props) Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 12 02:17:20 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s (added) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s [iso-8859-1] Sun Oct 12 02:17:20 2008 @@ -1,0 +1,8 @@ + +.globl __setjmp +__setjmp: + ret + +.globl _longjmp +_longjmp: + ret Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Sun Oct 12 02:17:20 2008 @@ -7,6 +7,7 @@ <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> <define name="FT2_BUILD_LIBRARY" /> + <library>libcntpr</library> <if property="NSWPAT" value="0"> <define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" /> </if> @@ -15,9 +16,16 @@ </if> <library>ntoskrnl</library> <library>libcntpr</library> + <if property="ARCH" value="i386"> <directory name="i386"> <file>setjmplongjmp.s</file> </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>setjmplongjmp.s</file> + </directory> + </if> <directory name="src"> <directory name="base"> <file>ftsystem.c</file>

1 0

[sserapion] 36725: Fix: "1" may not appear in macro parameter list
by sserapion＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: sserapion Date: Sun Oct 12 01:58:31 2008 New Revision: 36725 URL: http://svn.reactos.org/svn/reactos?rev=36725&view=rev Log: Fix: "1" may not appear in macro parameter list Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddi.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddi.h [iso-8859-1] Sun Oct 12 01:58:31 2008 @@ -2472,9 +2472,9 @@ #define FLOATOBJ_Equal(pf, pf1) (*(pf) == *(pf1)) #define FLOATOBJ_GreaterThan(pf, pf1) (*(pf) > *(pf1)) #define FLOATOBJ_LessThan(pf, pf1) (*(pf) < *(pf1)) -#define FLOATOBJ_EqualLong(pf, 1) (*(pf) == (FLOAT)(1)) -#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1)) -#define FLOATOBJ_LessThanLong(pf, 1) (*(pf) < (FLOAT)(1)) +#define FLOATOBJ_EqualLong(pf, l) (*(pf) == (FLOAT)(l)) +#define FLOATOBJ_GreaterThanLong(pf, l) (*(pf) > (FLOAT)(l)) +#define FLOATOBJ_LessThanLong(pf, l) (*(pf) < (FLOAT)(l)) #endif

1 0

[mjmartin] 36724: - Implement REnumServicesStatusA - REnumServicesStatusW: Dont try to access lpResumeHandle if it is NULL
by mjmartin＠svn.reactos.org 12 Oct '08

12 Oct '08

Author: mjmartin Date: Sat Oct 11 19:02:17 2008 New Revision: 36724 URL: http://svn.reactos.org/svn/reactos?rev=36724&view=rev Log: - Implement REnumServicesStatusA - REnumServicesStatusW: Dont try to access lpResumeHandle if it is NULL Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Oct 11 19:02:17 2008 @@ -2200,7 +2200,7 @@ DWORD dwRequiredSize; DWORD dwServiceCount; DWORD dwSize; - DWORD dwLastResumeCount; + DWORD dwLastResumeCount = 0; LPENUM_SERVICE_STATUSW lpStatusPtr; LPWSTR lpStringPtr; @@ -2214,6 +2214,21 @@ { DPRINT1("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; + } + + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; } /* Check access rights */ @@ -2225,10 +2240,7 @@ return ERROR_ACCESS_DENIED; } - *pcbBytesNeeded = 0; - *lpServicesReturned = 0; - - dwLastResumeCount = *lpResumeHandle; + if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle; /* FIXME: Lock the service list shared */ @@ -2306,7 +2318,7 @@ DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - *lpResumeHandle = dwLastResumeCount; + if (lpResumeHandle) *lpResumeHandle = dwLastResumeCount; *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; @@ -3357,8 +3369,206 @@ LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeHandle) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PMANAGER_HANDLE hManager; + PSERVICE lpService; + DWORD dwError = ERROR_SUCCESS; + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + DWORD dwState; + DWORD dwRequiredSize; + DWORD dwServiceCount; + DWORD dwSize; + DWORD dwLastResumeCount = 0; + LPENUM_SERVICE_STATUSA lpStatusPtr; + LPSTR lpStringPtr; + + DPRINT("REnumServicesStatusA() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hManager = (PMANAGER_HANDLE)hSCManager; + if (!hManager || hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT1("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT1("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle; + + /* FIXME: Lock the service list shared */ + + lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); + if (lpService == NULL) + { + dwError = ERROR_SUCCESS; + goto Done; + } + + dwRequiredSize = 0; + dwServiceCount = 0; + + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + dwSize = sizeof(ENUM_SERVICE_STATUSA) + + ((wcslen(CurrentService->lpServiceName) + 1)) + + ((wcslen(CurrentService->lpDisplayName) + 1)); + + if (dwRequiredSize + dwSize > dwBufSize) + { + DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); + break; + } + + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; + } + + DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); + DPRINT("dwServiceCount: %lu\n", dwServiceCount); + + for (; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + dwRequiredSize += (sizeof(ENUM_SERVICE_STATUSA) + + ((wcslen(CurrentService->lpServiceName) + 1)) + + ((wcslen(CurrentService->lpDisplayName) + 1))); + + dwError = ERROR_MORE_DATA; + } + + DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); + + if (lpResumeHandle) *lpResumeHandle = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; + *pcbBytesNeeded = dwRequiredSize; + + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpBuffer; + lpStringPtr = (LPSTR)((ULONG_PTR)lpBuffer + + dwServiceCount * sizeof(ENUM_SERVICE_STATUSA)); + + dwRequiredSize = 0; + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + dwSize = sizeof(ENUM_SERVICE_STATUSA) + + ((wcslen(CurrentService->lpServiceName) + 1)) + + ((wcslen(CurrentService->lpDisplayName) + 1)); + + if (dwRequiredSize + dwSize > dwBufSize) + break; + + /* Copy the service name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpServiceName, + -1, + lpStringPtr, + wcslen(CurrentService->lpServiceName), + 0, + 0); + lpStatusPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpDisplayName, + -1, + lpStringPtr, + wcslen(CurrentService->lpDisplayName), + 0, + 0); + lpStatusPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatus, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); + + lpStatusPtr++; + dwRequiredSize += dwSize; + } + +Done:; + /* FIXME: Unlock the service list */ + + DPRINT("REnumServicesStatusA() done (Error %lu)\n", dwError); + + return dwError; }

1 0

[janderwald] 36723: - Fix another bug...
by janderwald＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: janderwald Date: Sat Oct 11 14:40:56 2008 New Revision: 36723 URL: http://svn.reactos.org/svn/reactos?rev=36723&view=rev Log: - Fix another bug... Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Oct 11 14:40:56 2008 @@ -2826,7 +2826,7 @@ CopyIpAddrString(&pCurrentAdapter->IpAddressList, &pCurSettings->Ip, SUBMASK, NULL); CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL); //FIXME } - + uLength = 0; if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) == ERROR_BUFFER_OVERFLOW) { pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength);

1 0

[janderwald] 36722: - Fix MultiByteToWideChar api parameters (thanks Christoph) - Fix bugs in EnumNameServers
by janderwald＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: janderwald Date: Sat Oct 11 14:30:45 2008 New Revision: 36722 URL: http://svn.reactos.org/svn/reactos?rev=36722&view=rev Log: - Fix MultiByteToWideChar api parameters (thanks Christoph) - Fix bugs in EnumNameServers Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sat Oct 11 14:30:45 2008 @@ -1471,13 +1471,10 @@ * DWORD * */ -static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, - PWCHAR Server, - PVOID Data ) +static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server, PVOID Data) { IP_ADDR_STRING *pNext; PNAME_SERVER_LIST_CONTEXT Context = (PNAME_SERVER_LIST_CONTEXT)Data; - if (!Context->NumServers) { @@ -1518,7 +1515,7 @@ if (!ifName) return ERROR_INVALID_PARAMETER; - MultiByteToWideChar(CP_ACP, 0, ifName, -1, &keyname[62], sizeof(keyname) - (63 * sizeof(WCHAR))); + MultiByteToWideChar(CP_ACP, 0, ifName, -1, &keyname[62], sizeof(keyname)/sizeof(WCHAR) - 63); HeapFree(GetProcessHeap(), 0, (LPVOID)ifName); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &hkey) != ERROR_SUCCESS) Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Sat Oct 11 14:30:45 2008 @@ -136,19 +136,20 @@ malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); if (NameServer) { memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); + (ch - LastNameStart) * sizeof(WCHAR)); NameServer[ch - LastNameStart] = 0; cb( Interface, NameServer, Data ); free(NameServer); + LastNameStart = ch +1; } } LastNameStart = ch + 1; /* The first one after the comma */ } } if (ch - LastNameStart > 0) { /* A last name? */ - PWCHAR NameServer = malloc(ch - LastNameStart + 1); + PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart)); + (ch - LastNameStart) * sizeof(WCHAR)); NameServer[ch - LastNameStart] = 0; cb( Interface, NameServer, Data ); free(NameServer);

1 0

[janderwald] 36721: - Fix 2 bugs in the CopyIpAddrString leading to duplicate displayment of the same ip /dns /gw address
by janderwald＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: janderwald Date: Sat Oct 11 14:28:39 2008 New Revision: 36721 URL: http://svn.reactos.org/svn/reactos?rev=36721&view=rev Log: - Fix 2 bugs in the CopyIpAddrString leading to duplicate displayment of the same ip /dns /gw address Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Oct 11 14:28:39 2008 @@ -2363,11 +2363,11 @@ break; } ZeroMemory(pNew, sizeof(IP_ADDR)); - pNew->IpAddress = GetIpAddressFromStringA(pSrc->IpAddress.String); + pNew->IpAddress = GetIpAddressFromStringA(pCurrent->IpAddress.String); if (Type == SUBMASK) { - pNew->u.Subnetmask = GetIpAddressFromStringA(pSrc->IpMask.String); + pNew->u.Subnetmask = GetIpAddressFromStringA(pCurrent->IpMask.String); } else if (Type == METRIC) { @@ -2385,6 +2385,7 @@ pLast = pNew; pCurrent = pCurrent->Next; + } pLast->Next = NULL; return S_OK;

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
52
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 October 2008