Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 37114: * Implement disabling network adapter (WIP, not yet supported)
by janderwald＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: janderwald Date: Fri Oct 31 15:27:30 2008 New Revision: 37114 URL: http://svn.reactos.org/svn/reactos?rev=37114&view=rev Log: * Implement disabling network adapter (WIP, not yet supported) Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Fri Oct 31 15:27:30 2008 @@ -556,6 +556,157 @@ return FALSE; } +BOOL +FindNetworkAdapter(HDEVINFO hInfo, SP_DEVINFO_DATA *pDevInfo, LPWSTR pGuid) +{ + DWORD dwIndex, dwSize; + HKEY hSubKey; + WCHAR szNetCfg[50]; + WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; + + dwIndex = 0; + do + { + + ZeroMemory(pDevInfo, sizeof(SP_DEVINFO_DATA)); + pDevInfo->cbSize = sizeof(SP_DEVINFO_DATA); + + /* get device info */ + if (!SetupDiEnumDeviceInfo(hInfo, dwIndex++, pDevInfo)) + break; + + /* get device software registry path */ + if (!SetupDiGetDeviceRegistryPropertyW(hInfo, pDevInfo, 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); + if (!wcsicmp(pGuid, szNetCfg)) + { + return TRUE; + } + } + while(TRUE); + + return FALSE; +} + + + +VOID +DisableNetworkAdapter(INetConnection * pNet, LANSTATUSUI_CONTEXT * pContext, HWND hwndDlg) +{ + HKEY hKey; + NETCON_PROPERTIES * pProperties; + LPOLESTR pDisplayName; + WCHAR szPath[200]; + DWORD dwSize, dwType; + LPWSTR pPnp; + HDEVINFO hInfo; + SP_DEVINFO_DATA DevInfo; + SP_PROPCHANGE_PARAMS PropChangeParams; + BOOL bClose = FALSE; + NOTIFYICONDATAW nid; + + if (FAILED(INetConnection_GetProperties(pNet, &pProperties))) + return; + + + hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); + if (!hInfo) + { + NcFreeNetconProperties(pProperties); + return; + } + + if (FAILED(StringFromCLSID(&pProperties->guidId, &pDisplayName))) + { + NcFreeNetconProperties(pProperties); + SetupDiDestroyDeviceInfoList(hInfo); + return; + } + NcFreeNetconProperties(pProperties); + + if (FindNetworkAdapter(hInfo, &DevInfo, pDisplayName)) + { + PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; //; + PropChangeParams.StateChange = DICS_DISABLE; + PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; + PropChangeParams.HwProfile = 0; + + if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) + { + if (SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo)) + bClose = TRUE; + } + } + SetupDiDestroyDeviceInfoList(hInfo); + + swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); + CoTaskMemFree(pDisplayName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return; + + dwSize = 0; + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, NULL, &dwSize) != ERROR_SUCCESS || dwType != REG_SZ) + { + RegCloseKey(hKey); + return; + } + + pPnp = (LPWSTR)CoTaskMemAlloc(dwSize); + if (!pPnp) + { + RegCloseKey(hKey); + return; + } + + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, (LPBYTE)pPnp, &dwSize) != ERROR_SUCCESS) + { + CoTaskMemFree(pPnp); + RegCloseKey(hKey); + return; + } + RegCloseKey(hKey); + + swprintf(szPath, L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Enum\\%s", pPnp); + CoTaskMemFree(pPnp); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return; + + dwSize = 1; /* enable = 0, disable = 1 */ + RegSetValueExW(hKey, L"CSConfigFlags", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); + RegCloseKey(hKey); + + if (!bClose) + return; + + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_CANCEL); + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = pContext->uID; + nid.hWnd = pContext->hwndDlg; + nid.uFlags = NIF_STATE; + nid.dwState = NIS_HIDDEN; + nid.dwStateMask = NIS_HIDDEN; + + Shell_NotifyIconW(NIM_MODIFY, &nid); +} + + INT_PTR CALLBACK LANStatusUiDlg( @@ -591,8 +742,7 @@ } else if (LOWORD(wParam) == IDC_ENDISABLE) { - //FIXME - // disable network adapter + DisableNetworkAdapter(pContext->pNet, pContext, hwndDlg); break; } case WM_NOTIFY:

1 0

[jimtabor] 37113: - Update realization information and copyright notice for freetype.c.
by jimtabor＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: jimtabor Date: Fri Oct 31 13:56:23 2008 New Revision: 37113 URL: http://svn.reactos.org/svn/reactos?rev=37113&view=rev Log: - Update realization information and copyright notice for freetype.c. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Fri Oct 31 13:56:23 2008 @@ -230,7 +230,7 @@ FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Lanuage Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; typedef struct _RGN_ATTR Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Fri Oct 31 13:56:23 2008 @@ -231,10 +231,15 @@ ULONG Index; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE -{ - DWORD dwCsbDefault[2]; - DWORD dwCsbSupported0; +#define RI_TECH_BITMAP 1 +#define RI_TECH_FIXED 2 +#define RI_TECH_SCALABLE 3 + +typedef struct _REALIZATION_INFO +{ + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; } REALIZATION_INFO, *PREALIZATION_INFO; typedef struct _WIDTHDATA @@ -402,7 +407,10 @@ USHORT sWidth[256]; // Widths in pels. ULONG ulAveWidth; // bogus average used by USER TMW_INTERNAL tmw; // cached metrics - LOCALESIGNATURE lsLocSig; // font signature information + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; + DWORD dwCFCount; } CFONT, *PCFONT; // Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Fri Oct 31 13:56:23 2008 @@ -21,7 +21,7 @@ FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Language Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Fri Oct 31 13:56:23 2008 @@ -1,3 +1,30 @@ +/* + * FreeType font engine interface + * + * Copyright 2001 Huw D M Davies for CodeWeavers. + * Copyright 2006 Dmitry Timoshkov for CodeWeavers. + * + * This file contains the WineEng* functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +/* + * + * Addaped for the use in ReactOS. + * + */ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory

1 0

[janderwald] 37112: - Display drive details for CDROMs - Fix a bug in the free space calculation
by janderwald＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: janderwald Date: Fri Oct 31 13:48:15 2008 New Revision: 37112 URL: http://svn.reactos.org/svn/reactos?rev=37112&view=rev Log: - Display drive details for CDROMs - Fix a bug in the free space calculation Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Fri Oct 31 13:48:15 2008 @@ -295,6 +295,11 @@ GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) { LARGE_INTEGER Temp, Result, Remainder; + + if (TotalNumberOfFreeBytes.QuadPart == 0LL) + { + return ConvertUlongToLargeInteger(0); + } Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) @@ -388,7 +393,7 @@ } DriveType = GetDriveTypeW(szDrive); - if (DriveType == DRIVE_FIXED) + if (DriveType == DRIVE_FIXED || DriveType == DRIVE_CDROM) { if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes))

1 0

[sginsberg] 37111: - Don't dereference inside an SEH block after doing unsafe writes, as this could be missed in case a pointer is bad.
by sginsberg＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: sginsberg Date: Fri Oct 31 08:16:01 2008 New Revision: 37111 URL: http://svn.reactos.org/svn/reactos?rev=37111&view=rev Log: - Don't dereference inside an SEH block after doing unsafe writes, as this could be missed in case a pointer is bad. Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Fri Oct 31 08:16:01 2008 @@ -424,9 +424,6 @@ ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)-> Depth = KeReadStateQueue(Queue); - /* Dereference the queue */ - ObDereferenceObject(Queue); - /* Return Result Length if needed */ if (ResultLength) { @@ -439,6 +436,9 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; + + /* Dereference the queue */ + ObDereferenceObject(Queue); } /* Return Status */

1 0

[janderwald] 37110: - Add Documentation for netshell
by janderwald＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: janderwald Date: Fri Oct 31 06:26:23 2008 New Revision: 37110 URL: http://svn.reactos.org/svn/reactos?rev=37110&view=rev Log: - Add Documentation for netshell Added: trunk/reactos/dll/win32/netshell/README (with props) Added: trunk/reactos/dll/win32/netshell/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/README?… ============================================================================== --- trunk/reactos/dll/win32/netshell/README (added) +++ trunk/reactos/dll/win32/netshell/README [iso-8859-1] Fri Oct 31 06:26:23 2008 @@ -1,0 +1,58 @@ +=== Introduction === + +The netshell library is responsible for managing network connections. The user interface is accessed +by opening the control panel and selecting the "Network Connections" folder. +The netshell library provides COM interfaces to enumerate available network adapters, network protocols, network clients and network transports +and receive detailed information about them. However, it cannot configure these components. For configuration, look in the netcfgx documentation +(Hint: INetCfg) + +=== Interface === + +The user interface is exposed by implementing the IShellFolder interface as required by explorer +namespace extension. The code is currently placed in shfldr_netconnect.c + +The enumeration of the available network connections is performed by the IShellFolder::EnumObjects +(ISF_NetConnect_fnEnumObjects). It uses the INetConnectionManager interface implemented by netshell +in connectmanager.c to enumerate all available network connections. + +The context menu of network connection items is populated by the IContextMenu::QueryContextMenu +(ISF_NetConnect_IContextMenu3_QueryContextMenu) which is obtained by IShellFolder::GetUIObjectOf. The actions are performed by the +IContextMenu::InvokeCommand function (ISF_NetConnect_IContextMenu3_InvokeCommand). At the moment +the actions "Status" / "Properties" are implemented. + +=== Status Dialog & Notification Area === + +The status dialog is implemented by IOleCommandTarget interface(CLSID_LanConnectStatusUI). This interface manages all status dialogs +for all available dialogs. The interface is implemented as a singleton to advoid multiple notification icons +appear in the Notification area of the explorer. Everytime the IShellFolder object is created (ISF_NetConnect_Constructor), +it creates a reference to IOleCommandTarget interface and calls its IOleCommandTarget::Exec function with CGID_ShellServiceObject. +This causes IOleCommandTarget interface to enumerate all available network connections, check if they should be shown (NCCF_SHOW_ICON flag set +in the NETCON_PROPERTIES dwCharacter), and add them to notification area with Shell_NotifyIcon. For that purpose a hidden window is created (dialog +procedure is LANStatusDlg) which receives WM_SHOWSTATUSDLG msg when it shall show display the status dialog. + +When a user wants to display the status dialog by clicking on the context menu of network connection item, the IShellFolder sends the NetCfgInstanceId of +the selected network connection to IOleCommandTarget::Exec function. The function then looks up the specified notification item and then sends +the WM_SHOWSTATUSDLG msg to specific window. + +=== Network Connections Property Dialog === + +The network connections property dialog is implemented by the INetConnectionPropertyUi2 interface. The class id is obtained by calling +INetConnection::GetUiObjectClassId of the current selected network connection. After obtaining the interface by calling CoCreateInstance, the +selected network connection is stored as reference by calling INetConnectionPropertyUi::SetConnection. The next step is to call +INetConnectionPropertyUi::AddPages to add custom property pages to the property sheet set. If the function suceeds, the caller can then invoke +PropertySheetW function to display the properties. + Note: If the context doesnt match, i.e. the INetConnectionPropertyUi2 cannot work together + with current INetConnection, then it should fail INetConnectionPropertyUi::AddPages + Note: The function ShowNetConnectionProperties in shlfdr_netconnect.c shows how to invoke the Network Connections Property Dialog + +The enumeration of network components (protocols, client, transport) is done by using the INetCfg api). Initialization is performed in InitializeLANPropertiesUIDlg +function. When a user accepts changes, it calls INetCfg::Apply or when it aborts the changes INetCfg::Cancel. + +=== Known Issues === +* The notification icons are only added once IShellFolder of netshell is created for the first time +* Status changes of an adapter are not automatically updated because the information is cached +* There seems to be an icon problem which makes icon blink in the status dialog + +Last Update 31/10/2008 + + Propchange: trunk/reactos/dll/win32/netshell/README ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 37109: Merge in 37063, 37071, 37080, 37106-37108
by cfinck＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: cfinck Date: Thu Oct 30 16:13:29 2008 New Revision: 37109 URL: http://svn.reactos.org/svn/reactos?rev=37109&view=rev Log: Merge in 37063, 37071, 37080, 37106-37108 Modified: branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/iphlpapi_main.c branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/resinfo_reactos.c branches/ros-branch-0_3_7/reactos/dll/win32/netshell/lanstatusui.c branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Thu Oct 30 16:13:29 2008 @@ -1388,8 +1388,32 @@ CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING)); if (resInfo->riCount > 1) { - pFixedInfo->DnsServerList.Next = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); - CopyMemory(pFixedInfo->DnsServerList.Next, resInfo->DnsList->Next, sizeof(IP_ADDR_STRING) * (resInfo->riCount-1)); + IP_ADDR_STRING *pSrc = resInfo->DnsList->Next; + IP_ADDR_STRING *pTarget = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); + + pFixedInfo->DnsServerList.Next = pTarget; + + do + { + CopyMemory(pTarget, pSrc, sizeof(IP_ADDR_STRING)); + resInfo->riCount--; + if (resInfo->riCount > 1) + { + pTarget->Next = (IP_ADDR_STRING*)((char*)pTarget + sizeof(IP_ADDR_STRING)); + pTarget = pTarget->Next; + pSrc = pSrc->Next; + } + else + { + pTarget->Next = NULL; + break; + } + } + while(TRUE); + } + else + { + pFixedInfo->DnsServerList.Next = NULL; } } Modified: branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Thu Oct 30 16:13:29 2008 @@ -244,6 +244,6 @@ VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { + HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); - HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); -} +} Modified: branches/ros-branch-0_3_7/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Thu Oct 30 16:13:29 2008 @@ -429,9 +429,11 @@ { li.iItem = InsertItemToListView(hDlgCtrl, IDS_PHYSICAL_ADDRESS); if (li.iItem >= 0) - if (MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pCurAdapter->Address, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) - SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - + { + swprintf(szBuffer, L"%02x-%02x-%02x-%02x-%02x-%02x",pCurAdapter->Address[0], pCurAdapter->Address[1], + pCurAdapter->Address[2], pCurAdapter->Address[3], pCurAdapter->Address[4], pCurAdapter->Address[5]); + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + } li.iItem = InsertItemToListView(hDlgCtrl, IDS_IP_ADDRESS); if (li.iItem >= 0) if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->IpAddressList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) Modified: branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Thu Oct 30 16:13:29 2008 @@ -835,6 +835,8 @@ static UINT CF_IDLIST = 0; HRESULT hr; IDataObject* selection; + IContextMenu * cm; + HMENU hmenu; FORMATETC fetc; STGMEDIUM stgm; LPIDA pIDList; @@ -843,14 +845,68 @@ LPCWSTR parent_dir = NULL; SFGAOF attribs; int i; + CMINVOKECOMMANDINFOEX ici; + MENUITEMINFOW info; if (0 == ShellView_GetSelections(This)) { return S_OK; } + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, + (LPCITEMIDLIST*)This->apidl, &IID_IContextMenu, + 0, (LPVOID *)&cm); + + if (SUCCEEDED(hr)) + { + hmenu = CreatePopupMenu(); + if (hmenu) + { + if (SUCCEEDED(IContextMenu_QueryContextMenu( cm, hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY))) + { + INT def = -1, n = GetMenuItemCount(hmenu); + + for ( i = 0; i < n; i++ ) + { + memset( &info, 0, sizeof info ); + info.cbSize = sizeof info; + info.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; + if (GetMenuItemInfoW( hmenu, i, TRUE, &info)) + { + if (info.fState & MFS_DEFAULT) + { + def = info.wID; + break; + } + } + } + if (def != -1) + { + memset( &ici, 0, sizeof ici ); + ici.cbSize = sizeof ici; + ici.lpVerb = MAKEINTRESOURCEA( def ); + ici.hwnd = This->hWnd; + + IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } + + } + DestroyMenu( hmenu ); + } + IContextMenu_Release(cm); + } + + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (LPVOID *)&selection); + + + if (FAILED(hr)) return hr; Modified: branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu Oct 30 16:13:29 2008 @@ -1404,10 +1404,10 @@ } else if (_ILIsNetHood(This->dcm.apidl[0])) { - /* FIXME - * implement nethood properties - */ - FIXME("implement network connection shell folder\n"); + //FIXME path! + ShellExecuteW(NULL, L"open", L"explorer.exe", + L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, SW_SHOWDEFAULT); return S_OK; } else if (_ILIsBitBucket(This->dcm.apidl[0]))

1 0

[janderwald] 37108: - Make sure its DNS ServerList is NULL terminated
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 15:25:27 2008 New Revision: 37108 URL: http://svn.reactos.org/svn/reactos?rev=37108&view=rev Log: - Make sure its DNS ServerList is NULL terminated Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.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] Thu Oct 30 15:25:27 2008 @@ -1388,7 +1388,6 @@ CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING)); if (resInfo->riCount > 1) { - IP_ADDR_STRING *pSrc = resInfo->DnsList->Next; IP_ADDR_STRING *pTarget = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); @@ -1411,6 +1410,10 @@ } } while(TRUE); + } + else + { + pFixedInfo->DnsServerList.Next = NULL; } }

1 0

[janderwald] 37107: - Fix ...
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 15:12:09 2008 New Revision: 37107 URL: http://svn.reactos.org/svn/reactos?rev=37107&view=rev Log: - Fix ... Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c 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] Thu Oct 30 15:12:09 2008 @@ -244,6 +244,6 @@ VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { + HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); - HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); -} +}

1 0

[janderwald] 37106: - Try fix GetNetworkParams api
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 14:27:58 2008 New Revision: 37106 URL: http://svn.reactos.org/svn/reactos?rev=37106&view=rev Log: - Try fix GetNetworkParams api Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.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] Thu Oct 30 14:27:58 2008 @@ -1388,8 +1388,29 @@ CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING)); if (resInfo->riCount > 1) { - pFixedInfo->DnsServerList.Next = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); - CopyMemory(pFixedInfo->DnsServerList.Next, resInfo->DnsList->Next, sizeof(IP_ADDR_STRING) * (resInfo->riCount-1)); + + IP_ADDR_STRING *pSrc = resInfo->DnsList->Next; + IP_ADDR_STRING *pTarget = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); + + pFixedInfo->DnsServerList.Next = pTarget; + + do + { + CopyMemory(pTarget, pSrc, sizeof(IP_ADDR_STRING)); + resInfo->riCount--; + if (resInfo->riCount > 1) + { + pTarget->Next = (IP_ADDR_STRING*)((char*)pTarget + sizeof(IP_ADDR_STRING)); + pTarget = pTarget->Next; + pSrc = pSrc->Next; + } + else + { + pTarget->Next = NULL; + break; + } + } + while(TRUE); } }

1 0

[cfinck] 37105: Gregor Schneider (grschneider@gmail.com) - Hack: Hackfix displaying 32-bit tray icons in 32-bit color depth mode
by cfinck＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: cfinck Date: Thu Oct 30 13:43:36 2008 New Revision: 37105 URL: http://svn.reactos.org/svn/reactos?rev=37105&view=rev Log: Gregor Schneider (grschneider(a)gmail.com) - Hack: Hackfix displaying 32-bit tray icons in 32-bit color depth mode Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/taskbar/traynotify.cpp Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] Thu Oct 30 13:43:36 2008 @@ -741,7 +741,7 @@ AlphaBlend(canvas, x, y, NOTIFYICON_SIZE, NOTIFYICON_SIZE, mem_dc, 0, 0, NOTIFYICON_SIZE, NOTIFYICON_SIZE, blend); } else #endif - DrawIconEx(canvas, x, y, it->_hIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, 0, DI_NORMAL); + DrawIconEx(canvas, x, y, it->_hIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, GetSysColorBrush(COLOR_BTNFACE), DI_NORMAL); x += NOTIFYICON_DIST; }

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