Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 35720: Don't rely on DWIM semantics here, make an actual CC_FILE_SIZES. Noticed it and although strictly speaking it works, it's a little underhanded to just assume that some loose members of one struct can just be treated as another.
by arty＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: arty Date: Wed Aug 27 23:52:04 2008 New Revision: 35720 URL: http://svn.reactos.org/svn/reactos?rev=35720&view=rev Log: Don't rely on DWIM semantics here, make an actual CC_FILE_SIZES. Noticed it and although strictly speaking it works, it's a little underhanded to just assume that some loose members of one struct can just be treated as another. Modified: branches/arty-newcc/drivers/filesystems/cdfs/fcb.c branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c branches/arty-newcc/drivers/filesystems/cdfs/rw.c Modified: branches/arty-newcc/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Wed Aug 27 23:52:04 2008 @@ -223,6 +223,7 @@ PFILE_OBJECT FileObject; NTSTATUS Status; PCCB newCCB; + CC_FILE_SIZES FileSizes; FileObject = IoCreateStreamFileObject(NULL, Vcb->StorageDevice); @@ -240,6 +241,9 @@ newCCB->PtrFileObject = FileObject; Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; Status = STATUS_SUCCESS; CcInitializeCacheMap(FileObject, @@ -411,6 +415,7 @@ PFILE_OBJECT FileObject) { PCCB newCCB; + CC_FILE_SIZES FileSizes; newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); if (newCCB == NULL) @@ -424,11 +429,14 @@ FileObject->FsContext2 = newCCB; newCCB->PtrFileObject = FileObject; Fcb->DevExt = Vcb; + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; if (CdfsFCBIsDirectory(Fcb)) { CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); Modified: branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Aug 27 23:52:04 2008 @@ -309,6 +309,7 @@ PVPB Vpb; NTSTATUS Status; CDINFO CdInfo; + CC_FILE_SIZES FileSizes; DPRINT("CdfsMountVolume() called\n"); @@ -403,8 +404,12 @@ Fcb->Entry.ExtentLocationL = 0; Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; + CcInitializeCacheMap(DeviceExt->StreamFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, TRUE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Wed Aug 27 23:52:04 2008 @@ -76,14 +76,19 @@ { LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; + CC_FILE_SIZES FileSizes; if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; + CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb);

1 0

[janderwald] 35719: - Add Items to Connection ShellFolder Item Context Menu - Are not yet handled
by janderwald＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: janderwald Date: Wed Aug 27 22:52:51 2008 New Revision: 35719 URL: http://svn.reactos.org/svn/reactos?rev=35719&view=rev Log: - Add Items to Connection ShellFolder Item Context Menu - Are not yet handled Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/resource.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Wed Aug 27 22:52:51 2008 @@ -18,4 +18,12 @@ IDS_STATUS_CONNECTED "Verbindung hergestellt" IDS_STATUS_OPERATIONAL "Verbindung hergestellt" + IDS_NET_ACTIVATE "Aktivieren" + IDS_NET_DEACTIVATE "Deaktivieren" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Reparieren" + IDS_NET_CREATELINK "Verknüpfung erstellen" + IDS_NET_DELETE "Löschen" + IDS_NET_RENAME "Umbenennen" + IDS_NET_PROPERTIES "Eigenschaften" END Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Wed Aug 27 22:52:51 2008 @@ -16,5 +16,13 @@ IDS_STATUS_CONNECTING "Acquiring network address" IDS_STATUS_CONNECTED "Connected" IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" END Modified: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Wed Aug 27 22:52:51 2008 @@ -29,3 +29,12 @@ #define IDS_STATUS_CONNECTING 10011 #define IDS_STATUS_CONNECTED 10012 #define IDS_STATUS_OPERATIONAL 10013 + +#define IDS_NET_ACTIVATE 10100 +#define IDS_NET_DEACTIVATE 10101 +#define IDS_NET_STATUS 10102 +#define IDS_NET_REPAIR 10103 +#define IDS_NET_CREATELINK 10104 +#define IDS_NET_DELETE 10105 +#define IDS_NET_RENAME 10106 +#define IDS_NET_PROPERTIES 10107 Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Wed Aug 27 22:52:51 2008 @@ -380,7 +380,7 @@ val = _ILGetValueStruct(pidl); if (val) { - if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) == NOERROR) + if (INetConnection_GetProperties(val->pItem, &pProperties) == NOERROR) { if (pProperties->pszwName) { @@ -628,6 +628,51 @@ return IShellFolder2_Release((IShellFolder2*)This); } +void WINAPI _InsertMenuItemW ( + HMENU hmenu, + UINT indexMenu, + BOOL fByPosition, + UINT wID, + UINT fType, + LPCWSTR dwTypeData, + UINT fState) +{ + MENUITEMINFOW mii; + WCHAR szText[100]; + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + if (fType == MFT_SEPARATOR) + { + mii.fMask = MIIM_ID | MIIM_TYPE; + } + else if (fType == MFT_STRING) + { + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + if ((ULONG_PTR)HIWORD((ULONG_PTR)dwTypeData) == 0) + { + if (LoadStringW(netshell_hInstance, LOWORD((ULONG_PTR)dwTypeData), szText, sizeof(szText)/sizeof(WCHAR))) + { + szText[(sizeof(szText)/sizeof(WCHAR))-1] = 0; + mii.dwTypeData = szText; + } + else + { + return; + } + } + else + { + mii.dwTypeData = (LPWSTR) dwTypeData; + } + mii.fState = fState; + } + + mii.wID = wID; + mii.fType = fType; + InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); +} + /************************************************************************** * ISF_NetConnect_IContextMenu_QueryContextMenu() */ @@ -639,10 +684,52 @@ UINT idCmdLast, UINT uFlags) { - int Count = 1; - //IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + + val = _ILGetValueStruct(This->apidl); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (pProperties->Status == NCS_HARDWARE_DISABLED) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_ACTIVATE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DEACTIVATE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DEACTIVATE), MFS_ENABLED); + + if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED || pProperties->Status == NCS_DISCONNECTED) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_GRAYED); + else if (pProperties->Status == NCS_CONNECTED) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_DEFAULT); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_STATUS, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_ENABLED); + + if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_REPAIR, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_GRAYED); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_REPAIR, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_ENABLED); + + _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_CREATELINK), MFS_ENABLED); + + if (pProperties->dwCharacter & NCCF_ALLOW_REMOVAL) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_ENABLED); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_GRAYED); + + if (pProperties->dwCharacter & NCCF_ALLOW_RENAME) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_ENABLED); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED); + + _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); + + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); }

1 0

[janderwald] 35718: - Use CoTaskMemAlloc / CoTaskMemFree for memory de-allocation - Implement INetConnectionManager, IEnumNetConnection, INetConnection interface for CLSID_ConnectionManager - Refactor Network Connections Shell Folder enumeration code to use the now available COM functionality
by janderwald＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: janderwald Date: Wed Aug 27 21:57:10 2008 New Revision: 35718 URL: http://svn.reactos.org/svn/reactos?rev=35718&view=rev Log: - Use CoTaskMemAlloc / CoTaskMemFree for memory de-allocation - Implement INetConnectionManager, IEnumNetConnection, INetConnection interface for CLSID_ConnectionManager - Refactor Network Connections Shell Folder enumeration code to use the now available COM functionality Added: trunk/reactos/dll/win32/netshell/connectmanager.c (with props) Modified: trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/win32/netshell/enumlist.c trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/netshell.rbuild trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/classfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -54,7 +54,7 @@ if (!refCount) { - HeapFree(GetProcessHeap(),0,This); + CoTaskMemFree(This); return 0; } return refCount; @@ -110,7 +110,7 @@ { IClassFactoryImpl* lpclf; - lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl)); + lpclf = CoTaskMemAlloc(sizeof(IClassFactoryImpl)); lpclf->ref = 1; lpclf->lpVtbl = &dclfvt; lpclf->lpfnCI = lpfnCI; Added: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c (added) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -1,0 +1,693 @@ +#include <precomp.h> + +typedef struct tagINetConnectionItem +{ + struct tagINetConnectionItem * Next; + NETCON_PROPERTIES Props; +}INetConnectionItem, *PINetConnectionItem; + +typedef struct +{ + const INetConnectionManagerVtbl * lpVtbl; + const IEnumNetConnectionVtbl * lpVtblNetConnection; + LONG ref; + PINetConnectionItem pHead; + PINetConnectionItem pCurrent; + +} INetConnectionManagerImpl, *LPINetConnectionManagerImpl; + +typedef struct +{ + const INetConnectionVtbl * lpVtbl; + LONG ref; + NETCON_PROPERTIES Props; +} INetConnectionImpl, *LPINetConnectionImpl; + + +static LPINetConnectionManagerImpl __inline impl_from_EnumNetConnection(IEnumNetConnection *iface) +{ + return (LPINetConnectionManagerImpl)((char *)iface - FIELD_OFFSET(INetConnectionManagerImpl, lpVtblNetConnection)); +} + + +static +HRESULT +WINAPI +INetConnectionManager_fnQueryInterface( + INetConnectionManager * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionManagerImpl * This = (INetConnectionManagerImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetConnectionManager)) + { + *ppvObj = This; + INetConnectionManager_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +INetConnectionManager_fnAddRef( + INetConnectionManager * iface) +{ + INetConnectionManagerImpl * This = (INetConnectionManagerImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +INetConnectionManager_fnRelease( + INetConnectionManager * iface) +{ + INetConnectionManagerImpl * This = (INetConnectionManagerImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +INetConnectionManager_fnEnumConnections( + INetConnectionManager * iface, + NETCONMGR_ENUM_FLAGS Flags, + IEnumNetConnection **ppEnum) +{ + INetConnectionManagerImpl * This = (INetConnectionManagerImpl*)iface; + + if (!ppEnum) + return E_POINTER; + + if (Flags != NCME_DEFAULT) + return E_FAIL; + + *ppEnum = (IEnumNetConnection *)&This->lpVtblNetConnection; + INetConnectionManager_AddRef(iface); + return S_OK; +} + +static const INetConnectionManagerVtbl vt_NetConnectionManager = +{ + INetConnectionManager_fnQueryInterface, + INetConnectionManager_fnAddRef, + INetConnectionManager_fnRelease, + INetConnectionManager_fnEnumConnections, +}; + +/*************************************************************** + * INetConnection Interface + */ + +static +HRESULT +WINAPI +INetConnection_fnQueryInterface( + INetConnection * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionImpl * This = (INetConnectionImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetConnection)) + { + *ppvObj = This; + INetConnection_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +INetConnection_fnAddRef( + INetConnection * iface) +{ + INetConnectionImpl * This = (INetConnectionImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +INetConnection_fnRelease( + INetConnection * iface) +{ + INetConnectionImpl * This = (INetConnectionImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree(This->Props.pszwName); + CoTaskMemFree(This->Props.pszwDeviceName); + CoTaskMemFree(This); + } + return refCount; +} + +static +HRESULT +WINAPI +INetConnection_fnConnect( + INetConnection * iface) +{ + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +INetConnection_fnDisconnect( + INetConnection * iface) +{ + return E_NOTIMPL; +} + + +static +HRESULT +WINAPI +INetConnection_fnDelete( + INetConnection * iface) +{ + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +INetConnection_fnDuplicate( + INetConnection * iface, + LPCWSTR pszwDuplicateName, + INetConnection **ppCon) +{ + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +INetConnection_fnGetProperties( + INetConnection * iface, + NETCON_PROPERTIES **ppProps) +{ +#if 0 + NETCON_PROPERTIES * pProperties; +#endif + INetConnectionImpl * This = (INetConnectionImpl*)iface; + + if (!ppProps) + return E_POINTER; + +#if 1 + *ppProps = &This->Props; +#else + pProperties = CoTaskMemAlloc(sizeof(NETCON_PROPERTIES)); + if (!pProperties) + return E_OUTOFMEMORY; + + CopyMemory(pProperties, &This->Props, sizeof(NETCON_PROPERTIES)); + if (This->Props.pszwName) + { + pProperties->pszwName = CoTaskMemAlloc((wcslen(This->Props.pszwName)+1)*sizeof(WCHAR)); + if (pProperties->pszwName) + wcscpy(pProperties->pszwName, This->Props.pszwName); + } + if (This->Props.pszwDeviceName) + { + pProperties->pszwDeviceName = CoTaskMemAlloc((wcslen(This->Props.pszwDeviceName)+1)*sizeof(WCHAR)); + if (pProperties->pszwDeviceName) + wcscpy(pProperties->pszwDeviceName, This->Props.pszwDeviceName); + } + + *ppProps = pProperties; +#endif + return NOERROR; +} + +static +HRESULT +WINAPI +INetConnection_fnGetUiObjectClassId( + INetConnection * iface, + CLSID *pclsid) +{ + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +INetConnection_fnRename( + INetConnection * iface, + LPCWSTR pszwDuplicateName) +{ + return E_NOTIMPL; +} + + +static const INetConnectionVtbl vt_NetConnection = +{ + INetConnection_fnQueryInterface, + INetConnection_fnAddRef, + INetConnection_fnRelease, + INetConnection_fnConnect, + INetConnection_fnDisconnect, + INetConnection_fnDelete, + INetConnection_fnDuplicate, + INetConnection_fnGetProperties, + INetConnection_fnGetUiObjectClassId, + INetConnection_fnRename +}; + +HRESULT WINAPI IConnection_Constructor (INetConnection **ppv, PINetConnectionItem pItem) +{ + INetConnectionImpl *This; + + if (!ppv) + return E_POINTER; + + This = (INetConnectionImpl *) CoTaskMemAlloc(sizeof (INetConnectionImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = &vt_NetConnection; + + CopyMemory(&This->Props, &pItem->Props, sizeof(NETCON_PROPERTIES)); + + This->Props.pszwName = CoTaskMemAlloc((wcslen(pItem->Props.pszwName)+1)*sizeof(WCHAR)); + if (This->Props.pszwName) + wcscpy(This->Props.pszwName, pItem->Props.pszwName); + + This->Props.pszwDeviceName = CoTaskMemAlloc((wcslen(pItem->Props.pszwDeviceName)+1)*sizeof(WCHAR)); + if (This->Props.pszwDeviceName) + wcscpy(This->Props.pszwDeviceName, pItem->Props.pszwDeviceName); + + *ppv = (INetConnection *)This; + + + return S_OK; +} + + +/*************************************************************** + * IEnumNetConnection Interface + */ + +static +HRESULT +WINAPI +IEnumNetConnection_fnQueryInterface( + IEnumNetConnection * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetConnectionManager)) + { + *ppvObj = This; + INetConnectionManager_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +IEnumNetConnection_fnAddRef( + IEnumNetConnection * iface) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +IEnumNetConnection_fnRelease( + IEnumNetConnection * iface) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +IEnumNetConnection_fnNext( + IEnumNetConnection * iface, + ULONG celt, + INetConnection **rgelt, + ULONG *pceltFetched) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + HRESULT hr; + + if (!pceltFetched || !rgelt) + return E_POINTER; + + if (celt != 1) + return E_FAIL; + + if (!This->pCurrent) + return S_FALSE; + + hr = IConnection_Constructor(rgelt, This->pCurrent); + This->pCurrent = This->pCurrent->Next; + + return hr; +} + +static +HRESULT +WINAPI +IEnumNetConnection_fnSkip( + IEnumNetConnection * iface, + ULONG celt) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + + while(This->pCurrent && celt-- > 0) + This->pCurrent = This->pCurrent->Next; + + if (celt) + return S_FALSE; + else + return NOERROR; + +} + +static +HRESULT +WINAPI +IEnumNetConnection_fnReset( + IEnumNetConnection * iface) +{ + INetConnectionManagerImpl * This = impl_from_EnumNetConnection(iface); + + This->pCurrent = This->pHead; + return NOERROR; +} + +static +HRESULT +WINAPI +IEnumNetConnection_fnClone( + IEnumNetConnection * iface, + IEnumNetConnection **ppenum) +{ + return E_NOTIMPL; +} + +static const IEnumNetConnectionVtbl vt_EnumNetConnection = +{ + IEnumNetConnection_fnQueryInterface, + IEnumNetConnection_fnAddRef, + IEnumNetConnection_fnRelease, + IEnumNetConnection_fnNext, + IEnumNetConnection_fnSkip, + IEnumNetConnection_fnReset, + IEnumNetConnection_fnClone +}; + +static +BOOL +GetAdapterIndexFromNetCfgInstanceId(PIP_ADAPTER_INFO pAdapterInfo, LPWSTR szNetCfg, PDWORD pIndex) +{ + WCHAR szBuffer[50]; + IP_ADAPTER_INFO * pCurrentAdapter; + + pCurrentAdapter = pAdapterInfo; + while(pCurrentAdapter) + { + szBuffer[0] = L'\0'; + if (MultiByteToWideChar(CP_ACP, 0, pCurrentAdapter->AdapterName, -1, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]))) + { + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; + } + if (!wcsicmp(szBuffer, szNetCfg)) + { + *pIndex = pCurrentAdapter->Index; + return TRUE; + } + pCurrentAdapter = pCurrentAdapter->Next; + } + return FALSE; +} + + +static +BOOL +EnumerateINetConnections(INetConnectionManagerImpl *This) +{ + DWORD dwSize, dwResult, dwIndex, dwAdapterIndex, dwShowIcon; + MIB_IFTABLE *pIfTable; + MIB_IFROW IfEntry; + IP_ADAPTER_INFO * pAdapterInfo; + HDEVINFO hInfo; + SP_DEVINFO_DATA DevInfo; + HKEY hSubKey; + WCHAR szNetCfg[50]; + WCHAR szAdapterNetCfg[50]; + WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; + WCHAR szName[130] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"; + PINetConnectionItem pNew; + PINetConnectionItem pCurrent = NULL; + + /* get the IfTable */ + dwSize = 0; + if (GetIfTable(NULL, &dwSize, TRUE) != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + pIfTable = (PMIB_IFTABLE)CoTaskMemAlloc(dwSize); + if (!pIfTable) + return FALSE; + + dwResult = GetIfTable(pIfTable, &dwSize, TRUE); + if (dwResult != NO_ERROR) + { + CoTaskMemFree(pIfTable); + return FALSE; + } + + dwSize = 0; + dwResult = GetAdaptersInfo(NULL, &dwSize); + if (dwResult!= ERROR_BUFFER_OVERFLOW) + { + CoTaskMemFree(pIfTable); + return FALSE; + } + + pAdapterInfo = (PIP_ADAPTER_INFO)CoTaskMemAlloc(dwSize); + if (!pAdapterInfo) + { + CoTaskMemFree(pIfTable); + return FALSE; + } + + if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR) + { + CoTaskMemFree(pIfTable); + CoTaskMemFree(pAdapterInfo); + return FALSE; + } + + + hInfo = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); + if (!hInfo) + { + CoTaskMemFree(pIfTable); + CoTaskMemFree(pAdapterInfo); + return FALSE; + } + + dwIndex = 0; + do + { + ZeroMemory(&DevInfo, sizeof(SP_DEVINFO_DATA)); + DevInfo.cbSize = sizeof(DevInfo); + + /* get device info */ + if (!SetupDiEnumDeviceInfo(hInfo, dwIndex++, &DevInfo)) + break; + + /* get device software registry path */ + if (!SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) + break; + + /* open device registry key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) + break; + + /* query NetCfgInstanceId for current device */ + dwSize = sizeof(szNetCfg); + if (RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + break; + } + RegCloseKey(hSubKey); + /* get the current adapter index from NetCfgInstanceId */ + if (!GetAdapterIndexFromNetCfgInstanceId(pAdapterInfo, szNetCfg, &dwAdapterIndex)) + break; + + /* get detailed adapter info */ + ZeroMemory(&IfEntry, sizeof(IfEntry)); + IfEntry.dwIndex = dwAdapterIndex; + if(GetIfEntry(&IfEntry) != NO_ERROR) + break; + + /* allocate new INetConnectionItem */ + pNew = CoTaskMemAlloc(sizeof(INetConnectionItem)); + if (!pNew) + break; + + ZeroMemory(pNew, sizeof(INetConnectionItem)); + + /* store NetCfgInstanceId */ + CLSIDFromString(szNetCfg, &pNew->Props.guidId); + switch(IfEntry.dwOperStatus) + { + case MIB_IF_OPER_STATUS_NON_OPERATIONAL: + pNew->Props.Status = NCS_HARDWARE_DISABLED; + break; + case MIB_IF_OPER_STATUS_UNREACHABLE: + pNew->Props.Status = NCS_DISCONNECTED; + break; + case MIB_IF_OPER_STATUS_DISCONNECTED: + pNew->Props.Status = NCS_MEDIA_DISCONNECTED; + break; + case MIB_IF_OPER_STATUS_CONNECTING: + pNew->Props.Status = NCS_CONNECTING; + break; + case MIB_IF_OPER_STATUS_CONNECTED: + pNew->Props.Status = NCS_CONNECTED; + break; + case MIB_IF_OPER_STATUS_OPERATIONAL: + pNew->Props.Status = NCS_CONNECTED; + break; + default: + break; + } + + switch(IfEntry.dwType) + { + case IF_TYPE_ETHERNET_CSMACD: + pNew->Props.MediaType = NCM_LAN; + break; + case IF_TYPE_IEEE80211: + pNew->Props.MediaType = NCM_SHAREDACCESSHOST_RAS; + break; + default: + break; + } + /* open network connections details */ + wcscpy(&szName[80], szNetCfg); + wcscpy(&szName[118], L"\\Connection"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + /* retrieve name of connection */ + dwSize = sizeof(szAdapterNetCfg); + if (RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szAdapterNetCfg, &dwSize) == ERROR_SUCCESS) + { + pNew->Props.pszwName = CoTaskMemAlloc((wcslen(szAdapterNetCfg)+1) * sizeof(WCHAR)); + if (pNew->Props.pszwName) + wcscpy(pNew->Props.pszwName, szAdapterNetCfg); + } + dwSize = sizeof(dwShowIcon); + if (RegQueryValueExW(hSubKey, L"ShowIcon", NULL, NULL, (LPBYTE)&dwShowIcon, &dwSize) == ERROR_SUCCESS) + { + if (dwShowIcon) + pNew->Props.dwCharacter |= NCCF_SHOW_ICON; + } + RegCloseKey(hSubKey); + } + if (SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, (PBYTE)szNetCfg, sizeof(szNetCfg)/sizeof(WCHAR), &dwSize)) + { + szNetCfg[(sizeof(szNetCfg)/sizeof(WCHAR))-1] = L'\0'; + pNew->Props.pszwDeviceName = CoTaskMemAlloc((wcslen(szNetCfg)+1) * sizeof(WCHAR)); + if (pNew->Props.pszwDeviceName) + wcscpy(pNew->Props.pszwDeviceName, szNetCfg); + } + + if (pCurrent) + pCurrent->Next = pNew; + else + This->pHead = pNew; + + pCurrent = pNew; + }while(TRUE); + + CoTaskMemFree(pIfTable); + CoTaskMemFree(pAdapterInfo); + SetupDiDestroyDeviceInfoList(hInfo); + + This->pCurrent = This->pHead; + return TRUE; +} + +HRESULT WINAPI INetConnectionManager_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + INetConnectionManagerImpl *sf; + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = (INetConnectionManagerImpl *) CoTaskMemAlloc(sizeof (INetConnectionManagerImpl)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->lpVtbl = &vt_NetConnectionManager; + sf->lpVtblNetConnection = &vt_EnumNetConnection; + + + if (!SUCCEEDED (INetConnectionManager_QueryInterface ((INetConnectionManager*)sf, riid, ppv))) + { + INetConnectionManager_Release((INetConnectionManager*)sf); + return E_NOINTERFACE; + } + + INetConnectionManager_Release((INetConnectionManager*)sf); + EnumerateINetConnections(sf); + return S_OK; +} + + Propchange: trunk/reactos/dll/win32/netshell/connectmanager.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/enumlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/enumlist.c [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -129,7 +129,7 @@ SHFree(pDelete->pidl); SHFree(pDelete); } - HeapFree(GetProcessHeap(),0,This); + CoTaskMemFree(This); } return refCount; } @@ -242,13 +242,15 @@ IEnumIDList * IEnumIDList_Constructor(void) { - IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl)); + IEnumIDListImpl *lpeidl = CoTaskMemAlloc(sizeof(IEnumIDListImpl)); if (lpeidl) { lpeidl->ref = 1; lpeidl->lpVtbl = &eidlvt; + lpeidl->mpCurrent = NULL; + lpeidl->mpLast = NULL; + lpeidl->mpFirst = NULL; } return (IEnumIDList*)lpeidl; @@ -322,34 +324,24 @@ return FALSE; } -LPITEMIDLIST ILCreateNetConnectItem(MIB_IFROW * pRow, LPWSTR szName, LPWSTR szAdapterName) -{ - PIDLDATA tmp; +LPITEMIDLIST ILCreateNetConnectItem(INetConnection * pItem) +{ LPITEMIDLIST pidl; - VALUEStruct * p; - int size = sizeof(struct tagVALUEStruct); - - tmp.type = 0x00; - tmp.u.value.dummy = 0xFF; - - tmp.u.value.dwOperStatus = pRow->dwOperStatus; - tmp.u.value.dwType = pRow->dwType; - tmp.u.value.dwNameLength = wcslen(szName) + 1; - - size += (tmp.u.value.dwNameLength + wcslen(szAdapterName)) * sizeof(WCHAR); - - pidl = (LPITEMIDLIST)SHAlloc(size + 4); + LPPIDLDATA pdata; + int size = sizeof(PIDLDATA); + + pidl = (LPITEMIDLIST)SHAlloc(size + 2 * sizeof(SHITEMID)); if (!pidl) return pidl; - - pidl->mkid.cb = size+2; - memcpy(pidl->mkid.abID, &tmp, 2+sizeof(struct tagVALUEStruct)); - - p = &((PIDLDATA*)pidl->mkid.abID)->u.value; - wcscpy(&p->szName[0], szName); - wcscpy(p->szName + tmp.u.value.dwNameLength, szAdapterName); - - *(WORD*)((char*)pidl+(size+2)) = 0; + ZeroMemory(pidl, size + 2 * sizeof(SHITEMID)); + + pidl->mkid.cb = size + sizeof(SHITEMID); + + pdata = _ILGetDataPointer(pidl); + pdata->type = 0x99; + pdata->u.value.dummy = 0xFF; + pdata->u.value.pItem = (PVOID)pItem; + return pidl; } @@ -357,7 +349,7 @@ { LPPIDLDATA pdata = _ILGetDataPointer(pidl); - if (pdata && pdata->type==0x00) + if (pdata && pdata->type==0x99) return (VALUEStruct*)&(pdata->u.value); return NULL; Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -11,6 +11,10 @@ { &CLSID_NetworkConnections, ISF_NetConnect_Constructor + }, + { + &CLSID_ConnectionManager, + INetConnectionManager_Constructor }, { NULL, Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -23,5 +23,6 @@ <file>enumlist.c</file> <file>netshell.rc</file> <file>classfactory.c</file> + <file>connectmanager.c</file> <file>netshell.spec</file> </module> Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -32,6 +32,7 @@ #include <shtypes.h> #include <setupapi.h> #include <devguid.h> +#include <netcon.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -53,10 +54,7 @@ typedef struct tagVALUEStruct { BYTE dummy; - DWORD dwType; - DWORD dwOperStatus; - DWORD dwNameLength; - WCHAR szName[1]; + INetConnection * pItem; }VALUEStruct; /* globals */ @@ -71,7 +69,7 @@ /* enumlist.c */ IEnumIDList * IEnumIDList_Constructor(void); LPITEMIDLIST _ILCreateNetConnect(); -LPITEMIDLIST ILCreateNetConnectItem(MIB_IFROW * pRow, LPWSTR szName, LPWSTR szAdapterName); +LPITEMIDLIST ILCreateNetConnectItem(INetConnection * pItem); BOOL _ILIsNetConnect (LPCITEMIDLIST pidl); BOOL AddToEnumList(IEnumIDList * iface, LPITEMIDLIST pidl); VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl); @@ -79,4 +77,7 @@ /* classfactory.c */ IClassFactory * IClassFactory_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); +/* connectmanager.c */ +HRESULT WINAPI INetConnectionManager_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); + #endif Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Wed Aug 27 21:57:10 2008 @@ -117,7 +117,7 @@ if (!refCount) { SHFree (This->pidlRoot); - HeapFree (GetProcessHeap(), 0, This); + CoTaskMemFree(This); } return refCount; } @@ -145,140 +145,46 @@ */ static BOOL CreateNetConnectEnumList(IEnumIDList *list, DWORD dwFlags) { - DWORD dwSize, dwResult, dwIndex; - MIB_IFTABLE *pIfTable; - MIB_IFROW IfEntry; - IP_ADAPTER_INFO * pAdapterInfo, *pCurrentAdapter; - HDEVINFO hInfo; - SP_DEVINFO_DATA DevInfo; - HKEY hSubKey; - WCHAR szNetCfg[50]; - WCHAR szAdapterNetCfg[50]; + HRESULT hr; + INetConnectionManager * INetConMan; + IEnumNetConnection * IEnumCon; + INetConnection * INetCon; + ULONG Count; LPITEMIDLIST pidl; - WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; - WCHAR szName[130] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"; - - /* get the IfTable */ - dwSize = 0; - if (GetIfTable(NULL, &dwSize, TRUE) != ERROR_INSUFFICIENT_BUFFER) + + /* get an instance to of IConnectionManager */ + hr = INetConnectionManager_Constructor(NULL, &IID_INetConnectionManager, (LPVOID*)&INetConMan); + if (FAILED(hr)) return FALSE; - pIfTable = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!pIfTable) + hr = INetConnectionManager_EnumConnections(INetConMan, NCME_DEFAULT, &IEnumCon); + if (FAILED(hr)) + { + INetConnectionManager_Release(INetConMan); return FALSE; - - dwResult = GetIfTable(pIfTable, &dwSize, TRUE); - if (dwResult != NO_ERROR) - { - HeapFree(GetProcessHeap(), 0, pIfTable); - return FALSE; - } - - dwSize = 0; - dwResult = GetAdaptersInfo(NULL, &dwSize); - if (dwResult!= ERROR_BUFFER_OVERFLOW) - { - HeapFree(GetProcessHeap(), 0, pIfTable); - return FALSE; - } - - pAdapterInfo = (PIP_ADAPTER_INFO)HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!pAdapterInfo) - { - HeapFree(GetProcessHeap(), 0, pIfTable); - return FALSE; - } - - if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR) - { - HeapFree(GetProcessHeap(), 0, pIfTable); - HeapFree(GetProcessHeap(), 0, pAdapterInfo); - return FALSE; - } - - - hInfo = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); - if (!hInfo) - { - HeapFree(GetProcessHeap(), 0, pIfTable); - HeapFree(GetProcessHeap(), 0, pAdapterInfo); - return FALSE; - } - - dwIndex = 0; + } + do { - ZeroMemory(&DevInfo, sizeof(SP_DEVINFO_DATA)); - DevInfo.cbSize = sizeof(DevInfo); - if (SetupDiEnumDeviceInfo(hInfo, dwIndex++, &DevInfo)) + hr = IEnumNetConnection_Next(IEnumCon, 1, &INetCon, &Count); + if (hr == S_OK) { - if (SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) + pidl = ILCreateNetConnectItem(INetCon); + if (pidl) { - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) - { - dwSize = sizeof(szNetCfg); - dwResult = RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize); - if (dwResult == ERROR_SUCCESS) - { - pCurrentAdapter = pAdapterInfo; - while(pCurrentAdapter) - { - szAdapterNetCfg[0] = L'\0'; - if (MultiByteToWideChar(CP_ACP, 0, pCurrentAdapter->AdapterName, -1, szAdapterNetCfg, sizeof(szAdapterNetCfg)/sizeof(szAdapterNetCfg[0]))) - { - szAdapterNetCfg[(sizeof(szAdapterNetCfg)/sizeof(WCHAR))-1] = L'\0'; - } - if (!wcsicmp(szAdapterNetCfg, szNetCfg)) - { - ZeroMemory(&IfEntry, sizeof(IfEntry)); - IfEntry.dwIndex = pCurrentAdapter->Index; - dwResult = GetIfEntry(&IfEntry); - if (dwResult == NO_ERROR) - { - if (IfEntry.dwType == IF_TYPE_ETHERNET_CSMACD || IfEntry.dwType == IF_TYPE_IEEE80211) - { - wcscpy(&szName[80], szNetCfg); - wcscpy(&szName[118], L"\\Connection"); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) - { - dwSize = sizeof(szAdapterNetCfg); - if (RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szAdapterNetCfg, &dwSize) != ERROR_SUCCESS) - { - if (!SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_FRIENDLYNAME, NULL, (PBYTE)szAdapterNetCfg, sizeof(szAdapterNetCfg)/sizeof(WCHAR), &dwSize)) - { - szDetail[0] = 0; - } - } - RegCloseKey(hSubKey); - } - szNetCfg[0] = 0; - SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, (PBYTE)szNetCfg, sizeof(szNetCfg)/sizeof(WCHAR), &dwSize); - pidl = ILCreateNetConnectItem(&IfEntry, szAdapterNetCfg, szNetCfg); - if (pidl) - { - AddToEnumList(list, pidl); - } - } - } - break; - } - pCurrentAdapter = pCurrentAdapter->Next; - } - } - } + AddToEnumList(list, pidl); } - }else if (GetLastError() == ERROR_NO_MORE_ITEMS) + } + else { break; } }while(TRUE); - HeapFree(GetProcessHeap(), 0, pAdapterInfo); - HeapFree(GetProcessHeap(), 0, pIfTable); - SetupDiDestroyDeviceInfoList(hInfo); - - return FALSE; - + IEnumNetConnection_Release(IEnumCon); + INetConnectionManager_Release(INetConMan); + + return TRUE; } /************************************************************************** @@ -450,6 +356,8 @@ { LPWSTR pszName; HRESULT hr = E_FAIL; + NETCON_PROPERTIES * pProperties; + VALUEStruct * val; //IGenericSFImpl *This = (IGenericSFImpl *)iface; if (!strRet) @@ -469,11 +377,18 @@ } else { - VALUEStruct * val = _ILGetValueStruct(pidl); + val = _ILGetValueStruct(pidl); if (val) { - wcscpy(pszName, val->szName); - hr = S_OK; + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) == NOERROR) + { + if (pProperties->pszwName) + { + wcscpy(pszName, pProperties->pszwName); + hr = S_OK; + } + //NcFreeNetconProperties(pProperties); + } } } @@ -567,6 +482,7 @@ WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; VALUEStruct * val; + NETCON_PROPERTIES * pProperties; if (iColumn >= NETCONNECTSHELLVIEWCOLUMNS) return E_FAIL; @@ -592,10 +508,14 @@ if (!val) return E_FAIL; + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + switch(iColumn) { case COLUMN_TYPE: - if (val->dwType == IF_TYPE_ETHERNET_CSMACD || val->dwType == IF_TYPE_IEEE80211) + if (pProperties->MediaType == NCM_LAN || pProperties->MediaType == NCM_SHAREDACCESSHOST_RAS) { if (LoadStringW(netshell_hInstance, IDS_TYPE_ETHERNET, buffer, MAX_PATH)) { @@ -606,18 +526,16 @@ break; case COLUMN_STATUS: buffer[0] = L'\0'; - if (val->dwOperStatus == MIB_IF_OPER_STATUS_NON_OPERATIONAL) + if (pProperties->Status == NCS_HARDWARE_DISABLED) LoadStringW(netshell_hInstance, IDS_STATUS_NON_OPERATIONAL, buffer, MAX_PATH); - else if (val->dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE) + else if (pProperties->Status == NCS_DISCONNECTED) LoadStringW(netshell_hInstance, IDS_STATUS_UNREACHABLE, buffer, MAX_PATH); - else if (val->dwOperStatus == MIB_IF_OPER_STATUS_DISCONNECTED) + else if (pProperties->Status == NCS_MEDIA_DISCONNECTED) LoadStringW(netshell_hInstance, IDS_STATUS_DISCONNECTED, buffer, MAX_PATH); - else if (val->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTING) + else if (pProperties->Status == NCS_CONNECTING) LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTING, buffer, MAX_PATH); - else if (val->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED) + else if (pProperties->Status == NCS_CONNECTED) LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTED, buffer, MAX_PATH); - else if (val->dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) - LoadStringW(netshell_hInstance, IDS_STATUS_OPERATIONAL, buffer, MAX_PATH); if (buffer[0]) { @@ -627,7 +545,7 @@ } break; case COLUMN_DEVNAME: - wcscpy(buffer, val->szName + val->dwNameLength); + wcscpy(buffer, pProperties->pszwDeviceName); buffer[MAX_PATH-1] = L'\0'; psd->str.uType = STRRET_WSTR; hr = SHStrDupW(buffer, &psd->str.u.pOleStr); @@ -638,7 +556,9 @@ psd->str.uType = STRRET_CSTR; break; } - +#if 0 + NcFreeNetconProperties(pProperties); +#endif return hr; } @@ -885,7 +805,7 @@ if (pUnkOuter) return CLASS_E_NOAGGREGATION; - sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + sf = (IGenericSFImpl *) CoTaskMemAlloc(sizeof (IGenericSFImpl)); if (!sf) return E_OUTOFMEMORY;

1 0

[janderwald] 35717: - Add netcon header
by janderwald＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: janderwald Date: Wed Aug 27 19:07:30 2008 New Revision: 35717 URL: http://svn.reactos.org/svn/reactos?rev=35717&view=rev Log: - Add netcon header Added: trunk/reactos/include/psdk/netcon.h (with props) Added: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h (added) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Wed Aug 27 19:07:30 2008 @@ -1,0 +1,171 @@ +#ifndef __NETCON_H__ +#define __NETCON_H__ + +typedef enum +{ + NCME_DEFAULT = 0 +}NETCONMGR_ENUM_FLAGS; + +typedef enum +{ + NCCF_NONE = 0, + NCCF_ALL_USERS = 0x1, + NCCF_ALLOW_DUPLICATION = 0x2, + NCCF_ALLOW_REMOVAL = 0x4, + NCCF_ALLOW_RENAME = 0x8, + NCCF_SHOW_ICON = 0x10, + NCCF_INCOMING_ONLY = 0x20, + NCCF_OUTGOING_ONLY = 0x40, + NCCF_BRANDED = 0x80, + NCCF_SHARED = 0x100, + NCCF_BRIDGED = 0x200, + NCCF_FIREWALLED = 0x400, + NCCF_DEFAULT = 0x800, + NCCF_HOMENET_CAPABLE = 0x1000, + NCCF_SHARED_PRIVATE = 0x2000, + NCCF_QUARANTINED = 0x4000, + NCCF_RESERVED = 0x8000, + NCCF_BLUETOOTH_MASK = 0xf0000, + NCCF_LAN_MASK = 0xf00000 +}NETCON_CHARACTERISTIC_FLAGS; + + +typedef enum +{ + NCS_DISCONNECTED = 0, + NCS_CONNECTING = NCS_DISCONNECTED + 1, + NCS_CONNECTED = NCS_CONNECTING + 1, + NCS_DISCONNECTING = NCS_CONNECTED + 1, + NCS_HARDWARE_NOT_PRESENT = NCS_DISCONNECTING + 1, + NCS_HARDWARE_DISABLED = NCS_HARDWARE_NOT_PRESENT + 1, + NCS_HARDWARE_MALFUNCTION = NCS_HARDWARE_DISABLED + 1, + NCS_MEDIA_DISCONNECTED = NCS_HARDWARE_MALFUNCTION + 1, + NCS_AUTHENTICATING = NCS_MEDIA_DISCONNECTED + 1, + NCS_AUTHENTICATION_SUCCEEDED= NCS_AUTHENTICATING + 1, + NCS_AUTHENTICATION_FAILED = NCS_AUTHENTICATION_SUCCEEDED + 1, + NCS_INVALID_ADDRESS = NCS_AUTHENTICATION_FAILED + 1, + NCS_CREDENTIALS_REQUIRED = NCS_INVALID_ADDRESS + 1 +}NETCON_STATUS; + +typedef enum +{ + NCT_DIRECT_CONNECT = 0, + NCT_INBOUND = NCT_DIRECT_CONNECT + 1, + NCT_INTERNET = NCT_INBOUND + 1, + NCT_LAN = NCT_INTERNET + 1, + NCT_PHONE = NCT_LAN + 1, + NCT_TUNNEL = NCT_PHONE + 1, + NCT_BRIDGE = NCT_TUNNEL + 1 +}NETCON_TYPE; + + +typedef enum +{ + NCM_NONE = 0, + NCM_DIRECT = NCM_NONE + 1, + NCM_ISDN = NCM_DIRECT + 1, + NCM_LAN = NCM_ISDN + 1, + NCM_PHONE = NCM_LAN + 1, + NCM_TUNNEL = NCM_PHONE + 1, + NCM_PPPOE = NCM_TUNNEL + 1, + NCM_BRIDGE = NCM_PPPOE + 1, + NCM_SHAREDACCESSHOST_LAN = NCM_BRIDGE + 1, + NCM_SHAREDACCESSHOST_RAS = NCM_SHAREDACCESSHOST_LAN + 1 +}NETCON_MEDIATYPE; + + +typedef struct tagNETCON_PROPERTIES +{ + GUID guidId; + LPWSTR pszwName; + LPWSTR pszwDeviceName; + NETCON_STATUS Status; + NETCON_MEDIATYPE MediaType; + DWORD dwCharacter; + CLSID clsidThisObject; + CLSID clsidUiObject; +}NETCON_PROPERTIES; + + +#undef INTERFACE +#define INTERFACE INetConnection +DECLARE_INTERFACE_(INetConnection, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Connect) (THIS) PURE; + STDMETHOD_(HRESULT,Disconnect) (THIS) PURE; + STDMETHOD_(HRESULT,Delete) (THIS) PURE; + STDMETHOD_(HRESULT,Duplicate)(THIS_ LPCWSTR pszwDuplicateName, INetConnection **ppCon) PURE; + STDMETHOD_(HRESULT,GetProperties) (THIS_ NETCON_PROPERTIES **ppProps) PURE; + STDMETHOD_(HRESULT,GetUiObjectClassId) (THIS_ CLSID *pclsid) PURE; + STDMETHOD_(HRESULT,Rename) (THIS_ LPCWSTR pszwNewName) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetConnection_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnection_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnection_Release(p) (p)->lpVtbl->Release(p) +#define INetConnection_Connect(p) (p)->lpVtbl->Connect(p) +#define INetConnection_Disconnect(p) (p)->lpVtbl->Disconnect(p) +#define INetConnection_Delete(p) (p)->lpVtbl->Delete(p) +#define INetConnection_Duplicate(p,a,b) (p)->lpVtbl->Duplicate(p,a,b) +#define INetConnection_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) +#define INetConnection_GetUiObjectClassId(p,a) (p)->lpVtbl->GetUiObjectClassId(p,a) +#define INetConnection_Rename(p,a) (p)->lpVtbl->Rename(p,a) +#endif + +EXTERN_C const IID IID_INetConnection; + + +#undef INTERFACE +#define INTERFACE IEnumNetConnection +DECLARE_INTERFACE_(IEnumNetConnection, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Next)(THIS_ ULONG celt, INetConnection **rgelt, ULONG *pceltFetched) PURE; + STDMETHOD(Skip) (THIS_ ULONG celt) PURE; + STDMETHOD(Reset) (THIS) PURE; + STDMETHOD(Clone) (THIS_ IEnumNetConnection **ppenum) PURE; +}; +#undef INTERFACE + +EXTERN_C const IID IID_IEnumNetConnection; + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IEnumNetConnection_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IEnumNetConnection_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IEnumNetConnection_Release(p) (p)->lpVtbl->Release(p) +#define IEnumNetConnection_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) +#define IEnumNetConnection_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#define IEnumNetConnection_Reset(p) (p)->lpVtbl->Reset(p) +#define IEnumNetConnection_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif + +#undef INTERFACE +#define INTERFACE INetConnectionManager +DECLARE_INTERFACE_(INetConnectionManager, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,EnumConnections) (THIS_ NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define INetConnectionManager_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnectionManager_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnectionManager_Release(p) (p)->lpVtbl->Release(p) +#define INetConnectionManager_EnumConnections(p,a,b) (p)->lpVtbl->EnumConnections(p,a,b) +#endif + +EXTERN_C const CLSID CLSID_ConnectionManager; +EXTERN_C const IID IID_INetConnectionManager; + +#endif Propchange: trunk/reactos/include/psdk/netcon.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 35716: - Add IIDs and CLSID for netshell
by janderwald＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: janderwald Date: Wed Aug 27 19:03:28 2008 New Revision: 35716 URL: http://svn.reactos.org/svn/reactos?rev=35716&view=rev Log: - Add IIDs and CLSID for netshell Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=35… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Wed Aug 27 19:03:28 2008 @@ -95,6 +95,9 @@ DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); @@ -123,3 +126,4 @@ DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ConnectionManager, 0xBA126AD1,0x2166, 0x11D1,0xB1,0xD0,0x0,0x80,0x5F,0xC1,0x27,0x0E);

1 0

[tkreuzer] 35715: Merge MMerge 34969 from ros-amd64-bringup branch: - Fix parameter types of NtQuery/SetSystemInformation, ExInitialize(N)PagedLookasideList, KeBugCheckWithTf, IoGetstackLimits - Use ALIGN_UP_POINTER for a pointer - Fix pointer to ULONG cast
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 17:40:17 2008 New Revision: 35715 URL: http://svn.reactos.org/svn/reactos?rev=35715&view=rev Log: Merge MMerge 34969 from ros-amd64-bringup branch: - Fix parameter types of NtQuery/SetSystemInformation, ExInitialize(N)PagedLookasideList, KeBugCheckWithTf, IoGetstackLimits - Use ALIGN_UP_POINTER for a pointer - Fix pointer to ULONG cast Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -390,8 +390,8 @@ NtQuerySystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, OUT PVOID SystemInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + IN ULONG Length, + OUT PULONG ResultLength ); NTSYSCALLAPI @@ -539,7 +539,7 @@ NtSetSystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, IN PVOID SystemInformation, - IN SIZE_T SystemInformationLength + IN ULONG SystemInformationLength ); NTSYSCALLAPI Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -222,7 +222,7 @@ IN PALLOCATE_FUNCTION Allocate OPTIONAL, IN PFREE_FUNCTION Free OPTIONAL, IN ULONG Flags, - IN ULONG Size, + IN SIZE_T Size, IN ULONG Tag, IN USHORT Depth) { @@ -274,7 +274,7 @@ IN PALLOCATE_FUNCTION Allocate OPTIONAL, IN PFREE_FUNCTION Free OPTIONAL, IN ULONG Flags, - IN ULONG Size, + IN SIZE_T Size, IN ULONG Tag, IN USHORT Depth) { Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -742,10 +742,10 @@ NTAPI KeBugCheckWithTf( ULONG BugCheckCode, - ULONG BugCheckParameter1, - ULONG BugCheckParameter2, - ULONG BugCheckParameter3, - ULONG BugCheckParameter4, + ULONG_PTR BugCheckParameter1, + ULONG_PTR BugCheckParameter2, + ULONG_PTR BugCheckParameter3, + ULONG_PTR BugCheckParameter4, PKTRAP_FRAME Tf ); Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -214,10 +214,10 @@ } /* Align the buffer */ - StringBuffer = (PVOID)ALIGN_UP(StringBuffer, WCHAR); + StringBuffer = ALIGN_UP_POINTER(StringBuffer, WCHAR); /* Set the offset for the driver's name to the current buffer */ - ErrorMessage->DriverNameOffset = (ULONG)(StringBuffer - + ErrorMessage->DriverNameOffset = (ULONG_PTR)(StringBuffer - (ULONG_PTR)ErrorMessage); /* Check how much space we have left for the device string */ Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -48,8 +48,8 @@ */ VOID NTAPI -IoGetStackLimits(OUT PULONG LowLimit, - OUT PULONG HighLimit) +IoGetStackLimits(OUT PULONG_PTR LowLimit, + OUT PULONG_PTR HighLimit) { PKPRCB Prcb = KeGetCurrentPrcb(); ULONG_PTR DpcStack = (ULONG_PTR)(Prcb->DpcStack); Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Wed Aug 27 17:40:17 2008 @@ -104,7 +104,7 @@ Prcb = KeGetCurrentPrcb(); NewCookie = Prcb->MmPageFaultCount ^ Prcb->InterruptTime ^ SystemTime.u.LowPart ^ SystemTime.u.HighPart ^ - (ULONG)&SystemTime; + (ULONG_PTR)&SystemTime; /* Set the new cookie*/ InterlockedCompareExchange((LONG*)&SharedUserData->Cookie, @@ -333,6 +333,9 @@ #elif defined(_M_ARM) Thread->StartAddress = (PVOID)ThreadContext->Pc; Thread->Win32StartAddress = (PVOID)ThreadContext->R0; +#elif defined(_M_AMD64) + Thread->StartAddress = (PVOID)ThreadContext->Rip; + Thread->Win32StartAddress = (PVOID)ThreadContext->Rax; #else #error Unknown architecture #endif

1 0

[cgutman] 35714: - Don't handle OSK_EINPROGRESS since TCPTranslateError already has done the conversion to STATUS_PENDING
by cgutman＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: cgutman Date: Wed Aug 27 16:45:45 2008 New Revision: 35714 URL: http://svn.reactos.org/svn/reactos?rev=35714&view=rev Log: - Don't handle OSK_EINPROGRESS since TCPTranslateError already has done the conversion to STATUS_PENDING Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Aug 27 16:45:45 2008 @@ -592,10 +592,7 @@ TcpipRecursiveMutexLeave( &TCPLock ); - if( Status == OSK_EINPROGRESS ) - return STATUS_PENDING; - else - return Status; + return Status; } NTSTATUS TCPDisconnect

1 0

[tkreuzer] 35713: MMerge 34827 from ros-amd64-bringup branch: - fix parameter types of NtAllocateVirtualMemory and NtFreeVirtualMemory
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 15:56:16 2008 New Revision: 35713 URL: http://svn.reactos.org/svn/reactos?rev=35713&view=rev Log: MMerge 34827 from ros-amd64-bringup branch: - fix parameter types of NtAllocateVirtualMemory and NtFreeVirtualMemory Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Aug 27 15:56:16 2008 @@ -523,7 +523,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, IN OUT PVOID* UBaseAddress, IN ULONG ZeroBits, - IN OUT PULONG URegionSize, + IN OUT PSIZE_T URegionSize, IN ULONG AllocationType, IN ULONG Protect) /* @@ -900,7 +900,7 @@ NTSTATUS STDCALL NtFreeVirtualMemory(IN HANDLE ProcessHandle, IN PVOID* PBaseAddress, - IN PULONG PRegionSize, + IN PSIZE_T PRegionSize, IN ULONG FreeType) /* * FUNCTION: Frees a range of virtual memory

1 0

[tkreuzer] 35712: Merge 34714, 34716, 34718, 34720 from ros-amd64-bringup branch: recyclebin: DWORD -> SIZE_T and SIZE_T -> DWORD rtl: - cast AtomName to ULONG_PTR instead of ULONG - RtlQueryProcessdebugInformation(): cast teb->ClientId.UniqueProcess to ULONG_PTR for assignment to Pid. - vs(w)nprintf: cast argument to ULONG_PTR instead of unsigned long for a %p crt: - int -> intptr_t - unsigned long -> uintptr_t - #undef _MINGW_IMPORT in ctype.c, to avoid warnings scrnsafe: rename _toul to _toul
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 15:27:32 2008 New Revision: 35712 URL: http://svn.reactos.org/svn/reactos?rev=35712&view=rev Log: Merge 34714, 34716, 34718, 34720 from ros-amd64-bringup branch: recyclebin: DWORD -> SIZE_T and SIZE_T -> DWORD rtl: - cast AtomName to ULONG_PTR instead of ULONG - RtlQueryProcessdebugInformation(): cast teb->ClientId.UniqueProcess to ULONG_PTR for assignment to Pid. - vs(w)nprintf: cast argument to ULONG_PTR instead of unsigned long for a %p crt: - int -> intptr_t - unsigned long -> uintptr_t - #undef _MINGW_IMPORT in ctype.c, to avoid warnings scrnsafe: rename _toul to _toulptr and make it return an ULONG_PTR Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c trunk/reactos/lib/rtl/atom.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/srw.c trunk/reactos/lib/rtl/swprintf.c trunk/reactos/lib/sdk/crt/process/_system.c trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/string/ctype.c trunk/reactos/lib/sdk/scrnsave/scrnsave.c Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -564,7 +564,7 @@ LPWSTR FileName; /* Pointer into BufferName buffer */ LPCSTR DesktopIniContents = "[.ShellClassInfo]\r\nCLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"; INFO2_HEADER Info2Contents[] = { { 5, 0, 0, 0x320, 0 } }; - SIZE_T BytesToWrite, BytesWritten, Needed; + DWORD BytesToWrite, BytesWritten, Needed; HANDLE hFile = INVALID_HANDLE_VALUE; HRESULT hr; @@ -676,7 +676,7 @@ HANDLE tokenHandle = INVALID_HANDLE_VALUE; PTOKEN_USER TokenUserInfo = NULL; LPWSTR StringSid = NULL, p; - SIZE_T Needed, DirectoryLength; + DWORD Needed, DirectoryLength; INT len; HRESULT hr; Modified: trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -191,9 +191,9 @@ static HRESULT STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_GetFileName( IN IRecycleBinFile *This, - IN DWORD BufferSize, + IN SIZE_T BufferSize, IN OUT LPWSTR Buffer, - OUT DWORD *RequiredSize) + OUT SIZE_T *RequiredSize) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); DWORD dwRequired; Modified: trunk/reactos/lib/rtl/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/atom.c?rev=35712&r… ============================================================================== --- trunk/reactos/lib/rtl/atom.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/atom.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -90,9 +90,9 @@ DPRINT("RtlpCheckIntegerAtom(AtomName '%S' AtomValue %p)\n", AtomName, AtomValue); - if (!((ULONG)AtomName & 0xFFFF0000)) - { - LoValue = (USHORT)((ULONG)AtomName & 0xFFFF); + if (!((ULONG_PTR)AtomName & 0xFFFF0000)) + { + LoValue = (USHORT)((ULONG_PTR)AtomName & 0xFFFF); if (LoValue == 0) LoValue = 0xC000; Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=35… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG) NtCurrentTeb()->ClientId.UniqueProcess; + ULONG Pid = (ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); @@ -319,7 +319,7 @@ Buf->TargetProcessHandle = NtCurrentProcess(); ClientId.UniqueThread = 0; - ClientId.UniqueProcess = (HANDLE)ProcessId; + ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)ProcessId; InitializeObjectAttributes(&ObjectAttributes, NULL, 0, Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=3571… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -577,7 +577,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (ULONG_PTR) va_arg(args, void *), 16, field_width, precision, flags); continue; Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=35712&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -44,7 +44,7 @@ RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) #define RTL_SRWLOCK_BITS 4 -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(_M_AMD64) /* This macro will cause the code to assert if compiled with a buggy version of GCC that doesn't align the wait blocks properly on the stack! */ #define ASSERT_SRW_WAITBLOCK(ptr) \ Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=357… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -575,7 +575,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (ULONG_PTR) va_arg(args, void *), 16, field_width, precision, flags); continue; Modified: trunk/reactos/lib/sdk/crt/process/_system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/_syste… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/_system.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/_system.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -108,7 +108,7 @@ CloseHandle(ProcessInformation.hThread); // system should wait untill the calling process is finished - _cwait(&nStatus,(int)ProcessInformation.hProcess,0); + _cwait(&nStatus,(intptr_t)ProcessInformation.hProcess,0); CloseHandle(ProcessInformation.hProcess); return nStatus; Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -182,7 +182,7 @@ return str; } -static int +static intptr_t do_spawnT(int mode, const _TCHAR* cmdname, const _TCHAR* args, const _TCHAR* envp) { STARTUPINFO StartupInfo = {0}; @@ -304,7 +304,7 @@ { case _P_NOWAIT: case _P_NOWAITO: - return((int)ProcessInformation.hProcess); + return((intptr_t)ProcessInformation.hProcess); case _P_OVERLAY: CloseHandle(ProcessInformation.hProcess); _exit(0); @@ -317,7 +317,7 @@ CloseHandle(ProcessInformation.hProcess); return( 0); } - return( (int)ProcessInformation.hProcess); + return( (intptr_t)ProcessInformation.hProcess); } /* Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -1,4 +1,6 @@ #include <string.h> +#undef __MINGW_IMPORT +#define __MINGW_IMPORT #include <ctype.h> #undef _pctype Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Wed Aug 27 15:27:32 2008 @@ -36,10 +36,10 @@ #define ISNUM(c) ((c) >= '0' && c <= '9') -static unsigned long _toul(const TCHAR *s) -{ - unsigned long res; - unsigned long n; +static ULONG_PTR _toulptr(const TCHAR *s) +{ + ULONG_PTR res; + ULONG_PTR n; const TCHAR *p; for (p = s; *p; p++) @@ -223,7 +223,7 @@ fChildPreview = TRUE; while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); + hParent = (HWND) _toulptr(p); if (hParent && IsWindow(hParent)) return LaunchScreenSaver(hParent);

1 0

[cfinck] 35711: Add the "wine" include directory for the user32 Wine test and remove ROS-specific additions to some files. Fixes the user32_winetest and thus rostests build under Unix.
by cfinck＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: cfinck Date: Wed Aug 27 15:10:45 2008 New Revision: 35711 URL: http://svn.reactos.org/svn/reactos?rev=35711&view=rev Log: Add the "wine" include directory for the user32 Wine test and remove ROS-specific additions to some files. Fixes the user32_winetest and thus rostests build under Unix. Modified: trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/user32.rbuild Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… ============================================================================== --- trunk/rostests/winetests/user32/input.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/input.c [iso-8859-1] Wed Aug 27 15:10:45 2008 @@ -49,7 +49,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/winuser.h" +#include "winuser.h" #include "wine/test.h" Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Wed Aug 27 15:10:45 2008 @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser.h" #include "winuser.h" #include "winnls.h" Modified: trunk/rostests/winetests/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/user32.r… ============================================================================== --- trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] Wed Aug 27 15:10:45 2008 @@ -3,6 +3,7 @@ <group> <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true"> <include base="user32_winetest">.</include> + <include base="ReactOS">include/reactos/wine</include> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x609</define>

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