Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [NTOSKRNL] Properly align VACB writes

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a80ae2bb6fdb4135d412… commit 2a80ae2bb6fdb4135d41244335caa2dadb6c8fa9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 23 10:31:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 23 10:32:14 2018 +0200 [NTOSKRNL] Properly align VACB writes Also simplify VACB reads alignment code. Also add some sanity ASSERTs. --- ntoskrnl/cc/copy.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 78c6553d8a..4509e2e43b 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -81,7 +81,7 @@ NTAPI CcReadVirtualAddress ( PROS_VACB Vacb) { - ULONG Size, Pages; + ULONG Size; PMDL Mdl; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; @@ -95,10 +95,11 @@ CcReadVirtualAddress ( } Size = LargeSize.LowPart; - Pages = BYTES_TO_PAGES(Size); - ASSERT(Pages * PAGE_SIZE <= VACB_MAPPING_GRANULARITY); + Size = ROUND_TO_PAGES(Size); + ASSERT(Size <= VACB_MAPPING_GRANULARITY); + ASSERT(Size > 0); - Mdl = IoAllocateMdl(Vacb->BaseAddress, Pages * PAGE_SIZE, FALSE, FALSE, NULL); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { return STATUS_INSUFFICIENT_RESOURCES; @@ -177,6 +178,10 @@ CcWriteVirtualAddress ( } while (++i < (Size >> PAGE_SHIFT)); } + Size = ROUND_TO_PAGES(Size); + ASSERT(Size <= VACB_MAPPING_GRANULARITY); + ASSERT(Size > 0); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) {

5 years, 12 months

01/01: [BOOTDATA] Factorize the creation of user profile directories inside a helper function that can be called with different parameters.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7b9db0f66ae3b4e51c27… commit f7b9db0f66ae3b4e51c273ac66ae953afb036d23 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 23 00:12:24 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:38:12 2018 +0200 [BOOTDATA] Factorize the creation of user profile directories inside a helper function that can be called with different parameters. --- boot/CMakeLists.txt | 99 +++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 0bff234030..727f75a7ff 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -53,10 +53,45 @@ ${_isobtrt_file} 2 ${_efisys_file} 1 ") -# ISO image identificator names +# ISO image identifier names set(ISO_MANUFACTURER "ReactOS Foundation") # For both the publisher and the preparer set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Volume set ID + +# Create user profile directories in the LiveImage +function(add_allusers_profile_dirs _image_filelist _rootdir) + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +endfunction() +function(add_user_profile_dirs _image_filelist _rootdir _username) + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +endfunction() + + ## BootCD # Create the file list file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") @@ -92,34 +127,9 @@ add_custom_target(bootcdregtest file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -# Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") add_custom_target(livecd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 @@ -136,34 +146,9 @@ add_custom_target(livecd file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -# Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4

5 years, 12 months

01/01: [SHELL32] In _SHExpandEnvironmentStrings(), fall back to SHExpandEnvironmentStringsForUserW() if the simplified code paths failed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ee298bbfc3838e7fbf92… commit 7ee298bbfc3838e7fbf92d775206ca9f4d0c38dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 23 00:07:07 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:18:57 2018 +0200 [SHELL32] In _SHExpandEnvironmentStrings(), fall back to SHExpandEnvironmentStringsForUserW() if the simplified code paths failed. This allows the code to give a last chance for expanding the string. And if it still fails, we bail out as expected and the caller will take appropriate actions. As a by-product, this commit (together with the previous one e2960914) fixes the regression CORE-14981 (Quick-Launch bar couldn't be opened in LiveCD). --- dll/win32/shell32/wine/shellpath.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 96e47b288a..b247fd3bf3 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1986,7 +1986,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else DWORD cchSize = cchDest; if (!GetAllUsersProfileDirectoryW(szDest, &cchSize)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } @@ -2015,7 +2015,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else DWORD cchSize = cchDest; if (!_SHGetUserProfileDirectoryW(hToken, szDest, &cchSize)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif PathAppendW(szDest, szTemp + strlenW(UserProfileW)); } @@ -2025,16 +2025,19 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR GetSystemDirectoryW(szDest, MAX_PATH); #else if (!GetSystemDirectoryW(szDest, cchDest)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else +#ifdef __REACTOS__ +fallback_expand: +#endif { #ifndef __REACTOS__ DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); #else - DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szSrc, szDest, cchDest); + DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szTemp, szDest, cchDest); #endif #ifndef __REACTOS__

5 years, 12 months

02/02: [SHELL32] In _SHGetUserShellFolderPath(), check the return value of _SHExpandEnvironmentStrings() and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e29609147b6da48f4a016… commit e29609147b6da48f4a0166b39be8664a996b06b8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 23:37:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:16:06 2018 +0200 [SHELL32] In _SHGetUserShellFolderPath(), check the return value of _SHExpandEnvironmentStrings() and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string. CORE-14981 --- dll/win32/shell32/wine/shellpath.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 6396641a15..96e47b288a 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1480,7 +1480,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us #ifndef __REACTOS__ _SHExpandEnvironmentStrings(path, szTemp); #else - _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp)); + hr = _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp)); + if (FAILED(hr)) + goto end; #endif lstrcpynW(path, szTemp, MAX_PATH); } @@ -1493,6 +1495,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us } else hr = E_FAIL; +#ifdef __REACTOS__ +end: +#endif RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); TRACE("returning 0x%08x\n", hr);

5 years, 12 months

01/02: [SHELL32] Partially synchronize wine/shellpath.c with Wine.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41a5b11fcd3e6cae64185… commit 41a5b11fcd3e6cae64185d7e51b8ed9800d87ecd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 22:19:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:16:02 2018 +0200 [SHELL32] Partially synchronize wine/shellpath.c with Wine. - Adjust the code with respect to: "shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility." 4a6855a575c02aa1569aab8b2e96720fc02f3f26 (Alexandre Julliard) - "shell32: Avoid infinite loop in _SHExpandEnvironmentStrings." ceea5bda14ecf4c8ce262fc7ab88df49e500bc38 (Alexandre Julliard) - "shell32: Assume that system directory always contains a drive letter." 54530bc4933ae1014c3697c95e22b8ca5a275bc4 (Alexandre Julliard) - "shell32: Use ARRAY_SIZE macro." 612a1941331485725952d34f3dcd5866fc318dc2 (Nikolay Sivov) - "shell32: Fix a trace message." bb09bb5750d617047aa23635731519a2f9486159 (Nikolay Sivov) - "shell32: Fix SHGetFolderPathAndSubDir() trace message." f75d5625966933562b974540a3f29dfcd720ad50 (Nikolay Sivov) - "shell32: Pass correct buffer length to RegQueryValueExW()." 0bfb97dcba29552b51d8609fcc6e7bbc04bb8320 (Nikolay Sivov) - "shell32: Remove unused string (Clang)." 8d50a8a246960749afba21eac117b4fcbbf2c79d (André Hentschel) - "shell32: Use E_NOT_SUFFICIENT_BUFFER definition." 730e744e3bd6b706612fe0f90a7efb2e600f114f (Nikolay Sivov) --- dll/win32/shell32/wine/shell32_main.h | 2 + dll/win32/shell32/wine/shellpath.c | 80 +++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index 170d844b4b..1653697538 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -26,6 +26,8 @@ extern "C" { #endif +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) + /******************************************* * global SHELL32.DLL variables */ diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index d1a3ada74e..6396641a15 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -578,7 +578,6 @@ static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'}; -static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'}; #endif static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; @@ -601,6 +600,9 @@ static const WCHAR Program_Files_x86_Common_FilesW[] = {'P','r','o','g','r','a', static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'}; static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'}; +#ifndef __REACTOS__ +static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; +#endif static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'}; static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'}; #ifndef __REACTOS__ @@ -624,6 +626,9 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' #endif static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +#ifndef __REACTOS__ +static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; +#endif static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; #ifndef __REACTOS__ @@ -1425,8 +1430,8 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwType, dwPathLen = MAX_PATH; HKEY userShellFolderKey, shellFolderKey; + DWORD dwType, dwPathLen; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), path); @@ -1461,6 +1466,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) { @@ -1539,8 +1545,9 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) TRACE("0x%02x,%p\n", folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; + if (!pszPath) return E_INVALIDARG; @@ -1576,7 +1583,11 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) strcpyW(pszPath, UserProfileW); break; case CSIDL_Type_AllUsers: +#ifndef __REACTOS__ + strcpyW(pszPath, PublicProfileW); +#else strcpyW(pszPath, AllUsersProfileW); +#endif break; case CSIDL_Type_CurrVer: strcpyW(pszPath, SystemDriveW); @@ -1624,7 +1635,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_CurrVer) return E_INVALIDARG; @@ -1736,7 +1747,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_User) return E_INVALIDARG; @@ -1815,7 +1826,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_AllUsers) return E_INVALIDARG; @@ -1946,8 +1957,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, szDefaultProfileDirW ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } @@ -1966,7 +1976,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR strcpyW(szDest, szProfilesPrefix); hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + szAllUsers, AllUsersW); PathAppendW(szDest, szAllUsers); #else DWORD cchSize = cchDest; @@ -1975,6 +1985,19 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #endif PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } +#ifndef __REACTOS__ + else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + { + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; + + GetSystemDirectoryW(def_val, MAX_PATH); + strcpyW( def_val + 3, UsersPublicW ); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + PathAppendW(szDest, szAllUsers); + PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + } +#endif else if (!strncmpiW(szTemp, UserProfileW, strlenW(UserProfileW))) { #ifndef __REACTOS__ @@ -1999,21 +2022,12 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR if (!GetSystemDirectoryW(szDest, cchDest)) return HRESULT_FROM_WIN32(GetLastError()); #endif - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); - hr = S_OK; - } + strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else { #ifndef __REACTOS__ - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); + DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); #else DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szSrc, szDest, cchDest); #endif @@ -2023,19 +2037,12 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else if (ret > cchDest) #endif - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - strcpyW(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; + else if (!strcmpW( szTemp, szDest )) break; /* nothing expanded */ } + if (SUCCEEDED(hr)) strcpyW(szTemp, szDest); } end: #ifndef __REACTOS__ @@ -2092,7 +2099,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( HRESULT hr = S_OK; LPWSTR pszSubPathW = NULL; LPWSTR pszPathW = NULL; - TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); @@ -2145,7 +2153,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first @@ -2153,7 +2161,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( if (pszPath) *pszPath = '\0'; - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) return E_INVALIDARG; @@ -2317,7 +2325,7 @@ HRESULT WINAPI SHGetFolderPathA( WCHAR szTemp[MAX_PATH]; HRESULT hr; - TRACE("%p,%p,nFolder=0x%04x\n",hwndOwner,pszPath,nFolder); + TRACE("%p,%d,%p,%#x,%p\n", hwndOwner, nFolder, hToken, dwFlags, pszPath); if (pszPath) *pszPath = '\0'; @@ -2486,7 +2494,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) } hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, - pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); + pShellFolderPath, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; } @@ -2511,7 +2519,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) TRACE("\n"); hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders, - szSHFolders, folders, sizeof(folders) / sizeof(folders[0])); + szSHFolders, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; }

5 years, 12 months

01/01: [MSCONFIG_NEW] Do not assign an access key to a letter with diacritic

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=983b4c9f9441a9e31b05a… commit 983b4c9f9441a9e31b05a7ed23272b1d75d57b78 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Sep 22 21:40:57 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 22 21:51:14 2018 +0200 [MSCONFIG_NEW] Do not assign an access key to a letter with diacritic --- base/applications/msconfig_new/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/msconfig_new/lang/ro-RO.rc b/base/applications/msconfig_new/lang/ro-RO.rc index a561922510..0c4cb7b3d7 100644 --- a/base/applications/msconfig_new/lang/ro-RO.rc +++ b/base/applications/msconfig_new/lang/ro-RO.rc @@ -84,7 +84,7 @@ BEGIN LTEXT "secunde", IDC_STATIC, 330, 104, 31, 10 CONTROL "&Permanenizează configurația de inițializare", 292, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49 - PUSHBUTTON "&Șterge", IDC_BTN_DELETE, 295, 68, 66, 14 + PUSHBUTTON "Ș&terge", IDC_BTN_DELETE, 295, 68, 66, 14 END IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175

5 years, 12 months

01/01: [DWNL] Add Polish translation

by Paweł Cholewa

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13045d50ed4e4629df23e… commit 13045d50ed4e4629df23e8515a9ef2bd26efcf3c Author: Paweł Cholewa <MCPlayG(a)wp.pl> AuthorDate: Sat Sep 22 14:53:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 22 14:53:13 2018 +0200 [DWNL] Add Polish translation --- base/applications/network/dwnl/dwnl.rc | 3 +++ base/applications/network/dwnl/lang/pl-PL.rc | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc index c73cb425dd..5077a012ee 100644 --- a/base/applications/network/dwnl/dwnl.rc +++ b/base/applications/network/dwnl/dwnl.rc @@ -20,6 +20,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/base/applications/network/dwnl/lang/pl-PL.rc b/base/applications/network/dwnl/lang/pl-PL.rc new file mode 100644 index 0000000000..2c9d024204 --- /dev/null +++ b/base/applications/network/dwnl/lang/pl-PL.rc @@ -0,0 +1,25 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Użycie: dwnl URL [CEL]\n" + IDS_RESOLVING "Rozwiązywanie %s... " + IDS_DONE "ukończone.\n" + IDS_LENGTH_FULL "Długość: %I64u [%s]\n" + IDS_LENGTH "Długość: %I64u\n" + IDS_FILE_SAVED "\nPlik zapisany.\n" + IDS_CONNECTING_TO_FULL "Nawiązywanie połączenia z %s [%s]... " + IDS_CONNECTING_TO "Nawiązywanie połączenia z %s... " + IDS_REDIRECTING_TO "Przekierowywanie do %s... " + IDS_SEND_REQUEST "Wysyłanie zapytania... " + IDS_BYTES_DOWNLOADED "Pobrano %I64u bajt(ów)." + IDS_BYTES_DOWNLOADED_FULL "%2d%% (pobrano %I64u bajt(ów))" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nBŁĄD: Pobieranie nieudane.\n" + IDS_ERROR_CODE "\nBŁĄD: %u\n" + IDS_ERROR_FILENAME "\nBŁĄD: Nie można ustalić nazwy pliku, podaj docelową nazwę pliku.\n" + IDS_ERROR_PROTOCOL "\nBŁĄD: Niewspierany protokół.\n" +END

5 years, 12 months

01/01: [SETUPAPI] SetupDiCreateDevRegKeyW / SetupDiOpenDevRegKey: Create or open the 'Device Parameters' subkey of the given devices enum key when we try to access its hardware key.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de08785aded3e7eb803b3… commit de08785aded3e7eb803b35510ea82cc033f19c24 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 22 14:43:43 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 22 14:43:43 2018 +0200 [SETUPAPI] SetupDiCreateDevRegKeyW / SetupDiOpenDevRegKey: Create or open the 'Device Parameters' subkey of the given devices enum key when we try to access its hardware key. This creates the PortName value in the proper location for serial ports. --- dll/win32/setupapi/devinst.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 73990f5952..91356c3f54 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1515,6 +1515,27 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( SetLastError(rc); goto cleanup; } + + if (Scope == DICS_FLAG_GLOBAL) + { + HKEY hTempKey = hKey; + + rc = RegCreateKeyExW(hTempKey, + L"Device Parameters", + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + NULL); + if (rc == ERROR_SUCCESS) + RegCloseKey(hTempKey); + } } else /* KeyType == DIREG_DRV */ { @@ -5905,6 +5926,18 @@ HKEY WINAPI SetupDiOpenDevRegKey( { case DIREG_DEV: key = SETUPDI_OpenDevKey(RootKey, devInfo, samDesired); + if (Scope == DICS_FLAG_GLOBAL) + { + LONG rc; + HKEY hTempKey = key; + rc = RegOpenKeyExW(hTempKey, + L"Device Parameters", + 0, + samDesired, + &key); + if (rc == ERROR_SUCCESS) + RegCloseKey(hTempKey); + } break; case DIREG_DRV: key = SETUPDI_OpenDrvKey(RootKey, devInfo, samDesired);

5 years, 12 months

01/01: [NTOSKRNL] IoGetDeviceProperty: Add support for the DevicePropertyRemovalPolicy property.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e32a2cc026fe4199ade1d… commit e32a2cc026fe4199ade1de703cb6ed133b15c046 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 22 11:20:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 22 11:22:22 2018 +0200 [NTOSKRNL] IoGetDeviceProperty: Add support for the DevicePropertyRemovalPolicy property. This could probably fix CORE-15068. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 5456b8aa68..010a997b52 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -4180,6 +4180,9 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, *ResultLength -= sizeof(OBJECT_NAME_INFORMATION); break; + case DevicePropertyRemovalPolicy: + PIP_RETURN_DATA(sizeof(UCHAR), &DeviceNode->RemovalPolicy); + /* Handle the registry-based properties */ case DevicePropertyUINumber: PIP_REGISTRY_DATA(REGSTR_VAL_UI_NUMBER, REG_DWORD); @@ -4206,8 +4209,6 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, case DevicePropertyContainerID: //PIP_REGISTRY_DATA(REGSTR_VAL_CONTAINERID, REG_SZ); // Win7 PIP_UNIMPLEMENTED(); - case DevicePropertyRemovalPolicy: - PIP_UNIMPLEMENTED(); break; case DevicePropertyInstallState: PIP_REGISTRY_DATA(REGSTR_VAL_CONFIGFLAGS, REG_DWORD);

5 years, 12 months

01/01: [BTHCI] Add a bluetooth icon (#871)

by Abdulganiev Rafael

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a6aa7770efef022ced87… commit 2a6aa7770efef022ced875baf7fe083cde9c53a6 Author: Abdulganiev Rafael <40519766+A-Rafael(a)users.noreply.github.com> AuthorDate: Sat Sep 22 01:42:27 2018 +0400 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri Sep 21 23:42:27 2018 +0200 [BTHCI] Add a bluetooth icon (#871) [BTHCI] Add a bluetooth icon --- dll/win32/bthci/bthci.rc | 4 ++-- dll/win32/bthci/resource.h | 3 +++ dll/win32/bthci/resources/bluetooth.ico | Bin 0 -> 25214 bytes media/inf/bth.inf | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/win32/bthci/bthci.rc b/dll/win32/bthci/bthci.rc index eaef1c4d08..d4a0d84c1d 100644 --- a/dll/win32/bthci/bthci.rc +++ b/dll/win32/bthci/bthci.rc @@ -1,7 +1,7 @@ #include <windef.h> #include <winuser.h> -//#include "resource.h" +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -13,7 +13,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include <reactos/version.rc> #include <reactos/manifest_dll.rc> -//IDI_BLUETOOTH ICON "resources/bluetooth.ico" +IDI_BLUETOOTH ICON "resources/bluetooth.ico" /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/bthci/resource.h b/dll/win32/bthci/resource.h new file mode 100644 index 0000000000..9601e59294 --- /dev/null +++ b/dll/win32/bthci/resource.h @@ -0,0 +1,3 @@ +#pragma once + +#define IDI_BLUETOOTH 201 diff --git a/dll/win32/bthci/resources/bluetooth.ico b/dll/win32/bthci/resources/bluetooth.ico new file mode 100644 index 0000000000..c42f6dbad0 Binary files /dev/null and b/dll/win32/bthci/resources/bluetooth.ico differ diff --git a/media/inf/bth.inf b/media/inf/bth.inf index 35f9be39cd..03d9712ed4 100644 --- a/media/inf/bth.inf +++ b/media/inf/bth.inf @@ -18,7 +18,7 @@ CopyFiles=BluetoothClass.NT.Files HKR, , , 0, %BluetoothClassName% HKR, , NoInstallClass, 0, 1 HKR, , Installer32, , "bthci.dll,BluetoothClassInstaller" -;HKR, , Icon, 0, "201" +HKR, , Icon, 0, "201" [BluetoothClass.NT.Files] bthci.dll

5 years, 12 months

← Newer
1
...
5
6
7
8
9
10
11
...
23
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 September 2018