Ros-diffs

ros-diffs@reactos.org

81390 discussions

[npwoods] 18077: 1. More merging from WINE regedit; imported refresh feature (which is wayyy slower than Windows regedit; need to optimize this)
by npwoods＠svn.reactos.com 26 Sep '05

26 Sep '05

1. More merging from WINE regedit; imported refresh feature (which is wayyy slower than Windows regedit; need to optimize this) 2. Using GetVersion() to determine whether to add HKEY_DYN_DATA Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-26 03:18:53 UTC (rev 18077) @@ -77,7 +77,7 @@ /* Update the status bar pane sizes */ nParts = -1; - SendMessage(hStatusBar, SB_SETPARTS, 1, (long)&nParts); + SendMessage(hStatusBar, SB_SETPARTS, 1, (LPARAM)&nParts); bInMenuLoop = TRUE; SendMessage(hStatusBar, SB_SETTEXT, (WPARAM)0, (LPARAM)_T("")); } @@ -454,18 +454,6 @@ return result; } -BOOL RefreshView(HWND hWnd) -{ - /* TODO:*/ - MessageBeep(-1); - MessageBeep(MB_ICONASTERISK); - MessageBeep(MB_ICONEXCLAMATION); - MessageBeep(MB_ICONHAND); - MessageBeep(MB_ICONQUESTION); - MessageBeep(MB_OK); - return TRUE; -} - static BOOL CreateNewValue(HKEY hRootKey, LPCTSTR pszKeyPath, DWORD dwType) { TCHAR szNewValueFormat[128]; @@ -689,7 +677,8 @@ break; case ID_VIEW_REFRESH: - RefreshView(hWnd); + RefreshTreeView(g_pChildWnd->hTreeWnd); + /*RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); */ break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/main.h 2005-09-26 03:18:53 UTC (rev 18077) @@ -37,6 +37,8 @@ #define PM_NEW 1 #define PM_TREECONTEXT 2 +#define MAX_NEW_KEY_LEN 128 + extern HINSTANCE hInst; /*********************************************************************** *******/ @@ -97,8 +99,11 @@ /* treeview.c */ extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); +extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name); +extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); /* edit.c */ _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-26 03:18:53 UTC (rev 18077) @@ -103,25 +103,197 @@ return pathBuffer; } -static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren, HTREEITEM insAfter ) +/* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ +static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) { TVITEM tvi; TVINSERTSTRUCT tvins; + if (hKey) { + if (RegQueryInfoKey(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + dwChildren = 0; + } + } + tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; tvi.pszText = label; - tvi.cchTextMax = _tcslen(tvi.pszText); + tvi.cchTextMax = lstrlen(tvi.pszText); tvi.iImage = Image_Closed; tvi.iSelectedImage = Image_Open; tvi.cChildren = dwChildren; tvi.lParam = (LPARAM)hKey; tvins.u.item = tvi; - tvins.hInsertAfter = insAfter; + tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; return TreeView_InsertItem(hwndTV, &tvins); } +static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) +{ + HKEY hRoot, hKey, hSubKey; + HTREEITEM childItem; + LPCTSTR KeyPath; + DWORD dwCount, dwIndex, dwMaxSubKeyLen; + LPSTR Name; + TVITEM tvItem; + + KeyPath = GetItemPath(hwndTV, hItem, &hRoot); + if (*KeyPath) { + if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { + return FALSE; + } + } else { + hKey = hRoot; + } + + if (RegQueryInfoKey(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + return FALSE; + } + + /* Set the number of children again */ + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = hItem; + tvItem.cChildren = dwCount; + if (!TreeView_SetItem(hwndTV, &tvItem)) { + return FALSE; + } + + /* We don't have to bother with the rest if it's not expanded. */ + if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDED) == 0) { + RegCloseKey(hKey); + return TRUE; + } + + dwMaxSubKeyLen++; /* account for the \0 terminator */ + if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + return FALSE; + } + tvItem.cchTextMax = dwMaxSubKeyLen; + if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + return FALSE; + } + + /* Now go through all the children in the registry, and check if any have to be added. */ + for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { + DWORD cName = dwMaxSubKeyLen, dwSubCount; + BOOL found; + + found = FALSE; + if (RegEnumKeyEx(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { + continue; + } + + /* Find the number of children of the node. */ + dwSubCount = 0; + if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { + if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + dwSubCount = 0; + } + RegCloseKey(hSubKey); + } + + /* Check if the node is already in there. */ + for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; + childItem = TreeView_GetNextSibling(hwndTV, childItem)) { + tvItem.mask = TVIF_TEXT; + tvItem.hItem = childItem; + if (!TreeView_GetItem(hwndTV, &tvItem)) { + return FALSE; + } + + if (!strcmp(tvItem.pszText, Name)) { + found = TRUE; + break; + } + } + + if (found == FALSE) { + AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); + } + } + HeapFree(GetProcessHeap(), 0, Name); + HeapFree(GetProcessHeap(), 0, tvItem.pszText); + RegCloseKey(hKey); + + /* Now go through all the children in the tree, and check if any have to be removed. */ + childItem = TreeView_GetChild(hwndTV, hItem); + while (childItem) { + HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); + if (RefreshTreeItem(hwndTV, childItem) == FALSE) { + TreeView_DeleteItem(hwndTV, childItem); + } + childItem = nextItem; + } + + return TRUE; +} + +BOOL RefreshTreeView(HWND hwndTV) +{ + HTREEITEM hItem; + HTREEITEM hSelectedItem; + HCURSOR hcursorOld; + + hSelectedItem = TreeView_GetSelection(hwndTV); + hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); + SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + + hItem = TreeView_GetChild(hwndTV, TreeView_GetRoot(hwndTV)); + while (hItem) { + RefreshTreeItem(hwndTV, hItem); + hItem = TreeView_GetNextSibling(hwndTV, hItem); + } + + SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SetCursor(hcursorOld); + + /* We reselect the currently selected node, this will prompt a refresh of the listview. */ + TreeView_SelectItem(hwndTV, hSelectedItem); + return TRUE; +} + +HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name) +{ + TCHAR buf[MAX_NEW_KEY_LEN]; + HTREEITEM hNewItem = 0; + TVITEMEX item; + + if (!hItem) hItem = TreeView_GetSelection(hwndTV); + if (!hItem) return FALSE; + if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE)) { + hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); + } else { + item.mask = TVIF_CHILDREN | TVIF_HANDLE; + item.hItem = hItem; + if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + item.cChildren = 1; + if (!TreeView_SetItem(hwndTV, &item)) return FALSE; + } + TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + if (!hNewItem) { + for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = hNewItem; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + if (!TreeView_GetItem(hwndTV, &item)) continue; + if (lstrcmp(name, item.pszText) == 0) break; + } + } + if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); + + return hNewItem; +} + +HWND StartKeyRename(HWND hwndTV) +{ + HTREEITEM hItem; + + if(!(hItem = TreeView_GetSelection(hwndTV))) return 0; + return TreeView_EditLabel(hwndTV, hItem); +} + static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) { TVITEM tvi; @@ -131,7 +303,7 @@ tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ tvi.pszText = pHostName; - tvi.cchTextMax = _tcslen(tvi.pszText); + tvi.cchTextMax = lstrlen(tvi.pszText); /* Assume the item is not a parent item, so give it an image. */ tvi.iImage = Image_Root; tvi.iSelectedImage = Image_Root; @@ -144,12 +316,18 @@ /* Add the item to the tree view control. */ if (!(hRoot = TreeView_InsertItem(hwndTV, &tvins))) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_USERS"), HKEY_USERS, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG, 1, TVI_LAST)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_USERS"), HKEY_USERS, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG, 1)) return FALSE; + if (GetVersion() & 0x80000000) + { + /* Win9x specific key */ + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; + } + /* expand and select host name */ TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); TreeView_Select(hwndTV, hRoot, TVGN_CARET); @@ -230,19 +408,17 @@ if (!Name) goto done; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { - DWORD cName = dwMaxSubKeyLen, dwSubCount; - FILETIME LastWriteTime; + DWORD cName = dwMaxSubKeyLen, dwSubCount; - errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, &LastWriteTime); - if (errCode != ERROR_SUCCESS) continue; - errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); - if (errCode == ERROR_SUCCESS) { - errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); - RegCloseKey(hKey); - } - if (errCode != ERROR_SUCCESS) dwSubCount = 0; - /*printf("dwSubCount=%ld, Name=%s\n", dwSubCount, Name);*/ - AddEntryToTree(hwndTV, pnmtv->itemNew.hItem, Name, NULL, dwSubCount, TVI_FIRST); + errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); + if (errCode != ERROR_SUCCESS) continue; + errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); + if (errCode == ERROR_SUCCESS) { + errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); + RegCloseKey(hKey); + } + if (errCode != ERROR_SUCCESS) dwSubCount = 0; + AddEntryToTree(hwndTV, pnmtv->itemNew.hItem, Name, NULL, dwSubCount); } SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM)pnmtv->itemNew.hItem); @@ -292,7 +468,7 @@ } while(!hNewKey); - hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0, NULL); + hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0); if (!hNewItem) goto done; TreeView_EditLabel(hwndTV, hNewItem);

1 0

[greatlrd] 18076: remove dead code
by greatlrd＠svn.reactos.com 25 Sep '05

25 Sep '05

remove dead code Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:05:39 UTC (rev 18075) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:16:05 UTC (rev 18076) @@ -693,55 +693,6 @@ } } -#if 1 - /* FIXME file rename not yet implemented in all FSDs so it will always - * fail, even when the move is to the same device - */ - //else if (STATUS_NOT_IMPLEMENTED == errCode) - { - - UNICODE_STRING SrcPathU; - - SrcPathU.Buffer = alloca(sizeof(WCHAR) * MAX_PATH); - SrcPathU.MaximumLength = MAX_PATH * sizeof(WCHAR); - SrcPathU.Length = GetFullPathNameW(lpExistingFileName, MAX_PATH, SrcPathU.Buffer, NULL); - if (SrcPathU.Length >= MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; - } - SrcPathU.Length *= sizeof(WCHAR); - - DstPathU.Buffer = alloca(sizeof(WCHAR) * MAX_PATH); - DstPathU.MaximumLength = MAX_PATH * sizeof(WCHAR); - DstPathU.Length = GetFullPathNameW(lpNewFileName, MAX_PATH, DstPathU.Buffer, NULL); - if (DstPathU.Length >= MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; - } - DstPathU.Length *= sizeof(WCHAR); - - if (0 == RtlCompareUnicodeString(&SrcPathU, &DstPathU, TRUE)) - { - /* Source and destination file are the same, nothing to do */ - return TRUE; - } - - Result = CopyFileExW (lpExistingFileName, - lpNewFileName, - lpProgressRoutine, - lpData, - NULL, - FileRename->ReplaceIfExists ? 0 : COPY_FILE_FAIL_IF_EXISTS); - if (Result) - { - /* Cleanup the source file */ - AdjustFileAttributes(lpExistingFileName, lpNewFileName); - Result = DeleteFileW (lpExistingFileName); - } - } -#endif return Result; }

1 0

[greatlrd] 18075: don't expect FS drivers to return STATUS_NOT_IMPLEMENTED if they don't know how to do the move (STATUS_NOT_SUPPORTED is also a perfect valid error code), this change did hpoussin suggest
by greatlrd＠svn.reactos.com 25 Sep '05

25 Sep '05

don't expect FS drivers to return STATUS_NOT_IMPLEMENTED if they don't know how to do the move (STATUS_NOT_SUPPORTED is also a perfect valid error code), this change did hpoussin suggest Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:18:27 UTC (rev 18074) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:05:39 UTC (rev 18075) @@ -386,7 +386,7 @@ { Result = TRUE; } - else if (STATUS_NOT_IMPLEMENTED == errCode) + else { if (folder==FALSE) { @@ -697,7 +697,7 @@ /* FIXME file rename not yet implemented in all FSDs so it will always * fail, even when the move is to the same device */ - else if (STATUS_NOT_IMPLEMENTED == errCode) + //else if (STATUS_NOT_IMPLEMENTED == errCode) { UNICODE_STRING SrcPathU; @@ -742,11 +742,7 @@ } } #endif - else - { - SetLastErrorByStatus (errCode); - Result = TRUE; - } + return Result; }

1 0

[hpoussin] 18074: Implement SetupDiInstallDriverFiles
by hpoussin＠svn.reactos.com 25 Sep '05

25 Sep '05

Implement SetupDiInstallDriverFiles Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-25 21:05:18 UTC (rev 18073) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-25 21:18:27 UTC (rev 18074) @@ -129,6 +129,8 @@ DWORD DriverRank; SP_DRVINFO_DATA_V2_W Info; + LPWSTR InfPath; + LPWSTR InfSection; }; struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ @@ -3271,8 +3273,45 @@ } SetLastError(ERROR_INSUFFICIENT_BUFFER); + driverInfo->InfSection = NULL; while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + driverInfo->InfSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!driverInfo->InfSection) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + Result = SetupGetStringFieldW( + &ContextDevice, + 1, + driverInfo->InfSection, RequiredSize, + &RequiredSize); + } + if (!Result) + { + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + + driverInfo->InfPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(InfFile) + 1) * sizeof(WCHAR)); + if (!driverInfo->InfPath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + RtlCopyMemory(driverInfo->InfPath, InfFile, (wcslen(InfFile) + 1) * sizeof(WCHAR)); + + Result = FALSE; + RequiredSize = 128; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { HeapFree(GetProcessHeap(), 0, DeviceDescription); DeviceDescription = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!DeviceDescription) @@ -3285,6 +3324,8 @@ } if (!Result) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); return FALSE; @@ -3299,6 +3340,8 @@ InfInstallSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!InfInstallSection) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); return FALSE; @@ -3311,6 +3354,8 @@ } if (!Result) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); HeapFree(GetProcessHeap(), 0, InfInstallSection); @@ -4232,12 +4277,62 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + BOOL ret = FALSE; + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - FIXME("SetupDiInstallDriverFiles not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; - return TRUE; + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct DriverInfoElement *DriverInfo; + HWND hWnd; + HINF hInf; + + if (DeviceInfoData) + { + DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + hWnd = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->hwndParent; + } + else + { + DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + hWnd = ((struct DeviceInfoSet *)DeviceInfoSet)->hwndParent; + } + + hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); + if (hInf != INVALID_HANDLE_VALUE) + { + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + + ret = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (ret) + { + PVOID callback_context = SetupInitDefaultQueueCallback(hWnd); + ret = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, callback_context, + NULL, NULL); + SetupTermDefaultQueueCallback(callback_context); + } + SetupCloseInfFile(hInf); + } + } + + TRACE("Returning %d\n", ret); + return ret; } /***********************************************************************

1 0

[greatlrd] 18073: Implement support for move folder, even from different vol. But for now it does not think of EA or set file attrib right. it is a present to brandon so he stop nag about ros can not move a folder. It maybe got some other bugs. it need more testing see if it handling all case right.
by greatlrd＠svn.reactos.com 25 Sep '05

25 Sep '05

Implement support for move folder, even from different vol. But for now it does not think of EA or set file attrib right. it is a present to brandon so he stop nag about ros can not move a folder. It maybe got some other bugs. it need more testing see if it handling all case right. Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:02:43 UTC (rev 18072) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:05:18 UTC (rev 18073) @@ -405,14 +405,291 @@ } else { - /* move folder not complete code */ - Result = CreateDirectoryW (lpNewFileName, NULL); - if (Result == FALSE) return FALSE; + /* move folder code start */ + WIN32_FIND_DATAW findBuffer; + LPCWSTR lpExistingFileName2 = NULL; + LPCWSTR lpNewFileName2 = NULL; + LPCWSTR lpDeleteFile = NULL; + INT size; + INT size2; + BOOL loop = TRUE; + BOOL Result = FALSE; + + /* Build the string */ + size = wcslen(lpExistingFileName); + + lpDeleteFile = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpDeleteFile == NULL) + goto FreeMemAndExit; + + lpNewFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpNewFileName2 == NULL) + goto FreeMemAndExit; + + lpExistingFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpExistingFileName2 == NULL) + goto FreeMemAndExit; + + if ((size+6)*sizeof(WCHAR)>MAX_PATH) + { + HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(VOID *) lpExistingFileName2,(size+6)*sizeof(WCHAR)); + if (lpExistingFileName2 == NULL) + goto FreeMemAndExit; + } + + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + + /* Get the file name */ + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + if (hFile == NULL) + loop=FALSE; + + if (findBuffer.cFileName[0] == L'\0') + loop=FALSE; + + DPRINT("MoveFileWithProgressW : lpExistingFileName1 = %S\n",lpExistingFileName); + DPRINT("MoveFileWithProgressW : lpExistingFileName2 = %S\n",lpExistingFileName2); + DPRINT("MoveFileWithProgressW : lpNewFileName = %S\n",lpNewFileName); + + DPRINT("MoveFileWithProgressW : loop = %d %d %d\n",TRUE, FALSE, loop); + + + CreateDirectoryW(lpNewFileName,NULL); + + + /* search the file */ + while (loop==TRUE) + { + Result = TRUE; + + if ((!wcscmp(findBuffer.cFileName,L"..")) || (!wcscmp(findBuffer.cFileName,L"."))) + { + loop = FindNextFileW(hFile, &findBuffer); + + if (!loop) + { + size = wcslen(lpExistingFileName2)-4; + FindClose(hFile); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\0"); + + if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) + { + FindClose(hFile); + + /* delete folder */ + + size = GetFullPathNameW(lpExistingFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); + if (size>MAX_PATH) + { + lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpDeleteFile,size); + + if (lpDeleteFile == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + + GetFullPathNameW(lpExistingFileName2, size,(LPWSTR) lpDeleteFile, NULL); + } + + DPRINT("MoveFileWithProgressW : folder : %s\n",lpDeleteFile); + + Result = RemoveDirectoryW(lpDeleteFile); + if (Result == FALSE) + break; + + loop=TRUE; + size = wcslen(lpExistingFileName); + + if ((size+6)*sizeof(WCHAR)>MAX_PATH) + { + lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *)lpExistingFileName2,(size+6)*sizeof(WCHAR)); + + if (lpExistingFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + + /* Get the file name */ + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + } + } + continue; + } + + if (findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + DPRINT("MoveFileWithProgressW : 1: %S %S\n",lpExistingFileName2,findBuffer.cFileName); + + /* Build the new string */ + size = wcslen(findBuffer.cFileName); + size2= wcslen(lpExistingFileName2); + + if ((size2+size+6)*sizeof(WCHAR)>MAX_PATH) + { + lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *)lpExistingFileName2, (size2+size+6)*sizeof(WCHAR)); + + if (lpExistingFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\\*.*\0"); + - /* add scan code for move the folder */ + /* Build the new dst string */ + size = wcslen(lpExistingFileName2) + wcslen(lpNewFileName); + size2 = wcslen(lpExistingFileName); - AdjustFileAttributes(lpExistingFileName, lpNewFileName); - Result = RemoveDirectoryW(lpExistingFileName); + if (size>MAX_PATH) + { + lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + + if (lpNewFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + size = wcslen(lpNewFileName); + wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpExistingFileName2[size2]); + size = wcslen(lpNewFileName2); + wcscpy( (WCHAR *)&lpNewFileName2[size-4],L"\0"); + + /* build dest path */ + /* remove this code when it will be out into kernel32.dll ? */ + + size = GetFullPathNameW(lpNewFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); + if (MAX_PATH>size2) + { + lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpDeleteFile,size) ; + + if (lpDeleteFile == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + + GetFullPathNameW(lpNewFileName2, size,(LPWSTR) lpDeleteFile, NULL); + } + + /* Create Folder */ + + DPRINT("MoveFileWithProgressW : CreateDirectoryW lpNewFileName2 : %S\n",lpNewFileName2); + DPRINT("MoveFileWithProgressW : CreateDirectoryW : %S\n",lpDeleteFile); + + CreateDirectoryW(lpDeleteFile,NULL); + + DPRINT("MoveFileWithProgressW : 1x: %S : %S \n",lpExistingFileName2, lpNewFileName2); + + FindClose(hFile); + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + } + else + { + + /* Build the new string */ + size = wcslen(findBuffer.cFileName); + size2= wcslen(lpExistingFileName2); + wcscpy( (WCHAR *)lpDeleteFile,lpExistingFileName2); + wcscpy( (WCHAR *)&lpDeleteFile[size2-3],findBuffer.cFileName); + + /* Build dest string */ + size = wcslen(lpDeleteFile) + wcslen(lpNewFileName); + size2 = wcslen(lpExistingFileName); + + if (size*sizeof(WCHAR)>MAX_PATH) + { + lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + + if (lpNewFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + size = wcslen(lpNewFileName); + wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); + + /* copy file */ + Result = CopyFileW(lpDeleteFile,lpNewFileName2, FALSE); + + /* delete file */ + DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2); + + + Result = DeleteFileW(lpDeleteFile); + if (Result == FALSE) + { + DPRINT("MoveFileWithProgressW : Fails\n"); + break; + } + } + DPRINT("MoveFileWithProgressW : 2 : %S : %S \n",lpExistingFileName2,findBuffer.cFileName); + loop = FindNextFileW(hFile, &findBuffer); + } + + FindClose(hFile); + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + if (hFile == NULL) + loop=TRUE; + + if (findBuffer.cFileName[0] == L'\0') + loop=TRUE; + + if (loop == FALSE) + { + FindClose(hFile); + Result = RemoveDirectoryW(lpExistingFileName); + DPRINT("MoveFileWithProgressW RemoveDirectoryW :%S",lpExistingFileName); + } + +FreeMemAndExit: + DPRINT("MoveFileWithProgressW : result : r=%d, T=%d, F=%d",Result,TRUE,FALSE); + + if (lpNewFileName2 != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + lpNewFileName2 = NULL; + } + + if (lpExistingFileName2 != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + lpExistingFileName2 = NULL; + } + + if (lpDeleteFile != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + lpDeleteFile = NULL; + } + + return Result; + // end move folder code } } _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-09-25 21:02:43 UTC (rev 18072) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-09-25 21:05:18 UTC (rev 18073) @@ -74,6 +74,7 @@ DWORD FilenameU2A_FitOrFail(LPSTR DestA, INT destLen, PUNICODE_STRING SourceU); #define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap POBJECT_ATTRIBUTES

1 0

[ekohl] 18072: - Implement CM_Is_Dock_Station_Present[_Ex]
by ekohl＠svn.reactos.com 25 Sep '05

25 Sep '05

- Implement CM_Is_Dock_Station_Present[_Ex] Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/include/idl/pnp.idl 2005-09-25 21:02:43 UTC (rev 18072) @@ -5,6 +5,7 @@ #define WORD unsigned short #define DWORD unsigned long #define CONFIGRET unsigned long +#define PBOOL unsigned long * [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), @@ -14,21 +15,32 @@ ] interface pnp { + /* Function 0 */ +// CONFIGRET PNP_Unknown0(handle_t BindingHandle); + + /* Function 1 */ +// CONFIGRET PNP_Unknown1(handle_t BindingHandle); + + /* Function 2 */ CONFIGRET PNP_GetVersion(handle_t BindingHandle, [out] WORD *Version); + /* Function 3 */ CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, [out] unsigned long *State, [in] unsigned long Flags); + /* Function 6 */ CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] DWORD Flags); + /* Function 7 */ CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, [out, string, size_is(Length)] wchar_t *DeviceInstance, [in] DWORD Length); + /* Function 8 */ cpp_quote("#define PNP_DEVICE_PARENT 1") cpp_quote("#define PNP_DEVICE_CHILD 2") cpp_quote("#define PNP_DEVICE_SIBLING 3") @@ -39,6 +51,7 @@ [in] DWORD Length, [in] DWORD Flags); + /* Function 9 */ cpp_quote("#define PNP_BRANCH_ENUM 1") cpp_quote("#define PNP_BRANCH_CLASS 2") CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, @@ -49,22 +62,26 @@ [out] unsigned long *RequiredLength, [in] DWORD Flags); + /* Function 10 */ // CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, // [in, unique, string] wchar_t *Filter, // [out, string, size_is(*Length)] unsigned char *Buffer // [in, out] unsigned long *Length, // [in] DWORD Flags); + /* Function 11 */ CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, [in, unique, string] wchar_t *Filter, [out] unsigned long *Length, [in] DWORD Flags); + /* Function 12 */ CONFIGRET PNP_GetDepth(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [out] unsigned long *Depth, [in] DWORD Flags); + /* Function 13 */ CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] unsigned long Property, @@ -74,6 +91,7 @@ [in, out] unsigned long *Length, [in] DWORD Flags); + /* Function 14 */ CONFIGRET PNP_SetDeviceRegProp(handle_t BindingHandle, [in, string] wchar_t *DeviceId, [in] unsigned long Property, @@ -82,24 +100,38 @@ [in] unsigned long Length, [in] unsigned long Flags); + /* Function 16 */ + CONFIGRET PNP_CreateKey(handle_t BindingHandle, + [in, string] wchar_t *SubKey, + [in] unsigned long DesiredAccess, + [in] unsigned long Flags); + + /* Function 19 */ CONFIGRET PNP_GetClassName(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, [out, string, size_is(*Length)] wchar_t *Buffer, [in, out] unsigned long *Length, [in] unsigned long Flags); + /* Function 20 */ CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, [in] unsigned long Flags); + /* Function 30 */ CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [out] unsigned long *Status, [out] unsigned long *Problem, [in] DWORD Flags); + /* Function 31 */ CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] unsigned long Problem, [in] DWORD Flags); + + /* Function 38 */ + CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, + [out]PBOOL Present); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-09-25 21:02:43 UTC (rev 18072) @@ -207,6 +207,8 @@ WORD WINAPI CM_Get_Version( VOID ); WORD WINAPI CM_Get_Version_Ex( HMACHINE ); +CONFIGRET WINAPI CM_Is_Dock_Station_Present( PBOOL ); +CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex( PBOOL, HMACHINE ); CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST, DEVINSTID_A, ULONG); CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST, DEVINSTID_W, ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-25 21:02:43 UTC (rev 18072) @@ -1521,6 +1521,49 @@ /*********************************************************************** + * CM_Is_Dock_Station_Present [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Is_Dock_Station_Present( + PBOOL pbPresent) +{ + TRACE("%p\n", pbPresent); + return CM_Is_Dock_Station_Present_Ex(pbPresent, NULL); +} + + +/********************************************************************** * + * CM_Is_Dock_Station_Present_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex( + PBOOL pbPresent, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + + FIXME("%p %lx\n", pbPresent, hMachine); + + if (pbPresent == NULL) + return CR_INVALID_POINTER; + + *pbPresent = FALSE; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_IsDockStationPresent(BindingHandle, + (unsigned long *)pbPresent); +} + + +/********************************************************************** * * CM_Locate_DevNodeA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Locate_DevNodeA( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-25 21:02:43 UTC (rev 18072) @@ -127,8 +127,8 @@ @ stdcall CM_Get_Version_Ex(long) @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List -@ stub CM_Is_Dock_Station_Present -@ stub CM_Is_Dock_Station_Present_Ex +@ stdcall CM_Is_Dock_Station_Present(ptr) +@ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-25 21:02:43 UTC (rev 18072) @@ -794,6 +794,56 @@ } +CONFIGRET +PNP_IsDockStationPresent(handle_t BindingHandle, + unsigned long *Present) +{ + HKEY hKey; + DWORD dwType; + DWORD dwValue; + DWORD dwSize; + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_IsDockStationPresent() called\n"); + + *Present = FALSE; + + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, + L"CurrentDockInfo", + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + dwSize = sizeof(DWORD); + if (RegQueryValueExW(hKey, + L"DockingState", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) != ERROR_SUCCESS) + ret = CR_REGISTRY_ERROR; + + RegCloseKey(hKey); + + if (ret == CR_SUCCESS) + { + if (dwType != REG_DWORD || dwSize != sizeof(DWORD)) + { + ret = CR_REGISTRY_ERROR; + } + else if (dwValue != 0) + { + *Present = TRUE; + } + } + + DPRINT1("PNP_IsDockStationPresent() done (returns %lx)\n", ret); + + return ret; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-25 21:02:43 UTC (rev 18072) @@ -587,6 +587,13 @@ +/* FIXME: Missing CMP_Init_Detection */ +/* FIXME: Missing CMP_RegisterNotification */ +/* FIXME: Missing CMP_Report_LogOn */ +/* FIXME: Missing CMP_UnregisterNotification */ +/* FIXME: Missing CMP_WaitNoPendingInstallEvents */ +/* FIXME: Missing CMP_WaitServicesAvailable */ + /* CM_Add_Empty_Log_Conf.ulFlags constants */ #define PRIORITY_EQUAL_FIRST 0x00000008 #define PRIORITY_EQUAL_LAST 0x00000000 @@ -1452,21 +1459,32 @@ /* FIXME: Obsolete CM_Intersect_Range_List */ /* FIXME: Obsolete CM_Invert_Range_List */ -/* FIXME: Obsolete CM_Is_Dock_Station_Present */ -/* FIXME: Obsolete CM_Is_Dock_Station_Present_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Is_Dock_Station_Present( + OUT PBOOL pbPresent); + +CMAPI +CONFIGRET +WINAPI +CM_Is_Dock_Station_Present_Ex( + OUT PBOOL pbPresent, + IN HMACHINE hMachine); + /* CM_Locate_DevNode.ulFlags constants */ -#define CM_LOCATE_DEVNODE_NORMAL 0x00000000 -#define CM_LOCATE_DEVNODE_PHANTOM 0x00000001 -#define CM_LOCATE_DEVNODE_CANCELREMOVE 0x00000002 -#define CM_LOCATE_DEVNODE_NOVALIDATION 0x00000004 -#define CM_LOCATE_DEVNODE_BITS 0x00000007 +#define CM_LOCATE_DEVNODE_NORMAL 0x00000000 +#define CM_LOCATE_DEVNODE_PHANTOM 0x00000001 +#define CM_LOCATE_DEVNODE_CANCELREMOVE 0x00000002 +#define CM_LOCATE_DEVNODE_NOVALIDATION 0x00000004 +#define CM_LOCATE_DEVNODE_BITS 0x00000007 -#define CM_LOCATE_DEVINST_NORMAL CM_LOCATE_DEVNODE_NORMAL -#define CM_LOCATE_DEVINST_PHANTOM CM_LOCATE_DEVNODE_PHANTOM -#define CM_LOCATE_DEVINST_CANCELREMOVE CM_LOCATE_DEVNODE_CANCELREMOVE -#define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION -#define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS +#define CM_LOCATE_DEVINST_NORMAL CM_LOCATE_DEVNODE_NORMAL +#define CM_LOCATE_DEVINST_PHANTOM CM_LOCATE_DEVNODE_PHANTOM +#define CM_LOCATE_DEVINST_CANCELREMOVE CM_LOCATE_DEVNODE_CANCELREMOVE +#define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION +#define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS CMAPI CONFIGRET

1 0

[hpoussin] 18071: USB root hub is not really a child of the USB Controller, so don't give it a device identifier
by hpoussin＠svn.reactos.com 25 Sep '05

25 Sep '05

USB root hub is not really a child of the USB Controller, so don't give it a device identifier Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-09-25 20:54:40 UTC (rev 18070) +++ trunk/reactos/bootdata/hivesys.inf 2005-09-25 20:56:58 UTC (rev 18071) @@ -606,6 +606,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x0 0010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615A D&REV_00\0000","Service",0x0000000,"usbuhci" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615 AD&REV_00\0000","ParentIdPrefix",0x0000000,"0000" ;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x000 00001 _____ Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c --- trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-25 20:54:40 UTC (rev 18070) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-25 20:56:58 UTC (rev 18071) @@ -170,7 +170,7 @@ case BusQueryInstanceID: { DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - RtlInitUnicodeString(&SourceString, L"0000"); /* FIXME */ + RtlInitUnicodeString(&SourceString, L""); break; } default:

1 0

[navaraf] 18070: Revert r18064 and correctly set the cell size for hash cells.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Revert r18064 and correctly set the cell size for hash cells. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 20:46:28 UTC (rev 18069) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 20:54:40 UTC (rev 18070) @@ -3033,6 +3033,7 @@ else { ASSERT(SubKeyCount <= 0xffff); /* should really be USHORT_MAX or similar */ + NewHashBlock->CellSize = -NewHashSize; NewHashBlock->Id = REG_HASH_TABLE_CELL_ID; NewHashBlock->HashTableSize = (USHORT)SubKeyCount; *HashBlock = NewHashBlock; @@ -3456,20 +3457,14 @@ else { PCELL_HEADER pFree = Cell; - PHASH_TABLE_CELL pHash = Cell; - LONG CellSize; - if (pHash->Id == REG_HASH_TABLE_CELL_ID) - CellSize = sizeof(HASH_TABLE_CELL) + pHash->HashTableSize * sizeof(HASH_RECORD); - else - CellSize = abs(pFree->CellSize); + if (pFree->CellSize < 0) + pFree->CellSize = -pFree->CellSize; - /* Clear block */ - RtlZeroMemory(pFree, CellSize); - - /* restore CellSize */ - pFree->CellSize = CellSize; - + /* Clear block (except the block size) */ + RtlZeroMemory(((char*)pFree) + sizeof(ULONG), + pFree->CellSize - sizeof(ULONG)); + /* Add block to the list of free blocks */ CmiAddFree(RegistryHive, Cell, CellOffset, TRUE);

1 0

[gedmurphy] 18069: Simple implementation of the MS comp utility (remembered to add the files this time :) )
by gedmurphy＠svn.reactos.com 25 Sep '05

25 Sep '05

Simple implementation of the MS comp utility (remembered to add the files this time :) ) Added: trunk/rosapps/cmdutils/comp/ Added: trunk/rosapps/cmdutils/comp/comp.c Added: trunk/rosapps/cmdutils/comp/comp.rc Added: trunk/rosapps/cmdutils/comp/comp.xml _____ Added: trunk/rosapps/cmdutils/comp/comp.c --- trunk/rosapps/cmdutils/comp/comp.c 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.c 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,181 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS comp utility + * FILE: comp.c + * PURPOSE: Compares the contents of two files + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 25/09/05 Created + * + */ + + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define STRBUF 1024 + +/* getline: read a line, return length */ +INT GetLine(char *line, FILE *in) +{ + if (fgets(line, STRBUF, in) == NULL) + return 0; + else + return strlen(line); +} + +/* print program usage */ +VOID Usage(VOID) +{ + _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" + "COMP [data1] [data2]\n\n" + " data1 Specifies location and name of first file to compare.\n" + " data2 Specifies location and name of second file to compare.\n")); +} + + +int _tmain (int argc, TCHAR *argv[]) +{ + INT i; + INT LineLen1, LineLen2; + FILE *fp1, *fp2; // file pointers + PTCHAR Line1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + PTCHAR Line2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + TCHAR File1[_MAX_PATH], // file paths + File2[_MAX_PATH]; + BOOL bMatch = TRUE, // files match + bAscii = FALSE, // /A switch + bLineNos = FALSE; // /L switch + + /* parse command line for options */ + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + --argc; + switch (argv[i][1]) { + case 'A': bAscii = TRUE; + _tprintf(_T("/a not Supported\n")); /*FIXME: needs adding */ + break; + case 'L': bLineNos = TRUE; + _tprintf(_T("/l not supported\n")); /*FIXME: needs adding */ + break; + case '?': Usage(); + return EXIT_SUCCESS; + default: + _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + Usage(); + return EXIT_FAILURE; + } + } + } + + switch (argc) + { + case 1 : + _tprintf(_T("Name of first file to compare: ")); + fgets(File1, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File1[i] == '\n') + { + File1[i] = '\0'; + break; + } + } + + _tprintf(_T("Name of second file to compare: ")); + fgets(File2, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File2[i] == '\n') + { + File2[i] = '\0'; + break; + } + } + break; + case 2 : + _tcsncpy(File1, argv[1], _MAX_PATH); + _tprintf(_T("Name of second file to compare: ")); + fgets(File2, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File2[i] == '\n') + { + File2[i] = '\0'; + break; + } + } + break; + case 3 : + _tcsncpy(File1, argv[1], _MAX_PATH); + _tcsncpy(File2, argv[2], _MAX_PATH); + break; + default : + _tprintf(_T("Bad command line syntax\n")); + return EXIT_FAILURE; + break; + } + + + + if ((fp1 = fopen(File1, "r")) == NULL) + { + _tprintf(_T("Can't find/open file: %s\n"), File1); + return EXIT_FAILURE; + } + if ((fp2 = fopen(File2, "r")) == NULL) + { + _tprintf(_T("Can't find/open file: %s\n"), File2); + return EXIT_FAILURE; + } + + + _tprintf(_T("Comparing %s and %s...\n"), File1, File2); + + while ((LineLen1 = GetLine(Line1, fp1) != 0) && + (LineLen2 = GetLine(Line2, fp2) != 0)) + { + // LineCount++; + while ((*Line1 != '\0') && (*Line2 != '\0')) + { + if (*Line1 != *Line2) + { + bMatch = FALSE; + break; + } + Line1++, Line2++; + } + } + + bMatch ? _tprintf(_T("Files compare OK\n")) : _tprintf(_T("Files are different sizes.\n")); + + fclose(fp1); + fclose(fp2); + + + return EXIT_SUCCESS; +} +/* EOF */ _____ Added: trunk/rosapps/cmdutils/comp/comp.rc --- trunk/rosapps/cmdutils/comp/comp.rc 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.rc 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility\0" +#define REACTOS_STR_INTERNAL_NAME "comp\0" +#define REACTOS_STR_ORIGINAL_FILENAME "comp.exe\0" +#include <reactos/version.rc> _____ Added: trunk/rosapps/cmdutils/comp/comp.xml --- trunk/rosapps/cmdutils/comp/comp.xml 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.xml 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,7 @@ +<module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>comp.c</file> + <file>comp.rc</file> +</module> +

1 0

[gedmurphy] 18068: Simple implementation of the MS comp utility
by gedmurphy＠svn.reactos.com 25 Sep '05

25 Sep '05

Simple implementation of the MS comp utility Modified: trunk/rosapps/cmdutils/cmdutils.xml _____ Modified: trunk/rosapps/cmdutils/cmdutils.xml --- trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 19:40:48 UTC (rev 18067) +++ trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 20:39:55 UTC (rev 18068) @@ -1,23 +1,26 @@ <group> +<directory name="comp"> + <xi:include href="comp/comp.xml" /> +</directory> <directory name="find"> - <xi:include href="find/find.xml" /> + <xi:include href="find/find.xml" /> </directory> <directory name="mode"> - <xi:include href="mode/mode.xml" /> + <xi:include href="mode/mode.xml" /> </directory> <directory name="more"> - <xi:include href="more/more.xml" /> + <xi:include href="more/more.xml" /> </directory> <directory name="sort"> - <xi:include href="sort/sort.xml" /> + <xi:include href="sort/sort.xml" /> </directory> <directory name="tee"> - <xi:include href="tee/tee.xml" /> + <xi:include href="tee/tee.xml" /> </directory> <directory name="touch"> - <xi:include href="touch/touch.xml" /> + <xi:include href="touch/touch.xml" /> </directory> <directory name="y"> - <xi:include href="y/y.xml" /> + <xi:include href="y/y.xml" /> </directory> </group>

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