Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gedmurphy] 44682: Don't re-add the dependants
by gedmurphy＠svn.reactos.org 21 Dec '09

21 Dec '09

Author: gedmurphy Date: Mon Dec 21 17:17:18 2009 New Revision: 44682 URL: http://svn.reactos.org/svn/reactos?rev=44682&view=rev Log: Don't re-add the dependants Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Mon Dec 21 17:17:18 2009 @@ -223,11 +223,21 @@ { if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE1) { - TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + /* Has this node been expanded before */ + if (!TreeView_GetChild(pDlgInfo->hDependsTreeView1, lpnmtv->itemNew.hItem)) + { + /* It's not, add the children */ + TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + } } else if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE2) { - TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + /* Has this node been expanded before */ + if (!TreeView_GetChild(pDlgInfo->hDependsTreeView1, lpnmtv->itemNew.hItem)) + { + /* It's not, add the children */ + TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + } } } break;

1 0

[gedmurphy] 44681: Recurse the tree and clean up all the strings tagged to the items. Servman now has working dependency tracking
by gedmurphy＠svn.reactos.org 21 Dec '09

21 Dec '09

Author: gedmurphy Date: Mon Dec 21 15:25:54 2009 New Revision: 44681 URL: http://svn.reactos.org/svn/reactos?rev=44681&view=rev Log: Recurse the tree and clean up all the strings tagged to the items. Servman now has working dependency tracking Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Mon Dec 21 15:25:54 2009 @@ -27,8 +27,9 @@ tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_CHILDREN; tvi.pszText = lpDisplayName; tvi.cchTextMax = _tcslen(lpDisplayName); - tvi.cChildren = bHasChildren; //I_CHILDRENCALLBACK; - + tvi.cChildren = bHasChildren; + + /* Select the image for this service */ switch (ServiceType) { case SERVICE_WIN32_OWN_PROCESS: @@ -49,13 +50,16 @@ break; } - /* Attach the service name */ - tvi.lParam = (LPARAM)(LPTSTR)HeapAlloc(GetProcessHeap(), - 0, - (_tcslen(lpServiceName) + 1) * sizeof(TCHAR)); - if (tvi.lParam) - { - _tcscpy((LPTSTR)tvi.lParam, lpServiceName); + if (lpServiceName) + { + /* Attach the service name */ + tvi.lParam = (LPARAM)(LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + (_tcslen(lpServiceName) + 1) * sizeof(TCHAR)); + if (tvi.lParam) + { + _tcscpy((LPTSTR)tvi.lParam, lpServiceName); + } } tvins.item = tvi; @@ -64,10 +68,73 @@ return TreeView_InsertItem(hTreeView, &tvins); } +static LPARAM +TreeView_GetItemParam(HWND hTreeView, + HTREEITEM hItem) +{ + LPARAM lParam = 0; + TVITEM tv = {0}; + + tv.mask = TVIF_PARAM | TVIF_HANDLE; + tv.hItem = hItem; + + if (TreeView_GetItem(hTreeView, &tv)) + { + lParam = tv.lParam; + } + + return lParam; +} + +static VOID +DestroyItem(HWND hTreeView, + HTREEITEM hItem) +{ + HTREEITEM hChildItem; + LPTSTR lpServiceName; + + /* Does this item have any children */ + hChildItem = TreeView_GetChild(hTreeView, hItem); + if (hChildItem) + { + /* It does, recurse to that one */ + DestroyItem(hTreeView, hChildItem); + } + + /* Get the string and free it */ + lpServiceName = (LPTSTR)TreeView_GetItemParam(hTreeView, hItem); + if (lpServiceName) + { + HeapFree(GetProcessHeap(), + 0, + lpServiceName); + } +} + static VOID DestroyTreeView(HWND hTreeView) { - //FIXME: traverse the nodes and free the strings + HTREEITEM hItem; + + /* Get the first item in the top level */ + hItem = TreeView_GetFirstVisible(hTreeView); + if (hItem) + { + /* Kill it and all children */ + DestroyItem(hTreeView, hItem); + + /* Kill all remaining top level items */ + while (hItem) + { + /* Are there any more items at the top level */ + hItem = TreeView_GetNextSibling(hTreeView, hItem); + if (hItem) + { + /* Kill it and all children */ + DestroyItem(hTreeView, hItem); + } + } + } } /* @@ -85,25 +152,6 @@ tv.cchTextMax = (int)cbBuffer; return TreeView_GetItem(hTreeView, &tv); -} - - -static LPARAM -TreeView_GetItemParam(HWND hTreeView, - HTREEITEM hItem) -{ - LPARAM lParam = 0; - TVITEM tv = {0}; - - tv.mask = TVIF_PARAM | TVIF_HANDLE; - tv.hItem = hItem; - - if (TreeView_GetItem(hTreeView, &tv)) - { - lParam = tv.lParam; - } - - return lParam; } */

1 0

[gedmurphy] 44680: Add full depth of dependencies for the first tree view
by gedmurphy＠svn.reactos.org 21 Dec '09

21 Dec '09

Author: gedmurphy Date: Mon Dec 21 14:42:29 2009 New Revision: 44680 URL: http://svn.reactos.org/svn/reactos?rev=44680&view=rev Log: Add full depth of dependencies for the first tree view Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] Mon Dec 21 14:42:29 2009 @@ -80,84 +80,110 @@ return lpStr; } -static VOID +VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, - SC_HANDLE hService) + LPTSTR lpServiceName) { + SC_HANDLE hSCManager; + SC_HANDLE hService; LPQUERY_SERVICE_CONFIG lpServiceConfig; LPTSTR lpDependants; LPTSTR lpStr; LPTSTR lpNoDepends; BOOL bHasChildren; - /* Get a list of service dependents */ - lpDependants = TV1_GetDependants(pDlgInfo, hService); - if (lpDependants) + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) { - lpStr = lpDependants; - - /* Make sure this isn't the end of the list */ - while (*lpStr) + hService = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + if (hService) { - /* Get the info for this service */ - lpServiceConfig = GetServiceConfig(lpStr); - if (lpServiceConfig) + /* Get a list of service dependents */ + lpDependants = TV1_GetDependants(pDlgInfo, hService); + if (lpDependants) { - /* Does this item need a +/- box? */ - bHasChildren = lpServiceConfig->lpDependencies ? TRUE : FALSE; - - /* Add it */ - AddItemToTreeView(pDlgInfo->hDependsTreeView1, - hParent, - lpServiceConfig->lpDisplayName, - lpStr, - lpServiceConfig->dwServiceType, - bHasChildren); + lpStr = lpDependants; + + /* Make sure this isn't the end of the list */ + while (*lpStr) + { + /* Get the info for this service */ + lpServiceConfig = GetServiceConfig(lpStr); + if (lpServiceConfig) + { + /* Does this item need a +/- box? */ + if (lpServiceConfig->lpDependencies && + *lpServiceConfig->lpDependencies != '\0') + { + bHasChildren = TRUE; + } + else + { + bHasChildren = FALSE; + } + + /* Add it */ + AddItemToTreeView(pDlgInfo->hDependsTreeView1, + hParent, + lpServiceConfig->lpDisplayName, + lpStr, + lpServiceConfig->dwServiceType, + bHasChildren); + + HeapFree(GetProcessHeap(), + 0, + lpServiceConfig); + } + + /* Move to the end of the string */ + while (*lpStr++) + ; + } HeapFree(GetProcessHeap(), 0, - lpServiceConfig); + lpDependants); } - - /* Move to the end of the string */ - while (*lpStr++) - ; + else + { + /* If there is no parent, set the tree to 'no dependencies' */ + if (!hParent) + { + /* Load the 'No dependencies' string */ + AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); + + AddItemToTreeView(pDlgInfo->hDependsTreeView1, + NULL, + lpNoDepends, + NULL, + 0, + FALSE); + + HeapFree(ProcessHeap, + 0, + lpNoDepends); + + /* Disable the window */ + EnableWindow(pDlgInfo->hDependsTreeView1, FALSE); + } + } + + CloseServiceHandle(hService); } - HeapFree(GetProcessHeap(), - 0, - lpDependants); - } - else - { - /* If there is no parent, set the tree to 'no dependencies' */ - if (!hParent) - { - /* Load the 'No dependencies' string */ - AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - - AddItemToTreeView(pDlgInfo->hDependsTreeView1, - NULL, - lpNoDepends, - NULL, - 0, - FALSE); - - HeapFree(ProcessHeap, - 0, - lpNoDepends); - - /* Disable the window */ - EnableWindow(pDlgInfo->hDependsTreeView1, FALSE); - } + CloseServiceHandle(hSCManager); } } BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, - SC_HANDLE hService) + LPTSTR lpServiceName) { BOOL bRet = FALSE; @@ -174,7 +200,7 @@ TVSIL_NORMAL); /* Set the first items in the control */ - TV1_AddDependantsToTree(pDlgInfo, NULL, hService); + TV1_AddDependantsToTree(pDlgInfo, NULL, lpServiceName); return bRet; } Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Mon Dec 21 14:42:29 2009 @@ -106,62 +106,81 @@ } -static VOID +VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, - SC_HANDLE hService) -{ + LPTSTR lpServiceName) +{ + SC_HANDLE hSCManager; + SC_HANDLE hService; LPENUM_SERVICE_STATUS lpServiceStatus; LPTSTR lpNoDepends; DWORD count, i; BOOL bHasChildren; - /* Get a list of service dependents */ - lpServiceStatus = TV2_GetDependants(hService, &count); - if (lpServiceStatus) - { - for (i = 0; i < count; i++) + /* Set the first items in each tree view */ + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + if (hService) { - /* Does this item need a +/- box? */ - bHasChildren = HasDependantServices(lpServiceStatus[i].lpServiceName); - - /* Add it */ - AddItemToTreeView(pDlgInfo->hDependsTreeView2, - hParent, - lpServiceStatus[i].lpDisplayName, - lpServiceStatus[i].lpServiceName, - lpServiceStatus[i].ServiceStatus.dwServiceType, - bHasChildren); + /* Get a list of service dependents */ + lpServiceStatus = TV2_GetDependants(hService, &count); + if (lpServiceStatus) + { + for (i = 0; i < count; i++) + { + /* Does this item need a +/- box? */ + bHasChildren = HasDependantServices(lpServiceStatus[i].lpServiceName); + + /* Add it */ + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + hParent, + lpServiceStatus[i].lpDisplayName, + lpServiceStatus[i].lpServiceName, + lpServiceStatus[i].ServiceStatus.dwServiceType, + bHasChildren); + } + } + else + { + /* If there is no parent, set the tree to 'no dependencies' */ + if (!hParent) + { + /* Load the 'No dependencies' string */ + AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); + + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + NULL, + lpNoDepends, + NULL, + 0, + FALSE); + + HeapFree(ProcessHeap, + 0, + lpNoDepends); + + /* Disable the window */ + EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); + } + } + + CloseServiceHandle(hService); } - } - else - { - /* If there is no parent, set the tree to 'no dependencies' */ - if (!hParent) - { - /* Load the 'No dependencies' string */ - AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - - AddItemToTreeView(pDlgInfo->hDependsTreeView2, - NULL, - lpNoDepends, - NULL, - 0, - FALSE); - - HeapFree(ProcessHeap, - 0, - lpNoDepends); - - /* Disable the window */ - EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); - } + + CloseServiceHandle(hSCManager); } } BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, - SC_HANDLE hService) + LPTSTR lpServiceName) { BOOL bRet = FALSE; @@ -178,7 +197,7 @@ TVSIL_NORMAL); /* Set the first items in the control */ - TV2_AddDependantsToTree(pDlgInfo, NULL, hService); + TV2_AddDependantsToTree(pDlgInfo, NULL, lpServiceName); return bRet; } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Mon Dec 21 14:42:29 2009 @@ -121,15 +121,15 @@ HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpDisplayName, LPTSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); /* dependencies */ -//LPENUM_SERVICE_STATUS GetServiceDependents(SC_HANDLE hService, LPDWORD lpdwCount); INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -//LPTSTR GetDependentServices(SC_HANDLE hService); /* tv1_dependencies */ -BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService); +BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); +VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); /* tv2_dependencies */ -BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService); +BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); +VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Mon Dec 21 14:42:29 2009 @@ -12,10 +12,10 @@ HTREEITEM AddItemToTreeView(HWND hTreeView, - HTREEITEM hRoot, + HTREEITEM hParent, LPTSTR lpDisplayName, LPTSTR lpServiceName, - ULONG serviceType, + ULONG ServiceType, BOOL bHasChildren) { TV_ITEM tvi; @@ -24,33 +24,50 @@ ZeroMemory(&tvi, sizeof(tvi)); ZeroMemory(&tvins, sizeof(tvins)); - tvi.mask = TVIF_TEXT | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_CHILDREN; + tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_CHILDREN; tvi.pszText = lpDisplayName; tvi.cchTextMax = _tcslen(lpDisplayName); tvi.cChildren = bHasChildren; //I_CHILDRENCALLBACK; - if (serviceType == SERVICE_WIN32_OWN_PROCESS || - serviceType == SERVICE_WIN32_SHARE_PROCESS) - { - tvi.iImage = 1; - tvi.iSelectedImage = 1; - } - else if (serviceType == SERVICE_KERNEL_DRIVER || - serviceType == SERVICE_FILE_SYSTEM_DRIVER) - { - tvi.iImage = 2; - tvi.iSelectedImage = 2; - } - else - { - tvi.iImage = 0; - tvi.iSelectedImage = 0; + switch (ServiceType) + { + case SERVICE_WIN32_OWN_PROCESS: + case SERVICE_WIN32_SHARE_PROCESS: + tvi.iImage = 1; + tvi.iSelectedImage = 1; + break; + + case SERVICE_KERNEL_DRIVER: + case SERVICE_FILE_SYSTEM_DRIVER: + tvi.iImage = 2; + tvi.iSelectedImage = 2; + break; + + default: + tvi.iImage = 0; + tvi.iSelectedImage = 0; + break; + } + + /* Attach the service name */ + tvi.lParam = (LPARAM)(LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + (_tcslen(lpServiceName) + 1) * sizeof(TCHAR)); + if (tvi.lParam) + { + _tcscpy((LPTSTR)tvi.lParam, lpServiceName); } tvins.item = tvi; - tvins.hParent = hRoot; + tvins.hParent = hParent; return TreeView_InsertItem(hTreeView, &tvins); +} + +static VOID +DestroyTreeView(HWND hTreeView) +{ + //FIXME: traverse the nodes and free the strings } /* @@ -69,15 +86,30 @@ return TreeView_GetItem(hTreeView, &tv); } + + +static LPARAM +TreeView_GetItemParam(HWND hTreeView, + HTREEITEM hItem) +{ + LPARAM lParam = 0; + TVITEM tv = {0}; + + tv.mask = TVIF_PARAM | TVIF_HANDLE; + tv.hItem = hItem; + + if (TreeView_GetItem(hTreeView, &tv)) + { + lParam = tv.lParam; + } + + return lParam; +} */ -static BOOL +static VOID InitDependPage(PSERVICEPROPSHEET pDlgInfo) { - SC_HANDLE hSCManager; - SC_HANDLE hService; - BOOL bRet = FALSE; - /* Initialize the image list */ pDlgInfo->hDependsImageList = InitImageList(IDI_NODEPENDS, IDI_DRIVER, @@ -85,32 +117,11 @@ GetSystemMetrics(SM_CXSMICON), IMAGE_ICON); - /* Set the first items in each tree view */ - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenService(hSCManager, - pDlgInfo->pService->lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); - if (hService) - { - /* Set the first tree view */ - TV1_Initialize(pDlgInfo, hService); - - /* Set the second tree view */ - TV2_Initialize(pDlgInfo, hService); - - bRet = TRUE; - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } - - return bRet; + /* Set the first tree view */ + TV1_Initialize(pDlgInfo, pDlgInfo->pService->lpServiceName); + + /* Set the second tree view */ + TV2_Initialize(pDlgInfo, pDlgInfo->pService->lpServiceName); } @@ -162,7 +173,14 @@ if (lpnmtv->action == TVE_EXPAND) { - + if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE1) + { + TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + } + else if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE2) + { + TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + } } break; } @@ -178,6 +196,9 @@ break; case WM_DESTROY: + DestroyTreeView(pDlgInfo->hDependsTreeView1); + DestroyTreeView(pDlgInfo->hDependsTreeView2); + if (pDlgInfo->hDependsImageList) ImageList_Destroy(pDlgInfo->hDependsImageList); }

1 0

[gedmurphy] 44679: Implement the first level of service dependants
by gedmurphy＠svn.reactos.org 21 Dec '09

21 Dec '09

Author: gedmurphy Date: Mon Dec 21 12:57:58 2009 New Revision: 44679 URL: http://svn.reactos.org/svn/reactos?rev=44679&view=rev Log: Implement the first level of service dependants Added: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c (with props) trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c (with props) Modified: trunk/reactos/base/applications/mscutils/servman/dependencies.c trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/manifest.xml trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.rbuild trunk/reactos/base/applications/mscutils/servman/servman.rc trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -9,158 +9,13 @@ #include "precomp.h" - -/* - * Services which depend on the given service. - * The return components depend on this service - */ -LPTSTR -GetDependentServices(SC_HANDLE hService) -{ - LPQUERY_SERVICE_CONFIG lpServiceConfig; - LPTSTR lpStr = NULL; - DWORD bytesNeeded; - DWORD bytes; - - if (!QueryServiceConfig(hService, - NULL, - 0, - &bytesNeeded) && - GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - lpServiceConfig = HeapAlloc(ProcessHeap, - 0, - bytesNeeded); - if (lpServiceConfig) - { - if (QueryServiceConfig(hService, - lpServiceConfig, - bytesNeeded, - &bytesNeeded)) - { - if (lpServiceConfig) - { - lpStr = lpServiceConfig->lpDependencies; - bytes = 0; - - while (TRUE) - { - bytes++; - - if (!*lpStr && !*(lpStr + 1)) - { - bytes++; - break; - } - - lpStr++; - } - - bytes *= sizeof(TCHAR); - lpStr = HeapAlloc(ProcessHeap, - 0, - bytes); - if (lpStr) - { - CopyMemory(lpStr, - lpServiceConfig->lpDependencies, - bytes); - } - } - } - } - } - - return lpStr; -} - - -/* - * Services which the given service depends on (1st treeview) - * The service depends on the return components - */ -LPENUM_SERVICE_STATUS -GetServiceDependents(SC_HANDLE hService, - LPDWORD lpdwCount) -{ - LPENUM_SERVICE_STATUS lpDependencies; - DWORD dwBytesNeeded; - DWORD dwCount; - - if (EnumDependentServices(hService, - SERVICE_STATE_ALL, - NULL, - 0, - &dwBytesNeeded, - &dwCount)) - { - /* There are no dependent services */ - return NULL; - } - else - { - if (GetLastError() != ERROR_MORE_DATA) - return NULL; /* Unexpected error */ - - lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), - 0, - dwBytesNeeded); - if (lpDependencies) - { - if (EnumDependentServices(hService, - SERVICE_STATE_ALL, - lpDependencies, - dwBytesNeeded, - &dwBytesNeeded, - &dwCount)) - { - *lpdwCount = dwCount; - } - else - { - HeapFree(ProcessHeap, - 0, - lpDependencies); - - lpDependencies = NULL; - } - } - } - - return lpDependencies; - -} - - -BOOL -HasDependentServices(SC_HANDLE hService) -{ - DWORD dwBytesNeeded, dwCount; - BOOL bRet = FALSE; - - if (hService) - { - if (!EnumDependentServices(hService, - SERVICE_STATE_ALL, - NULL, - 0, - &dwBytesNeeded, - &dwCount)) - { - if (GetLastError() == ERROR_MORE_DATA) - bRet = TRUE; - } - } - - return bRet; -} - +//FIXME: reimplement this static BOOL DoInitDependsDialog(PSTOP_INFO pStopInfo, HWND hDlg) { - LPENUM_SERVICE_STATUS lpDependencies; - DWORD dwCount; + //LPENUM_SERVICE_STATUS lpDependencies; + //DWORD dwCount; LPTSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; @@ -219,8 +74,8 @@ lpPartialStr); } - /* Get the list of dependencies */ - lpDependencies = GetServiceDependents(pStopInfo->hMainService, &dwCount); + /* Get the list of dependencies + GetServiceDependents(pStopInfo->hMainService, &dwCount); if (lpDependencies) { LPENUM_SERVICE_STATUS lpEnumServiceStatus; @@ -230,7 +85,7 @@ { lpEnumServiceStatus = &lpDependencies[i]; - /* Add the service to the listbox */ + Add the service to the listbox SendDlgItemMessage(hDlg, IDC_STOP_DEPENDS_LB, LB_ADDSTRING, @@ -241,7 +96,7 @@ HeapFree(ProcessHeap, 0, lpDependencies); - } + }*/ } return bRet; Added: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c (added) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -1,0 +1,180 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/servman/tv1_dependencies.c + * PURPOSE: Helper functions for service dependents + * COPYRIGHT: Copyright 2009 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "precomp.h" + + +LPTSTR +TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo, + SC_HANDLE hService) +{ + LPQUERY_SERVICE_CONFIG lpServiceConfig; + LPTSTR lpStr = NULL; + DWORD bytesNeeded; + DWORD bytes; + + /* Get the info for this service */ + if (!QueryServiceConfig(hService, + NULL, + 0, + &bytesNeeded) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + lpServiceConfig = HeapAlloc(ProcessHeap, + 0, + bytesNeeded); + if (lpServiceConfig) + { + if (QueryServiceConfig(hService, + lpServiceConfig, + bytesNeeded, + &bytesNeeded)) + { + /* Does this service have any dependencies? */ + if (lpServiceConfig->lpDependencies && + *lpServiceConfig->lpDependencies != '\0') + { + lpStr = lpServiceConfig->lpDependencies; + bytes = 0; + + /* Work out how many bytes we need to hold the list */ + while (TRUE) + { + bytes++; + + if (!*lpStr && !*(lpStr + 1)) + { + bytes++; + break; + } + + lpStr++; + } + + /* Allocate and copy the list */ + bytes *= sizeof(TCHAR); + lpStr = HeapAlloc(ProcessHeap, + 0, + bytes); + if (lpStr) + { + CopyMemory(lpStr, + lpServiceConfig->lpDependencies, + bytes); + } + } + } + + HeapFree(GetProcessHeap(), + 0, + lpServiceConfig); + } + } + + return lpStr; +} + +static VOID +TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, + HTREEITEM hParent, + SC_HANDLE hService) +{ + LPQUERY_SERVICE_CONFIG lpServiceConfig; + LPTSTR lpDependants; + LPTSTR lpStr; + LPTSTR lpNoDepends; + BOOL bHasChildren; + + /* Get a list of service dependents */ + lpDependants = TV1_GetDependants(pDlgInfo, hService); + if (lpDependants) + { + lpStr = lpDependants; + + /* Make sure this isn't the end of the list */ + while (*lpStr) + { + /* Get the info for this service */ + lpServiceConfig = GetServiceConfig(lpStr); + if (lpServiceConfig) + { + /* Does this item need a +/- box? */ + bHasChildren = lpServiceConfig->lpDependencies ? TRUE : FALSE; + + /* Add it */ + AddItemToTreeView(pDlgInfo->hDependsTreeView1, + hParent, + lpServiceConfig->lpDisplayName, + lpStr, + lpServiceConfig->dwServiceType, + bHasChildren); + + HeapFree(GetProcessHeap(), + 0, + lpServiceConfig); + } + + /* Move to the end of the string */ + while (*lpStr++) + ; + } + + HeapFree(GetProcessHeap(), + 0, + lpDependants); + } + else + { + /* If there is no parent, set the tree to 'no dependencies' */ + if (!hParent) + { + /* Load the 'No dependencies' string */ + AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); + + AddItemToTreeView(pDlgInfo->hDependsTreeView1, + NULL, + lpNoDepends, + NULL, + 0, + FALSE); + + HeapFree(ProcessHeap, + 0, + lpNoDepends); + + /* Disable the window */ + EnableWindow(pDlgInfo->hDependsTreeView1, FALSE); + } + } +} + + +BOOL +TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, + SC_HANDLE hService) +{ + BOOL bRet = FALSE; + + /* Accociate the imagelist with TV1 */ + pDlgInfo->hDependsTreeView1 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE1); + if (!pDlgInfo->hDependsTreeView1) + { + ImageList_Destroy(pDlgInfo->hDependsImageList); + pDlgInfo->hDependsImageList = NULL; + return FALSE; + } + (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView1, + pDlgInfo->hDependsImageList, + TVSIL_NORMAL); + + /* Set the first items in the control */ + TV1_AddDependantsToTree(pDlgInfo, NULL, hService); + + return bRet; +} Propchange: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c (added) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -1,0 +1,184 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/servman/tv2_dependencies.c + * PURPOSE: Helper functions for service dependents + * COPYRIGHT: Copyright 2009 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "precomp.h" + + +static BOOL +HasDependantServices(LPWSTR lpServiceName) +{ + HANDLE hSCManager; + HANDLE hService; + DWORD dwBytesNeeded, dwCount; + BOOL bRet = FALSE; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + /* Does this have any dependencies? */ + if (!EnumDependentServices(hService, + SERVICE_STATE_ALL, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + if (GetLastError() == ERROR_MORE_DATA) + { + /* It does, return TRUE */ + bRet = TRUE; + } + } + } + + CloseServiceHandle(hSCManager); + } + + return bRet; +} + + +static LPENUM_SERVICE_STATUS +TV2_GetDependants(SC_HANDLE hService, + LPDWORD lpdwCount) +{ + LPENUM_SERVICE_STATUS lpDependencies; + DWORD dwBytesNeeded; + DWORD dwCount; + + /* Does this have any dependencies? */ + if (EnumDependentServices(hService, + SERVICE_STATE_ALL, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + /* There are no dependent services */ + return NULL; + } + else + { + if (GetLastError() != ERROR_MORE_DATA) + return NULL; /* Unexpected error */ + + lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), + 0, + dwBytesNeeded); + if (lpDependencies) + { + /* Get the list of dependents */ + if (EnumDependentServices(hService, + SERVICE_STATE_ALL, + lpDependencies, + dwBytesNeeded, + &dwBytesNeeded, + &dwCount)) + { + /* Set the count */ + *lpdwCount = dwCount; + } + else + { + HeapFree(ProcessHeap, + 0, + lpDependencies); + + lpDependencies = NULL; + } + } + } + + return lpDependencies; +} + + +static VOID +TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, + HTREEITEM hParent, + SC_HANDLE hService) +{ + LPENUM_SERVICE_STATUS lpServiceStatus; + LPTSTR lpNoDepends; + DWORD count, i; + BOOL bHasChildren; + + /* Get a list of service dependents */ + lpServiceStatus = TV2_GetDependants(hService, &count); + if (lpServiceStatus) + { + for (i = 0; i < count; i++) + { + /* Does this item need a +/- box? */ + bHasChildren = HasDependantServices(lpServiceStatus[i].lpServiceName); + + /* Add it */ + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + hParent, + lpServiceStatus[i].lpDisplayName, + lpServiceStatus[i].lpServiceName, + lpServiceStatus[i].ServiceStatus.dwServiceType, + bHasChildren); + } + } + else + { + /* If there is no parent, set the tree to 'no dependencies' */ + if (!hParent) + { + /* Load the 'No dependencies' string */ + AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); + + AddItemToTreeView(pDlgInfo->hDependsTreeView2, + NULL, + lpNoDepends, + NULL, + 0, + FALSE); + + HeapFree(ProcessHeap, + 0, + lpNoDepends); + + /* Disable the window */ + EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); + } + } +} + +BOOL +TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, + SC_HANDLE hService) +{ + BOOL bRet = FALSE; + + /* Accociate the imagelist with TV2 */ + pDlgInfo->hDependsTreeView2 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE2); + if (!pDlgInfo->hDependsTreeView2) + { + ImageList_Destroy(pDlgInfo->hDependsImageList); + pDlgInfo->hDependsImageList = NULL; + return FALSE; + } + (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView2, + pDlgInfo->hDependsImageList, + TVSIL_NORMAL); + + /* Set the first items in the control */ + TV2_AddDependantsToTree(pDlgInfo, NULL, hService); + + return bRet; +} Propchange: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -106,8 +106,8 @@ FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN - CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 - CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67 LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26 LTEXT "This service depends on the following components", IDC_STATIC, 8, 57, 236, 9 LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 Modified: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -1,20 +1,15 @@ <?xml version='1.0' encoding='UTF-8' standalone='yes'?> <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> - <dependency> - <dependentAssembly> - <assemblyIdentity type='win32' - name='Microsoft.Windows.Common-Controls' - version='6.0.0.0' - processorArchitecture='X86' - publicKeyToken='6595b64144ccf1df' - language='*' /> - </dependentAssembly> - </dependency> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> <requestedPrivileges> - <requestedExecutionLevel level='highestAvailable' uiAccess='false' /> + <requestedExecutionLevel level='asInvoker' uiAccess='false' /> </requestedPrivileges> </security> </trustInfo> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' /> + </dependentAssembly> + </dependency> </assembly> Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -105,11 +105,6 @@ BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices); -/* dependencies */ -LPENUM_SERVICE_STATUS GetServiceDependents(SC_HANDLE hService, LPDWORD lpdwCount); -BOOL HasDependentServices(SC_HANDLE hService); -INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -LPTSTR GetDependentServices(SC_HANDLE hService); /* propsheet.c */ typedef struct _SERVICEPROPSHEET @@ -117,7 +112,24 @@ PMAIN_WND_INFO Info; ENUM_SERVICE_STATUS_PROCESS *pService; HIMAGELIST hDependsImageList; + HWND hDependsWnd; + HWND hDependsTreeView1; + HWND hDependsTreeView2; } SERVICEPROPSHEET, *PSERVICEPROPSHEET; + + +HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpDisplayName, LPTSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); + +/* dependencies */ +//LPENUM_SERVICE_STATUS GetServiceDependents(SC_HANDLE hService, LPDWORD lpdwCount); +INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +//LPTSTR GetDependentServices(SC_HANDLE hService); + +/* tv1_dependencies */ +BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService); + +/* tv2_dependencies */ +BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService); LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -10,11 +10,13 @@ #include "precomp.h" -static HTREEITEM +HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, - LPTSTR lpLabel, - ULONG serviceType) + LPTSTR lpDisplayName, + LPTSTR lpServiceName, + ULONG serviceType, + BOOL bHasChildren) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -22,9 +24,10 @@ ZeroMemory(&tvi, sizeof(tvi)); ZeroMemory(&tvins, sizeof(tvins)); - tvi.mask = TVIF_TEXT | TVIF_SELECTEDIMAGE | TVIF_IMAGE; - tvi.pszText = lpLabel; - tvi.cchTextMax = lstrlen(lpLabel); + tvi.mask = TVIF_TEXT | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_CHILDREN; + tvi.pszText = lpDisplayName; + tvi.cchTextMax = _tcslen(lpDisplayName); + tvi.cChildren = bHasChildren; //I_CHILDRENCALLBACK; if (serviceType == SERVICE_WIN32_OWN_PROCESS || serviceType == SERVICE_WIN32_SHARE_PROCESS) @@ -50,221 +53,56 @@ return TreeView_InsertItem(hTreeView, &tvins); } -#if 0 -static VOID -AddServiceDependency(PSERVICEPROPSHEET dlgInfo, - HWND hTreeView, - SC_HANDLE hSCManager, - LPTSTR lpServiceName, - HTREEITEM hParent, - HWND hwndDlg) +/* +static BOOL +TreeView_GetItemText(HWND hTreeView, + HTREEITEM hItem, + LPTSTR lpBuffer, + DWORD cbBuffer) { - LPQUERY_SERVICE_CONFIG lpServiceConfig; - SC_HANDLE hService; - HTREEITEM hChild; - LPTSTR lpStr; - LPTSTR lpNoDepends; + TVITEM tv = {0}; - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_CONFIG); - if (hService) - { + tv.mask = TVIF_TEXT | TVIF_HANDLE; + tv.hItem = hItem; + tv.pszText = lpBuffer; + tv.cchTextMax = (int)cbBuffer; - lpStr = GetDependentServices(hService); - if (lpStr) - { - while (*lpStr) - { - hChild = AddItemToTreeView(hTreeView, - hParent, - lpServiceConfig->lpDisplayName, - lpServiceConfig->dwServiceType); + return TreeView_GetItem(hTreeView, &tv); +} +*/ - - AddServiceDependency(dlgInfo, - hTreeView, - hSCManager, - lpStr, - hChild, - hwndDlg); - - while (*lpStr++) - ; - } - } - else - { - if (TreeView_GetCount(hTreeView) == 0) - { - if (AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS)) - { - lpStr = lpNoDepends; - } - - AddItemToTreeView(hTreeView, - hParent, - lpStr, - 0); - - HeapFree(ProcessHeap, - 0, - lpNoDepends); - - EnableWindow(hTreeView, FALSE); - } - } - - - HeapFree(ProcessHeap, - 0, - lpStr); - - CloseServiceHandle(hService); - } - -} -#endif - -static VOID -AddServiceDependent(HWND hTreeView, - HTREEITEM hParent, - SC_HANDLE hSCManager, - LPTSTR lpServiceName, - LPTSTR lpDisplayName, - DWORD dwServiceType) +static BOOL +InitDependPage(PSERVICEPROPSHEET pDlgInfo) { - LPENUM_SERVICE_STATUS lpServiceStatus; - SC_HANDLE hChildService; - HTREEITEM hChildNode; - DWORD count; - INT i; - - - hChildNode = AddItemToTreeView(hTreeView, - hParent, - lpDisplayName, - dwServiceType); - - hChildService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); - if (hChildService) - { - lpServiceStatus = GetServiceDependents(hChildService, &count); - if (lpServiceStatus) - { - for (i = 0; i < count; i++) - { - AddServiceDependent(hTreeView, - hChildNode, - hSCManager, - lpServiceStatus[i].lpServiceName, - lpServiceStatus[i].lpDisplayName, - lpServiceStatus[i].ServiceStatus.dwServiceType); - } - - HeapFree(ProcessHeap, - 0, - lpServiceStatus); - } - - CloseServiceHandle(hChildService); - } -} - -static VOID -SetServiceDependents(HWND hTreeView, - SC_HANDLE hSCManager, - SC_HANDLE hService) -{ - LPENUM_SERVICE_STATUS lpServiceStatus; - LPTSTR lpNoDepends; - DWORD count, i; - - lpServiceStatus = GetServiceDependents(hService, &count); - if (lpServiceStatus) - { - for (i = 0; i < count; i++) - { - AddServiceDependent(hTreeView, - NULL, - hSCManager, - lpServiceStatus[i].lpServiceName, - lpServiceStatus[i].lpDisplayName, - lpServiceStatus[i].ServiceStatus.dwServiceType); - } - } - else - { - AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - - AddItemToTreeView(hTreeView, - NULL, - lpNoDepends, - 0); - - HeapFree(ProcessHeap, - 0, - lpNoDepends); - - EnableWindow(hTreeView, FALSE); - } -} - -static VOID -SetDependentServices(SC_HANDLE hService) -{ -} - -static VOID -InitDependPage(PSERVICEPROPSHEET dlgInfo, - HWND hwndDlg) -{ - HWND hTreeView1, hTreeView2; SC_HANDLE hSCManager; SC_HANDLE hService; + BOOL bRet = FALSE; - dlgInfo->hDependsImageList = InitImageList(IDI_NODEPENDS, - IDI_DRIVER, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CXSMICON), - IMAGE_ICON); + /* Initialize the image list */ + pDlgInfo->hDependsImageList = InitImageList(IDI_NODEPENDS, + IDI_DRIVER, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + IMAGE_ICON); - - hTreeView1 = GetDlgItem(hwndDlg, IDC_DEPEND_TREE1); - if (!hTreeView1) - return; - - (void)TreeView_SetImageList(hTreeView1, - dlgInfo->hDependsImageList, - TVSIL_NORMAL); - - hTreeView2 = GetDlgItem(hwndDlg, IDC_DEPEND_TREE2); - if (!hTreeView2) - return; - - (void)TreeView_SetImageList(hTreeView2, - dlgInfo->hDependsImageList, - TVSIL_NORMAL); - + /* Set the first items in each tree view */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager) { hService = OpenService(hSCManager, - dlgInfo->pService->lpServiceName, + pDlgInfo->pService->lpServiceName, SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); if (hService) { /* Set the first tree view */ - SetServiceDependents(hTreeView1, - hSCManager, - hService); + TV1_Initialize(pDlgInfo, hService); /* Set the second tree view */ - SetDependentServices(hService); + TV2_Initialize(pDlgInfo, hService); + + bRet = TRUE; CloseServiceHandle(hService); } @@ -272,8 +110,8 @@ CloseServiceHandle(hSCManager); } + return bRet; } - /* @@ -286,12 +124,12 @@ WPARAM wParam, LPARAM lParam) { - PSERVICEPROPSHEET dlgInfo; + PSERVICEPROPSHEET pDlgInfo; /* Get the window context */ - dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, - GWLP_USERDATA); - if (dlgInfo == NULL && uMsg != WM_INITDIALOG) + pDlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, + GWLP_USERDATA); + if (pDlgInfo == NULL && uMsg != WM_INITDIALOG) { return FALSE; } @@ -300,17 +138,37 @@ { case WM_INITDIALOG: { - dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); - if (dlgInfo != NULL) + pDlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); + if (pDlgInfo != NULL) { SetWindowLongPtr(hwndDlg, GWLP_USERDATA, - (LONG_PTR)dlgInfo); + (LONG_PTR)pDlgInfo); - InitDependPage(dlgInfo, hwndDlg); + pDlgInfo->hDependsWnd = hwndDlg; + + InitDependPage(pDlgInfo); } } break; + + case WM_NOTIFY: + { + switch (((LPNMHDR)lParam)->code) + { + case TVN_ITEMEXPANDING: + { + LPNMTREEVIEW lpnmtv = (LPNMTREEVIEW)lParam; + + if (lpnmtv->action == TVE_EXPAND) + { + + } + break; + } + } + break; + } case WM_COMMAND: switch(LOWORD(wParam)) @@ -318,6 +176,10 @@ } break; + + case WM_DESTROY: + if (pDlgInfo->hDependsImageList) + ImageList_Destroy(pDlgInfo->hDependsImageList); } return FALSE; Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -30,63 +30,54 @@ LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName) { - SC_HANDLE hSCManager = NULL; - SC_HANDLE hSc = NULL; - LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; - DWORD BytesNeeded = 0; + LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; + SC_HANDLE hSCManager; + SC_HANDLE hService; + DWORD dwBytesNeeded; hSCManager = OpenSCManager(NULL, NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (hSCManager == NULL) - { - GetError(); - return NULL; - } - - hSc = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_CONFIG); - if (hSc == NULL) - { - GetError(); - goto cleanup; - } - - if (!QueryServiceConfig(hSc, - pServiceConfig, - 0, - &BytesNeeded)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(ProcessHeap, - 0, - BytesNeeded); - if (pServiceConfig == NULL) - goto cleanup; - - if (!QueryServiceConfig(hSc, - pServiceConfig, - BytesNeeded, - &BytesNeeded)) - { - HeapFree(ProcessHeap, - 0, - pServiceConfig); - - pServiceConfig = NULL; - } - } - } - -cleanup: - if (hSCManager != NULL) + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + if (hService) + { + if (!QueryServiceConfig(hService, + NULL, + 0, + &dwBytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + lpServiceConfig = (LPQUERY_SERVICE_CONFIG)HeapAlloc(GetProcessHeap(), + 0, + dwBytesNeeded); + if (lpServiceConfig) + { + if (!QueryServiceConfig(hService, + lpServiceConfig, + dwBytesNeeded, + &dwBytesNeeded)) + { + HeapFree(GetProcessHeap(), + 0, + lpServiceConfig); + lpServiceConfig = NULL; + } + } + } + } + + CloseServiceHandle(hService); + } + CloseServiceHandle(hSCManager); - if (hSc != NULL) - CloseServiceHandle(hSc); - - return pServiceConfig; + } + + return lpServiceConfig; } Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -15,6 +15,8 @@ <file>create.c</file> <file>delete.c</file> <file>dependencies.c</file> + <file>dependencies_tv1.c</file> + <file>dependencies_tv2.c</file> <file>export.c</file> <file>listview.c</file> <file>mainwnd.c</file> Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -6,7 +6,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Service Manager\0" #define REACTOS_STR_INTERNAL_NAME "services\0" #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" -#include <reactos/version.rc> +//#include <reactos/version.rc> 1 24 DISCARDABLE "manifest.xml" Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Mon Dec 21 12:57:58 2009 @@ -71,10 +71,13 @@ StopDependentServices(PSTOP_INFO pStopInfo, SC_HANDLE hService) { - LPENUM_SERVICE_STATUS lpDependencies; - SC_HANDLE hDepService; - DWORD dwCount; + //LPENUM_SERVICE_STATUS lpDependencies; + //SC_HANDLE hDepService; + //DWORD dwCount; BOOL bRet = FALSE; + + MessageBox(NULL, L"Rewrite StopDependentServices", NULL, 0); + /* lpDependencies = GetServiceDependents(hService, &dwCount); if (lpDependencies) @@ -106,7 +109,7 @@ HeapFree(GetProcessHeap(), 0, lpDependencies); - } + }*/ return bRet; } @@ -116,14 +119,34 @@ DoStop(PMAIN_WND_INFO pInfo) { STOP_INFO stopInfo; - SC_HANDLE hSCManager; - SC_HANDLE hService; + //SC_HANDLE hSCManager; + SC_HANDLE hService = NULL; BOOL bRet = FALSE; if (pInfo) { - stopInfo.pInfo = pInfo; + //stopInfo.pInfo = pInfo; + if (TRUE /*HasDependentServices(pInfo->pCurrentService->lpServiceName)*/) + { + INT ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)&stopInfo); + if (ret == IDOK) + { + if (StopDependentServices(&stopInfo, hService)) + { + bRet = StopService(&stopInfo, hService); + } + } + } + else + { + bRet = StopService(&stopInfo, hService); + } +/* hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); @@ -137,31 +160,11 @@ stopInfo.hSCManager = hSCManager; stopInfo.hMainService = hService; - if (HasDependentServices(hService)) - { - INT ret = DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)&stopInfo); - if (ret == IDOK) - { - if (StopDependentServices(&stopInfo, hService)) - { - bRet = StopService(&stopInfo, hService); - } - } - } - else - { - bRet = StopService(&stopInfo, hService); - } - CloseServiceHandle(hService); } CloseServiceHandle(hSCManager); - } + }*/ } return bRet;

1 0

[gschneider] 44678: [win32k] Rename windowToViewPort to IntWindowToViewPort
by gschneider＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: gschneider Date: Sun Dec 20 23:46:22 2009 New Revision: 44678 URL: http://svn.reactos.org/svn/reactos?rev=44678&view=rev Log: [win32k] Rename windowToViewPort to IntWindowToViewPort Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Dec 20 23:46:22 2009 @@ -166,7 +166,7 @@ } // FIXME: Don't use floating point in the kernel! -void windowToViewPort(PDC_ATTR pdcattr, LPXFORM xformWnd2Vport) +void IntWindowToViewPort(PDC_ATTR pdcattr, LPXFORM xformWnd2Vport) { FLOAT scaleX, scaleY; @@ -218,7 +218,7 @@ break; case GdiPageSpaceToDeviceSpace: - windowToViewPort(dc->pdcattr, XForm); + IntWindowToViewPort(dc->pdcattr, XForm); break; case GdiDeviceSpaceToWorldSpace: @@ -1101,7 +1101,7 @@ XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; /* Construct a transformation to do the window-to-viewport conversion */ - windowToViewPort(pdcattr, &xformWnd2Vport); + IntWindowToViewPort(pdcattr, &xformWnd2Vport); /* Combine with the world transformation */ MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice);

1 0

[gschneider] 44677: [win32k] - Make DC_UpdateXforms update DeviceToWorld conversion matrix as well - Fixes four gdi32 mapping tests and drawing in applications that use DPtoLP (Yuan's coordinate space test for example)
by gschneider＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: gschneider Date: Sun Dec 20 23:35:16 2009 New Revision: 44677 URL: http://svn.reactos.org/svn/reactos?rev=44677&view=rev Log: [win32k] - Make DC_UpdateXforms update DeviceToWorld conversion matrix as well - Fixes four gdi32 mapping tests and drawing in applications that use DPtoLP (Yuan's coordinate space test for example) Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Dec 20 23:35:16 2009 @@ -1119,8 +1119,9 @@ pdcattr->flXform |= DEVICE_TO_WORLD_INVALID; } + /* Update transformation matrices */ XForm2MatrixS(&dc->dclevel.mxWorldToDevice, &xformWorld2Vport); - + XForm2MatrixS(&dc->dclevel.mxDeviceToWorld, &xformVport2World); } LONG FASTCALL

1 0

[gschneider] 44676: [win32k] Reuse existing code to support page to device space transformations, fixes 4 gdi32 mapping tests
by gschneider＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: gschneider Date: Sun Dec 20 19:59:10 2009 New Revision: 44676 URL: http://svn.reactos.org/svn/reactos?rev=44676&view=rev Log: [win32k] Reuse existing code to support page to device space transformations, fixes 4 gdi32 mapping tests Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Dec 20 19:59:10 2009 @@ -165,6 +165,21 @@ return TRUE; } +// FIXME: Don't use floating point in the kernel! +void windowToViewPort(PDC_ATTR pdcattr, LPXFORM xformWnd2Vport) +{ + FLOAT scaleX, scaleY; + + scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); + scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy / (FLOAT)pdcattr->szlWindowExt.cy : 0.0f); + xformWnd2Vport->eM11 = scaleX; + xformWnd2Vport->eM12 = 0.0; + xformWnd2Vport->eM21 = 0.0; + xformWnd2Vport->eM22 = scaleY; + xformWnd2Vport->eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX * (FLOAT)pdcattr->ptlWindowOrg.x; + xformWnd2Vport->eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY * (FLOAT)pdcattr->ptlWindowOrg.y; +} + // FIXME: Should be XFORML and use XFORMOBJ functions directly BOOL APIENTRY @@ -203,7 +218,7 @@ break; case GdiPageSpaceToDeviceSpace: - DPRINT1("Page space -> device space is unsupported!\n"); + windowToViewPort(dc->pdcattr, XForm); break; case GdiDeviceSpaceToWorldSpace: @@ -1078,25 +1093,15 @@ return TRUE; } - -// FIXME: Don't use floating point in the kernel! VOID FASTCALL DC_UpdateXforms(PDC dc) { XFORM xformWnd2Vport; - FLOAT scaleX, scaleY; PDC_ATTR pdcattr = dc->pdcattr; XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; /* Construct a transformation to do the window-to-viewport conversion */ - scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); - scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy / (FLOAT)pdcattr->szlWindowExt.cy : 0.0f); - xformWnd2Vport.eM11 = scaleX; - xformWnd2Vport.eM12 = 0.0; - xformWnd2Vport.eM21 = 0.0; - xformWnd2Vport.eM22 = scaleY; - xformWnd2Vport.eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX * (FLOAT)pdcattr->ptlWindowOrg.x; - xformWnd2Vport.eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY * (FLOAT)pdcattr->ptlWindowOrg.y; + windowToViewPort(pdcattr, &xformWnd2Vport); /* Combine with the world transformation */ MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice);

1 0

[mkupfer] 44675: - remove SmallDiam for check boxes and radio butttons - TODO: needs some fixes to adjust the checkmark vertically
by mkupfer＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: mkupfer Date: Sun Dec 20 19:48:34 2009 New Revision: 44675 URL: http://svn.reactos.org/svn/reactos?rev=44675&view=rev Log: - remove SmallDiam for check boxes and radio butttons - TODO: needs some fixes to adjust the checkmark vertically Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Sun Dec 20 19:48:34 2009 @@ -701,10 +701,9 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio) { - RECT rc; LOGFONTW lf; HFONT hFont, hOldFont; - int SmallDiam, i; + int i; TCHAR OutRight, OutLeft, InRight, InLeft, Center; if (Radio) @@ -723,10 +722,8 @@ Center = 'g'; // center } - SmallDiam = UITOOLS_MakeSquareRect(r, &rc); - ZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = SmallDiam; + lf.lfHeight = r->top - r->bottom; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -738,12 +735,12 @@ { SetBkMode(dc, OPAQUE); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, &Center, 1); + TextOut(dc, r->left, r->top, &Center, 1); SetBkMode(dc, TRANSPARENT); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, &OutRight, 1); + TextOut(dc, r->left, r->top, &OutRight, 1); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, &OutLeft, 1); + TextOut(dc, r->left, r->top, &OutLeft, 1); } else { @@ -752,26 +749,26 @@ /* Center section, white for active, grey for inactive */ i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; SetTextColor(dc, GetSysColor(i)); - TextOut(dc, rc.left, rc.top, &Center, 1); + TextOut(dc, r->left, r->top, &Center, 1); if(uFlags & (DFCS_FLAT | DFCS_MONO)) { SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, &OutRight, 1); - TextOut(dc, rc.left, rc.top, &OutLeft, 1); - TextOut(dc, rc.left, rc.top, &InRight, 1); - TextOut(dc, rc.left, rc.top, &InLeft, 1); + TextOut(dc, r->left, r->top, &OutRight, 1); + TextOut(dc, r->left, r->top, &OutLeft, 1); + TextOut(dc, r->left, r->top, &InRight, 1); + TextOut(dc, r->left, r->top, &InLeft, 1); } else { SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); - TextOut(dc, rc.left, rc.top, &OutRight, 1); + TextOut(dc, r->left, r->top, &OutRight, 1); SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, rc.left, rc.top, &OutLeft, 1); + TextOut(dc, r->left, r->top, &OutLeft, 1); SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); - TextOut(dc, rc.left, rc.top, &InRight, 1); + TextOut(dc, r->left, r->top, &InRight, 1); SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); - TextOut(dc, rc.left, rc.top, &InLeft, 1); + TextOut(dc, r->left, r->top, &InLeft, 1); } } @@ -780,7 +777,7 @@ TCHAR Check = (Radio) ? 'i' : 'b'; SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - TextOut(dc, rc.left, rc.top, &Check, 1); + TextOut(dc, r->left, r->top, &Check, 1); } SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));

1 0

[mkupfer] 44674: - reenable KeyboardCues-value
by mkupfer＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: mkupfer Date: Sun Dec 20 19:45:49 2009 New Revision: 44674 URL: http://svn.reactos.org/svn/reactos?rev=44674&view=rev Log: - reenable KeyboardCues-value Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Sun Dec 20 19:45:49 2009 @@ -143,7 +143,7 @@ SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &g->Theme.Effects.bDragFullWindows, 0); /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ - //SystemParametersInfo(SPI_GETKEYBOARDCUES, sizeof(BOOL), &g->Theme.Effects.bKeyboardCues, 0); + SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &g->Theme.Effects.bKeyboardCues, 0); }

1 0

[mkupfer] 44673: - Add some German translations - Add About-Dialog-Proc
by mkupfer＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: mkupfer Date: Sun Dec 20 19:44:29 2009 New Revision: 44673 URL: http://svn.reactos.org/svn/reactos?rev=44673&view=rev Log: - Add some German translations - Add About-Dialog-Proc Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] Sun Dec 20 19:44:29 2009 @@ -8,25 +8,25 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Information zu reactOS_sndrec32" +CAPTION "Information zum Audiorecorder" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 - LTEXT "reactOS_sndrec32, Version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX - LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 + LTEXT "ReactOS Audiorecorder, Version 1.0",IDC_STATIC,16,16,134,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC,16,25,134,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP END IDR_MENU1 MENU BEGIN - POPUP "File" + POPUP "Datei" BEGIN MENUITEM "Neu", ID_NEW - MENUITEM "Öffnen...", ID_FILE_OPEN - MENUITEM "Speichern", ID_FILE_SAVE, GRAYED - MENUITEM "Speichern Unter...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Öffnen...", ID_FILE_OPEN + MENUITEM "Speichern", ID_FILE_SAVE, GRAYED + MENUITEM "Speichern unter...", ID_FILE_SAVEAS, GRAYED MENUITEM SEPARATOR - MENUITEM "Beenden", ID_EXIT + MENUITEM "Beenden", ID_EXIT END MENUITEM "todo1", 0 MENUITEM "todo2", 0 @@ -38,6 +38,6 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "reactOS_sndrec32" + IDS_APP_TITLE "Audiorecorder" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Sun Dec 20 19:44:29 2009 @@ -29,7 +29,6 @@ BOOL InitInstance_wave( HWND, HINSTANCE, int ); LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM ); LRESULT CALLBACK WndProc_wave( HWND, UINT, WPARAM, LPARAM ); -INT_PTR CALLBACK About( HWND, UINT, WPARAM, LPARAM ); BOOL win_first, wout_first; @@ -82,6 +81,24 @@ RECT cli; +INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_COMMAND: + switch (LOWORD(wp)) + { + case IDOK: + EndDialog(hWnd, 0); + return TRUE; + } + break; + case WM_CLOSE: + EndDialog(hWnd, 0); + return TRUE; + } + return FALSE; +} @@ -292,7 +309,7 @@ wcex.hInstance = hInstance; wcex.hIcon = LoadIcon( hInstance, MAKEINTRESOURCE( IDI_SNDREC32 )); wcex.hCursor = LoadCursor( NULL, IDC_ARROW ); - wcex.hbrBackground = (HBRUSH)( 16 ); + wcex.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); wcex.lpszMenuName = MAKEINTRESOURCE( IDR_MENU1 ); wcex.lpszClassName = szWindowClass; wcex.hIconSm = LoadIcon( wcex.hInstance, MAKEINTRESOURCE( IDI_SNDREC32 )); @@ -797,8 +814,8 @@ case ID__ABOUT: - - + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutDlgProc); + return TRUE; break;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009