Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 35760: - Activate INetConnection::GetProperties code - Import from ncpa properties and status dialog - Implement INetConnectionProperty interface - Fix a bug & handle leak in registering code - Implement NcFreeNetconProperties - Make resources of netshell to be similar of Windows XP to allow netshell to be loaded - Add NCF constants from ncpa - Implement enumerating control/protocol and devices - items dont appear for some unknown reason - Load property dialog in the same way like W
by janderwald＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: janderwald Date: Fri Aug 29 09:18:55 2008 New Revision: 35760 URL: http://svn.reactos.org/svn/reactos?rev=35760&view=rev Log: - Activate INetConnection::GetProperties code - Import from ncpa properties and status dialog - Implement INetConnectionProperty interface - Fix a bug & handle leak in registering code - Implement NcFreeNetconProperties - Make resources of netshell to be similar of Windows XP to allow netshell to be loaded - Add NCF constants from ncpa - Implement enumerating control/protocol and devices - items dont appear for some unknown reason - Load property dialog in the same way like Windows (using INetConnectionProperty) interface Added: trunk/reactos/dll/win32/netshell/lanconnectui.c (with props) Modified: trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/netshell.rbuild trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/netshell/netshell.spec trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/resource.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] Fri Aug 29 09:18:55 2008 @@ -21,7 +21,6 @@ IClassFactoryImpl *This = (IClassFactoryImpl *)iface; *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppvObj = This; Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -211,17 +211,14 @@ 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; @@ -241,7 +238,6 @@ } *ppProps = pProperties; -#endif return NOERROR; } @@ -252,6 +248,15 @@ INetConnection * iface, CLSID *pclsid) { + + INetConnectionImpl * This = (INetConnectionImpl*)iface; + + if (This->Props.MediaType == NCM_LAN) + { + CopyMemory(pclsid, &CLSID_LANConnectUI, sizeof(CLSID)); + return S_OK; + } + return E_NOTIMPL; } Added: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c (added) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -1,0 +1,456 @@ +#include <precomp.h> + +typedef enum +{ + NET_TYPE_CLIENT = 1, + NET_TYPE_SERVICE = 2, + NET_TYPE_PROTOCOL = 3 +}NET_TYPE; + +typedef struct +{ + NET_TYPE Type; + DWORD dwCharacteristics; + LPWSTR szHelp; +}NET_ITEM, *PNET_ITEM; + +typedef struct +{ + INetConnectionPropertyUi *lpVtbl; + INetConnection * pCon; + LONG ref; +}INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; + + +/// CLASSID +/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} +/// open network properties and wlan properties + +HPROPSHEETPAGE +InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) +{ + PROPSHEETPAGEW ppage; + + memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); + ppage.dwSize = sizeof(PROPSHEETPAGEW); + ppage.dwFlags = PSP_DEFAULT; + ppage.u.pszTemplate = resname; + ppage.pfnDlgProc = dlgproc; + ppage.lParam = lParam; + ppage.hInstance = netshell_hInstance; + ppage.pszTitle = szTitle; + if (szTitle) + { + ppage.dwFlags |= PSP_USETITLE; + } + return CreatePropertySheetPageW(&ppage); +} + +HRESULT +LaunchUIDlg(UINT * pResourceIDs, DLGPROC * pDlgs, UINT Count, NETCON_PROPERTIES * pProperties) +{ + HPROPSHEETPAGE * hpsp; + PROPSHEETHEADERW psh; + BOOL ret; + UINT Index, Offset; + + hpsp = CoTaskMemAlloc(Count * sizeof(HPROPSHEETPAGE)); + if (!hpsp) + return E_OUTOFMEMORY; + + ZeroMemory(hpsp, Count * sizeof(HPROPSHEETPAGE)); + + Index = 0; + Offset = 0; + do + { + hpsp[Offset] = InitializePropertySheetPage(MAKEINTRESOURCEW(pResourceIDs[Index]), pDlgs[Index], (LPARAM)pProperties, NULL); + if (hpsp[Offset]) + Offset++; + + }while(++Index < Count); + + if (!Offset) + { + CoTaskMemFree(hpsp); + return E_FAIL; + } + + + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); + psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; + psh.pszCaption = pProperties->pszwName; + psh.hwndParent = NULL; + psh.u3.phpage = hpsp; + psh.nPages = Offset; + psh.hInstance = netshell_hInstance; + + + ret = PropertySheetW(&psh); + CoTaskMemFree(hpsp); + + if (ret < 0) + return E_FAIL; + else + return S_OK; +} + +VOID +AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName) +{ + LVITEMW lvItem; + + ZeroMemory(&lvItem, sizeof(lvItem)); + lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.pszText = szName; + lvItem.lParam = (LPARAM)pItem; + lvItem.iItem = ListView_GetItemCount(hDlgCtrl); + + SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); +} + +VOID +EnumClientServiceProtocol(HWND hDlgCtrl, HKEY hKey, UINT Type) +{ + DWORD dwIndex = 0; + DWORD dwSize; + DWORD dwRetVal; + DWORD dwCharacteristics; + WCHAR szName[60]; + WCHAR szText[40]; + WCHAR szHelp[200]; + HKEY hSubKey; + static WCHAR szNDI[] = L"\\Ndi"; + PNET_ITEM pItem; + + do + { + szHelp[0] = L'\0'; + dwCharacteristics = 0; + szText[0] = L'\0'; + + dwSize = sizeof(szName)/sizeof(WCHAR); + if (RegEnumKeyExW(hKey, dwIndex++, szName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + /* Get Help Text */ + if (dwSize + (sizeof(szNDI)/sizeof(WCHAR)) + 1 < sizeof(szName)/sizeof(WCHAR)) + { + wcscpy(&szName[dwSize], szNDI); + if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { +#if 0 + if (RegLoadMUIStringW(hSubKey, L"HelpText", szHelp, sizeof(szHelp)/sizeof(WCHAR), &dwRetVal, 0, NULL) == ERROR_SUCCESS) + szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; +#else + DWORD dwType; + dwRetVal = sizeof(szHelp); + if (RegQueryValueExW(hSubKey, L"HelpText", NULL, &dwType, (LPBYTE)szHelp, &dwRetVal) == ERROR_SUCCESS) + szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; +#endif + RegCloseKey(hSubKey); + } + szName[dwSize] = L'\0'; + } + /* Get Characteristics */ + if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(dwCharacteristics); + if (RegQueryValueExW(hSubKey, L"Characteristics", NULL, NULL, (LPBYTE)&dwCharacteristics, &dwSize) == ERROR_SUCCESS) + { + if (dwCharacteristics & NCF_HIDDEN) + { + RegCloseKey(hSubKey); + continue; + } + } + /* Get the Client/Procotol/Service name */ + dwSize = sizeof(szText); + if (RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) + { + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + } + RegCloseKey(hSubKey); + } + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); + if (!pItem) + continue; + + pItem->dwCharacteristics = dwCharacteristics; + pItem->Type = Type; + pItem->szHelp = CoTaskMemAlloc((wcslen(szHelp)+1)*sizeof(WCHAR)); + if (pItem->szHelp) + wcscpy(pItem->szHelp, szHelp); + + AddItemToListView(hDlgCtrl, pItem, szText); + } + else + break; + + }while(TRUE); + +} + + +VOID +InitializeLANPropertiesUIDlg(HWND hwndDlg) +{ + static WCHAR szNetClient[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e973-e325-11ce-bfc1-08002be10318}"; + static WCHAR szNetService[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e974-e325-11ce-bfc1-08002be10318}"; + static WCHAR szNetProtocol[] =L"System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"; + HKEY hKey; + HWND hDlgCtrl; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); + /* Enumerate Clients */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetClient, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_CLIENT); + RegCloseKey(hKey); + } + + /* Enumerate Service */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetService, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_SERVICE); + RegCloseKey(hKey); + } + + /* Enumerate Protocol */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetProtocol, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_PROTOCOL); + RegCloseKey(hKey); + } + + +} + + +INT_PTR +CALLBACK +LANPropertiesUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + PROPSHEETPAGE *page; + NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) + { + case WM_INITDIALOG: + page = (PROPSHEETPAGE*)lParam; + pProperties = (NETCON_PROPERTIES*)page->lParam; + SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)pProperties->pszwDeviceName); + if (pProperties->dwCharacter & NCCF_SHOW_ICON) + { + /* check show item on taskbar*/ + SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_SETCHECK, BST_CHECKED, 0); + } + if (pProperties->dwCharacter & NCCF_NOTIFY_DISCONNECTED) + { + /* check notify item */ + SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_SETCHECK, BST_CHECKED, 0); + } + InitializeLANPropertiesUIDlg(hwndDlg); + return TRUE; + } + return FALSE; +} + + +HRESULT +ShowLANConnectionPropertyDialog(NETCON_PROPERTIES * pProperties) +{ + UINT ResourceId[1] = { IDD_NETPROPERTIES }; + DLGPROC Dlgs[1] = {LANPropertiesUIDlg}; + INITCOMMONCONTROLSEX ic; + + + ic.dwSize = sizeof(INITCOMMONCONTROLSEX); + ic.dwICC = ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&ic); + + return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); +} + +INT_PTR +CALLBACK +LANStatusUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) + { + case WM_INITDIALOG: + pProperties = (NETCON_PROPERTIES*)lParam; + return TRUE; + } + return FALSE; +} + + +HRESULT +ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties) +{ + UINT ResourceId[1] = { IDD_NETSTATUS }; + DLGPROC Dlgs[1] = {LANStatusUIDlg}; + return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnQueryInterface( + INetConnectionPropertyUi * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetConnectionPropertyUi)) + { + *ppvObj = This; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +INetConnectionPropertyUi_fnAddRef( + INetConnectionPropertyUi * iface) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +INetConnectionPropertyUi_fnRelease( + INetConnectionPropertyUi * iface) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnSetConnection( + INetConnectionPropertyUi * iface, + INetConnection *pCon) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + + if (!pCon) + return E_POINTER; + + if (This->pCon) + INetConnection_Release(This->pCon); + + This->pCon = pCon; + INetConnection_AddRef(This->pCon); + return S_OK; +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnAddPages( + INetConnectionPropertyUi * iface, + HWND hwndParent, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + HPROPSHEETPAGE hProp; + NETCON_PROPERTIES * pProperties; + BOOL ret; + HRESULT hr; + INITCOMMONCONTROLSEX initEx; + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + + + initEx.dwSize = sizeof(initEx); + initEx.dwICC = ICC_LISTVIEW_CLASSES; + + + if(!InitCommonControlsEx(&initEx)) + return E_FAIL; + + + + hr = INetConnection_GetProperties(This->pCon, &pProperties); + if (FAILED(hr)) + return hr; + + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)pProperties, pProperties->pszwName); + if (hProp) + { + ret = (*pfnAddPage)(hProp, lParam); + if (ret) + { + return NOERROR; + } + DestroyPropertySheetPage(hProp); + } + return E_FAIL; +} + +static const INetConnectionPropertyUiVtbl vt_NetConnectionPropertyUi = +{ + INetConnectionPropertyUi_fnQueryInterface, + INetConnectionPropertyUi_fnAddRef, + INetConnectionPropertyUi_fnRelease, + INetConnectionPropertyUi_fnSetConnection, + INetConnectionPropertyUi_fnAddPages, +}; + +HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + INetConnectionPropertyUiImpl * This; + + if (!ppv) + return E_POINTER; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = (INetConnectionPropertyUiImpl *) CoTaskMemAlloc(sizeof (INetConnectionPropertyUiImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->pCon = NULL; + This->lpVtbl = (INetConnectionPropertyUi*)&vt_NetConnectionPropertyUi; + + if (!SUCCEEDED (INetConnectionPropertyUi_fnQueryInterface ((INetConnectionPropertyUi*)This, riid, ppv))) + { + IUnknown_Release((IUnknown*)This); + return E_NOINTERFACE; + } + + IUnknown_Release((IUnknown*)This); + return S_OK; +} Propchange: trunk/reactos/dll/win32/netshell/lanconnectui.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Fri Aug 29 09:18:55 2008 @@ -1,4 +1,49 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 + CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Benachrichtigen, wenn diese Verbindung eingeschränkte oder\nkeine Konnektivität besitzt", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Allgemein", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Dauer:", -1, 19, 34, 60, 8 + LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Gesendet", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Empfangen", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "E&igenschaften", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END STRINGTABLE DISCARDABLE 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] Fri Aug 29 09:18:55 2008 @@ -1,4 +1,50 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connect Using:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Duration:", -1, 19, 34, 60, 8 + LTEXT "Speed:", -1, 19, 48, 60, 8 + GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Sent", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Received", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Properties", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + STRINGTABLE DISCARDABLE BEGIN 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] Fri Aug 29 09:18:55 2008 @@ -1,9 +1,12 @@ #include "precomp.h" HINSTANCE netshell_hInstance; +const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID GUID_DEVCLASS_NET = {0x4d36e972, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; + static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; static INTERFACE_TABLE InterfaceTable[] = @@ -15,6 +18,10 @@ { &CLSID_ConnectionManager, INetConnectionManager_Constructor + }, + { + &CLSID_LANConnectUI, + LanConnectUI_Constructor }, { NULL, @@ -51,7 +58,7 @@ DllRegisterServer(void) { HKEY hKey, hSubKey; - WCHAR szName[MAX_PATH] = {0}; + WCHAR szName[MAX_PATH+20] = {0}; WCHAR szNet[20]; UINT Length, Offset; @@ -71,7 +78,7 @@ } Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); - Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH); + Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], (sizeof(szName)/sizeof(WCHAR))-1); if (Offset + Length + 2 < MAX_PATH) { /* set localized name */ @@ -100,6 +107,7 @@ RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); } + RegCloseKey(hKey); return S_OK; } @@ -146,3 +154,12 @@ return hres; } + +VOID +STDCALL +NcFreeNetconProperties (NETCON_PROPERTIES* pProps) +{ + CoTaskMemFree(pProps->pszwName); + CoTaskMemFree(pProps->pszwDeviceName); + CoTaskMemFree(pProps); +} 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] Fri Aug 29 09:18:55 2008 @@ -17,6 +17,7 @@ <library>uuid</library> <library>advapi32</library> <library>setupapi</library> + <library>comctl32</library> <pch>precomp.h</pch> <file>netshell.c</file> <file>shfldr_netconnect.c</file> @@ -25,4 +26,5 @@ <file>classfactory.c</file> <file>connectmanager.c</file> <file>netshell.spec</file> + <file>lanconnectui.c</file> </module> Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -4,6 +4,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "W32 subsystem kernel\0" +#define REACTOS_STR_INTERNAL_NAME "netshell.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "netshell.dll\0" +#define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" +#define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" + +#include <reactos/version.rc> + + IDI_SHELL_NETWORK_FOLDER ICON "res/netshell.ico" #include "lang/de-DE.rc" Modified: trunk/reactos/dll/win32/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -20,7 +20,7 @@ 19 stub HrRenameConnection 20 stub HrRunWizard 21 stub InvokeDunFile -22 stub NcFreeNetconProperties +22 stdcall NcFreeNetconProperties(ptr) 23 stub NcIsValidConnectionName 24 stub NetSetupAddRasConnection 25 stub NetSetupFinishInstall 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] Fri Aug 29 09:18:55 2008 @@ -38,6 +38,17 @@ #include "wine/unicode.h" #include "resource.h" +#define NCF_VIRTUAL 0x1 +#define NCF_SOFTWARE_ENUMERATED 0x2 +#define NCF_PHYSICAL 0x4 +#define NCF_HIDDEN 0x8 +#define NCF_NO_SERVICE 0x10 +#define NCF_NOT_USER_REMOVABLE 0x20 +#define NCF_MULTIPORT_INSTANCED_ADAPTER 0x40 +#define NCF_HAS_UI 0x80 +#define NCF_FILTER 0x400 +#define NCF_NDIS_PROTOCOL 0x4000 + typedef struct { int colnameid; int pcsFlags; @@ -60,6 +71,7 @@ /* globals */ extern HINSTANCE netshell_hInstance; extern const GUID CLSID_NetworkConnections; +extern const GUID CLSID_LANConnectUI; extern const GUID GUID_DEVCLASS_NET; @@ -80,4 +92,10 @@ /* connectmanager.c */ HRESULT WINAPI INetConnectionManager_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +/* lanconnectui.c */ +HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties); + +#define NCCF_NOTIFY_DISCONNECTED 0x100000 + #endif 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] Fri Aug 29 09:18:55 2008 @@ -2,15 +2,32 @@ /* icons */ #define IDI_SHELL_NETWORK_FOLDER 100 - +#define IDI_HORIZONTAL 101 +#define IDI_NETSTAT 102 +#define IDI_VERTICAL 103 /* dialogs */ - - - - +#define IDD_NETPROPERTIES 400 +#define IDD_NETSTATUS 401 /* dialog controls */ +#define IDC_NETCARDNAME 1000 +#define IDC_CONFIGURE 1001 +#define IDC_COMPONENTSLIST 2800 +#define IDC_INSTALL 1003 +#define IDC_UNINSTALL 1004 +#define IDC_PROPERTIES 1005 +#define IDC_DESCRIPTION 1006 +#define IDC_SHOWTASKBAR 1007 +#define IDC_NOTIFYNOCONNECTION 1008 + +#define IDC_SEND 1100 +#define IDC_RECEIVED 1101 +#define IDC_STATUS_PROPERTIES 1102 +#define IDC_ENDISABLE 1103 +#define IDC_STATUS 1104 +#define IDC_DURATION 1105 +#define IDC_SPEED 1106 /* resource constants */ 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] Fri Aug 29 09:18:55 2008 @@ -21,6 +21,8 @@ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); + +#define MAX_PROPERTY_SHEET_PAGE (10) /*********************************************************************** * IShellFolder implementation @@ -732,6 +734,19 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } +BOOL +CALLBACK +PropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam) +{ + PROPSHEETHEADERW *pinfo = (PROPSHEETHEADERW *)lParam; + + if (pinfo->nPages < MAX_PROPERTY_SHEET_PAGE) + { + pinfo->u3.phpage[pinfo->nPages++] = hPage; + return TRUE; + } + return FALSE; +} /************************************************************************** * ISF_NetConnect_IContextMenu_InvokeCommand() @@ -740,7 +755,61 @@ IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + HRESULT hr = S_OK; + PROPSHEETHEADERW pinfo; + CLSID ClassID; + HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; + INetConnectionPropertyUi * pNCP; + + val = _ILGetValueStruct(This->apidl); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS)) + { + if (pProperties->MediaType == NCM_LAN) + { + hr = ShowLANConnectionStatusDialog(pProperties); + NcFreeNetconProperties(pProperties); + } + return hr; + } + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES)) + { + hr = INetConnection_GetUiObjectClassId(val->pItem, &ClassID); + if (SUCCEEDED(hr)) + { + /* FIXME perform version checks */ + hr = CoCreateInstance(&ClassID, NULL, 0, &IID_INetConnectionPropertyUi, (LPVOID)&pNCP); + if (SUCCEEDED(hr)) + { + hr = INetConnectionPropertyUi_SetConnection(pNCP, val->pItem); + if (SUCCEEDED(hr)) + { + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); + pinfo.dwSize = sizeof(PROPSHEETHEADERW); + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.u3.phpage = hppages; + pinfo.pszCaption = pProperties->pszwName; + + hr = INetConnectionPropertyUi_AddPages(pNCP, lpcmi->hwnd, PropSheetExCallback, (LPARAM)&pinfo); + if (SUCCEEDED(hr)) + { + if(PropertySheetW(&pinfo) < 0) + hr = E_FAIL; + } + } + } + } + NcFreeNetconProperties(pProperties); + return hr; + } return S_OK; }

1 0

[janderwald] 35759: - add INetConnectionProperty interface
by janderwald＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: janderwald Date: Fri Aug 29 09:12:34 2008 New Revision: 35759 URL: http://svn.reactos.org/svn/reactos?rev=35759&view=rev Log: - add INetConnectionProperty interface Modified: trunk/reactos/include/psdk/netcon.h Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Fri Aug 29 09:12:34 2008 @@ -168,4 +168,30 @@ EXTERN_C const CLSID CLSID_ConnectionManager; EXTERN_C const IID IID_INetConnectionManager; +#undef INTERFACE +#define INTERFACE INetConnectionPropertyUi +DECLARE_INTERFACE_(INetConnectionPropertyUi, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT, SetConnection) (THIS_ INetConnection *pCon) PURE; + STDMETHOD_(HRESULT, AddPages) (THIS_ HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) PURE; + + +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define INetConnectionPropertyUi_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnectionPropertyUi_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnectionPropertyUi_Release(p) (p)->lpVtbl->Release(p) +#define INetConnectionPropertyUi_SetConnection(p,a) (p)->lpVtbl->SetConnection(p,a) +#define INetConnectionPropertyUi_AddPages(p,a,b,c) (p)->lpVtbl->AddPages(p,a,b,c) #endif + +EXTERN_C const IID IID_INetConnectionPropertyUi; + +VOID STDCALL NcFreeNetconProperties (NETCON_PROPERTIES* pProps); + +#endif

1 0

[janderwald] 35758: - add INetConnectionPropertyUi iid
by janderwald＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: janderwald Date: Fri Aug 29 09:12:01 2008 New Revision: 35758 URL: http://svn.reactos.org/svn/reactos?rev=35758&view=rev Log: - add INetConnectionPropertyUi iid 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] Fri Aug 29 09:12:01 2008 @@ -98,6 +98,7 @@ 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(IID_INetConnectionPropertyUi, 0xC08956A4,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);

1 0

[cfinck] 35757: Add "Categories=Development" to the created shortcut as requested by HeisSpiter
by cfinck＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: cfinck Date: Fri Aug 29 08:41:52 2008 New Revision: 35757 URL: http://svn.reactos.org/svn/reactos?rev=35757&view=rev Log: Add "Categories=Development" to the created shortcut as requested by HeisSpiter Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cre… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] Fri Aug 29 08:41:52 2008 @@ -77,6 +77,7 @@ echo "[Desktop Entry]" > "$shortcut" echo "Type=Application" >> "$shortcut" +echo "Categories=Development" >> "$shortcut" echo "Version=$ROSBE_VERSION" >> "$shortcut" echo "Name=ReactOS Build Environment" >> "$shortcut" echo "Icon=$SCRIPTDIR/RosBE.png" >> "$shortcut"

1 0

[ekohl] 35756: [FORMATTING] No code changes.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 08:08:03 2008 New Revision: 35756 URL: http://svn.reactos.org/svn/reactos?rev=35756&view=rev Log: [FORMATTING] No code changes. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 08:08:03 2008 @@ -6,7 +6,6 @@ * COPYRIGHT: Copyright 2005-2006 Eric Kohl * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> - * */ /* INCLUDES ****************************************************************/ @@ -1168,6 +1167,7 @@ return dwError; } + /* Create a path suitable for the bootloader out of the full path */ DWORD ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) @@ -1183,12 +1183,12 @@ DPRINT("ScmConvertToBootPathName %S\n", CanonName); ServiceNameLen = wcslen(CanonName); + /* First check, if it's already good */ if (ServiceNameLen > 12 && !wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) { *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); - if (*RelativeName == NULL) { DPRINT1("Error allocating memory for boot driver name!\n"); @@ -1236,8 +1236,8 @@ Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR)); if (!Expanded) { - DPRINT1("Error allocating memory for boot driver name!\n"); - return ERROR_NOT_ENOUGH_MEMORY; + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; } /* Expand it */ @@ -1279,7 +1279,6 @@ /* Only \SystemRoot\ is missing */ *RelativeName = LocalAlloc(LMEM_ZEROINIT, (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); - if (*RelativeName == NULL) { DPRINT1("Error allocating memory for boot driver name!\n"); @@ -1644,9 +1643,8 @@ if (dwServiceType & SERVICE_DRIVER) { dwError = ScmCanonDriverImagePath(dwStartType, - lpBinaryPathName, - &lpImagePath); - + lpBinaryPathName, + &lpImagePath); if (dwError != ERROR_SUCCESS) goto done; } @@ -3210,10 +3208,10 @@ lpDatabaseName); dwError = ROpenSCManagerW(BindingHandle, - lpMachineName ? MachineName.Buffer : NULL, - lpDatabaseName ? DatabaseName.Buffer : NULL, - dwDesiredAccess, - lpScHandle); + lpMachineName ? MachineName.Buffer : NULL, + lpDatabaseName ? DatabaseName.Buffer : NULL, + dwDesiredAccess, + lpScHandle); if (lpMachineName) RtlFreeUnicodeString(&MachineName); @@ -3243,10 +3241,10 @@ lpServiceName); dwError = ROpenServiceW(BindingHandle, - hSCManager, - ServiceName.Buffer, - dwDesiredAccess, - lpServiceHandle); + hSCManager, + lpServiceName ? ServiceName.Buffer : NULL, + dwDesiredAccess, + lpServiceHandle); if (lpServiceName) RtlFreeUnicodeString(&ServiceName);

1 0

[ekohl] 35755: - RCreateServiceW: - Add more parameter checks. - Set the services "ObjectName" value to "LocalSystem" if it doesn't have a name. - REnumServicesStatusW: Simplify it a little.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 07:59:27 2008 New Revision: 35755 URL: http://svn.reactos.org/svn/reactos?rev=35755&view=rev Log: - RCreateServiceW: - Add more parameter checks. - Set the services "ObjectName" value to "LocalSystem" if it doesn't have a name. - REnumServicesStatusW: Simplify it a little. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 07:59:27 2008 @@ -1599,9 +1599,47 @@ return ERROR_ACCESS_DENIED; } - /* Fail if the service already exists! */ - if (ScmGetServiceEntryByName(lpServiceName) != NULL) + if (wcslen(lpServiceName) == 0) + { + return ERROR_INVALID_NAME; + } + + if (wcslen(lpBinaryPathName) == 0) + { + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && + (lpServiceStartName)) + { + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceType > SERVICE_WIN32_SHARE_PROCESS) && + (dwServiceType != (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && + (dwServiceType != (SERVICE_WIN32_SHARE_PROCESS | SERVICE_INTERACTIVE_PROCESS))) + { + return ERROR_INVALID_PARAMETER; + } + + if (dwStartType > SERVICE_DISABLED) + { + return ERROR_INVALID_PARAMETER; + } + + lpService = ScmGetServiceEntryByName(lpServiceName); + if (lpService) + { + /* check if it is marked for deletion */ + if (lpService->bDeleted) + return ERROR_SERVICE_MARKED_FOR_DELETE; + /* Return Error exist */ return ERROR_SERVICE_EXISTS; + } + + if (lpDisplayName != NULL && + ScmGetServiceEntryByDisplayName(lpDisplayName) != NULL) + return ERROR_DUPLICATE_SERVICE_NAME; if (dwServiceType & SERVICE_DRIVER) { @@ -1611,6 +1649,14 @@ if (dwError != ERROR_SUCCESS) goto done; + } + else + { + if (dwStartType == SERVICE_BOOT_START || + dwStartType == SERVICE_SYSTEM_START) + { + return ERROR_INVALID_PARAMETER; + } } /* Allocate a new service entry */ @@ -1760,6 +1806,19 @@ dwError = ScmWriteDependencies(hServiceKey, (LPWSTR)lpDependencies, dwDependSize); + if (dwError != ERROR_SUCCESS) + goto done; + } + + /* If a non driver and NULL for lpServiceName, write ObjectName as LocalSystem */ + if ((dwServiceType & SERVICE_WIN32) && (!lpServiceName)) + { + dwError = RegSetValueExW(hServiceKey, + L"ObjectName", + 0, + REG_SZ, + (LPBYTE)L"LocalSystem", + 24); if (dwError != ERROR_SUCCESS) goto done; } @@ -2033,19 +2092,16 @@ ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); - if (dwRequiredSize + dwSize <= dwBufSize) - { - DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); - dwRequiredSize += dwSize; - dwServiceCount++; - dwLastResumeCount = CurrentService->dwResumeCount; - } - else + if (dwRequiredSize + dwSize > dwBufSize) { DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); break; } + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; } DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); @@ -2109,33 +2165,26 @@ ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); - if (dwRequiredSize + dwSize <= dwBufSize) - { - /* Copy the service name */ - wcscpy(lpStringPtr, - CurrentService->lpServiceName); - lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); - - /* Copy the display name */ - wcscpy(lpStringPtr, - CurrentService->lpDisplayName); - lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); - - /* Copy the status information */ - memcpy(&lpStatusPtr->ServiceStatus, - &CurrentService->Status, - sizeof(SERVICE_STATUS)); - - lpStatusPtr++; - dwRequiredSize += dwSize; - } - else - { + if (dwRequiredSize + dwSize > dwBufSize) break; - } - + + /* Copy the service name */ + wcscpy(lpStringPtr, CurrentService->lpServiceName); + lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + wcscpy(lpStringPtr, CurrentService->lpDisplayName); + lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatus, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); + + lpStatusPtr++; + dwRequiredSize += dwSize; } Done:;

1 0

[pschweitzer] 35754: In FsRtlInsertPerStreamContext, FsRtlLookupPerStreamContextInternal, FsRtlRemovePerStreamContext: removed not needed assertion and return normally when PFSRTL_ADVANCED_FCB_HEADER pointer is null
by pschweitzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: pschweitzer Date: Fri Aug 29 07:48:59 2008 New Revision: 35754 URL: http://svn.reactos.org/svn/reactos?rev=35754&view=rev Log: In FsRtlInsertPerStreamContext, FsRtlLookupPerStreamContextInternal, FsRtlRemovePerStreamContext: removed not needed assertion and return normally when PFSRTL_ADVANCED_FCB_HEADER pointer is null Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/filtr… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] Fri Aug 29 07:48:59 2008 @@ -48,9 +48,7 @@ PLIST_ENTRY NextEntry; PFSRTL_PER_STREAM_CONTEXT TmpPerStreamContext, PerStreamContext = NULL; - ASSERT(StreamContext); - - if (!(StreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) + if (!(StreamContext) || !(StreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) { return NULL; } @@ -108,9 +106,7 @@ FsRtlInsertPerStreamContext(IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext, IN PFSRTL_PER_STREAM_CONTEXT Ptr) { - ASSERT(PerStreamContext); - - if (!(PerStreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) + if (!(PerStreamContext) || !(PerStreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) { return STATUS_INVALID_DEVICE_REQUEST; } @@ -133,9 +129,7 @@ PLIST_ENTRY NextEntry; PFSRTL_PER_STREAM_CONTEXT TmpPerStreamContext, PerStreamContext = NULL; - ASSERT(StreamContext); - - if (!(StreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) + if (!(StreamContext) || !(StreamContext->Flags2 & FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS)) { return NULL; }

1 0

[ekohl] 35753: Implement REnumDependentServicesA/W. Patch is based on bug report #3669 by bugboy <martinmnet@hotmail.com>
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 06:56:39 2008 New Revision: 35753 URL: http://svn.reactos.org/svn/reactos?rev=35753&view=rev Log: Implement REnumDependentServicesA/W. Patch is based on bug report #3669 by bugboy <martinmnet(a)hotmail.com> Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 06:56:39 2008 @@ -243,6 +243,159 @@ DPRINT("Assigning new tag to service %S\n", lpService->lpServiceName); lpService->dwTag = 0; return ERROR_SUCCESS; +} + + +/* Internal recursive function */ +/* Need to search for every dependency on every service */ +static DWORD +Int_EnumDependentServicesW(HKEY hServicesKey, + PSERVICE lpService, + DWORD dwServiceState, + PSERVICE *lpServices, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned) +{ + DWORD dwError = ERROR_SUCCESS; + WCHAR szNameBuf[MAX_PATH]; + WCHAR szValueBuf[MAX_PATH]; + WCHAR *lpszNameBuf = szNameBuf; + WCHAR *lpszValueBuf = szValueBuf; + DWORD dwSize; + DWORD dwNumSubKeys; + DWORD dwIteration; + PSERVICE lpCurrentService; + HKEY hServiceEnumKey; + DWORD dwCurrentServiceState = SERVICE_ACTIVE; + DWORD dwDependServiceStrPtr = 0; + DWORD dwRequiredSize = 0; + + /* Get the number of service keys */ + dwError = RegQueryInfoKeyW(hServicesKey, + NULL, + NULL, + NULL, + &dwNumSubKeys, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ERROR! Unable to get number of services keys.\n"); + return dwError; + } + + /* Iterate the service keys to see if another service depends on the this service */ + for (dwIteration = 0; dwIteration < dwNumSubKeys; dwIteration++) + { + dwSize = MAX_PATH; + dwError = RegEnumKeyExW(hServicesKey, + dwIteration, + lpszNameBuf, + &dwSize, + NULL, + NULL, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Open the Service key */ + dwError = RegOpenKeyExW(hServicesKey, + lpszNameBuf, + 0, + KEY_READ, + &hServiceEnumKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwSize = MAX_PATH; + + /* Check for the DependOnService Value */ + dwError = RegQueryValueExW(hServiceEnumKey, + L"DependOnService", + NULL, + NULL, + (LPBYTE)lpszValueBuf, + &dwSize); + + /* FIXME: Handle load order. */ + + /* If the service found has a DependOnService value */ + if (dwError == ERROR_SUCCESS) + { + dwDependServiceStrPtr = 0; + + /* Can be more than one Dependencies in the DependOnService string */ + while (wcslen(lpszValueBuf + dwDependServiceStrPtr) > 0) + { + if (wcsicmp(lpszValueBuf + dwDependServiceStrPtr, lpService->lpServiceName) == 0) + { + /* Get the current enumed service pointer */ + lpCurrentService = ScmGetServiceEntryByName(lpszNameBuf); + + /* Check for valid Service */ + if (!lpCurrentService) + { + /* This should never happen! */ + DPRINT1("This should not happen at this point, report to Developer\n"); + return ERROR_NOT_FOUND; + } + + /* Determine state the service is in */ + if (lpCurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwCurrentServiceState = SERVICE_INACTIVE; + + /* If the ServiceState matches that requested or searching for SERVICE_STATE_ALL */ + if ((dwCurrentServiceState == dwServiceState) || + (dwServiceState == SERVICE_STATE_ALL)) + { + /* Calculate the required size */ + dwRequiredSize += sizeof(SERVICE_STATUS); + dwRequiredSize += ((wcslen(lpCurrentService->lpServiceName) + 1) * sizeof(WCHAR)); + dwRequiredSize += ((wcslen(lpCurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + /* Add the size for service name and display name pointers */ + dwRequiredSize += (2 * sizeof(PVOID)); + + /* increase the BytesNeeded size */ + *pcbBytesNeeded = *pcbBytesNeeded + dwRequiredSize; + + /* Don't fill callers buffer yet, as MSDN read that the last service with dependency + comes first */ + + /* Recursive call to check for its dependencies */ + Int_EnumDependentServicesW(hServicesKey, + lpCurrentService, + dwServiceState, + lpServices, + pcbBytesNeeded, + lpServicesReturned); + + /* If the lpServices is valid set the service pointer */ + if (lpServices) + lpServices[*lpServicesReturned] = lpCurrentService; + + *lpServicesReturned = *lpServicesReturned + 1; + } + } + + dwDependServiceStrPtr += (wcslen(lpszValueBuf + dwDependServiceStrPtr) + 1); + } + } + else if (*pcbBytesNeeded) + { + dwError = ERROR_SUCCESS; + } + + RegCloseKey(hServiceEnumKey); + } + + return dwError; } @@ -1676,12 +1829,120 @@ LPBOUNDED_DWORD_256K lpServicesReturned) { DWORD dwError = ERROR_SUCCESS; - - UNIMPLEMENTED; + DWORD dwServicesReturned = 0; + DWORD dwServiceCount; + HKEY hServicesKey = NULL; + LPSC_RPC_HANDLE hSCObject; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + PSERVICE *lpServicesArray = NULL; + LPENUM_SERVICE_STATUSW lpServicesPtr = NULL; + LPWSTR lpStr; + *pcbBytesNeeded = 0; *lpServicesReturned = 0; - DPRINT1("REnumDependentServicesW() done (Error %lu)\n", dwError); + DPRINT("REnumDependentServicesW() called\n"); + + hSCObject = &hService; + hSvc = (PSERVICE_HANDLE) *hSCObject; + lpService = hSvc->ServiceEntry; + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* First determine the bytes needed and get the number of dependent services */ + dwError = Int_EnumDependentServicesW(hServicesKey, + lpService, + dwServiceState, + NULL, + pcbBytesNeeded, + &dwServicesReturned); + if (dwError != ERROR_SUCCESS) + goto Done; + + /* If buffer size is less than the bytes needed or pointer is null */ + if ((!lpServices) || (cbBufSize < *pcbBytesNeeded)) + { + dwError = ERROR_MORE_DATA; + goto Done; + } + + /* Allocate memory for array of service pointers */ + lpServicesArray = HeapAlloc(GetProcessHeap(), + 0, + (dwServicesReturned + 1) * sizeof(PSERVICE)); + if (!lpServicesArray) + { + DPRINT1("Could not allocate a buffer!!\n"); + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto Done; + } + + dwServicesReturned = 0; + *pcbBytesNeeded = 0; + + dwError = Int_EnumDependentServicesW(hServicesKey, + lpService, + dwServiceState, + lpServicesArray, + pcbBytesNeeded, + &dwServicesReturned); + if (dwError != ERROR_SUCCESS) + { + goto Done; + } + + lpServicesPtr = (LPENUM_SERVICE_STATUSW) lpServices; + lpStr = (LPWSTR)(lpServices + (dwServicesReturned * sizeof(ENUM_SERVICE_STATUSW))); + + /* Copy EnumDepenedentService to Buffer */ + for (dwServiceCount = 0; dwServiceCount < dwServicesReturned; dwServiceCount++) + { + lpService = lpServicesArray[dwServiceCount]; + + /* Copy status info */ + memcpy(&lpServicesPtr->ServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + + /* Copy display name */ + wcscpy(lpStr, lpService->lpDisplayName); + lpServicesPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServices); + lpStr += (wcslen(lpService->lpDisplayName) + 1); + + /* Copy service name */ + wcscpy(lpStr, lpService->lpServiceName); + lpServicesPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServices); + lpStr += (wcslen(lpService->lpServiceName) + 1); + + lpServicesPtr ++; + } + + *lpServicesReturned = dwServicesReturned; + +Done: + if (lpServicesArray != NULL) + HeapFree(GetProcessHeap(), 0, lpServicesArray); + + RegCloseKey(hServicesKey); + + DPRINT("REnumDependentServicesW() done (Error %lu)\n", dwError); return dwError; } @@ -2722,10 +2983,141 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned) { - UNIMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + DWORD dwServicesReturned = 0; + DWORD dwServiceCount; + HKEY hServicesKey = NULL; + LPSC_RPC_HANDLE hSCObject; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + PSERVICE *lpServicesArray = NULL; + LPENUM_SERVICE_STATUSA lpServicesPtr = NULL; + LPSTR lpStr; + *pcbBytesNeeded = 0; *lpServicesReturned = 0; - return ERROR_CALL_NOT_IMPLEMENTED; + + DPRINT("REnumDependentServicesA() called\n"); + + hSCObject = &hService; + hSvc = (PSERVICE_HANDLE) *hSCObject; + lpService = hSvc->ServiceEntry; + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + + if (dwError != ERROR_SUCCESS) return dwError; + + /* NOTE: Windows calculates the pcbBytesNeeded based on WCHAR strings for + both EnumDependentServicesA and EnumDependentServicesW. So returned pcbBytesNeeded + are the same for both. Verified in WINXP. */ + + /* First determine the bytes needed and get the number of dependent services*/ + dwError = Int_EnumDependentServicesW(hServicesKey, + lpService, + dwServiceState, + NULL, + pcbBytesNeeded, + &dwServicesReturned); + if (dwError != ERROR_SUCCESS) + goto Done; + + /* If buffer size is less than the bytes needed or pointer is null*/ + if ((!lpServices) || (cbBufSize < *pcbBytesNeeded)) + { + dwError = ERROR_MORE_DATA; + goto Done; + } + + /* Allocate memory for array of service pointers */ + lpServicesArray = HeapAlloc(GetProcessHeap(), + 0, + (dwServicesReturned + 1) * sizeof(PSERVICE)); + if (!lpServicesArray) + { + DPRINT1("Could not allocate a buffer!!\n"); + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto Done; + } + + dwServicesReturned = 0; + *pcbBytesNeeded = 0; + + dwError = Int_EnumDependentServicesW(hServicesKey, + lpService, + dwServiceState, + lpServicesArray, + pcbBytesNeeded, + &dwServicesReturned); + if (dwError != ERROR_SUCCESS) + { + goto Done; + } + + lpServicesPtr = (LPENUM_SERVICE_STATUSA)lpServices; + lpStr = (LPSTR)(lpServices + (dwServicesReturned * sizeof(ENUM_SERVICE_STATUSA))); + + /* Copy EnumDepenedentService to Buffer */ + for (dwServiceCount = 0; dwServiceCount < dwServicesReturned; dwServiceCount++) + { + lpService = lpServicesArray[dwServiceCount]; + + /* Copy the status info */ + memcpy(&lpServicesPtr->ServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + + /* Copy display name */ + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpDisplayName, + -1, + lpStr, + wcslen(lpService->lpDisplayName), + 0, + 0); + lpServicesPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServices); + lpStr += strlen(lpStr) + 1; + + /* Copy service name */ + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpServiceName, + -1, + lpStr, + wcslen(lpService->lpServiceName), + 0, + 0); + lpServicesPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServices); + lpStr += strlen(lpStr) + 1; + + lpServicesPtr ++; + } + + *lpServicesReturned = dwServicesReturned; + +Done: + if (lpServicesArray) + HeapFree(GetProcessHeap(), 0, lpServicesArray); + + RegCloseKey(hServicesKey); + + DPRINT("REnumDependentServicesA() done (Error %lu)\n", dwError); + + return dwError; }

1 0

[ekohl] 35752: - QueryServiceConfig2A/W: Fail if lpBuffer is NULL but cbBufSize is not 0. - RChangeServiceConfigW: Update the display name if it has been changed. - RQueryServiceConfigW: Return pointers to empty strings instead of NULL pointers if information is not available. - RQueryServiceConfig2W: Fail if lpBuffer is NULL. - Implement RChangeServiceConfigA, RQueryServiceConfigA and RQueryServiceConfig2A. Patch is based on bug report #3669 by bugboy <marinmnet@hotmail.com>.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 06:15:53 2008 New Revision: 35752 URL: http://svn.reactos.org/svn/reactos?rev=35752&view=rev Log: - QueryServiceConfig2A/W: Fail if lpBuffer is NULL but cbBufSize is not 0. - RChangeServiceConfigW: Update the display name if it has been changed. - RQueryServiceConfigW: Return pointers to empty strings instead of NULL pointers if information is not available. - RQueryServiceConfig2W: Fail if lpBuffer is NULL. - Implement RChangeServiceConfigA, RQueryServiceConfigA and RQueryServiceConfig2A. Patch is based on bug report #3669 by bugboy <marinmnet(a)hotmail.com>. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 06:15:53 2008 @@ -801,6 +801,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; HKEY hServiceKey = NULL; + LPWSTR lpDisplayNameW = NULL; DPRINT("RChangeServiceConfigW() called\n"); DPRINT("dwServiceType = %lu\n", dwServiceType); @@ -860,7 +861,21 @@ REG_SZ, (LPBYTE)lpDisplayName, (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); - /* FIXME: update lpService->lpDisplayName */ + + /* Update the display name */ + lpDisplayNameW = (LPWSTR)HeapAlloc(GetProcessHeap(), + 0, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + if (lpDisplayNameW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + if (lpService->lpDisplayName != lpService->lpServiceName) + HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + + lpService->lpDisplayName = lpDisplayNameW; } if (dwServiceType != SERVICE_NO_CHANGE) @@ -2011,7 +2026,8 @@ LPWSTR lpImagePath = NULL; LPWSTR lpServiceStartName = NULL; DWORD dwRequiredSize; - LPQUERY_SERVICE_CONFIGW lpConfig; + LPQUERY_SERVICE_CONFIGW lpConfig = NULL; + WCHAR lpEmptyString[] = {0,0}; LPWSTR lpStr; DPRINT("RQueryServiceConfigW() called\n"); @@ -2062,17 +2078,25 @@ if (lpImagePath != NULL) dwRequiredSize += ((wcslen(lpImagePath) + 1) * sizeof(WCHAR)); + else + dwRequiredSize += 2 * sizeof(WCHAR); if (lpService->lpGroup != NULL) dwRequiredSize += ((wcslen(lpService->lpGroup->lpGroupName) + 1) * sizeof(WCHAR)); + else + dwRequiredSize += 2 * sizeof(WCHAR); /* FIXME: Add Dependencies length*/ if (lpServiceStartName != NULL) dwRequiredSize += ((wcslen(lpServiceStartName) + 1) * sizeof(WCHAR)); + else + dwRequiredSize += 2 * sizeof(WCHAR); if (lpService->lpDisplayName != NULL) dwRequiredSize += ((wcslen(lpService->lpDisplayName) + 1) * sizeof(WCHAR)); + else + dwRequiredSize += 2 * sizeof(WCHAR); if (lpServiceConfig == NULL || cbBufSize < dwRequiredSize) { @@ -2091,48 +2115,55 @@ if (lpImagePath != NULL) { wcscpy(lpStr, lpImagePath); - lpConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); - lpStr += (wcslen(lpImagePath) + 1); } else { - lpConfig->lpBinaryPathName = NULL; - } + wcscpy(lpStr, lpEmptyString); + } + + lpConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (wcslen(lpStr) + 1); if (lpService->lpGroup != NULL) { wcscpy(lpStr, lpService->lpGroup->lpGroupName); - lpConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); - lpStr += (wcslen(lpService->lpGroup->lpGroupName) + 1); } else { - lpConfig->lpLoadOrderGroup = NULL; - } + wcscpy(lpStr, lpEmptyString); + } + + lpConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (wcslen(lpStr) + 1); /* FIXME: Append Dependencies */ - lpConfig->lpDependencies = NULL; + wcscpy(lpStr, lpEmptyString); + + lpStr += (wcslen(lpStr) + 1); + lpConfig->lpDependencies = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); if (lpServiceStartName != NULL) { wcscpy(lpStr, lpServiceStartName); - lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); - lpStr += (wcslen(lpServiceStartName) + 1); } else { - lpConfig->lpServiceStartName = NULL; - } + wcscpy(lpStr, lpEmptyString); + } + + lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (wcslen(lpStr) + 1); if (lpService->lpDisplayName != NULL) { wcscpy(lpStr, lpService->lpDisplayName); - lpConfig->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); } else { - lpConfig->lpDisplayName = NULL; - } + wcscpy(lpStr, lpEmptyString); + } + + lpConfig->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); } if (pcbBytesNeeded != NULL) @@ -2388,8 +2419,271 @@ DWORD dwPwSize, LPSTR lpDisplayName) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + LPWSTR lpDisplayNameW = NULL; + // LPWSTR lpBinaryPathNameW = NULL; + LPWSTR lpLoadOrderGroupW = NULL; + LPWSTR lpDependenciesW = NULL; + // LPWSTR lpPasswordW = NULL; + + DPRINT("RChangeServiceConfigA() called\n"); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %s\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %s\n", lpLoadOrderGroup); + DPRINT("lpDisplayName = %s\n", lpDisplayName); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_CHANGE_CONFIG)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock database exclusively */ + + if (lpService->bDeleted) + { + /* FIXME: Unlock database */ + DPRINT1("The service has already been marked for delete!\n"); + return ERROR_SERVICE_MARKED_FOR_DELETE; + } + + /* Open the service key */ + dwError = ScmOpenServiceKey(lpService->szServiceName, + KEY_SET_VALUE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Write service data to the registry */ + + if (lpDisplayName != NULL && *lpDisplayName != 0) + { + /* Set the display name */ + lpDisplayNameW = HeapAlloc(GetProcessHeap(), + 0, + (strlen(lpDisplayName) + 1) * sizeof(WCHAR)); + if (lpDisplayNameW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpDisplayName, + -1, + lpDisplayNameW, + (wcslen(lpDisplayNameW) + 1) * sizeof(WCHAR)); + + RegSetValueExW(hServiceKey, + L"DisplayName", + 0, + REG_SZ, + (LPBYTE)lpDisplayNameW, + (wcslen(lpDisplayNameW) + 1) * sizeof(WCHAR)); + + /* Update lpService->lpDisplayName */ + if (lpService->lpDisplayName) + HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + + lpService->lpDisplayName = lpDisplayNameW; + } + + if (dwServiceType != SERVICE_NO_CHANGE) + { + /* Set the service type */ + dwError = RegSetValueExW(hServiceKey, + L"Type", + 0, + REG_DWORD, + (LPBYTE)&dwServiceType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->Status.dwServiceType = dwServiceType; + } + + if (dwStartType != SERVICE_NO_CHANGE) + { + /* Set the start value */ + dwError = RegSetValueExW(hServiceKey, + L"Start", + 0, + REG_DWORD, + (LPBYTE)&dwStartType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->dwStartType = dwStartType; + } + + if (dwErrorControl != SERVICE_NO_CHANGE) + { + /* Set the error control value */ + dwError = RegSetValueExW(hServiceKey, + L"ErrorControl", + 0, + REG_DWORD, + (LPBYTE)&dwErrorControl, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->dwErrorControl = dwErrorControl; + } + +#if 0 + /* FIXME: set the new ImagePath value */ + + /* Set the image path */ + if (dwServiceType & SERVICE_WIN32) + { + if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) + { + lpBinaryPathNameW=HeapAlloc(GetProcessHeap(),0, (strlen(lpBinaryPathName)+1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, (wcslen(lpBinaryPathNameW)+1) * sizeof(WCHAR)); + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpBinaryPathNameW, + (wcslen(lpBinaryPathNameW) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + else if (dwServiceType & SERVICE_DRIVER) + { + if (lpImagePath != NULL && *lpImagePath != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpImagePath, + (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } +#endif + + /* Set the group name */ + if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) + { + lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), + 0, + (strlen(lpLoadOrderGroup)+1) * sizeof(WCHAR)); + if (lpLoadOrderGroupW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpLoadOrderGroup, + -1, + lpLoadOrderGroupW, + (wcslen(lpLoadOrderGroupW) + 1) * sizeof(WCHAR)); + + dwError = RegSetValueExW(hServiceKey, + L"Group", + 0, + REG_SZ, + (LPBYTE)lpLoadOrderGroupW, + (wcslen(lpLoadOrderGroupW) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + + /* FIXME: Update lpService->lpServiceGroup */ + + HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); + } + + if (lpdwTagId != NULL) + { + dwError = ScmAssignNewTag(lpService); + if (dwError != ERROR_SUCCESS) + goto done; + + dwError = RegSetValueExW(hServiceKey, + L"Tag", + 0, + REG_DWORD, + (LPBYTE)&lpService->dwTag, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + *lpdwTagId = lpService->dwTag; + } + + /* Write dependencies */ + if (lpDependencies != NULL && *lpDependencies != 0) + { + lpDependenciesW = HeapAlloc(GetProcessHeap(), + 0, + (strlen(lpDependencies)+1) * sizeof(WCHAR)); + if (lpDependenciesW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpDependencies, + dwDependSize, + lpDependenciesW, + (wcslen(lpDependenciesW)+1) * sizeof(WCHAR)); + + dwError = ScmWriteDependencies(hServiceKey, + (LPWSTR)lpDependenciesW, + dwDependSize); + + HeapFree(GetProcessHeap(), 0, lpDependenciesW); + } + + if (lpPassword != NULL) + { + /* FIXME: Write password */ + } + + /* FIXME: Unlock database */ + +done: + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + DPRINT("RChangeServiceConfigA() done (Error %lu)\n", dwError); + + return dwError; } @@ -2528,8 +2822,204 @@ DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf; + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + LPWSTR lpImagePath = NULL; + LPWSTR lpServiceStartName = NULL; + DWORD dwRequiredSize; + LPQUERY_SERVICE_CONFIGA lpConfig = NULL; + CHAR lpEmptyString[]={0,0}; + LPSTR lpStr; + + DPRINT("RQueryServiceConfigA() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_CONFIG)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock the service database shared */ + + dwError = ScmOpenServiceKey(lpService->lpServiceName, + KEY_READ, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto Done; + + dwError = ScmReadString(hServiceKey, + L"ImagePath", + &lpImagePath); + if (dwError != ERROR_SUCCESS) + goto Done; + + ScmReadString(hServiceKey, + L"ObjectName", + &lpServiceStartName); + + dwRequiredSize = sizeof(QUERY_SERVICE_CONFIGW); + + if (lpImagePath != NULL) + dwRequiredSize += wcslen(lpImagePath) + 1; + else + dwRequiredSize += 2; + + if (lpService->lpGroup != NULL) + dwRequiredSize += wcslen(lpService->lpGroup->lpGroupName) + 1; + else + dwRequiredSize += 2; + + /* FIXME: Add Dependencies length*/ + dwRequiredSize += 2; + + if (lpServiceStartName != NULL) + dwRequiredSize += wcslen(lpServiceStartName) + 1; + else + dwRequiredSize += 2; + + if (lpService->lpDisplayName != NULL) + dwRequiredSize += wcslen(lpService->lpDisplayName) + 1; + else + dwRequiredSize += 2; + + if (lpServiceConfig == NULL || cbBufSize < dwRequiredSize) + { + dwError = ERROR_INSUFFICIENT_BUFFER; + } + else + { + lpConfig = (LPQUERY_SERVICE_CONFIGA)lpServiceConfig; + lpConfig->dwServiceType = lpService->Status.dwServiceType; + lpConfig->dwStartType = lpService->dwStartType; + lpConfig->dwErrorControl = lpService->dwErrorControl; + lpConfig->dwTagId = lpService->dwTag; + + lpStr = (LPSTR)(lpServiceConfig + 1); + + /* NOTE: Strings that are NULL for QUERY_SERVICE_CONFIG are pointers to empty strings. + Verified in WINXP*/ + + if (lpImagePath) + { + WideCharToMultiByte(CP_ACP, + 0, + lpImagePath, + -1, + lpStr, + wcslen(lpImagePath), + 0, + 0); + } + else + { + strcpy(lpStr, lpEmptyString); + } + + lpConfig->lpBinaryPathName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (strlen((LPSTR)lpStr) + 1); + + if (lpService->lpGroup) + { + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpGroup->lpGroupName, + -1, + lpStr, + wcslen(lpService->lpGroup->lpGroupName), + 0, + 0); + } + else + { + strcpy(lpStr, lpEmptyString); + } + + lpConfig->lpLoadOrderGroup = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (strlen(lpStr) + 1); + + /* FIXME: Append Dependencies */ + strcpy(lpStr, lpEmptyString); + + lpConfig->lpDependencies = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (strlen(lpStr) + 1); + + if (lpServiceStartName) + { + WideCharToMultiByte(CP_ACP, + 0, + lpServiceStartName, + -1, + lpStr, + wcslen(lpServiceStartName), + 0, + 0); + } + else + { + strcpy(lpStr, lpEmptyString); + } + + lpConfig->lpServiceStartName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (strlen(lpStr) + 1); + + if (lpService->lpDisplayName) + { + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpDisplayName, + -1, + lpStr, + wcslen(lpService->lpDisplayName), + 0, + 0); + } + else + { + strcpy(lpStr, lpEmptyString); + } + + lpConfig->lpDisplayName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + } + + if (pcbBytesNeeded != NULL) + *pcbBytesNeeded = dwRequiredSize; + +Done:; + if (lpImagePath != NULL) + HeapFree(GetProcessHeap(), 0, lpImagePath); + + if (lpServiceStartName != NULL) + HeapFree(GetProcessHeap(), 0, lpServiceStartName); + + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + /* FIXME: Unlock the service database */ + + DPRINT("RQueryServiceConfigA() done\n"); + + return dwError; } @@ -2917,8 +3407,102 @@ DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + DWORD dwRequiredSize; + LPWSTR lpDescriptionW = NULL; + LPSTR lpDescription = NULL; + + DPRINT("RQueryServiceConfig2W() called\n"); + + if (!lpBuffer) + return ERROR_INVALID_ADDRESS; + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_CONFIG)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock the service database shared */ + + dwError = ScmOpenServiceKey(lpService->lpServiceName, + KEY_READ, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + { + LPSERVICE_DESCRIPTIONA lpServiceDescription = (LPSERVICE_DESCRIPTIONA)lpBuffer; + LPSTR lpStr; + + dwError = ScmReadString(hServiceKey, + L"Description", + &lpDescriptionW); + if (dwError != ERROR_SUCCESS) + goto done; + + dwRequiredSize = sizeof(SERVICE_DESCRIPTIONA) + ((wcslen(lpDescriptionW) + 1)); + + if (cbBufSize < dwRequiredSize) + { + *pcbBytesNeeded = dwRequiredSize; + dwError = ERROR_INSUFFICIENT_BUFFER; + goto done; + } + + lpStr = (LPSTR)(lpServiceDescription + 1); + + WideCharToMultiByte(CP_ACP, + 0, + lpDescriptionW, + -1, + lpStr, + wcslen(lpDescriptionW), + NULL, + NULL); + lpServiceDescription->lpDescription = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription); + } + else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) + { + UNIMPLEMENTED; + dwError = ERROR_CALL_NOT_IMPLEMENTED; + goto done; + } + +done: + if (lpDescription != NULL) + HeapFree(GetProcessHeap(), 0, lpDescription); + + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + /* FIXME: Unlock database */ + + DPRINT("RQueryServiceConfig2W() done (Error %lu)\n", dwError); + + return dwError; } @@ -2940,6 +3524,9 @@ DPRINT("RQueryServiceConfig2W() called\n"); + if (!lpBuffer) + return ERROR_INVALID_ADDRESS; + if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2991,12 +3578,10 @@ dwError = ERROR_INSUFFICIENT_BUFFER; goto done; } - else - { - lpStr = (LPWSTR)(lpServiceDescription + 1); - wcscpy(lpStr, lpDescription); - lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription); - } + + lpStr = (LPWSTR)(lpServiceDescription + 1); + wcscpy(lpStr, lpDescription); + lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription); } else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) { Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Aug 29 06:15:53 2008 @@ -1831,6 +1831,12 @@ TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + if (lpBuffer == NULL && cbBufSize != 0) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + HandleBind(); _SEH_TRY @@ -1915,6 +1921,12 @@ TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + if (lpBuffer == NULL && cbBufSize != 0) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + HandleBind(); _SEH_TRY

1 0

[arty] 35751: Make CcPinRead and CcPreparePinWrite the same for now.
by arty＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: arty Date: Fri Aug 29 05:55:59 2008 New Revision: 35751 URL: http://svn.reactos.org/svn/reactos?rev=35751&view=rev Log: Make CcPinRead and CcPreparePinWrite the same for now. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Aug 29 05:55:59 2008 @@ -670,23 +670,11 @@ OUT PVOID *Bcb, OUT PVOID *Buffer) { - BOOLEAN GotIt = CcPinMappedData - (FileObject, - FileOffset, - Length, - Flags, - Bcb); - - PNOCC_BCB TheBcb = (PNOCC_BCB)*Bcb; - ULONG Start = TheBcb - CcCacheSections; - - DPRINT("CcPreparePinWrite(#%x)\n", Start); - - if (GotIt) - { - CcCacheSections[Start].Dirty = TRUE; - *Buffer = (PVOID)((PCHAR)TheBcb->BaseAddress + (FileOffset->QuadPart - TheBcb->FileOffset.QuadPart)); - DPRINT("Returning Buffer: %x\n", *Buffer); + BOOLEAN Result = CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer); + + if (Result) + { + PNOCC_BCB TheBcb = (PNOCC_BCB)*Bcb; if (!TheBcb->Pinned) { TheBcb->Pinned = IoAllocateMdl @@ -695,12 +683,21 @@ FALSE, FALSE, NULL); - MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); - } - } - - DPRINT("Done\n"); - return GotIt; + _SEH_TRY + { + MmProbeAndLockPages(TheBcb->Pinned, KernelMode, IoReadAccess); + } + _SEH_HANDLE + { + IoFreeMdl(TheBcb->Pinned); + TheBcb->Pinned = NULL; + Result = FALSE; + } + _SEH_END; + } + } + + return Result; } VOID

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