Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [APISETS] *_seh_filter_*() are NT6+ (#2729)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f5b0d8890ee30e55294d… commit 8f5b0d8890ee30e55294de532ba708be54ff3cb1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 4 22:26:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 23:26:38 2020 +0300 [APISETS] *_seh_filter_*() are NT6+ (#2729) Addendum to 65fd292. CORE-16700 --- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 2 ++ dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dll/win32/crtdll/crtdll.spec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index aa89729e4d0..7cdd75c7979 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -641,6 +641,8 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ cdecl -version=0x600+ _o__seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0x600+ _o__seh_filter_exe() msvcrt._XcptFilter @ stub _o__set_abort_behavior @ stub _o__set_doserrno @ stub _o__set_errno diff --git a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec index 168f5b949af..261d49ff79c 100644 --- a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec @@ -66,8 +66,8 @@ @ stub _register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ stdcall _resetstkoflw() msvcrt._resetstkoflw -@ cdecl _seh_filter_dll(long ptr) msvcrt.__CppXcptFilter -@ cdecl _seh_filter_exe(long ptr) msvcrt._XcptFilter +@ cdecl -version=0x600+ _seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0x600+ _seh_filter_exe() msvcrt._XcptFilter @ stub _set_abort_behavior @ stub _set_app_type @ stub _set_controlfp diff --git a/dll/win32/crtdll/crtdll.spec b/dll/win32/crtdll/crtdll.spec index 38f2fb36b7b..749140e7faa 100644 --- a/dll/win32/crtdll/crtdll.spec +++ b/dll/win32/crtdll/crtdll.spec @@ -20,7 +20,7 @@ @ cdecl _CItan() msvcrt._CItan @ cdecl _CItanh() msvcrt._CItanh @ extern _HUGE_dll msvcrt._HUGE - @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter + @ cdecl _XcptFilter() msvcrt._XcptFilter @ cdecl __GetMainArgs(ptr ptr ptr long) @ extern __argc_dll msvcrt.__argc @ extern __argv_dll msvcrt.__argv

4 years, 7 months

[reactos] 01/01: [NETID] Update Polish translation (#2709)

by Adam Stachowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4da611ad4b12abc581db6… commit 4da611ad4b12abc581db6dd116eff55b769542bb Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Mon May 4 22:20:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 23:20:04 2020 +0300 [NETID] Update Polish translation (#2709) Addendum to c276681. --- dll/win32/netid/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc index f190c528bc1..14d93dedc08 100644 --- a/dll/win32/netid/lang/pl-PL.rc +++ b/dll/win32/netid/lang/pl-PL.rc @@ -28,7 +28,7 @@ BEGIN PUSHBUTTON "Z&mień...", IDC_NETWORK_PROPERTY, 167, 149, 82, 14 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE - LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8 + LTEXT "Zmiany zostaną zastosowane po ponownym uruchomieniu komputera.", IDC_RESTARTTEXT, 25, 195, 209, 8 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

4 years, 7 months

[reactos] 02/02: [REACTOS] Drop support for Visual Studio below 2015

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=156b3bd0149a7caee67fa… commit 156b3bd0149a7caee67faebcfb09c77157ac55b3 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Apr 25 03:14:44 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 4 21:47:37 2020 +0300 [REACTOS] Drop support for Visual Studio below 2015 --- README.md | 2 +- configure.cmd | 5 +---- sdk/cmake/msvc.cmake | 12 +++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bf96c76dab8..a200f9a5dc1 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). -Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). +Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). ### Binaries diff --git a/configure.cmd b/configure.cmd index c0fa3ac00d4..2d780760681 100755 --- a/configure.cmd +++ b/configure.cmd @@ -50,14 +50,11 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 - cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 - cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( - echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. + echo Error: Visual Studio version too old ^(before 14 ^(2015^)^) or version detection failed. goto quit ) set BUILD_ENVIRONMENT=VS diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ce526ed979f..01bbfee00e0 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -50,19 +50,17 @@ endif() # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 -if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") +if(ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") endif () # VS 12+ requires /FS when used in parallel compilations -if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) +if(NOT MSVC_IDE) add_compile_flags("/FS") endif () # VS14+ tries to use thread-safe initialization -if(MSVC_VERSION GREATER 1899) - add_compile_flags("/Zc:threadSafeInit-") -endif () +add_compile_flags("/Zc:threadSafeInit-") # HACK: Disable use of __CxxFrameHandler4 on VS 16.3+ (x64 only) # See https://developercommunity.visualstudio.com/content/problem/746534/visual-c… @@ -112,8 +110,8 @@ add_compile_flags("/wd4018") add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced -# Not in Release mode and not with MSVC 2010 -if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT MSVC_VERSION LESS 1700)) +# Not in Release mode +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/we4189") endif()

4 years, 7 months

[reactos] 01/02: [REACTOS] Raise C standard to gnu99 And remove -Wdeclaration-after-statement

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95483b42ea1b45dc11620… commit 95483b42ea1b45dc11620ce139b8456ee9cdda76 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Apr 25 03:10:27 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 4 21:44:55 2020 +0300 [REACTOS] Raise C standard to gnu99 And remove -Wdeclaration-after-statement --- sdk/cmake/gcc.cmake | 7 +++---- sdk/include/reactos/libs/pseh/pseh3.h | 19 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 1a3be9a4ab4..616d4578f47 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -52,7 +52,7 @@ if(NOT GCC_VERSION VERSION_LESS 4.8) endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_flags_language("-std=gnu89 -Wno-microsoft" "C") + add_compile_flags_language("-std=gnu99 -Wno-microsoft" "C") set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") @@ -70,7 +70,6 @@ if(DBG) if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_flags_language("-Wold-style-declaration" "C") endif() - add_compile_flags_language("-Wdeclaration-after-statement" "C") endif() add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") @@ -351,8 +350,8 @@ endif() function(fixup_load_config _target) get_target_property(PEFIXUP native-pefixup IMPORTED_LOCATION_NOCONFIG) - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND "${PEFIXUP}" + add_custom_command(TARGET ${_target} POST_BUILD + COMMAND "${PEFIXUP}" "$<TARGET_FILE:${_target}>" COMMENT "Patching in LOAD_CONFIG") endfunction() diff --git a/sdk/include/reactos/libs/pseh/pseh3.h b/sdk/include/reactos/libs/pseh/pseh3.h index 6f9732ed728..05bb3de3b87 100644 --- a/sdk/include/reactos/libs/pseh/pseh3.h +++ b/sdk/include/reactos/libs/pseh/pseh3.h @@ -16,12 +16,6 @@ extern "C" { #endif -#ifdef __cplusplus -#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT -#else -#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") -#endif - /* CLANG must safe non-volatiles, because it uses a return-twice algorithm */ #if defined(__clang__) && !defined(_SEH3$_FRAME_ALL_NONVOLATILES) #define _SEH3$_FRAME_ALL_NONVOLATILES 1 @@ -358,9 +352,6 @@ _Pragma("GCC diagnostic pop") \ (void)&&_SEH3$_l_OnException; \ (void)&&_SEH3$_l_BeforeFilterOrFinally; \ (void)&&_SEH3$_l_FilterOrFinally; \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \ enum { \ @@ -373,8 +364,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Allocate a registration frame */ \ volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \ -\ -_Pragma("GCC diagnostic pop") \ \ goto _SEH3$_l_BeforeTry; \ /* Silence warning */ goto _SEH3$_l_AfterTry; \ @@ -390,9 +379,6 @@ _Pragma("GCC diagnostic pop") \ \ _SEH3$_l_BeforeTry: (void)0; \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the filter function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \ @@ -440,9 +426,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ _SEH3$_l_BeforeTry: (void)0; \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the finally function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \ @@ -479,8 +462,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Implementation of the auto cleanup function */ \ _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ -\ -_Pragma("GCC diagnostic pop") \ \ /* Close the outer scope */ \ }

4 years, 7 months

[reactos] 01/01: [GITHUB][TRAVIS][APPVEYOR] Move all CI to GitHub Actions

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0283ecea3c10d081320a… commit a0283ecea3c10d081320a6fab0821a03cda6b7f8 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Apr 29 12:07:50 2020 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon May 4 19:53:16 2020 +0300 [GITHUB][TRAVIS][APPVEYOR] Move all CI to GitHub Actions --- .github/workflows/build.yml | 127 ++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 34 ------------ README.md | 6 +-- appveyor.yml | 59 -------------------- 4 files changed, 128 insertions(+), 98 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000000..b533cb4f214 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,127 @@ +name: Build +on: [push, pull_request] + +jobs: + build-gcc-i386: + name: GCC (i386) + runs-on: ubuntu-latest + steps: + - name: Install RosBE + run: | + wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst + mkdir ${{github.workspace}}/rosbe + tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe + - uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: | + mkdir build + echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Build + run: | + echo 'cd ${{github.workspace}}/build && cmake --build .' > commands + ${{github.workspace}}/rosbe/RosBE.sh < commands + - name: Generate ISOs + run: | + echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands + ${{github.workspace}}/rosbe/RosBE.sh < 'commands' + - name: Upload bootcd + uses: actions/upload-artifact@v1 + with: + name: reactos-gcc-i386-${{github.sha}} + path: build/bootcd.iso + - name: Upload livecd + uses: actions/upload-artifact@v1 + with: + name: reactos-gcc-i386-${{github.sha}} + path: build/livecd.iso + + build-msvc-i386: + name: MSVC (i386) + runs-on: windows-latest + steps: + - name: Install packages + run: choco install ninja -y + - name: Install Flex and Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "::add-path::${{github.workspace}}\bin" + - name: Add CL to PATH + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + - uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: | + mkdir build + cd build + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src + - name: Build + working-directory: ${{github.workspace}}\build + run: cmake --build . + - name: Generate ISOs + working-directory: ${{github.workspace}}\build + run: | + cmake --build . --target bootcd + cmake --build . --target livecd + - name: Upload bootcd + uses: actions/upload-artifact@v1 + with: + name: reactos-msvc-i386-${{github.sha}} + path: build/bootcd.iso + - name: Upload livecd + uses: actions/upload-artifact@v1 + with: + name: reactos-msvc-i386-${{github.sha}} + path: build/livecd.iso + + build-msvc-amd64: + name: MSVC (amd64) + runs-on: windows-latest + steps: + - name: Install packages + # HACK: remove all packages which contain gcc binary + run: | + choco install ninja -y + choco uninstall mingw strawberryperl -y + - name: Install Flex and Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "::add-path::${{github.workspace}}\bin" + - name: Add CL to PATH + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 + - uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: | + mkdir build + cd build + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=amd64 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src + - name: Build + working-directory: ${{github.workspace}}\build + run: | + cmake --build . + - name: Generate ISOs + working-directory: ${{github.workspace}}\build + run: | + cmake --build . --target bootcd + cmake --build . --target livecd + - name: Upload bootcd + uses: actions/upload-artifact@v1 + with: + name: reactos-msvc-amd64-${{github.sha}} + path: build/bootcd.iso + - name: Upload livecd + uses: actions/upload-artifact@v1 + with: + name: reactos-msvc-amd64-${{github.sha}} + path: build/livecd.iso diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9f123a95180..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -dist: bionic -language: cpp - -addons: - apt: - sources: - - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - packages: - clang-format-9 - -git: - depth: 5 - -env: - global: - - DO_BUILD=0 - - DO_CHECK=0 - - CLFORMAT_BINARY=clang-format-9 - jobs: - - DO_BUILD=1 - -before_install: - - ln -s /usr/share/clang/clang-format-9/clang-format-diff.py ./sdk/tools/; - - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz - - tar -xzf RosBE.tar.gz - - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file - -script: - - if [ $DO_BUILD == "1" ]; then - ./RosBEBinFull/RosBE.sh < tmp_file; - elif [ $DO_CHECK == "1" ]; then - ./sdk/tools/check_code_format.sh; - fi diff --git a/README.md b/README.md index f093644398f..bf96c76dab8 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r ## Building -[![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] +![Build](https://github.com/reactos/reactos/workflows/Build/badge.svg) [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). @@ -124,15 +124,11 @@ The main development is done on [GitHub](https://github.com/reactos/reactos). We There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes. -[travis.badge]: https://api.travis-ci.org/reactos/reactos.svg?branch=master -[appveyor.badge]: https://ci.appveyor.com/api/projects/status/github/reactos/reactos?branch=m… [coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1 [rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.1.6-0688CB.svg [rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.1.2-0688CB.svg [prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg -[travis.link]: https://travis-ci.org/github/reactos/reactos -[appveyor.link]: https://ci.appveyor.com/project/AmineKhaldi/reactos [coverity.link]: https://scan.coverity.com/projects/205 [rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.6/ [rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/ diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1c05af1dd27..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,59 +0,0 @@ -environment: - matrix: - - BuildType: "msvc-x64" - - BuildType: "msvc" -# - BuildType: "clang-cl" -# - BuildType: vssolution - -version: reactos.appveyor.{build} -skip_branch_with_pr: true -clone_depth: 5 -clone_folder: c:\reactos-cov -matrix: - fast_finish: true - -init: - - ps: (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/RosCMakeNinja.zip","C:\RosCMakeNinja.zip") - - 7z x C:\RosCMakeNinja.zip -oC:\RosCMakeNinja - - ps: >- - If ($env:BuildType -Match "clang-cl") { - $env:clang_configure_option="clang" - (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/clang-cl.7z","C:\clang-cl.7z") - 7z x C:\clang-cl.7z -oC:\RosCMakeNinja\bin - } Else { - $env:clang_configure_option="" - } - -build_script: - - set PATH=C:\RosCMakeNinja\bin;%PATH% - - if "%BuildType%" == "msvc-x64" ( - call "C:\PROGRA~2\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - ) else ( - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 - ) - - cmake --version - - md c:\ros_build - - cd c:\ros_build - - call %APPVEYOR_BUILD_FOLDER%\configure.cmd %clang_configure_option% -DENABLE_ROSTESTS=1 - - ps: >- - & ninja -k0 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} - - ps: >- - & ninja bootcd 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} - -test: off -deploy: off - -for: -- - matrix: - only: - - BuildType: vssolution - - build_script: - - set PATH=C:\RosCMakeNinja\bin;%PATH% - - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 - - cmake --version - - md C:\ros_build - - cd C:\ros_build - - call %APPVEYOR_BUILD_FOLDER%\configure.cmd VSSolution -DENABLE_ROSTESTS=1 - - msbuild /verbosity:quiet /target:bootcd REACTOS.sln

4 years, 7 months

[reactos] 01/01: [HTTPAPI] Convert httpapi.dll to a stub-only library Wine's implementation relies on http.sys driver, which we don't have anyway. Function declarations are taken from Wine 5.7

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bd9450da8167e71a2a3a… commit 8bd9450da8167e71a2a3a330983118065624fd5d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon May 4 11:33:57 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 4 11:37:16 2020 +0300 [HTTPAPI] Convert httpapi.dll to a stub-only library Wine's implementation relies on http.sys driver, which we don't have anyway. Function declarations are taken from Wine 5.7 CORE-16963 --- dll/win32/httpapi/CMakeLists.txt | 6 +- dll/win32/httpapi/httpapi.spec | 42 +-- dll/win32/httpapi/httpapi_main.c | 731 --------------------------------------- media/doc/README.WINE | 1 - 4 files changed, 14 insertions(+), 766 deletions(-) diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt index b53d70f2a2c..dbbb1f3ef46 100644 --- a/dll/win32/httpapi/CMakeLists.txt +++ b/dll/win32/httpapi/CMakeLists.txt @@ -1,15 +1,11 @@ -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(httpapi.dll httpapi.spec) list(APPEND SOURCE - httpapi_main.c ${CMAKE_CURRENT_BINARY_DIR}/httpapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) add_library(httpapi MODULE ${SOURCE}) set_module_type(httpapi win32dll) -target_link_libraries(httpapi wine) -add_importlibs(httpapi advapi32 msvcrt kernel32 ntdll) +add_importlibs(httpapi msvcrt kernel32 ntdll) add_cd_file(TARGET httpapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/httpapi/httpapi.spec b/dll/win32/httpapi/httpapi.spec index e2f165c6880..e1dec8cd90a 100644 --- a/dll/win32/httpapi/httpapi.spec +++ b/dll/win32/httpapi/httpapi.spec @@ -1,20 +1,12 @@ @ stub HttpAddFragmentToCache -@ stdcall HttpAddUrl(ptr wstr ptr) -@ stub HttpAddUrlToConfigGroup -@ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long) -@ stub HttpCancelHttpRequest +@ stdcall -stub HttpAddUrl(ptr wstr ptr) +@ stdcall -stub HttpAddUrlToUrlGroup(int64 wstr int64 long) @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter -@ stdcall HttpCreateHttpHandle(ptr long) -@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) -@ stdcall HttpCreateServerSession(long ptr long) -@ stdcall HttpCreateUrlGroup(int64 ptr long) -@ stdcall HttpCloseRequestQueue(ptr) -@ stdcall HttpCloseServerSession(int64) -@ stdcall HttpCloseUrlGroup(int64) +@ stdcall -stub HttpCreateHttpHandle(ptr long) @ stub HttpDeleteConfigGroup -@ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) +@ stdcall -stub HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @ stub HttpFilterAppRead @ stub HttpFilterAppWrite @@ -25,37 +17,29 @@ @ stub HttpFilterRawWriteAndAppRead @ stub HttpFlushResponseCache @ stub HttpGetCounters -@ stdcall HttpInitialize(long long ptr) -@ stub HttpInitializeServerContext +@ stdcall -stub HttpInitialize(long long ptr) @ stub HttpOpenAppPool @ stub HttpOpenControlChannel @ stub HttpOpenFilter @ stub HttpQueryAppPoolInformation @ stub HttpQueryConfigGroupInformation @ stub HttpQueryControlChannelInformation -@ stub HttpQueryServerContextInformation -@ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stdcall -stub HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate -@ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) -@ stub HttpReceiveHttpResponse -@ stub HttpReceiveRequestEntityBody +@ stdcall -stub HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) +@ stdcall -stub HttpReceiveRequestEntityBody(ptr int64 long ptr long ptr ptr) @ stub HttpRemoveAllUrlsFromConfigGroup -@ stdcall HttpRemoveUrl(ptr wstr) -@ stub HttpRemoveUrlFromConfigGroup -@ stdcall HttpRemoveUrlFromUrlGroup(int64 wstr long) -@ stub HttpSendHttpRequest -@ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) -@ stub HttpSendRequestEntityBody +@ stdcall -stub HttpRemoveUrl(ptr wstr) +@ stdcall -stub HttpRemoveUrlFromUrlGroup(int64 wstr long) +@ stdcall -stub HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendResponseEntityBody @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation -@ stub HttpSetServerContextInformation -@ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) -@ stdcall HttpSetUrlGroupProperty(int64 long ptr long) +@ stdcall -stub HttpSetServiceConfiguration(ptr long ptr long ptr) @ stub HttpShutdownAppPool @ stub HttpShutdownFilter -@ stdcall HttpTerminate(long ptr) +@ stdcall -stub HttpTerminate(long ptr) @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect diff --git a/dll/win32/httpapi/httpapi_main.c b/dll/win32/httpapi/httpapi_main.c deleted file mode 100644 index 62e90e85677..00000000000 --- a/dll/win32/httpapi/httpapi_main.c +++ /dev/null @@ -1,731 +0,0 @@ -/* - * HTTPAPI implementation - * - * Copyright 2009 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifdef __REACTOS__ -#include <stdio.h> -#endif -#include "wine/http.h" -#include "winsvc.h" -#include "wine/winternl.h" -#include "wine/debug.h" -#include "wine/heap.h" -#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(httpapi); - -static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - -static WCHAR *heap_strdupW(const WCHAR *str) -{ - int len = wcslen(str) + 1; - WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); - wcscpy(ret, str); - return ret; -} - -/*********************************************************************** - * HttpInitialize (HTTPAPI.@) - * - * Initializes HTTP Server API engine - * - * PARAMS - * version [ I] HTTP API version which caller will use - * flags [ I] initialization options which specify parts of API what will be used - * reserved [IO] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) -{ - static const WCHAR httpW[] = {'h','t','t','p',0}; - SC_HANDLE manager, service; - - TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, - version.HttpApiMinorVersion, flags, reserved); - - if (flags & ~HTTP_INITIALIZE_SERVER) - { - FIXME("Unhandled flags %#x.\n", flags); - return ERROR_CALL_NOT_IMPLEMENTED; - } - - if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) - return GetLastError(); - - if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) - { - ERR("Failed to open HTTP service, error %u.\n", GetLastError()); - CloseServiceHandle(manager); - return GetLastError(); - } - - if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) - { - ERR("Failed to start HTTP service, error %u.\n", GetLastError()); - CloseServiceHandle(service); - CloseServiceHandle(manager); - return GetLastError(); - } - - CloseServiceHandle(service); - CloseServiceHandle(manager); - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpTerminate (HTTPAPI.@) - * - * Cleans up HTTP Server API engine resources allocated by HttpInitialize - * - * PARAMS - * flags [ I] options which specify parts of API what should be released - * reserved [IO] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) -{ - FIXME( "(0x%x, %p): stub!\n", flags, reserved ); - return NO_ERROR; -} - -/*********************************************************************** - * HttpDeleteServiceConfiguration (HTTPAPI.@) - * - * Remove configuration record from HTTP Server API configuration store - * - * PARAMS - * handle [I] reserved, must be 0 - * type [I] configuration record type - * config [I] buffer which contains configuration record information - * length [I] length of configuration record buffer - * overlapped [I] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, - PVOID config, ULONG length, LPOVERLAPPED overlapped ) -{ - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); - return NO_ERROR; -} - -/*********************************************************************** - * HttpQueryServiceConfiguration (HTTPAPI.@) - * - * Retrieves configuration records from HTTP Server API configuration store - * - * PARAMS - * handle [ I] reserved, must be 0 - * type [ I] configuration records type - * query [ I] buffer which contains query data used to retrieve records - * query_len [ I] length of query buffer - * buffer [IO] buffer to store query results - * buffer_len [ I] length of output buffer - * data_len [ O] optional pointer to a buffer which receives query result length - * overlapped [ I] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, - PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, - PULONG data_len, LPOVERLAPPED overlapped ) -{ - FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, - buffer, buffer_len, data_len, overlapped ); - return ERROR_FILE_NOT_FOUND; -} - -/*********************************************************************** - * HttpSetServiceConfiguration (HTTPAPI.@) - * - * Add configuration record to HTTP Server API configuration store - * - * PARAMS - * handle [I] reserved, must be 0 - * type [I] configuration record type - * config [I] buffer which contains configuration record information - * length [I] length of configuration record buffer - * overlapped [I] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, - PVOID config, ULONG length, LPOVERLAPPED overlapped ) -{ - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); - return NO_ERROR; -} - -/*********************************************************************** - * HttpCreateHttpHandle (HTTPAPI.@) - * - * Creates a handle to the HTTP request queue - * - * PARAMS - * handle [O] handle to request queue - * reserved [I] reserved, must be NULL - * - * RETURNS - * NO_ERROR if function succeeds, or error code if function fails - * - */ -ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) -{ - OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; - IO_STATUS_BLOCK iosb; - - TRACE("handle %p, reserved %#x.\n", handle, reserved); - - if (!handle) - return ERROR_INVALID_PARAMETER; - - RtlInitUnicodeString(&string, device_nameW); - attr.ObjectName = &string; - return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, - FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); -} - -static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) -{ - struct http_add_url_params *params; - ULONG ret = ERROR_SUCCESS; - OVERLAPPED ovl; - int len; - - len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); - if (!(params = heap_alloc(offsetof(struct http_add_url_params, url[len])))) - return ERROR_OUTOFMEMORY; - WideCharToMultiByte(CP_ACP, 0, urlW, -1, params->url, len, NULL, NULL); - params->context = context; - - ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); - - if (!DeviceIoControl(queue, IOCTL_HTTP_ADD_URL, params, - offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) - ret = GetLastError(); - CloseHandle(ovl.hEvent); - heap_free(params); - return ret; -} - -/*********************************************************************** - * HttpAddUrl (HTTPAPI.@) - */ -ULONG WINAPI HttpAddUrl(HANDLE queue, const WCHAR *url, void *reserved) -{ - TRACE("queue %p, url %s, reserved %p.\n", queue, debugstr_w(url), reserved); - - return add_url(queue, url, 0); -} - -static ULONG remove_url(HANDLE queue, const WCHAR *urlW) -{ - ULONG ret = ERROR_SUCCESS; - OVERLAPPED ovl = {0}; - char *url; - int len; - - len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); - if (!(url = heap_alloc(len))) - return ERROR_OUTOFMEMORY; - WideCharToMultiByte(CP_ACP, 0, urlW, -1, url, len, NULL, NULL); - - ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); - - if (!DeviceIoControl(queue, IOCTL_HTTP_REMOVE_URL, url, len, NULL, 0, NULL, &ovl)) - ret = GetLastError(); - CloseHandle(ovl.hEvent); - heap_free(url); - return ret; -} - -/*********************************************************************** - * HttpRemoveUrl (HTTPAPI.@) - */ -ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) -{ - TRACE("queue %p, url %s.\n", queue, debugstr_w(url)); - - if (!queue) - return ERROR_INVALID_PARAMETER; - - return remove_url(queue, url); -} - -/*********************************************************************** - * HttpReceiveHttpRequest (HTTPAPI.@) - */ -ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, - HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) -{ -#ifndef __REACTOS__ - struct http_receive_request_params params = - { - .addr = (ULONG_PTR)request, - .id = id, - .flags = flags, - .bits = sizeof(void *) * 8, - }; -#else - struct http_receive_request_params params = - { (ULONGLONG)(ULONG_PTR)request, id, flags, sizeof(void *) * 8 }; -#endif - ULONG ret = ERROR_SUCCESS; - OVERLAPPED sync_ovl; - - TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", - queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); - - if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) - FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); - - if (size < sizeof(HTTP_REQUEST_V1)) - return ERROR_INSUFFICIENT_BUFFER; - - if (!ovl) - { - sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ovl = &sync_ovl; - } - - if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, NULL, ovl)) - ret = GetLastError(); - - if (ovl == &sync_ovl) - { - ret = ERROR_SUCCESS; - if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) - ret = GetLastError(); - CloseHandle(sync_ovl.hEvent); - } - - return ret; -} - -static void format_date(char *buffer) -{ - static const char day_names[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - static const char month_names[12][4] = - {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - SYSTEMTIME date; - GetSystemTime(&date); - sprintf(buffer + strlen(buffer), "Date: %s, %02u %s %u %02u:%02u:%02u GMT\r\n", - day_names[date.wDayOfWeek], date.wDay, month_names[date.wMonth - 1], - date.wYear, date.wHour, date.wMinute, date.wSecond); -} - -/*********************************************************************** - * HttpSendHttpResponse (HTTPAPI.@) - */ -ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, - HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, - void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data) -{ - static const char *const header_names[] = - { - "Cache-Control", - "Connection", - "Date", - "Keep-Alive", - "Pragma", - "Trailer", - "Transfer-Encoding", - "Upgrade", - "Via", - "Warning", - "Allow", - "Content-Length", - "Content-Type", - "Content-Encoding", - "Content-Language", - "Content-Location", - "Content-MD5", - "Content-Range", - "Expires", - "Last-Modified", - "Accept-Ranges", - "Age", - "ETag", - "Location", - "Proxy-Authenticate", - "Retry-After", - "Server", - "Set-Cookie", - "Vary", - "WWW-Authenticate", - }; - - struct http_response *buffer; - OVERLAPPED dummy_ovl = {0}; - ULONG ret = ERROR_SUCCESS; - int len, body_len = 0; - char *p, dummy[12]; - USHORT i; - - TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", - queue, wine_dbgstr_longlong(id), flags, response, cache_policy, - ret_size, reserved1, reserved2, ovl, log_data); - - if (flags) - FIXME("Unhandled flags %#x.\n", flags); - if (response->s.Flags) - FIXME("Unhandled response flags %#x.\n", response->s.Flags); - if (cache_policy) - WARN("Ignoring cache_policy.\n"); - if (log_data) - WARN("Ignoring log_data.\n"); - - len = 12 + sprintf(dummy, "%hu", response->s.StatusCode) + response->s.ReasonLength; - for (i = 0; i < response->s.EntityChunkCount; ++i) - { - if (response->s.pEntityChunks[i].DataChunkType != HttpDataChunkFromMemory) - { - FIXME("Unhandled data chunk type %u.\n", response->s.pEntityChunks[i].DataChunkType); - return ERROR_CALL_NOT_IMPLEMENTED; - } - body_len += response->s.pEntityChunks[i].FromMemory.BufferLength; - } - len += body_len; - for (i = 0; i < HttpHeaderResponseMaximum; ++i) - { - if (i == HttpHeaderDate) - len += 37; - else if (response->s.Headers.KnownHeaders[i].RawValueLength) - len += strlen(header_names[i]) + 2 + response->s.Headers.KnownHeaders[i].RawValueLength + 2; - else if (i == HttpHeaderContentLength) - { - char dummy[12]; - len += strlen(header_names[i]) + 2 + sprintf(dummy, "%d", body_len) + 2; - } - } - for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) - { - len += response->s.Headers.pUnknownHeaders[i].NameLength + 2; - len += response->s.Headers.pUnknownHeaders[i].RawValueLength + 2; - } - len += 2; - - if (!(buffer = heap_alloc(offsetof(struct http_response, buffer[len])))) - return ERROR_OUTOFMEMORY; - buffer->id = id; - buffer->len = len; - sprintf(buffer->buffer, "HTTP/1.1 %u %.*s\r\n", response->s.StatusCode, - response->s.ReasonLength, response->s.pReason); - - for (i = 0; i < HttpHeaderResponseMaximum; ++i) - { - const HTTP_KNOWN_HEADER *header = &response->s.Headers.KnownHeaders[i]; - if (i == HttpHeaderDate) - format_date(buffer->buffer); - else if (header->RawValueLength) - sprintf(buffer->buffer + strlen(buffer->buffer), "%s: %.*s\r\n", - header_names[i], header->RawValueLength, header->pRawValue); - else if (i == HttpHeaderContentLength) - sprintf(buffer->buffer + strlen(buffer->buffer), "Content-Length: %d\r\n", body_len); - } - for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) - { - const HTTP_UNKNOWN_HEADER *header = &response->s.Headers.pUnknownHeaders[i]; - sprintf(buffer->buffer + strlen(buffer->buffer), "%.*s: %.*s\r\n", header->NameLength, - header->pName, header->RawValueLength, header->pRawValue); - } - p = buffer->buffer + strlen(buffer->buffer); - /* Don't use strcat, because this might be the end of the buffer. */ - memcpy(p, "\r\n", 2); - p += 2; - for (i = 0; i < response->s.EntityChunkCount; ++i) - { - const HTTP_DATA_CHUNK *chunk = &response->s.pEntityChunks[i]; - memcpy(p, chunk->FromMemory.pBuffer, chunk->FromMemory.BufferLength); - p += chunk->FromMemory.BufferLength; - } - - if (!ovl) - ovl = &dummy_ovl; - - if (!DeviceIoControl(queue, IOCTL_HTTP_SEND_RESPONSE, buffer, - offsetof(struct http_response, buffer[len]), NULL, 0, NULL, ovl)) - ret = GetLastError(); - - heap_free(buffer); - return ret; -} - -struct url_group -{ - struct list entry, session_entry; - HANDLE queue; - WCHAR *url; - HTTP_URL_CONTEXT context; -}; - -static struct list url_groups = LIST_INIT(url_groups); - -static struct url_group *get_url_group(HTTP_URL_GROUP_ID id) -{ - struct url_group *group; - LIST_FOR_EACH_ENTRY(group, &url_groups, struct url_group, entry) - { - if ((HTTP_URL_GROUP_ID)(ULONG_PTR)group == id) - return group; - } - return NULL; -} - -struct server_session -{ - struct list entry; - struct list groups; -}; - -static struct list server_sessions = LIST_INIT(server_sessions); - -static struct server_session *get_server_session(HTTP_SERVER_SESSION_ID id) -{ - struct server_session *session; - LIST_FOR_EACH_ENTRY(session, &server_sessions, struct server_session, entry) - { - if ((HTTP_SERVER_SESSION_ID)(ULONG_PTR)session == id) - return session; - } - return NULL; -} - -/*********************************************************************** - * HttpCreateServerSession (HTTPAPI.@) - */ -ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved) -{ - struct server_session *session; - - TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, - version.HttpApiMinorVersion, id, reserved); - - if (!id) - return ERROR_INVALID_PARAMETER; - - if ((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2) - || version.HttpApiMinorVersion) - return ERROR_REVISION_MISMATCH; - - if (!(session = heap_alloc(sizeof(*session)))) - return ERROR_OUTOFMEMORY; - - list_add_tail(&server_sessions, &session->entry); - list_init(&session->groups); - - *id = (ULONG_PTR)session; - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpCloseServerSession (HTTPAPI.@) - */ -ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) -{ - struct url_group *group, *group_next; - struct server_session *session; - - TRACE("id %s.\n", wine_dbgstr_longlong(id)); - - if (!(session = get_server_session(id))) - return ERROR_INVALID_PARAMETER; - - LIST_FOR_EACH_ENTRY_SAFE(group, group_next, &session->groups, struct url_group, session_entry) - { - HttpCloseUrlGroup((ULONG_PTR)group); - } - list_remove(&session->entry); - heap_free(session); - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpCreateUrlGroup (HTTPAPI.@) - */ -ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved) -{ - struct server_session *session; - struct url_group *group; - - TRACE("session_id %s, group_id %p, reserved %#x.\n", - wine_dbgstr_longlong(session_id), group_id, reserved); - - if (!(session = get_server_session(session_id))) - return ERROR_INVALID_PARAMETER; - - if (!(group = heap_alloc_zero(sizeof(*group)))) - return ERROR_OUTOFMEMORY; - list_add_tail(&url_groups, &group->entry); - list_add_tail(&session->groups, &group->session_entry); - - *group_id = (ULONG_PTR)group; - - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpCloseUrlGroup (HTTPAPI.@) - */ -ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) -{ - struct url_group *group; - - TRACE("id %s.\n", wine_dbgstr_longlong(id)); - - if (!(group = get_url_group(id))) - return ERROR_INVALID_PARAMETER; - - list_remove(&group->session_entry); - list_remove(&group->entry); - heap_free(group); - - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpSetUrlGroupProperty (HTTPAPI.@) - */ -ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) -{ - struct url_group *group = get_url_group(id); - const HTTP_BINDING_INFO *info = value; - - TRACE("id %s, property %u, value %p, length %u.\n", - wine_dbgstr_longlong(id), property, value, length); - - if (property != HttpServerBindingProperty) - { - FIXME("Unhandled property %u.\n", property); - return ERROR_CALL_NOT_IMPLEMENTED; - } - - TRACE("Binding to queue %p.\n", info->RequestQueueHandle); - - group->queue = info->RequestQueueHandle; - - if (group->url) - add_url(group->queue, group->url, group->context); - - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpAddUrlToUrlGroup (HTTPAPI.@) - */ -ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, - HTTP_URL_CONTEXT context, ULONG reserved) -{ - struct url_group *group = get_url_group(id); - - TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), - debugstr_w(url), wine_dbgstr_longlong(context), reserved); - - if (group->url) - { - FIXME("Multiple URLs are not handled!\n"); - return ERROR_CALL_NOT_IMPLEMENTED; - } - - if (!(group->url = heap_strdupW(url))) - return ERROR_OUTOFMEMORY; - group->context = context; - - if (group->queue) - return add_url(group->queue, url, context); - - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpRemoveUrlFromUrlGroup (HTTPAPI.@) - */ -ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags) -{ - struct url_group *group = get_url_group(id); - - TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); - - if (!group->url) - return ERROR_FILE_NOT_FOUND; - - if (flags) - FIXME("Ignoring flags %#x.\n", flags); - - heap_free(group->url); - group->url = NULL; - - if (group->queue) - return remove_url(group->queue, url); - - return ERROR_SUCCESS; -} - -/*********************************************************************** - * HttpCreateRequestQueue (HTTPAPI.@) - */ -ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, - SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle) -{ - OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; - IO_STATUS_BLOCK iosb; - - TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", - version.HttpApiMajorVersion, version.HttpApiMinorVersion, - debugstr_w(name), sa, flags, handle); - - if (name) - FIXME("Unhandled name %s.\n", debugstr_w(name)); - if (flags) - FIXME("Unhandled flags %#x.\n", flags); - - RtlInitUnicodeString(&string, device_nameW); - attr.ObjectName = &string; - if (sa && sa->bInheritHandle) - attr.Attributes |= OBJ_INHERIT; - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, - FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); -} - -/*********************************************************************** - * HttpCloseRequestQueue (HTTPAPI.@) - */ -ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) -{ - TRACE("handle %p.\n", handle); - if (!CloseHandle(handle)) - return GetLastError(); - return ERROR_SUCCESS; -} diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 874afe6fbcf..718ba2425d9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -74,7 +74,6 @@ dll/win32/gdiplus # Synced to WineStaging-4.0 dll/win32/hhctrl.ocx # Synced to WineStaging-4.18 dll/win32/hlink # Synced to WineStaging-4.18 dll/win32/hnetcfg # Synced to WineStaging-4.18 -dll/win32/httpapi # Synced to WineStaging-4.18 dll/win32/iccvid # Synced to WineStaging-4.0 dll/win32/ieframe # Synced to WineStaging-4.18 dll/win32/imaadp32.acm # Synced to WineStaging-4.0

4 years, 7 months

[reactos] 01/01: [SHELL32] Follow-up 2 of #2659

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11b6f973b7dcf7fa6ac4c… commit 11b6f973b7dcf7fa6ac4cc2fc28d26e42bf69c0d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 4 16:22:38 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon May 4 16:22:38 2020 +0900 [SHELL32] Follow-up 2 of #2659 Add TODO comments. Make CreateAPCThread static. CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index da619b9104b..b5dc5e968c9 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -12,6 +12,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); +// TODO: SHCNRF_RecursiveInterrupt + static inline void NotifyFileSystemChange(LONG wEventId, LPCWSTR path1, LPCWSTR path2) { @@ -21,6 +23,8 @@ NotifyFileSystemChange(LONG wEventId, LPCWSTR path1, LPCWSTR path2) ////////////////////////////////////////////////////////////////////////////// // DIRLIST --- directory list +// TODO: Share a DIRLIST in multiple Explorer + struct DIRLISTITEM { WCHAR szPath[MAX_PATH]; @@ -787,7 +791,7 @@ void CChangeNotifyServer::RemoveItemsByProcess(DWORD dwOwnerPID, DWORD dwUserPID } } -BOOL CreateAPCThread(void) +static BOOL CreateAPCThread(void) { if (s_hThreadAPC != NULL) return TRUE;

4 years, 7 months

[reactos] 01/01: [SHELL32] Follow-up of #2659

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7980f409112cdc87890e9… commit 7980f409112cdc87890e90f9836ae52c6c3f8b76 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 4 15:28:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon May 4 15:28:16 2020 +0900 [SHELL32] Follow-up of #2659 Add CreateAPCThread function and use it. CORE-13950 --- .../shell32/shelldesktop/CChangeNotifyServer.cpp | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index a5852976f1e..da619b9104b 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -787,6 +787,17 @@ void CChangeNotifyServer::RemoveItemsByProcess(DWORD dwOwnerPID, DWORD dwUserPID } } +BOOL CreateAPCThread(void) +{ + if (s_hThreadAPC != NULL) + return TRUE; + + unsigned tid; + s_fTerminateAllWatches = FALSE; + s_hThreadAPC = (HANDLE)_beginthreadex(NULL, 0, DirWatchThreadFuncAPC, NULL, 0, &tid); + return s_hThreadAPC != NULL; +} + // Message CN_REGISTER: Register the registration entry. // wParam: The handle of registration entry. // lParam: The owner PID of registration entry. @@ -834,18 +845,12 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, if (pDirWatch) { // create an APC thread for directory watching - if (s_hThreadAPC == NULL) + if (!CreateAPCThread()) { - unsigned tid; - s_fTerminateAllWatches = FALSE; - s_hThreadAPC = (HANDLE)_beginthreadex(NULL, 0, DirWatchThreadFuncAPC, NULL, 0, &tid); - if (s_hThreadAPC == NULL) - { - pRegEntry->nRegID = INVALID_REG_ID; - SHUnlockShared(pRegEntry); - delete pDirWatch; - return FALSE; - } + pRegEntry->nRegID = INVALID_REG_ID; + SHUnlockShared(pRegEntry); + delete pDirWatch; + return FALSE; } // request adding the watch

4 years, 7 months

[reactos] 01/01: [SHELL32] Notify filesystem changes (#2659)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c589b55370406362a034… commit 5c589b55370406362a0344a77664b342433e4db5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 4 14:53:23 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 14:53:23 2020 +0900 [SHELL32] Notify filesystem changes (#2659) Notify filesystem change notifications by using ReadDirectoryChangesW function. Creating/Deleting files/folders will be responsive in Explorer. CORE-13950 --- dll/win32/shell32/CDefView.cpp | 7 +- dll/win32/shell32/changenotify.cpp | 2 +- .../shell32/shelldesktop/CChangeNotifyServer.cpp | 690 ++++++++++++++++++++- 3 files changed, 686 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index fbca53391f7..06d7c659f03 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1184,8 +1184,11 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl ntreg[0].fRecursive = FALSE; ntreg[0].pidl = m_pidlParent; } - m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_NewDelivery | SHCNRF_ShellLevel, - SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, nRegCount, ntreg); + m_hNotify = SHChangeNotifyRegister(m_hWnd, + SHCNRF_InterruptLevel | SHCNRF_ShellLevel | + SHCNRF_NewDelivery, + SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, + nRegCount, ntreg); if (nRegCount == 3) { ILFree(pidls[0]); diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index 3f2b7cf1f20..ae5e0e8bdb4 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -573,7 +573,7 @@ SHChangeNotification_Lock(HANDLE hTicket, DWORD dwOwnerPID, LPITEMIDLIST **lppid if (lppidls) *lppidls = pHandbag->pidls; if (lpwEventId) - *lpwEventId = pHandbag->pTicket->wEventId; + *lpwEventId = (pHandbag->pTicket->wEventId & ~SHCNE_INTERRUPT); // return the handbag return pHandbag; diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index 5c2184f7527..a5852976f1e 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -6,11 +6,619 @@ */ #include "shelldesktop.h" #include "shlwapi_undoc.h" -#include <atlsimpcoll.h> -#include <assert.h> +#include <atlsimpcoll.h> // for CSimpleArray +#include <process.h> // for _beginthreadex +#include <assert.h> // for assert WINE_DEFAULT_DEBUG_CHANNEL(shcn); +static inline void +NotifyFileSystemChange(LONG wEventId, LPCWSTR path1, LPCWSTR path2) +{ + SHChangeNotify(wEventId | SHCNE_INTERRUPT, SHCNF_PATHW, path1, path2); +} + +////////////////////////////////////////////////////////////////////////////// +// DIRLIST --- directory list + +struct DIRLISTITEM +{ + WCHAR szPath[MAX_PATH]; + DWORD dwFileSize; + BOOL fDir; + + DIRLISTITEM(LPCWSTR pszPath, DWORD dwSize, BOOL is_dir) + { + lstrcpynW(szPath, pszPath, _countof(szPath)); + dwFileSize = dwSize; + fDir = is_dir; + } + + BOOL IsEmpty() const + { + return szPath[0] == 0; + } + + BOOL EqualPath(LPCWSTR pszPath) const + { + return lstrcmpiW(szPath, pszPath) == 0; + } +}; + +class DIRLIST +{ +public: + DIRLIST() + { + } + + DIRLIST(LPCWSTR pszDir, BOOL fRecursive) + { + GetDirList(pszDir, fRecursive); + } + + BOOL AddItem(LPCWSTR pszPath, DWORD dwFileSize, BOOL fDir); + BOOL GetDirList(LPCWSTR pszDir, BOOL fRecursive); + BOOL Contains(LPCWSTR pszPath, BOOL fDir) const; + BOOL RenameItem(LPCWSTR pszPath1, LPCWSTR pszPath2, BOOL fDir); + BOOL DeleteItem(LPCWSTR pszPath, BOOL fDir); + BOOL GetFirstChange(LPWSTR pszPath) const; + + void RemoveAll() + { + m_items.RemoveAll(); + } + +protected: + CSimpleArray<DIRLISTITEM> m_items; +}; + +BOOL DIRLIST::Contains(LPCWSTR pszPath, BOOL fDir) const +{ + assert(!PathIsRelativeW(pszPath)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty() || fDir != m_items[i].fDir) + continue; + + if (m_items[i].EqualPath(pszPath)) + return TRUE; + } + return FALSE; +} + +BOOL DIRLIST::AddItem(LPCWSTR pszPath, DWORD dwFileSize, BOOL fDir) +{ + assert(!PathIsRelativeW(pszPath)); + + if (dwFileSize == INVALID_FILE_SIZE) + { + WIN32_FIND_DATAW find; + HANDLE hFind = FindFirstFileW(pszPath, &find); + if (hFind == INVALID_HANDLE_VALUE) + return FALSE; + FindClose(hFind); + dwFileSize = find.nFileSizeLow; + } + + DIRLISTITEM item(pszPath, dwFileSize, fDir); + return m_items.Add(item); +} + +BOOL DIRLIST::RenameItem(LPCWSTR pszPath1, LPCWSTR pszPath2, BOOL fDir) +{ + assert(!PathIsRelativeW(pszPath1)); + assert(!PathIsRelativeW(pszPath2)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].fDir == fDir && m_items[i].EqualPath(pszPath1)) + { + lstrcpynW(m_items[i].szPath, pszPath2, _countof(m_items[i].szPath)); + return TRUE; + } + } + return FALSE; +} + +BOOL DIRLIST::DeleteItem(LPCWSTR pszPath, BOOL fDir) +{ + assert(!PathIsRelativeW(pszPath)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].fDir == fDir && m_items[i].EqualPath(pszPath)) + { + m_items[i].szPath[0] = 0; + return TRUE; + } + } + return FALSE; +} + +BOOL DIRLIST::GetDirList(LPCWSTR pszDir, BOOL fRecursive) +{ + // get the full path + WCHAR szPath[MAX_PATH]; + lstrcpynW(szPath, pszDir, _countof(szPath)); + assert(!PathIsRelativeW(szPath)); + + // is it a directory? + if (!PathIsDirectoryW(szPath)) + return FALSE; + + // add the path + if (!AddItem(szPath, 0, TRUE)) + return FALSE; + + // enumerate the file items to remember + PathAppendW(szPath, L"*"); + WIN32_FIND_DATAW find; + HANDLE hFind = FindFirstFileW(szPath, &find); + if (hFind == INVALID_HANDLE_VALUE) + { + ERR("FindFirstFileW failed\n"); + return FALSE; + } + + do + { + // ignore "." and ".." + if (lstrcmpW(find.cFileName, L".") == 0 || + lstrcmpW(find.cFileName, L"..") == 0) + { + continue; + } + + // build a path + PathRemoveFileSpecW(szPath); + if (lstrlenW(szPath) + lstrlenW(find.cFileName) + 1 > MAX_PATH) + { + ERR("szPath is too long\n"); + continue; + } + PathAppendW(szPath, find.cFileName); + + // add the path and do recurse + if (fRecursive && (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + GetDirList(szPath, fRecursive); + else + AddItem(szPath, find.nFileSizeLow, FALSE); + } while (FindNextFileW(hFind, &find)); + + FindClose(hFind); + + return TRUE; +} + +BOOL DIRLIST::GetFirstChange(LPWSTR pszPath) const +{ + // validate paths + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty()) + continue; + + if (m_items[i].fDir) // item is a directory + { + if (!PathIsDirectoryW(m_items[i].szPath)) + { + // mismatched + lstrcpynW(pszPath, m_items[i].szPath, MAX_PATH); + return TRUE; + } + } + else // item is a normal file + { + if (!PathFileExistsW(m_items[i].szPath) || + PathIsDirectoryW(m_items[i].szPath)) + { + // mismatched + lstrcpynW(pszPath, m_items[i].szPath, MAX_PATH); + return TRUE; + } + } + } + + // check sizes + HANDLE hFind; + WIN32_FIND_DATAW find; + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty() || m_items[i].fDir) + continue; + + // get size + hFind = FindFirstFileW(m_items[i].szPath, &find); + FindClose(hFind); + + if (hFind == INVALID_HANDLE_VALUE || + find.nFileSizeLow != m_items[i].dwFileSize) + { + // different size + lstrcpynW(pszPath, m_items[i].szPath, MAX_PATH); + return TRUE; + } + } + + return FALSE; +} + +////////////////////////////////////////////////////////////////////////////// +// DirWatch --- directory watcher using ReadDirectoryChangesW + +static HANDLE s_hThreadAPC = NULL; +static BOOL s_fTerminateAllWatches = FALSE; + +// NOTE: Regard to asynchronous procedure call (APC), please see: +// https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sle… + +// The APC thread function for directory watch +static unsigned __stdcall DirWatchThreadFuncAPC(void *) +{ + while (!s_fTerminateAllWatches) + { +#if 1 // FIXME: This is a HACK + WaitForSingleObjectEx(GetCurrentThread(), INFINITE, TRUE); +#else + SleepEx(INFINITE, TRUE); +#endif + } + return 0; +} + +// the buffer for ReadDirectoryChangesW +#define BUFFER_SIZE 0x1000 +static BYTE s_buffer[BUFFER_SIZE]; + +class DirWatch +{ +public: + HANDLE m_hDir; + WCHAR m_szDir[MAX_PATH]; + BOOL m_fDeadWatch; + BOOL m_fRecursive; + OVERLAPPED m_overlapped; // for async I/O + DIRLIST m_DirList; + + static DirWatch *Create(LPCWSTR pszDir, BOOL fSubTree = FALSE); + ~DirWatch(); + +protected: + DirWatch(LPCWSTR pszDir, BOOL fSubTree); +}; + +DirWatch::DirWatch(LPCWSTR pszDir, BOOL fSubTree) + : m_fDeadWatch(FALSE) + , m_fRecursive(fSubTree) + , m_DirList(pszDir, fSubTree) +{ + TRACE("DirWatch::DirWatch: %p, '%S'\n", this, pszDir); + + lstrcpynW(m_szDir, pszDir, MAX_PATH); + + // open the directory to watch changes (for ReadDirectoryChangesW) + m_hDir = CreateFileW(pszDir, FILE_LIST_DIRECTORY, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, + NULL); +} + +/*static*/ DirWatch *DirWatch::Create(LPCWSTR pszDir, BOOL fSubTree) +{ + WCHAR szFullPath[MAX_PATH]; + GetFullPathNameW(pszDir, _countof(szFullPath), szFullPath, NULL); + + DirWatch *pDirWatch = new DirWatch(szFullPath, fSubTree); + if (pDirWatch->m_hDir == INVALID_HANDLE_VALUE) + { + ERR("CreateFileW failed\n"); + delete pDirWatch; + pDirWatch = NULL; + } + return pDirWatch; +} + +DirWatch::~DirWatch() +{ + TRACE("DirWatch::~DirWatch: %p, '%S'\n", this, m_szDir); + + if (m_hDir != INVALID_HANDLE_VALUE) + CloseHandle(m_hDir); +} + +static BOOL _BeginRead(DirWatch *pDirWatch); + +// The APC procedure to add a DirWatch and start the directory watch +static void NTAPI _AddDirectoryProcAPC(ULONG_PTR Parameter) +{ + DirWatch *pDirWatch = (DirWatch *)Parameter; + assert(pDirWatch != NULL); + + _BeginRead(pDirWatch); +} + +// The APC procedure to request termination of a DirWatch +static void NTAPI _RequestTerminationAPC(ULONG_PTR Parameter) +{ + DirWatch *pDirWatch = (DirWatch *)Parameter; + assert(pDirWatch != NULL); + + pDirWatch->m_fDeadWatch = TRUE; + CancelIo(pDirWatch->m_hDir); +} + +// The APC procedure to request termination of all the directory watches +static void NTAPI _RequestAllTerminationAPC(ULONG_PTR Parameter) +{ + s_fTerminateAllWatches = TRUE; + CloseHandle(s_hThreadAPC); + s_hThreadAPC = NULL; +} + +// convert the file action to an event +static DWORD +ConvertActionToEvent(DWORD Action, BOOL fDir) +{ + switch (Action) + { + case FILE_ACTION_ADDED: + return (fDir ? SHCNE_MKDIR : SHCNE_CREATE); + case FILE_ACTION_REMOVED: + return (fDir ? SHCNE_RMDIR : SHCNE_DELETE); + case FILE_ACTION_MODIFIED: + return (fDir ? SHCNE_UPDATEDIR : SHCNE_UPDATEITEM); + case FILE_ACTION_RENAMED_OLD_NAME: + break; + case FILE_ACTION_RENAMED_NEW_NAME: + return (fDir ? SHCNE_RENAMEFOLDER : SHCNE_RENAMEITEM); + default: + break; + } + return 0; +} + +// Notify a filesystem notification using pDirWatch. +static void _ProcessNotification(DirWatch *pDirWatch) +{ + PFILE_NOTIFY_INFORMATION pInfo = (PFILE_NOTIFY_INFORMATION)s_buffer; + WCHAR szName[MAX_PATH], szPath[MAX_PATH], szTempPath[MAX_PATH]; + DWORD dwEvent, cbName; + BOOL fDir; + + // if the watch is recursive + if (pDirWatch->m_fRecursive) + { + // get the first change + if (!pDirWatch->m_DirList.GetFirstChange(szPath)) + return; + + // then, notify a SHCNE_UPDATEDIR + if (lstrcmpiW(pDirWatch->m_szDir, szPath) != 0) + PathRemoveFileSpecW(szPath); + NotifyFileSystemChange(SHCNE_UPDATEDIR, szPath, NULL); + + // refresh directory list + pDirWatch->m_DirList.RemoveAll(); + pDirWatch->m_DirList.GetDirList(pDirWatch->m_szDir, TRUE); + return; + } + + // for each entry in s_buffer + szPath[0] = szTempPath[0] = 0; + for (;;) + { + // get name (relative from pDirWatch->m_szDir) + cbName = pInfo->FileNameLength; + if (sizeof(szName) - sizeof(UNICODE_NULL) < cbName) + { + ERR("pInfo->FileName is longer than szName\n"); + break; + } + // NOTE: FILE_NOTIFY_INFORMATION.FileName is not null-terminated. + ZeroMemory(szName, sizeof(szName)); + CopyMemory(szName, pInfo->FileName, cbName); + + // get full path + lstrcpynW(szPath, pDirWatch->m_szDir, _countof(szPath)); + PathAppendW(szPath, szName); + + // convert to long pathname if it contains '~' + if (StrChrW(szPath, L'~') != NULL) + { + GetLongPathNameW(szPath, szName, _countof(szName)); + lstrcpynW(szPath, szName, _countof(szPath)); + } + + // convert action to event + fDir = PathIsDirectoryW(szPath); + dwEvent = ConvertActionToEvent(pInfo->Action, fDir); + + // get the directory list of pDirWatch + DIRLIST& List = pDirWatch->m_DirList; + + // convert SHCNE_DELETE to SHCNE_RMDIR if the path is a directory + if (!fDir && (dwEvent == SHCNE_DELETE) && List.Contains(szPath, TRUE)) + { + fDir = TRUE; + dwEvent = SHCNE_RMDIR; + } + + // update List + switch (dwEvent) + { + case SHCNE_MKDIR: + if (!List.AddItem(szPath, 0, TRUE)) + dwEvent = 0; + break; + case SHCNE_CREATE: + if (!List.AddItem(szPath, INVALID_FILE_SIZE, FALSE)) + dwEvent = 0; + break; + case SHCNE_RENAMEFOLDER: + if (!List.RenameItem(szTempPath, szPath, TRUE)) + dwEvent = 0; + break; + case SHCNE_RENAMEITEM: + if (!List.RenameItem(szTempPath, szPath, FALSE)) + dwEvent = 0; + break; + case SHCNE_RMDIR: + if (!List.DeleteItem(szPath, TRUE)) + dwEvent = 0; + break; + case SHCNE_DELETE: + if (!List.DeleteItem(szPath, FALSE)) + dwEvent = 0; + break; + } + + if (dwEvent != 0) + { + // notify + if (pInfo->Action == FILE_ACTION_RENAMED_NEW_NAME) + NotifyFileSystemChange(dwEvent, szTempPath, szPath); + else + NotifyFileSystemChange(dwEvent, szPath, NULL); + } + else if (pInfo->Action == FILE_ACTION_RENAMED_OLD_NAME) + { + // save path for next FILE_ACTION_RENAMED_NEW_NAME + lstrcpynW(szTempPath, szPath, MAX_PATH); + } + + if (pInfo->NextEntryOffset == 0) + break; // there is no next entry + + // go next entry + pInfo = (PFILE_NOTIFY_INFORMATION)((LPBYTE)pInfo + pInfo->NextEntryOffset); + } +} + +// The completion routine of ReadDirectoryChangesW. +static void CALLBACK +_NotificationCompletion(DWORD dwErrorCode, + DWORD dwNumberOfBytesTransfered, + LPOVERLAPPED lpOverlapped) +{ + // MSDN: The hEvent member of the OVERLAPPED structure is not used by the + // system in this case, so you can use it yourself. We do just this, storing + // a pointer to the working struct in the overlapped structure. + DirWatch *pDirWatch = (DirWatch *)lpOverlapped->hEvent; + assert(pDirWatch != NULL); + + // If the FSD doesn't support directory change notifications, there's no + // no need to retry and requeue notification + if (dwErrorCode == ERROR_INVALID_FUNCTION) + { + ERR("ERROR_INVALID_FUNCTION\n"); + return; + } + + // Also, if the notify operation was canceled (like, user moved to another + // directory), then, don't requeue notification. + if (dwErrorCode == ERROR_OPERATION_ABORTED) + { + TRACE("ERROR_OPERATION_ABORTED\n"); + if (pDirWatch->m_fDeadWatch) + delete pDirWatch; + return; + } + + // is this watch dead? + if (pDirWatch->m_fDeadWatch) + { + TRACE("m_fDeadWatch\n"); + delete pDirWatch; + return; + } + + // This likely means overflow, so force whole directory refresh. + if (dwNumberOfBytesTransfered == 0) + { + // do notify a SHCNE_UPDATEDIR + NotifyFileSystemChange(SHCNE_UPDATEDIR, pDirWatch->m_szDir, NULL); + } + else + { + // do notify + _ProcessNotification(pDirWatch); + } + + // restart a watch + _BeginRead(pDirWatch); +} + +// convert events to notification filter +static DWORD +GetFilterFromEvents(DWORD fEvents) +{ + // FIXME + return (FILE_NOTIFY_CHANGE_FILE_NAME | + FILE_NOTIFY_CHANGE_DIR_NAME | + FILE_NOTIFY_CHANGE_CREATION | + FILE_NOTIFY_CHANGE_SIZE); +} + +// Restart a watch by using ReadDirectoryChangesW function +static BOOL _BeginRead(DirWatch *pDirWatch) +{ + assert(pDirWatch != NULL); + + if (pDirWatch->m_fDeadWatch) + { + delete pDirWatch; + return FALSE; // the watch is dead + } + + // initialize the buffer and the overlapped + ZeroMemory(s_buffer, sizeof(s_buffer)); + ZeroMemory(&pDirWatch->m_overlapped, sizeof(pDirWatch->m_overlapped)); + pDirWatch->m_overlapped.hEvent = (HANDLE)pDirWatch; + + // start the directory watch + DWORD dwFilter = GetFilterFromEvents(SHCNE_ALLEVENTS); + if (!ReadDirectoryChangesW(pDirWatch->m_hDir, s_buffer, sizeof(s_buffer), + pDirWatch->m_fRecursive, dwFilter, NULL, + &pDirWatch->m_overlapped, _NotificationCompletion)) + { + ERR("ReadDirectoryChangesW for '%S' failed (error: %ld)\n", + pDirWatch->m_szDir, GetLastError()); + return FALSE; // failure + } + + return TRUE; // success +} + +// create a DirWatch from a REGENTRY +static DirWatch * +CreateDirWatchFromRegEntry(LPREGENTRY pRegEntry) +{ + if (pRegEntry->ibPidl == 0) + return NULL; + + // it must be interrupt level if pRegEntry is a filesystem watch + if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) + return NULL; + + // get the path + WCHAR szPath[MAX_PATH]; + LPITEMIDLIST pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); + if (!SHGetPathFromIDListW(pidl, szPath) || !PathIsDirectoryW(szPath)) + return NULL; + + // create a DirWatch + DirWatch *pDirWatch = DirWatch::Create(szPath, pRegEntry->fRecursive); + if (pDirWatch == NULL) + return NULL; + + return pDirWatch; +} + +////////////////////////////////////////////////////////////////////////////// + // notification target item struct ITEM { @@ -18,6 +626,7 @@ struct ITEM DWORD dwUserPID; // The user PID; that is the process ID of the target window. HANDLE hRegEntry; // The registration entry. HWND hwndBroker; // Client broker window (if any). + DirWatch *pDirWatch; // for filesystem notification (for SHCNRF_InterruptLevel) }; typedef CWinTraits < @@ -53,6 +662,7 @@ public: LRESULT OnDeliverNotification(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSuspendResume(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnRemoveByPID(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); DECLARE_NOT_AGGREGATABLE(CChangeNotifyServer) @@ -69,13 +679,15 @@ public: MESSAGE_HANDLER(CN_DELIVER_NOTIFICATION, OnDeliverNotification) MESSAGE_HANDLER(CN_SUSPEND_RESUME, OnSuspendResume) MESSAGE_HANDLER(CN_UNREGISTER_PROCESS, OnRemoveByPID); + MESSAGE_HANDLER(WM_DESTROY, OnDestroy); END_MSG_MAP() private: UINT m_nNextRegID; CSimpleArray<ITEM> m_items; - BOOL AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, HWND hwndBroker); + BOOL AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, HWND hwndBroker, + DirWatch *pDirWatch); BOOL RemoveItemsByRegID(UINT nRegID, DWORD dwOwnerPID); void RemoveItemsByProcess(DWORD dwOwnerPID, DWORD dwUserPID); void DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndBroker); @@ -94,7 +706,8 @@ CChangeNotifyServer::~CChangeNotifyServer() { } -BOOL CChangeNotifyServer::AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, HWND hwndBroker) +BOOL CChangeNotifyServer::AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, + HWND hwndBroker, DirWatch *pDirWatch) { // find the empty room for (INT i = 0; i < m_items.GetSize(); ++i) @@ -106,12 +719,13 @@ BOOL CChangeNotifyServer::AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry m_items[i].dwUserPID = dwUserPID; m_items[i].hRegEntry = hRegEntry; m_items[i].hwndBroker = hwndBroker; + m_items[i].pDirWatch = pDirWatch; return TRUE; } } // no empty room found - ITEM item = { nRegID, dwUserPID, hRegEntry, hwndBroker }; + ITEM item = { nRegID, dwUserPID, hRegEntry, hwndBroker, pDirWatch }; m_items.Add(item); return TRUE; } @@ -119,10 +733,20 @@ BOOL CChangeNotifyServer::AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry void CChangeNotifyServer::DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndBroker) { // destroy broker if any and if first time - if (item.hwndBroker && item.hwndBroker != *phwndBroker) + HWND hwndBroker = item.hwndBroker; + item.hwndBroker = NULL; + if (hwndBroker && hwndBroker != *phwndBroker) + { + ::DestroyWindow(hwndBroker); + *phwndBroker = hwndBroker; + } + + // request termination of pDirWatch if any + DirWatch *pDirWatch = item.pDirWatch; + item.pDirWatch = NULL; + if (pDirWatch && s_hThreadAPC) { - ::DestroyWindow(item.hwndBroker); - *phwndBroker = item.hwndBroker; + QueueUserAPC(_RequestTerminationAPC, s_hThreadAPC, (ULONG_PTR)pDirWatch); } // free @@ -131,6 +755,7 @@ void CChangeNotifyServer::DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndB item.dwUserPID = 0; item.hRegEntry = NULL; item.hwndBroker = NULL; + item.pDirWatch = NULL; } BOOL CChangeNotifyServer::RemoveItemsByRegID(UINT nRegID, DWORD dwOwnerPID) @@ -204,11 +829,34 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, return FALSE; } + // create a directory watch if necessary + DirWatch *pDirWatch = CreateDirWatchFromRegEntry(pRegEntry); + if (pDirWatch) + { + // create an APC thread for directory watching + if (s_hThreadAPC == NULL) + { + unsigned tid; + s_fTerminateAllWatches = FALSE; + s_hThreadAPC = (HANDLE)_beginthreadex(NULL, 0, DirWatchThreadFuncAPC, NULL, 0, &tid); + if (s_hThreadAPC == NULL) + { + pRegEntry->nRegID = INVALID_REG_ID; + SHUnlockShared(pRegEntry); + delete pDirWatch; + return FALSE; + } + } + + // request adding the watch + QueueUserAPC(_AddDirectoryProcAPC, s_hThreadAPC, (ULONG_PTR)pDirWatch); + } + // unlock the registry entry SHUnlockShared(pRegEntry); // add an ITEM - return AddItem(m_nNextRegID, dwUserPID, hNewEntry, hwndBroker); + return AddItem(m_nNextRegID, dwUserPID, hNewEntry, hwndBroker, pDirWatch); } // Message CN_UNREGISTER: Unregister registration entries. @@ -274,6 +922,16 @@ LRESULT CChangeNotifyServer::OnRemoveByPID(UINT uMsg, WPARAM wParam, LPARAM lPar return 0; } +LRESULT CChangeNotifyServer::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (s_hThreadAPC) + { + // request termination of all directory watches + QueueUserAPC(_RequestAllTerminationAPC, s_hThreadAPC, (ULONG_PTR)NULL); + } + return 0; +} + // get next valid registration ID UINT CChangeNotifyServer::GetNextRegID() { @@ -344,8 +1002,20 @@ BOOL CChangeNotifyServer::ShouldNotify(LPDELITICKET pTicket, LPREGENTRY pRegEntr WCHAR szPath[MAX_PATH], szPath1[MAX_PATH], szPath2[MAX_PATH]; INT cch, cch1, cch2; + // check fSources + if (pTicket->uFlags & SHCNE_INTERRUPT) + { + if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) + return FALSE; + } + else + { + if (!(pRegEntry->fSources & SHCNRF_ShellLevel)) + return FALSE; + } + if (pRegEntry->ibPidl == 0) - return TRUE; + return TRUE; // there is no PIDL // get the stored pidl pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl);

4 years, 7 months

[reactos] 01/01: [SHELL32] Set the Run dialog to use the newer style browse for file dialog. (#2728)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b7be1572b74801eb0de9… commit 5b7be1572b74801eb0de9c32e782bb7c26212b55 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Sun May 3 22:53:35 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 12:53:35 2020 +0900 [SHELL32] Set the Run dialog to use the newer style browse for file dialog. (#2728) Apply the OFN_EXPLORER flag to the Run dialog so the dialog uses the newer style browse dialog. --- dll/win32/shell32/dialogs/dialogs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 5903fe4b31d..3d584480cf7 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -684,7 +684,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA ofn.lpstrFile = szFName; ofn.nMaxFile = _countof(szFName) - 1; ofn.lpstrTitle = szCaption; - ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_EXPLORER; ofn.lpstrInitialDir = prfdp->lpstrDirectory; if (NULL == (hComdlg = LoadLibraryExW(L"comdlg32", NULL, 0)) ||

4 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
20
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 May 2020