[ros-diffs] [reactos] 01/01: [ADVAPI32] Fix undue debug print in nominal case (#2734)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dfe3455db5d8c21a326178006ae8dab9c71fc4b
commit 5dfe3455db5d8c21a326178006ae8dab9c71fc4b
Author: Kyle Katarn
AuthorDate: Mon May 4 22:30:36 2020 +0200
Commit: GitHub
CommitDate: Mon May 4 23:30:36 2020 +0300
[ADVAPI32] Fix undue debug print in nominal case (#2734)
In current implementation, when regedit opens HKCR root key, an error is
logged
err:(dll/win32/advapi32/reg/hkcr.c:964) Returning 259.
This is not correct as the code 259 is ERROR_NO_MORE_ITEMS which is the
nominal return value when end of enumeration is reached.
---
dll/win32/advapi32/reg/hkcr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c
index 2756685d5fb..7d714f48388 100644
--- a/dll/win32/advapi32/reg/hkcr.c
+++ b/dll/win32/advapi32/reg/hkcr.c
@@ -961,7 +961,8 @@ EnumHKCRValue(
if (ErrorCode != ERROR_SUCCESS)
{
/* Most likely ERROR_NO_MORE_ITEMS */
-ERR("Returning %d.\n", ErrorCode);
+if (ErrorCode != ERROR_NO_MORE_ITEMS)
+ERR("Returning %d.\n", ErrorCode);
goto Exit;
}
FallbackValueName[FallbackValueNameLen] = L'\0';
[ros-diffs] [reactos] 01/01: [APISETS] *_seh_filter_*() are NT6+ (#2729)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f5b0d8890ee30e55294de532ba708be54ff3cb1 commit 8f5b0d8890ee30e55294de532ba708be54ff3cb1 Author: Serge Gautherie <32623169+sergegauthe...@users.noreply.github.com> AuthorDate: Mon May 4 22:26:38 2020 +0200 Commit: GitHub 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
[ros-diffs] [reactos] 01/01: [NETID] Update Polish translation (#2709)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4da611ad4b12abc581db6dd116eff55b769542bb commit 4da611ad4b12abc581db6dd116eff55b769542bb Author: Adam Stachowicz AuthorDate: Mon May 4 22:20:04 2020 +0200 Commit: GitHub 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
[ros-diffs] [reactos] 02/02: [REACTOS] Drop support for Visual Studio below 2015
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=156b3bd0149a7caee67faebcfb09c77157ac55b3
commit 156b3bd0149a7caee67faebcfb09c77157ac55b3
Author: Victor Perevertkin
AuthorDate: Sat Apr 25 03:14:44 2020 +0300
Commit: Victor Perevertkin
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-163-runtime-uses-an-unsupported-api-for-u.html
@@ -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()
[ros-diffs] [reactos] 01/02: [REACTOS] Raise C standard to gnu99 And remove -Wdeclaration-after-statement
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95483b42ea1b45dc11620ce139b8456ee9cdda76
commit 95483b42ea1b45dc11620ce139b8456ee9cdda76
Author: Victor Perevertkin
AuthorDate: Sat Apr 25 03:10:27 2020 +0300
Commit: Victor Perevertkin
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}"
"$"
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 */ \
}
[ros-diffs] [reactos] 01/01: [GITHUB][TRAVIS][APPVEYOR] Move all CI to GitHub Actions
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0283ecea3c10d081320a6fab0821a03cda6b7f8
commit a0283ecea3c10d081320a6fab0821a03cda6b7f8
Author: Victor Perevertkin
AuthorDate: Wed Apr 29 12:07:50 2020 +0300
Commit: Victor Perevertkin
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 000..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-am
[ros-diffs] [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
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bd9450da8167e71a2a3a330983118065624fd5d
commit 8bd9450da8167e71a2a3a330983118065624fd5d
Author: Victor Perevertkin
AuthorDate: Mon May 4 11:33:57 2020 +0300
Commit: Victor Perevertkin
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..000
--- a/dll/win32/httpapi/httpapi_main.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * HTTPAPI impl
[ros-diffs] [reactos] 01/01: [SHELL32] Follow-up 2 of #2659
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11b6f973b7dcf7fa6ac4cc2fc28d26e42bf69c0d
commit 11b6f973b7dcf7fa6ac4cc2fc28d26e42bf69c0d
Author: Katayama Hirofumi MZ
AuthorDate: Mon May 4 16:22:38 2020 +0900
Commit: Katayama Hirofumi MZ
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;
