Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 21 14:34:42 2015 New Revision: 66387 URL: http://svn.reactos.org/svn/reactos?rev=66387&view=rev Log: * Addendum to r66386. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66387&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 21 14:34:42 2015 @@ -142,7 +142,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS" AND NOT ENABLE_CCACHE) + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66387&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Feb 21 14:34:42 2015 @@ -366,7 +366,7 @@ set(PSEH_LIB "pseh") # Macros -if(PCH) +if(PCH AND (NOT ENABLE_CCACHE)) add_compile_flags("-Winvalid-pch -Werror=invalid-pch") macro(add_pch _target _pch _sources) # When including x.h GCC looks for x.h.gch first @@ -387,10 +387,6 @@ LANGUAGE ${_pch_language} EXTERNAL_SOURCE TRUE OBJECT_LOCATION ${_gch}) - - if(ENABLE_CCACHE) - set(_ccache_flag "-fpch-preprocess") - endif() # Include the gch in the specified source files, skipping the pch file itself list(REMOVE_ITEM ${_sources} ${_pch})

9 years, 7 months

[spetreolle] 66386: Disable PCH use in ccache builds.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Feb 21 14:24:19 2015 New Revision: 66386 URL: http://svn.reactos.org/svn/reactos?rev=66386&view=rev Log: Disable PCH use in ccache builds. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66386&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 21 14:24:19 2015 @@ -142,7 +142,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS" AND NOT ENABLE_CCACHE) set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

9 years, 7 months

[ekohl] 66385: [NTOSKRNL] NtQueryInformationFile: Implement the FileAllInformation case according to 'File System Internals' page 485.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 21 14:19:16 2015 New Revision: 66385 URL: http://svn.reactos.org/svn/reactos?rev=66385&view=rev Log: [NTOSKRNL] NtQueryInformationFile: Implement the FileAllInformation case according to 'File System Internals' page 485. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Feb 21 14:19:16 2015 @@ -1896,6 +1896,7 @@ PFILE_ACCESS_INFORMATION AccessBuffer; PFILE_MODE_INFORMATION ModeBuffer; PFILE_ALIGNMENT_INFORMATION AlignmentBuffer; + PFILE_ALL_INFORMATION AllBuffer; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2098,6 +2099,16 @@ AlignmentBuffer->AlignmentRequirement = DeviceObject->AlignmentRequirement; Irp->IoStatus.Information = sizeof(FILE_ALIGNMENT_INFORMATION); CallDriver = FALSE; + } + else if (FileInformationClass == FileAllInformation) + { + AllBuffer = Irp->AssociatedIrp.SystemBuffer; + AllBuffer->AccessInformation.AccessFlags = HandleInformation.GrantedAccess; + AllBuffer->ModeInformation.Mode = IopGetFileMode(FileObject); + AllBuffer->AlignmentInformation.AlignmentRequirement = DeviceObject->AlignmentRequirement; + Irp->IoStatus.Information = sizeof(FILE_ACCESS_INFORMATION) + + sizeof(FILE_MODE_INFORMATION) + + sizeof(FILE_ALIGNMENT_INFORMATION); } /* Call the Driver */

9 years, 7 months

[gadamopoulos] 66384: [SHELL32] - Fix build. Also note that the previous patch was from Huw Campbell.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 21 12:59:42 2015 New Revision: 66384 URL: http://svn.reactos.org/svn/reactos?rev=66384&view=rev Log: [SHELL32] - Fix build. Also note that the previous patch was from Huw Campbell. Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Feb 21 12:59:42 2015 @@ -34,18 +34,6 @@ static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; - -static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); -static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path); -static DWORD SHNotifyDeleteFileW(FILE_OPERATION *op, LPCWSTR path); -static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL isdir); -static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); -static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); -static HRESULT copy_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, FILE_LIST *flTo); -static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, const FILE_LIST *flTo); - -DWORD WINAPI _FileOpCountManager(FILE_OPERATION *op, const FILE_LIST *flFrom); -static BOOL _FileOpCount(FILE_OPERATION *op, LPWSTR pwszBuf, BOOL bFolder, DWORD *ticks); typedef struct { @@ -81,6 +69,18 @@ BOOL bAnyDirectories; BOOL bAnyDontExist; } FILE_LIST; + +static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); +static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path); +static DWORD SHNotifyDeleteFileW(FILE_OPERATION *op, LPCWSTR path); +static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL isdir); +static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); +static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); +static HRESULT copy_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, FILE_LIST *flTo); +static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, const FILE_LIST *flTo); + +DWORD WINAPI _FileOpCountManager(FILE_OPERATION *op, const FILE_LIST *flFrom); +static BOOL _FileOpCount(FILE_OPERATION *op, LPWSTR pwszBuf, BOOL bFolder, DWORD *ticks); /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations */

9 years, 7 months

[gadamopoulos] 66383: [SHELL32] - Implement progress dialogs for SHFileOperation - Patch by Hwu Davies CORE-4476

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 21 12:52:58 2015 New Revision: 66383 URL: http://svn.reactos.org/svn/reactos?rev=66383&view=rev Log: [SHELL32] - Implement progress dialogs for SHFileOperation - Patch by Hwu Davies CORE-4476 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Feb 21 12:52:58 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Feb 21 12:52:58 2015 @@ -37,10 +37,15 @@ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path); -static DWORD SHNotifyDeleteFileW(LPCWSTR path); -static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir); -static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); +static DWORD SHNotifyDeleteFileW(FILE_OPERATION *op, LPCWSTR path); +static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL isdir); +static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); +static HRESULT copy_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, FILE_LIST *flTo); +static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, const FILE_LIST *flTo); + +DWORD WINAPI _FileOpCountManager(FILE_OPERATION *op, const FILE_LIST *flFrom); +static BOOL _FileOpCount(FILE_OPERATION *op, LPWSTR pwszBuf, BOOL bFolder, DWORD *ticks); typedef struct { @@ -48,6 +53,10 @@ DWORD dwYesToAllMask; BOOL bManyItems; BOOL bCancelled; + IProgressDialog *progress; + ULARGE_INTEGER completedSize; + ULARGE_INTEGER totalSize; + WCHAR szBuilderString[50]; } FILE_OPERATION; #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 @@ -72,17 +81,6 @@ BOOL bAnyDirectories; BOOL bAnyDontExist; } FILE_LIST; - -typedef struct -{ - FILE_LIST * from; - FILE_LIST * to; - FILE_OPERATION * op; - DWORD Index; - HWND hDlgCtrl; - HWND hwndDlg; -}FILE_OPERATION_CONTEXT; - /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations */ @@ -371,7 +369,7 @@ * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ -BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +BOOL SHELL_DeleteDirectoryW(FILE_OPERATION *op, LPCWSTR pszDir, BOOL bShowUI) { BOOL ret = TRUE; HANDLE hFind; @@ -384,7 +382,7 @@ if (hFind == INVALID_HANDLE_VALUE) return FALSE; - if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) + if (!bShowUI || (ret = SHELL_ConfirmDialogW(op->req->hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) { do { @@ -392,10 +390,13 @@ continue; PathCombineW(szTemp, pszDir, wfd.cFileName); if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); + ret = SHELL_DeleteDirectoryW(op, szTemp, FALSE); else - ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); - } while (ret && FindNextFileW(hFind, &wfd)); + ret = (SHNotifyDeleteFileW(op, szTemp) == ERROR_SUCCESS); + + if (op->progress != NULL) + op->bCancelled |= op->progress->HasUserCancelled(); + } while (ret && FindNextFileW(hFind, &wfd) && !op->bCancelled); } FindClose(hFind); if (ret) @@ -474,22 +475,151 @@ return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); } +static void _SetOperationTitle(FILE_OPERATION *op) { + if (op->progress == NULL) + return; + WCHAR szTitle[50], szPreflight[50]; + + switch (op->req->wFunc) + { + case FO_COPY: + LoadStringW(shell32_hInstance, IDS_FILEOOP_COPYING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + break; + case FO_DELETE: + LoadStringW(shell32_hInstance, IDS_FILEOOP_DELETING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + break; + case FO_MOVE: + LoadStringW(shell32_hInstance, IDS_FILEOOP_MOVING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + break; + default: + return; + } + LoadStringW(shell32_hInstance, IDS_FILEOOP_PREFLIGHT, szPreflight, sizeof(szPreflight)/sizeof(WCHAR)); + + op->progress->SetTitle(szTitle); + op->progress->SetLine(1, szPreflight, false, NULL); +} + +static void _SetOperationTexts(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest) { + if (op->progress == NULL || src == NULL) + return; + LPWSTR fileSpecS, pathSpecS, fileSpecD, pathSpecD; + WCHAR szFolderS[50], szFolderD[50], szFinalString[260]; + + DWORD_PTR args[2]; + + fileSpecS = (pathSpecS = (LPWSTR) src); + fileSpecD = (pathSpecD = (LPWSTR) dest); + + // March across the string to get the file path and it's parent dir. + for (LPWSTR ptr = (LPWSTR) src; *ptr; ptr++) { + if (*ptr == '\\') { + pathSpecS = fileSpecS; + fileSpecS = ptr+1; + } + } + lstrcpynW(szFolderS, pathSpecS, min(50, fileSpecS - pathSpecS)); + args[0] = (DWORD_PTR) szFolderS; + + switch (op->req->wFunc) + { + case FO_COPY: + case FO_MOVE: + if (dest == NULL) + return; + for (LPWSTR ptr = (LPWSTR) dest; *ptr; ptr++) { + if (*ptr == '\\') { + pathSpecD = fileSpecD; + fileSpecD = ptr + 1; + } + } + lstrcpynW(szFolderD, pathSpecD, min(50, fileSpecD - pathSpecD)); + args[1] = (DWORD_PTR) szFolderD; + break; + case FO_DELETE: + break; + default: + return; + } + + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + op->szBuilderString, 0, 0, szFinalString, sizeof(szFinalString), (va_list*)args); + + op->progress->SetLine(1, fileSpecS, false, NULL); + op->progress->SetLine(2, szFinalString, false, NULL); +} + + +DWORD CALLBACK SHCopyProgressRoutine( + LARGE_INTEGER TotalFileSize, + LARGE_INTEGER TotalBytesTransferred, + LARGE_INTEGER StreamSize, + LARGE_INTEGER StreamBytesTransferred, + DWORD dwStreamNumber, + DWORD dwCallbackReason, + HANDLE hSourceFile, + HANDLE hDestinationFile, + LPVOID lpData +) { + FILE_OPERATION *op = (FILE_OPERATION *) lpData; + + if (op->progress) { + /* + * This is called at the start of each file. To keop less state, + * I'm adding the file to the completed size here, and the re-subtracting + * it when drawing the progress bar. + */ + if (dwCallbackReason & CALLBACK_STREAM_SWITCH) + op->completedSize.QuadPart += TotalFileSize.QuadPart; + + op->progress->SetProgress64(op->completedSize.QuadPart - + TotalFileSize.QuadPart + + TotalBytesTransferred.QuadPart + , op->totalSize.QuadPart); + + + op->bCancelled = op->progress->HasUserCancelled(); + } + + return 0; +} + + /************************************************************************ - * Win32DeleteFile [SHELL32.164] + * SHNotifyDeleteFileW [internal] * * Deletes a file. Also triggers a change notify if one exists. * * PARAMS - * path [I] path to file to delete + * op [I] File Operation context + * path [I] path to source file to move * * RETURNS - * TRUE if successful, FALSE otherwise - */ -static DWORD SHNotifyDeleteFileW(LPCWSTR path) + * ERORR_SUCCESS if successful + */ +static DWORD SHNotifyDeleteFileW(FILE_OPERATION *op, LPCWSTR path) { BOOL ret; TRACE("(%s)\n", debugstr_w(path)); + + _SetOperationTexts(op, path, NULL); + + LARGE_INTEGER FileSize; + FileSize.QuadPart = 0; + + WIN32_FIND_DATAW wfd; + HANDLE hFile = FindFirstFileW(path, &wfd); + if (hFile != INVALID_HANDLE_VALUE && IsAttribFile(wfd.dwFileAttributes)) { + ULARGE_INTEGER tmp; + tmp.u.LowPart = wfd.nFileSizeLow; + tmp.u.HighPart = wfd.nFileSizeHigh; + FileSize.QuadPart = tmp.QuadPart; + } + FindClose(hFile); ret = DeleteFileW(path); if (!ret) @@ -502,17 +632,28 @@ } if (ret) { + // Bit of a hack to make the progress bar move. We don't have progress inside the file, so inform when done. + SHCopyProgressRoutine(FileSize, FileSize, FileSize, FileSize, 0, CALLBACK_STREAM_SWITCH, NULL, NULL, op); SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); return ERROR_SUCCESS; } return GetLastError(); } -/***********************************************************************/ - +/************************************************************************ + * Win32DeleteFile [SHELL32.164] + * + * Deletes a file. Also triggers a change notify if one exists. + * + * PARAMS + * path [I] path to file to delete + * + * RETURNS + * TRUE if successful, FALSE otherwise + */ EXTERN_C DWORD WINAPI Win32DeleteFileW(LPCWSTR path) { - return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); + return (SHNotifyDeleteFileW(NULL, path) == ERROR_SUCCESS); } /************************************************************************ @@ -521,23 +662,26 @@ * Moves a file. Also triggers a change notify if one exists. * * PARAMS + * op [I] File Operation context * src [I] path to source file to move * dest [I] path to target file to move to * * RETURNS * ERORR_SUCCESS if successful */ -static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir) +static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL isdir) { BOOL ret; TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest)); - ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING); - - /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */ - if (!ret) - ret = MoveFileW(src, dest); + _SetOperationTexts(op, src, dest); + + ret = MoveFileWithProgressW(src, dest, SHCopyProgressRoutine, op, MOVEFILE_REPLACE_EXISTING); + + /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */ + if (!ret) + ret = MoveFileW(src, dest); if (!ret) { @@ -576,12 +720,14 @@ * RETURNS * ERROR_SUCCESS if successful */ -static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) +static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { BOOL ret; DWORD attribs; TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); + + _SetOperationTexts(op, src, dest); /* Destination file may already exist with read only attribute */ attribs = GetFileAttributesW(dest); @@ -597,7 +743,7 @@ } } - ret = CopyFileW(src, dest, bFailIfExists); + ret = CopyFileExW(src, dest, SHCopyProgressRoutine, op, &op->bCancelled, bFailIfExists); if (ret) { SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); @@ -1072,7 +1218,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) { WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; - SHFILEOPSTRUCTW fileOp; + FILE_LIST flFromNew, flToNew; static const WCHAR wildCardFiles[] = {'*','.','*',0}; @@ -1101,17 +1247,15 @@ PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); szFrom[lstrlenW(szFrom) + 1] = '\0'; - fileOp = *op->req; - fileOp.pFrom = szFrom; - fileOp.pTo = szTo; - fileOp.fFlags &= ~FOF_MULTIDESTFILES; /* we know we're copying to one dir */ - - /* Don't ask the user about overwriting files when he accepted to overwrite the - folder. FIXME: this is not exactly what Windows does - e.g. there would be - an additional confirmation for a nested folder */ - fileOp.fFlags |= FOF_NOCONFIRMATION; - - SHFileOperationW(&fileOp); + ZeroMemory(&flFromNew, sizeof(FILE_LIST)); + ZeroMemory(&flToNew, sizeof(FILE_LIST)); + parse_file_list(&flFromNew, szFrom); + parse_file_list(&flToNew, szTo); + + copy_files(op, FALSE, &flFromNew, &flToNew); + + destroy_file_list(&flFromNew); + destroy_file_list(&flToNew); } static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) @@ -1122,7 +1266,7 @@ return 0; } - return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0; + return SHNotifyCopyFileW(op, szFrom, szTo, FALSE) == 0; } /* copy a file or directory to another directory */ @@ -1162,7 +1306,7 @@ } /* the FO_COPY operation */ -static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) +static HRESULT copy_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToCopy; @@ -1185,7 +1329,7 @@ fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (multiDest) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; @@ -1237,7 +1381,7 @@ { entryToCopy = &flFrom->feFiles[i]; - if ((op->req->fFlags & FOF_MULTIDESTFILES) && + if ((multiDest) && flTo->dwNumFiles > 1) { fileDest = &flTo->feFiles[i]; @@ -1276,7 +1420,9 @@ return ERROR_CANCELLED; } } - + + if (op->progress != NULL) + op->bCancelled |= op->progress->HasUserCancelled(); /* Vista return code. XP would return e.g. ERROR_FILE_NOT_FOUND, ERROR_ALREADY_EXISTS */ if (op->bCancelled) return ERROR_CANCELLED; @@ -1310,7 +1456,7 @@ } /* the FO_DELETE operation */ -static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +static HRESULT delete_files(FILE_OPERATION *op, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; DWORD i; @@ -1321,13 +1467,13 @@ return ERROR_SUCCESS; /* Windows also checks only the first item */ - bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) + bTrash = (op->req->fFlags & FOF_ALLOWUNDO) && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); - if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) - if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) - { - lpFileOp->fAnyOperationsAborted = TRUE; + if (!(op->req->fFlags & FOF_NOCONFIRMATION) || (!bTrash && op->req->fFlags & FOF_WANTNUKEWARNING)) + if (!confirm_delete_list(op->req->hwnd, op->req->fFlags, bTrash, flFrom)) + { + op->req->fAnyOperationsAborted = TRUE; return 0; } @@ -1337,7 +1483,7 @@ fileEntry = &flFrom->feFiles[i]; if (!IsAttribFile(fileEntry->attributes) && - (lpFileOp->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) + (op->req->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) continue; if (bTrash) @@ -1350,14 +1496,14 @@ } /* Note: Windows silently deletes the file in such a situation, we show a dialog */ - if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING)) - bDelete = SHELL_ConfirmDialogW(lpFileOp->hwnd, ASK_CANT_TRASH_ITEM, fileEntry->szFullPath, NULL); + if (!(op->req->fFlags & FOF_NOCONFIRMATION) || (op->req->fFlags & FOF_WANTNUKEWARNING)) + bDelete = SHELL_ConfirmDialogW(op->req->hwnd, ASK_CANT_TRASH_ITEM, fileEntry->szFullPath, NULL); else bDelete = TRUE; if (!bDelete) { - lpFileOp->fAnyOperationsAborted = TRUE; + op->req->fAnyOperationsAborted = TRUE; break; } } @@ -1365,11 +1511,10 @@ /* delete the file or directory */ if (IsAttribFile(fileEntry->attributes)) { - bPathExists = DeleteFileW(fileEntry->szFullPath); - SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, fileEntry->szFullPath, NULL); + bPathExists = (ERROR_SUCCESS == SHNotifyDeleteFileW(op, fileEntry->szFullPath)); } else - bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); + bPathExists = SHELL_DeleteDirectoryW(op, fileEntry->szFullPath, FALSE); if (!bPathExists) { @@ -1386,15 +1531,21 @@ return err; } } + + if (op->progress != NULL) + op->bCancelled |= op->progress->HasUserCancelled(); + /* Should fire on progress dialog only */ + if (op->bCancelled) + return ERROR_CANCELLED; } return ERROR_SUCCESS; } -static void move_dir_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) +static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) { WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; - SHFILEOPSTRUCTW fileOp; + FILE_LIST flFromNew, flToNew; static const WCHAR wildCardFiles[] = {'*','.','*',0}; @@ -1409,31 +1560,36 @@ lstrcpyW(szTo, szDestPath); szTo[lstrlenW(szDestPath) + 1] = '\0'; - fileOp = *lpFileOp; - fileOp.pFrom = szFrom; - fileOp.pTo = szTo; - - SHFileOperationW(&fileOp); + ZeroMemory(&flFromNew, sizeof(FILE_LIST)); + ZeroMemory(&flToNew, sizeof(FILE_LIST)); + parse_file_list(&flFromNew, szFrom); + parse_file_list(&flToNew, szTo); + + move_files(op, FALSE, &flFromNew, &flToNew); + + destroy_file_list(&flFromNew); + destroy_file_list(&flToNew); } /* moves a file or directory to another directory */ -static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) +static void move_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) { WCHAR szDestPath[MAX_PATH]; PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); if (IsAttribFile(feFrom->attributes)) - SHNotifyMoveFileW(feFrom->szFullPath, szDestPath, FALSE); - else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) - move_dir_to_dir(lpFileOp, feFrom, szDestPath); + SHNotifyMoveFileW(op, feFrom->szFullPath, szDestPath, FALSE); + else if (!(op->req->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) + move_dir_to_dir(op, feFrom, szDestPath); } /* the FO_MOVE operation */ -static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; INT mismatched = 0; + const FILE_ENTRY *entryToMove; const FILE_ENTRY *fileDest; @@ -1443,13 +1599,13 @@ if (!flTo->dwNumFiles) return ERROR_FILE_NOT_FOUND; - if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && + if (!(multiDest) && flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1) { return ERROR_CANCELLED; } - if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && + if (!(multiDest) && !flFrom->bAnyDirectories && flFrom->dwNumFiles > flTo->dwNumFiles) { @@ -1459,7 +1615,7 @@ if (!PathFileExistsW(flTo->feFiles[0].szDirectory)) return ERROR_CANCELLED; - if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + if (multiDest) mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; fileDest = &flTo->feFiles[0]; @@ -1470,7 +1626,7 @@ if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; - if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + if (multiDest) { if (i >= flTo->dwNumFiles) break; @@ -1484,9 +1640,16 @@ } if (fileDest->bExists && IsAttribDir(fileDest->attributes)) - move_to_dir(lpFileOp, entryToMove, fileDest); + move_to_dir(op, entryToMove, fileDest); else - SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); + SHNotifyMoveFileW(op, entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); + + if (op->progress != NULL) + op->bCancelled |= op->progress->HasUserCancelled(); + /* Should fire on progress dialog only */ + if (op->bCancelled) + return ERROR_CANCELLED; + } if (mismatched > 0) @@ -1501,7 +1664,7 @@ } /* the FO_RENAME files */ -static HRESULT rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static HRESULT rename_files(FILE_OPERATION *op, const FILE_LIST *flFrom, const FILE_LIST *flTo) { const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo; @@ -1523,7 +1686,7 @@ if (feTo->bExists) return ERROR_ALREADY_EXISTS; - return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath, IsAttribDir(feFrom->attributes)); + return SHNotifyMoveFileW(op, feFrom->szFullPath, feTo->szFullPath, IsAttribDir(feFrom->attributes)); } /* alert the user if an unsupported flag is used */ @@ -1564,25 +1727,39 @@ ZeroMemory(&op, sizeof(op)); op.req = lpFileOp; + op.totalSize.QuadPart = 0ull; + op.completedSize.QuadPart = 0ull; op.bManyItems = (flFrom.dwNumFiles > 1); + if (lpFileOp->wFunc != FO_RENAME && !(lpFileOp->fFlags & FOF_SILENT)) { + CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, IID_IProgressDialog, (void**) &op.progress); + op.progress->StartProgressDialog(op.req->hwnd, NULL, PROGDLG_NORMAL & PROGDLG_AUTOTIME, NULL); + _SetOperationTitle(&op); + _FileOpCountManager(&op, &flFrom); + } + switch (lpFileOp->wFunc) { case FO_COPY: - ret = copy_files(&op, &flFrom, &flTo); + ret = copy_files(&op, op.req->fFlags & FOF_MULTIDESTFILES, &flFrom, &flTo); break; case FO_DELETE: - ret = delete_files(lpFileOp, &flFrom); + ret = delete_files(&op, &flFrom); break; case FO_MOVE: - ret = move_files(lpFileOp, &flFrom, &flTo); + ret = move_files(&op, op.req->fFlags & FOF_MULTIDESTFILES, &flFrom, &flTo); break; case FO_RENAME: - ret = rename_files(lpFileOp, &flFrom, &flTo); + ret = rename_files(&op, &flFrom, &flTo); break; default: ret = ERROR_INVALID_PARAMETER; break; + } + + if (op.progress) { + op.progress->StopProgressDialog(); + op.progress->Release(); } destroy_file_list(&flFrom); @@ -1824,3 +2001,87 @@ MultiByteToWideChar( CP_ACP, 0, path, -1, wpath, MAX_PATH); return SHPathPrepareForWriteW(hwnd, modless, wpath, flags); } + + +/* + * The two following background operations were modified from filedefext.cpp + * They use an inordinate amount of mutable state across the string functions, + * so are not easy to follow and care is required when modifying. + */ + +DWORD WINAPI +_FileOpCountManager(FILE_OPERATION *op, const FILE_LIST *from) +{ + DWORD ticks = GetTickCount(); + FILE_ENTRY *entryToCount; + + for (UINT i = 0; i < from->dwNumFiles; i++) + { + entryToCount = &from->feFiles[i]; + + WCHAR theFileName[MAX_PATH]; + StringCchCopyW(theFileName, MAX_PATH, entryToCount->szFullPath); + _FileOpCount(op, theFileName, IsAttribDir(entryToCount->attributes), &ticks); + } + return 0; +} + +// All path manipulations, even when this function is nested, occur on the one buffer. +static BOOL +_FileOpCount(FILE_OPERATION *op, LPWSTR pwszBuf, BOOL bFolder, DWORD *ticks) +{ + /* Find filename position */ + UINT cchBuf = wcslen(pwszBuf); + WCHAR *pwszFilename = pwszBuf + cchBuf; + size_t cchFilenameMax = MAX_PATH - cchBuf; + if (!cchFilenameMax) + return FALSE; + + if (bFolder) { + *(pwszFilename++) = '\\'; + --cchFilenameMax; + /* Find all files, FIXME: shouldn't be "*"? */ + StringCchCopyW(pwszFilename, cchFilenameMax, L"*"); + } + + WIN32_FIND_DATAW wfd; + HANDLE hFind = FindFirstFileW(pwszBuf, &wfd); + if (hFind == INVALID_HANDLE_VALUE) + { + ERR("FindFirstFileW %ls failed\n", pwszBuf); + return FALSE; + } + + do + { + if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + /* Don't process "." and ".." items */ + if (!wcscmp(wfd.cFileName, L".") || !wcscmp(wfd.cFileName, L"..")) + continue; + + StringCchCopyW(pwszFilename, cchFilenameMax, wfd.cFileName); + _FileOpCount(op, pwszBuf, TRUE, ticks); + } + else + { + ULARGE_INTEGER FileSize; + FileSize.u.LowPart = wfd.nFileSizeLow; + FileSize.u.HighPart = wfd.nFileSizeHigh; + op->totalSize.QuadPart += FileSize.QuadPart; + } + if (GetTickCount() - *ticks > (DWORD) 500) + { + // Check if the dialog has ended. If it has, we'll spin down. + if (op->progress != NULL) + op->bCancelled = op->progress->HasUserCancelled(); + + if (op->bCancelled) + break; + *ticks = GetTickCount(); + } + } while(FindNextFileW(hFind, &wfd)); + + FindClose(hFind); + return TRUE; +} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Feb 21 12:52:58 2015 @@ -202,6 +202,14 @@ #define IDS_PASTE 330 #define IDS_DESCRIPTION 331 #define IDS_COPY_OF 332 + +/* Strings for file operations*/ +#define IDS_FILEOOP_COPYING 333 +#define IDS_FILEOOP_MOVING 334 +#define IDS_FILEOOP_DELETING 335 +#define IDS_FILEOOP_FROM_TO 336 +#define IDS_FILEOOP_FROM 337 +#define IDS_FILEOOP_PREFLIGHT 338 #define IDS_MENU_EMPTY 34561

9 years, 7 months

[tfaber] 66382: [KERNEL32] - BasepGetModuleHandleExW returns BOOLEAN, not NTSTATUS. Treat it as such. - Always set last error code on failure in BasepGetModuleHandleExW. CORE-9241 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 21 12:24:19 2015 New Revision: 66382 URL: http://svn.reactos.org/svn/reactos?rev=66382&view=rev Log: [KERNEL32] - BasepGetModuleHandleExW returns BOOLEAN, not NTSTATUS. Treat it as such. - Always set last error code on failure in BasepGetModuleHandleExW. CORE-9241 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/loader.c Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sat Feb 21 12:24:19 2015 @@ -722,7 +722,7 @@ { DWORD Cookie; NTSTATUS Status = STATUS_SUCCESS, Status2; - HANDLE hModule = 0; + HANDLE hModule = NULL; UNICODE_STRING ModuleNameU; DWORD dwValid; BOOLEAN Redirected = FALSE; // FIXME @@ -739,7 +739,7 @@ { /* Fail */ BaseSetLastNTError(Status); - if (phModule) *phModule = 0; + if (phModule) *phModule = NULL; return NT_SUCCESS(Status); } } @@ -789,11 +789,11 @@ hModule); } +quickie: /* Set last error in case of failure */ if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status); -quickie: /* Unlock loader lock if it was acquired */ if (!NoLock) { @@ -843,20 +843,20 @@ GetModuleHandleW(LPCWSTR lpModuleName) { HMODULE hModule; - NTSTATUS Status; + BOOLEAN Success; /* If current module is requested - return it right away */ if (!lpModuleName) return ((HMODULE)NtCurrentPeb()->ImageBaseAddress); /* Use common helper routine */ - Status = BasepGetModuleHandleExW(TRUE, - GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - lpModuleName, - &hModule); - - /* If it wasn't successful - return 0 */ - if (!NT_SUCCESS(Status)) hModule = 0; + Success = BasepGetModuleHandleExW(TRUE, + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + lpModuleName, + &hModule); + + /* If it wasn't successful - return NULL */ + if (!Success) hModule = NULL; /* Return the handle */ return hModule; @@ -872,9 +872,8 @@ IN LPCWSTR lpwModuleName OPTIONAL, OUT HMODULE* phModule) { - NTSTATUS Status; DWORD dwValid; - BOOL Ret = FALSE; + BOOL Ret; /* Validate parameters */ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, lpwModuleName, phModule); @@ -886,13 +885,10 @@ if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; /* Use common helper routine */ - Status = BasepGetModuleHandleExW(FALSE, - dwFlags, - lpwModuleName, - phModule); - - /* Return TRUE in case of success */ - if (NT_SUCCESS(Status)) Ret = TRUE; + Ret = BasepGetModuleHandleExW(FALSE, + dwFlags, + lpwModuleName, + phModule); return Ret; } @@ -908,8 +904,7 @@ { PUNICODE_STRING lpModuleNameW; DWORD dwValid; - BOOL Ret = FALSE; - NTSTATUS Status; + BOOL Ret; /* Validate parameters */ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, (LPCWSTR)lpModuleName, phModule); @@ -924,10 +919,10 @@ if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) { /* Call the extended version of the API without conversion */ - Status = BasepGetModuleHandleExW(FALSE, - dwFlags, - (LPCWSTR)lpModuleName, - phModule); + Ret = BasepGetModuleHandleExW(FALSE, + dwFlags, + (LPCWSTR)lpModuleName, + phModule); } else { @@ -938,15 +933,11 @@ if (!lpModuleNameW) return FALSE; /* Call the extended version of the API */ - Status = BasepGetModuleHandleExW(FALSE, - dwFlags, - lpModuleNameW->Buffer, - phModule); - } - - /* If result was successful - return true */ - if (NT_SUCCESS(Status)) - Ret = TRUE; + Ret = BasepGetModuleHandleExW(FALSE, + dwFlags, + lpModuleNameW->Buffer, + phModule); + } /* Return result */ return Ret;

9 years, 7 months

[janderwald] 66381: [STREAMCI] - hackfix build #2

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 21 10:34:13 2015 New Revision: 66381 URL: http://svn.reactos.org/svn/reactos?rev=66381&view=rev Log: [STREAMCI] - hackfix build #2 Modified: trunk/reactos/dll/win32/streamci/streamci.c Modified: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 21 10:34:13 2015 @@ -50,7 +50,7 @@ { HDEVINFO hDevInfo; SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; - GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + // GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; HANDLE hDevice; PSWENUM_INSTALL_INTERFACE InstallInterface; @@ -64,7 +64,7 @@ } DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, NULL, 0, &DeviceInterfaceData)) { // failed SetupDiDestroyDeviceInfoList(hDevInfo);

9 years, 7 months

[janderwald] 66380: [PSDK] - fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 21 10:14:00 2015 New Revision: 66380 URL: http://svn.reactos.org/svn/reactos?rev=66380&view=rev Log: [PSDK] - fix build Modified: trunk/reactos/include/ddk/swenum.h Modified: trunk/reactos/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/swenum.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/swenum.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/swenum.h [iso-8859-1] Sat Feb 21 10:14:00 2015 @@ -23,7 +23,7 @@ #define BUSID_SoftwareDeviceEnumerator KSMEDIUMSETID_Standard #else #define STATIC_BUSID_SoftwareDeviceEnumerator \ - 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} #endif /* _KS_ */ #ifdef _NTDDK_

9 years, 7 months

[janderwald] 66379: [STREAMCI] - start implement streaming device class installer

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 21 10:09:36 2015 New Revision: 66379 URL: http://svn.reactos.org/svn/reactos?rev=66379&view=rev Log: [STREAMCI] - start implement streaming device class installer Added: trunk/reactos/dll/win32/streamci/ (with props) trunk/reactos/dll/win32/streamci/CMakeLists.txt (with props) trunk/reactos/dll/win32/streamci/precomp.h (with props) trunk/reactos/dll/win32/streamci/streamci.c (with props) trunk/reactos/dll/win32/streamci/streamci.rc (with props) trunk/reactos/dll/win32/streamci/streamci.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -196,6 +196,7 @@ add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) +add_subdirectory(streamci) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed) Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 10:09:36 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/streamci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/streamci/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/streamci/CMakeLists.txt [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,20 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(streamci.dll streamci.spec) + +list(APPEND SOURCE + streamci.c + precomp.h) + +add_library(streamci SHARED + ${SOURCE} + streamci.rc + ${CMAKE_CURRENT_BINARY_DIR}/streamci.def) + +set_module_type(streamci win32dll) +target_link_libraries(streamci uuid wine) +add_importlibs(streamci rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) +add_pch(streamci precomp.h SOURCE) +add_cd_file(TARGET streamci DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/streamci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/precomp… ============================================================================== --- trunk/reactos/dll/win32/streamci/precomp.h (added) +++ trunk/reactos/dll/win32/streamci/precomp.h [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,28 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <netcfgx.h> +#include <setupapi.h> +#include <netcfgn.h> +#include <devguid.h> +#include <strsafe.h> +#include <winioctl.h> +#include <swenum.h> +#include <debug.h> + +#endif /* EOF */ + Propchange: trunk/reactos/dll/win32/streamci/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c (added) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,187 @@ +#include "precomp.h" + +DWORD +PerformIO(IN HANDLE hDevice, + IN DWORD dwCtlCode, + IN LPVOID lpBufferIn, + IN DWORD dwBufferSizeIn, + OUT LPVOID lpBufferOut, + OUT DWORD dwBufferSizeOut, + OUT LPDWORD lpNumberBytes) +{ + OVERLAPPED overlapped; + DWORD dwResult; + + ZeroMemory(&overlapped, sizeof(OVERLAPPED)); + overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if (!overlapped.hEvent) + { + // failed to init event + return GetLastError(); + } + + if (DeviceIoControl(hDevice, dwCtlCode, lpBufferIn, dwBufferSizeIn, lpBufferOut, dwBufferSizeOut, lpNumberBytes, &overlapped)) + { + dwResult = ERROR_SUCCESS; + } + else if (GetLastError() == ERROR_IO_PENDING) + { + if (GetOverlappedResult(hDevice, &overlapped, lpNumberBytes, TRUE)) + { + dwResult = ERROR_SUCCESS; + } + else + { + dwResult = GetLastError(); + } + } + else + { + dwResult = GetLastError(); + } + CloseHandle(overlapped.hEvent); + return dwResult; +} + +DWORD +InstallSoftwareDeviceInterface(IN LPGUID DeviceId, + IN LPGUID InterfaceId, + IN LPWSTR ReferenceString) +{ + HDEVINFO hDevInfo; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; + HANDLE hDevice; + PSWENUM_INSTALL_INTERFACE InstallInterface; + DWORD dwResult; + + hDevInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_SYSTEM, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + if (!hDevInfo) + { + // failed + return GetLastError(); + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)); + if (!DeviceInterfaceDetailData) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + + hDevice = CreateFileW(DeviceInterfaceDetailData->DevicePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED|FILE_ATTRIBUTE_NORMAL, NULL); + if (hDevice == INVALID_HANDLE_VALUE) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + InstallInterface = (PSWENUM_INSTALL_INTERFACE)HeapAlloc(GetProcessHeap(), 0, sizeof(SWENUM_INSTALL_INTERFACE) + wcslen(ReferenceString) * sizeof(WCHAR)); + if (!InstallInterface) + { + // failed + CloseHandle(hDevice); + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + // init install interface param + InstallInterface->DeviceId = *DeviceId; + InstallInterface->InterfaceId = *InterfaceId; + wcscpy(InstallInterface->ReferenceString, ReferenceString); + + PerformIO(hDevice, IOCTL_SWENUM_INSTALL_INTERFACE, InstallInterface, sizeof(SWENUM_INSTALL_INTERFACE) + wcslen(ReferenceString) * sizeof(WCHAR), NULL, 0, NULL); + dwResult = HeapFree(GetProcessHeap(), 0, InstallInterface); + + CloseHandle(hDevice); + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return dwResult; +} + +VOID +WINAPI +StreamingDeviceSetupW(IN HWND hwnd, + IN HINSTANCE hinst, + IN LPWSTR lpszCmdLine, + IN int nCmdShow) +{ + DWORD Length; + LPWSTR pCmdLine; + LPWSTR pStr; + GUID Guids[2]; + //WCHAR DevicePath[MAX_PATH]; + HRESULT hResult; + DWORD Index; + + Length = (wcslen(lpszCmdLine) + 1) * sizeof(WCHAR); + + pCmdLine = (LPWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (pCmdLine == NULL) + { + // no memory + return; + } + + hResult = StringCbCopyExW(pCmdLine, Length, lpszCmdLine, NULL, NULL, STRSAFE_NULL_ON_FAILURE); + if (hResult != S_OK) + { + // failed + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + pStr = wcstok(pCmdLine, L",\t\""); + Index = 0; + do + { + if (pStr == NULL) + { + // invalid parameter + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + hResult = IIDFromString(pStr, &Guids[Index]); + if (hResult != S_OK) + { + // invalid parameter + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + Index++; + pStr = wcstok(NULL, L",\t\""); + + + }while(Index < 2); + + + hResult = InstallSoftwareDeviceInterface(&Guids[0], &Guids[1], pStr); + + // FIXME + // install inf section + +} Propchange: trunk/reactos/dll/win32/streamci/streamci.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.rc (added) +++ trunk/reactos/dll/win32/streamci/streamci.rc [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,18 @@ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Streaming Device Class Installer" +#define REACTOS_STR_INTERNAL_NAME "streamci.dll" +#define REACTOS_STR_ORIGINAL_FILENAME "streamci.dll" +#define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264" +#define REACTOS_STR_FILE_VERSION "5.1.2600.3264" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + Propchange: trunk/reactos/dll/win32/streamci/streamci.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.spec (added) +++ trunk/reactos/dll/win32/streamci/streamci.spec [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1 @@ +7 stdcall StreamingDeviceSetupW(ptr ptr ptr long) Propchange: trunk/reactos/dll/win32/streamci/streamci.spec ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 7 months

[hbelusca] 66378: [NTOS] - Mispelling + whitespace fixes. - Move the finalization of the boot logo display *before* we enable strings to be displayed (as on Windows), but *after* having increased t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 21 01:25:47 2015 New Revision: 66378 URL: http://svn.reactos.org/svn/reactos?rev=66378&view=rev Log: [NTOS] - Mispelling + whitespace fixes. - Move the finalization of the boot logo display *before* we enable strings to be displayed (as on Windows), but *after* having increased the progress bar to 100% (contrary to Windows), so that we can display the progress bar at 100% without any problem and then do the correct transition: * either GUI splash-screen --> text-mode emulation console with product name in console header + footer (aka. SOS mode) * or SOS mode --> text-mode emulation without any graphics. Since it is done before starting SMSS, we can correctly display the strings it may output (or start other native apps) without fearing that after 5 seconds, the screen clears up in front of you. CORE-9112 #resolve #comment Fixed in r66378, thanks for reporting! Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/config.c trunk/reactos/ntoskrnl/lpc/close.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=663… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -526,7 +526,7 @@ (USHORT)Size); /* Append the DLL path to it */ - RtlAppendUnicodeToString(&Environment, L"Path=" ); + RtlAppendUnicodeToString(&Environment, L"Path="); RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath); RtlAppendUnicodeStringToString(&Environment, &NullString); @@ -1956,6 +1956,9 @@ /* Update progress bar */ InbvUpdateProgressBar(100); + /* Clear the screen */ + if (InbvBootDriverInstalled) FinalizeBootLogo(); + /* Allow strings to be displayed */ InbvEnableDisplayString(TRUE); @@ -1994,9 +1997,6 @@ &Size, MEM_RELEASE); - /* Clean the screen */ - if (InbvBootDriverInstalled) FinalizeBootLogo(); - /* Increase init phase */ ExpInitializationPhase++; Modified: trunk/reactos/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -122,6 +122,6 @@ Child = Child->Child; } - /* If we got here, nothign was found */ + /* If we got here, nothing was found */ return NULL; } Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -439,7 +439,7 @@ KeReleaseGuardedMutex(&LpcpLock); } - /* Check if this is a connection port with a server process*/ + /* Check if this is a connection port with a server process */ if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && (ConnectionPort->ServerProcess)) {

9 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015