Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/12: [MSGINA] Disable exceptions in atl when compiling without exceptions
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f00854bad097d64e73cc… commit 9f00854bad097d64e73ccad3ade0cda229a2a601 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 22:53:56 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:38 2019 +0200 [MSGINA] Disable exceptions in atl when compiling without exceptions --- dll/win32/msgina/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 694481bc91..ca47e6c1d0 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -1,6 +1,9 @@ set_cpp(WITH_RUNTIME) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1 0

[reactos] 05/12: [NTOBJSHEX] Disable exceptions in atl when compiling without exceptions
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0a8b98bd82075f6ecc69… commit d0a8b98bd82075f6ecc6973993e326203ea1859a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 22:51:34 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:38 2019 +0200 [NTOBJSHEX] Disable exceptions in atl when compiling without exceptions --- dll/shellext/ntobjshex/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/shellext/ntobjshex/CMakeLists.txt b/dll/shellext/ntobjshex/CMakeLists.txt index 854c8a673e..3015c64994 100644 --- a/dll/shellext/ntobjshex/CMakeLists.txt +++ b/dll/shellext/ntobjshex/CMakeLists.txt @@ -1,6 +1,9 @@ project(SHELL) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) if(NOT MSVC)

1 0

[reactos] 04/12: [APPHELP_APITEST] Disable exceptions in atl when compiling without exceptions
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f60294c56ca6a25236fd… commit 0f60294c56ca6a25236fdf3c01ff80d9c4d68860 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 22:49:55 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:38 2019 +0200 [APPHELP_APITEST] Disable exceptions in atl when compiling without exceptions --- modules/rostests/apitests/apphelp/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/apphelp/CMakeLists.txt b/modules/rostests/apitests/apphelp/CMakeLists.txt index 40da34c905..5a17d8cbfe 100644 --- a/modules/rostests/apitests/apphelp/CMakeLists.txt +++ b/modules/rostests/apitests/apphelp/CMakeLists.txt @@ -1,5 +1,12 @@ project(appcompat) -add_definitions(-D__ROS_LONG64__ -DWINETEST_USE_DBGSTR_LONGLONG -DUNICODE -D_UNICODE) + +add_definitions( + -D__ROS_LONG64__ + -DWINETEST_USE_DBGSTR_LONGLONG + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl

1 0

[reactos] 03/12: [SHELL32] Use the same definitions for shell32 and it's static libs
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5731a41f8f8fa4b010ea… commit f5731a41f8f8fa4b010eae682cd6fe04c36a0d70 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 22:39:36 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:37 2019 +0200 [SHELL32] Use the same definitions for shell32 and it's static libs --- dll/win32/shell32/shelldesktop/CMakeLists.txt | 9 +++++++-- dll/win32/shell32/shellmenu/CMakeLists.txt | 7 +++++-- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 6 ++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CMakeLists.txt b/dll/win32/shell32/shelldesktop/CMakeLists.txt index b1eb11f57e..df1fc73842 100644 --- a/dll/win32/shell32/shelldesktop/CMakeLists.txt +++ b/dll/win32/shell32/shelldesktop/CMakeLists.txt @@ -1,7 +1,12 @@ - project(SHELL) + set_cpp(WITH_RUNTIME) -add_definitions(-DUNICODE -D_UNICODE) + +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) + include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE diff --git a/dll/win32/shell32/shellmenu/CMakeLists.txt b/dll/win32/shell32/shellmenu/CMakeLists.txt index 7899b58352..ebca89a022 100644 --- a/dll/win32/shell32/shellmenu/CMakeLists.txt +++ b/dll/win32/shell32/shellmenu/CMakeLists.txt @@ -1,8 +1,11 @@ -PROJECT(SHELL) +project(SHELL) set_cpp(WITH_RUNTIME) -add_definitions(-DUNICODE -D_UNICODE) +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index 6a07441ec7..5607bdbece 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -1,3 +1,9 @@ +project(SHELL) + +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) list(APPEND SOURCE recyclebin.c

1 0

[reactos] 02/12: [ATL] Retire atlnew
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9824a0154e40e01f44ef8… commit 9824a0154e40e01f44ef80eb9c54fe599876533e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 6 22:37:13 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:37 2019 +0200 [ATL] Retire atlnew --- base/applications/charmap_new/CMakeLists.txt | 2 +- base/applications/drwtsn32/CMakeLists.txt | 2 +- base/applications/fltmc/CMakeLists.txt | 1 - base/applications/msconfig_new/CMakeLists.txt | 2 +- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/rapps/CMakeLists.txt | 2 +- base/shell/explorer/CMakeLists.txt | 2 +- base/shell/rshell/CMakeLists.txt | 1 - dll/shellext/acppage/CMakeLists.txt | 2 +- dll/shellext/netshell/CMakeLists.txt | 2 +- dll/shellext/ntobjshex/CMakeLists.txt | 2 +- dll/shellext/stobject/CMakeLists.txt | 2 +- dll/shellext/zipfldr/CMakeLists.txt | 2 +- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/browseui/shellbars/CMakeLists.txt | 1 - dll/win32/devmgr/CMakeLists.txt | 2 +- dll/win32/msgina/CMakeLists.txt | 2 +- dll/win32/shell32/CMakeLists.txt | 2 +- .../applications/devutils/shlextdbg/CMakeLists.txt | 2 +- modules/rostests/apitests/atl/CMakeLists.txt | 2 +- sdk/lib/CMakeLists.txt | 1 - sdk/lib/atl/CMakeLists.txt | 9 ------- sdk/lib/atl/atlbase.cpp | 30 ---------------------- sdk/lib/atl/atlbase.h | 7 +++-- sdk/lib/atl/atlcore.cpp | 28 -------------------- sdk/lib/atl/atlcore.h | 3 ++- 26 files changed, 24 insertions(+), 91 deletions(-) diff --git a/base/applications/charmap_new/CMakeLists.txt b/base/applications/charmap_new/CMakeLists.txt index 657a5cb8fd..3863bca6eb 100644 --- a/base/applications/charmap_new/CMakeLists.txt +++ b/base/applications/charmap_new/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(charmap MODULE charmap.rc) set_module_type(charmap win32gui UNICODE) -target_link_libraries(charmap uuid atlnew wine) +target_link_libraries(charmap uuid wine) add_importlibs(charmap advapi32 user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll) add_pch(charmap precomp.h SOURCE) add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) diff --git a/base/applications/drwtsn32/CMakeLists.txt b/base/applications/drwtsn32/CMakeLists.txt index e58b1c095f..fbc210b5b8 100644 --- a/base/applications/drwtsn32/CMakeLists.txt +++ b/base/applications/drwtsn32/CMakeLists.txt @@ -17,6 +17,6 @@ list(APPEND CPP_SOURCE add_executable(drwtsn32 ${CPP_SOURCE} drwtsn32.rc) add_pch(drwtsn32 precomp.h CPP_SOURCE) set_module_type(drwtsn32 win32gui UNICODE) -target_link_libraries(drwtsn32 atlnew udmihelp) +target_link_libraries(drwtsn32 udmihelp) add_importlibs(drwtsn32 dbghelp psapi advapi32 shell32 shlwapi msvcrt user32 kernel32 ntdll) add_cd_file(TARGET drwtsn32 DESTINATION reactos/system32 FOR all) diff --git a/base/applications/fltmc/CMakeLists.txt b/base/applications/fltmc/CMakeLists.txt index 4bd22c0c32..01bf7a3a26 100644 --- a/base/applications/fltmc/CMakeLists.txt +++ b/base/applications/fltmc/CMakeLists.txt @@ -8,6 +8,5 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_executable(fltmc fltmc.cpp fltmc.rc) set_module_type(fltmc win32cui UNICODE) -target_link_libraries(fltmc atlnew) add_importlibs(fltmc fltlib msvcrt kernel32 advapi32) add_cd_file(TARGET fltmc DESTINATION reactos/system32 FOR all) diff --git a/base/applications/msconfig_new/CMakeLists.txt b/base/applications/msconfig_new/CMakeLists.txt index c2aad389e1..0fc32ec536 100644 --- a/base/applications/msconfig_new/CMakeLists.txt +++ b/base/applications/msconfig_new/CMakeLists.txt @@ -35,6 +35,6 @@ add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico) add_executable(msconfig_new ${C_SOURCE} ${CPP_SOURCE} msconfig.rc) add_pch(msconfig_new precomp.h CPP_SOURCE) set_module_type(msconfig_new win32gui UNICODE) -target_link_libraries(msconfig_new atlnew comsupp) +target_link_libraries(msconfig_new comsupp) add_importlibs(msconfig_new user32 gdi32 comctl32 comdlg32 advapi32 version ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32) add_cd_file(TARGET msconfig_new DESTINATION reactos/system32 FOR all) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 3f112003c0..b59a2ee419 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -33,7 +33,7 @@ file(GLOB mspaint_rc_deps icons/*.*) add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) -target_link_libraries(mspaint atlnew uuid) +target_link_libraries(mspaint uuid) add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index ce8ba3a0ba..f3dea22852 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -40,7 +40,7 @@ file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) -target_link_libraries(rapps atlnew uuid wine) +target_link_libraries(rapps uuid wine) add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index fa66d2e428..b3f2982fda 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -30,7 +30,7 @@ list(APPEND SOURCE file(GLOB explorer_rc_deps res/*.*) add_rc_deps(explorer.rc ${explorer_rc_deps}) add_executable(explorer ${SOURCE} explorer.rc) -target_link_libraries(explorer uuid atlnew wine) +target_link_libraries(explorer uuid wine) set_module_type(explorer win32gui UNICODE) add_importlibs(explorer advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll) add_pch(explorer precomp.h SOURCE) diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt index 4297edbb2e..5d4170d58e 100644 --- a/base/shell/rshell/CMakeLists.txt +++ b/base/shell/rshell/CMakeLists.txt @@ -20,7 +20,6 @@ target_link_libraries(rshell shellbars shellmenu shelldesktop - atlnew uuid wine) diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt index 9303c23110..f4dc6e1c01 100644 --- a/dll/shellext/acppage/CMakeLists.txt +++ b/dll/shellext/acppage/CMakeLists.txt @@ -32,7 +32,7 @@ add_library(acppage MODULE ${CMAKE_CURRENT_BINARY_DIR}/acppage.def) set_module_type(acppage win32dll UNICODE) -target_link_libraries(acppage atlnew wine uuid) +target_link_libraries(acppage wine uuid) add_delay_importlibs(acppage apphelp ole32 oleaut32 shlwapi comctl32 sfc_os) add_importlibs(acppage shell32 user32 advapi32 msvcrt kernel32) add_pch(acppage precomp.h SOURCE) diff --git a/dll/shellext/netshell/CMakeLists.txt b/dll/shellext/netshell/CMakeLists.txt index 0a2c0fad15..dc4a260045 100644 --- a/dll/shellext/netshell/CMakeLists.txt +++ b/dll/shellext/netshell/CMakeLists.txt @@ -39,7 +39,7 @@ add_library(netshell MODULE ${CMAKE_CURRENT_BINARY_DIR}/netshell.def) set_module_type(netshell win32dll UNICODE) -target_link_libraries(netshell atlnew uuid wine) +target_link_libraries(netshell uuid wine) add_delay_importlibs(netshell ole32 oleaut32 shlwapi shell32) add_importlibs(netshell version iphlpapi gdi32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) add_pch(netshell precomp.h SOURCE) diff --git a/dll/shellext/ntobjshex/CMakeLists.txt b/dll/shellext/ntobjshex/CMakeLists.txt index f8a6e7347b..854c8a673e 100644 --- a/dll/shellext/ntobjshex/CMakeLists.txt +++ b/dll/shellext/ntobjshex/CMakeLists.txt @@ -30,7 +30,7 @@ add_library(ntobjshex MODULE ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def) set_module_type(ntobjshex win32dll UNICODE) -target_link_libraries(ntobjshex uuid wine atlnew) +target_link_libraries(ntobjshex uuid wine) add_importlibs(ntobjshex advapi32 diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt index 093303f728..411dab205d 100644 --- a/dll/shellext/stobject/CMakeLists.txt +++ b/dll/shellext/stobject/CMakeLists.txt @@ -34,7 +34,7 @@ add_library(stobject MODULE ${CMAKE_CURRENT_BINARY_DIR}/stobject.def) set_module_type(stobject win32dll UNICODE) -target_link_libraries(stobject uuid wine atlnew) +target_link_libraries(stobject uuid wine) add_importlibs(stobject setupapi diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt index 9ad72cb173..3c39dc45c3 100644 --- a/dll/shellext/zipfldr/CMakeLists.txt +++ b/dll/shellext/zipfldr/CMakeLists.txt @@ -45,7 +45,7 @@ add_library(zipfldr MODULE set_module_type(zipfldr win32dll UNICODE) -target_link_libraries(zipfldr minizip zlib atlnew uuid) +target_link_libraries(zipfldr minizip zlib uuid) add_importlibs(zipfldr oleaut32 ole32 shlwapi comctl32 shell32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(zipfldr precomp.h SOURCE) add_cd_file(TARGET zipfldr DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 0c68a37df0..3681a2f043 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(browseui MODULE ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) set_module_type(browseui win32dll UNICODE) -target_link_libraries(browseui shellbars atlnew uuid wine) +target_link_libraries(browseui shellbars uuid wine) add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index ec87d6ce24..64cc9b55f2 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -23,5 +23,4 @@ if(NOT MSVC) endif() add_pch(shellbars shellbars.h SOURCE) -target_link_libraries(shellbars atlnew) add_dependencies(shellbars xdk) diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt index 44ba6f4cff..f427c3a3c3 100644 --- a/dll/win32/devmgr/CMakeLists.txt +++ b/dll/win32/devmgr/CMakeLists.txt @@ -35,7 +35,7 @@ add_library(devmgr MODULE ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def) set_module_type(devmgr win32dll UNICODE) -target_link_libraries(devmgr uuid atlnew wine) +target_link_libraries(devmgr uuid wine) add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 oleaut32 uxtheme ntdll) add_pch(devmgr precomp.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 1cfa45f808..694481bc91 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -27,7 +27,7 @@ add_library(msgina MODULE ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) set_module_type(msgina win32dll UNICODE) -target_link_libraries(msgina atlnew wine uuid ${PSEH_LIB}) +target_link_libraries(msgina wine uuid ${PSEH_LIB}) add_delay_importlibs(msgina secur32) add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) add_pch(msgina msgina.h CPP_SOURCE) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 60d0fc9a3d..ea2fe80631 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -117,7 +117,7 @@ add_typelib(shell32_shldisp.idl) set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb) set_module_type(shell32 win32dll UNICODE) -target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) +target_link_libraries(shell32 shellmenu shelldesktop wine uuid recyclebin) add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool.drv winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb diff --git a/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt b/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt index 21f80e7d60..232244049b 100644 --- a/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt @@ -7,6 +7,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_executable(shlextdbg shlextdbg.cpp shlextdbg.rc) set_module_type(shlextdbg win32cui UNICODE) -target_link_libraries(shlextdbg atlnew uuid) +target_link_libraries(shlextdbg uuid) add_importlibs(shlextdbg ole32 comctl32 shell32 user32 msvcrt kernel32) add_cd_file(TARGET shlextdbg DESTINATION reactos/system32 FOR all) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 249724746c..8055fffc45 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -24,7 +24,7 @@ add_executable(atl_apitest testlist.c atl_apitest.rc) -target_link_libraries(atl_apitest wine atlnew uuid) +target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll) add_pch(atl_apitest precomp.h SOURCE) diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index e5d2d92453..c9f4e39604 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory(inflib) if(CMAKE_CROSSCOMPILING) add_subdirectory(3rdparty) -add_subdirectory(atl) add_subdirectory(comsupp) add_subdirectory(conutils) add_subdirectory(cportlib) diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt deleted file mode 100644 index f0177d597f..0000000000 --- a/sdk/lib/atl/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -set_cpp(WITH_RTTI) - -add_definitions( - -DUNICODE -D_UNICODE - -DROS_Headers) - -add_library(atlnew atlbase.cpp atlcore.cpp) -add_dependencies(atlnew psdk) diff --git a/sdk/lib/atl/atlbase.cpp b/sdk/lib/atl/atlbase.cpp deleted file mode 100644 index 85e196b0df..0000000000 --- a/sdk/lib/atl/atlbase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * ReactOS ATL - * - * Copyright 2009 Andrew Hill <ash77(a)reactos.org> - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "atlbase.h" - -namespace ATL -{ - -CAtlBaseModule _AtlBaseModule; -CAtlWinModule _AtlWinModule = CAtlWinModule(); -CAtlComModule _AtlComModule; - -}; // namespace ATL diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index abd0711503..ae4c6ef03f 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -57,7 +57,6 @@ class CComModule; class CAtlComModule; __declspec(selectany) CAtlModule *_pAtlModule = NULL; __declspec(selectany) CComModule *_pModule = NULL; -extern CAtlComModule _AtlComModule; struct _ATL_CATMAP_ENTRY @@ -590,6 +589,9 @@ public: } }; +__declspec(selectany) CAtlComModule _AtlComModule; + + template <class T> HRESULT CAtlModuleT<T>::RegisterServer(BOOL bRegTypeLib, const CLSID *pCLSID) { @@ -983,7 +985,8 @@ public: } }; -extern CAtlWinModule _AtlWinModule; +__declspec(selectany) CAtlWinModule _AtlWinModule; + class CComAllocator { diff --git a/sdk/lib/atl/atlcore.cpp b/sdk/lib/atl/atlcore.cpp deleted file mode 100644 index 1b3c73de59..0000000000 --- a/sdk/lib/atl/atlcore.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * ReactOS ATL - * - * Copyright 2009 Andrew Hill <ash77(a)reactos.org> - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "atlcore.h" - -namespace ATL -{ - -bool CAtlBaseModule::m_bInitFailed = false; - -}; // namespace ATL diff --git a/sdk/lib/atl/atlcore.h b/sdk/lib/atl/atlcore.h index 279fa7f107..26f3cedc73 100644 --- a/sdk/lib/atl/atlcore.h +++ b/sdk/lib/atl/atlcore.h @@ -217,7 +217,8 @@ public: HINSTANCE GetHInstanceAt(int i); }; -extern CAtlBaseModule _AtlBaseModule; +__declspec(selectany) CAtlBaseModule _AtlBaseModule; +__declspec(selectany) bool CAtlBaseModule::m_bInitFailed = false; ///

1 0

[reactos] 01/12: [ATL][ATL_APITEST] Add test + implementation for CAtlFileMapping
by Mark Jansen 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9853cc4d7e04617960d57… commit 9853cc4d7e04617960d57ea184ded34b162ab9d8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 5 23:22:55 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:37 2019 +0200 [ATL][ATL_APITEST] Add test + implementation for CAtlFileMapping --- modules/rostests/apitests/atl/CAtlFileMapping.cpp | 254 +++++++++++++++++++ modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 + .../rostests/apitests/atl/devenv/CAtlFile.vcxproj | 168 ++++++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlbase.h | 15 +- sdk/lib/atl/atlcomcli.h | 6 + sdk/lib/atl/atldef.h | 59 +++++ sdk/lib/atl/atlexcept.h | 7 +- sdk/lib/atl/atlfile.h | 281 +++++++++++++++++++++ 10 files changed, 789 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlFileMapping.cpp b/modules/rostests/apitests/atl/CAtlFileMapping.cpp new file mode 100644 index 0000000000..49997474c1 --- /dev/null +++ b/modules/rostests/apitests/atl/CAtlFileMapping.cpp @@ -0,0 +1,254 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for CAtlFileMapping + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <atlfile.h> + +#ifdef __REACTOS__ + #include <apitest.h> +#else + #include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> + #include <windows.h> + int g_tests_executed = 0; + int g_tests_failed = 0; + int g_tests_skipped = 0; + const char *g_file = NULL; + int g_line = 0; + void set_location(const char *file, int line) + { + g_file = file; + g_line = line; + } + void ok_func(int value, const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", g_file, g_line); + vprintf(fmt, va); + g_tests_failed++; + } + g_tests_executed++; + va_end(va); + } + void skip_func(const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + printf("%s (%d): test skipped: ", g_file, g_line); + vprintf(fmt, va); + g_tests_skipped++; + va_end(va); + } + #undef ok + #define ok(value, ...) do { \ + set_location(__FILE__, __LINE__); \ + ok_func(value, __VA_ARGS__); \ + } while (0) + #define ok_(x1,x2) set_location(x1,x2); ok_func + #define skip(...) do { \ + set_location(__FILE__, __LINE__); \ + skip_func(__VA_ARGS__); \ + } while (0) + #define START_TEST(x) int main() + char *wine_dbgstr_w(const wchar_t *wstr) + { + static char buf[512]; + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); + return buf; + } +#endif + +struct TestData +{ + int data[4]; +}; + + +static void test_SharedMem() +{ + CAtlFileMapping<TestData> test1, test2; + CAtlFileMappingBase test3; + BOOL bAlreadyExisted; + HRESULT hr; + + ok(test1.GetData() == NULL, "Expected NULL, got %p\n", test1.GetData()); + ok(test3.GetData() == NULL, "Expected NULL, got %p\n", test3.GetData()); + ok(test1.GetHandle() == NULL, "Expected NULL, got %p\n", test1.GetHandle()); + ok(test3.GetHandle() == NULL, "Expected NULL, got %p\n", test3.GetHandle()); + ok(test1.GetMappingSize() == 0, "Expected 0, got %lu\n", test1.GetMappingSize()); + ok(test3.GetMappingSize() == 0, "Expected 0, got %lu\n", test3.GetMappingSize()); + + test1 = test1; + //test1 = test2; // Asserts on orig.m_pData != NULL, same with CopyFrom + //test1 = test3; // does not compile + hr = test1.Unmap(); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + + // Asserts on name == NULL + hr = test1.OpenMapping(_T("TEST_MAPPING"), 123, 0, FILE_MAP_ALL_ACCESS); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%lx\n", hr); + ok(test1.GetData() == NULL, "Expected NULL, got %p\n", test1.GetData()); + ok(test1.GetHandle() == NULL, "Expected NULL, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == 123, "Expected 123, got %lu\n", test1.GetMappingSize()); + + hr = test1.Unmap(); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test1.GetData() == NULL, "Expected NULL, got %p\n", test1.GetData()); + ok(test1.GetHandle() == NULL, "Expected NULL, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == 123, "Expected 123, got %lu\n", test1.GetMappingSize()); + + bAlreadyExisted = 123; + hr = test1.MapSharedMem(sizeof(TestData), _T("TEST_MAPPING"), &bAlreadyExisted, (LPSECURITY_ATTRIBUTES)0, PAGE_READWRITE, FILE_MAP_ALL_ACCESS); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test1.GetData() != NULL, "Expected ptr, got %p\n", test1.GetData()); + ok(test1.GetHandle() != NULL, "Expected handle, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test1.GetMappingSize()); + ok(bAlreadyExisted == FALSE, "Expected FALSE, got %u\n", bAlreadyExisted); + + if (test1.GetData()) + { + memset(test1.GetData(), 0x35, sizeof(TestData)); + } + + hr = test2.CopyFrom(test1); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test2.GetData() != NULL, "Expected ptr, got %p\n", test2.GetData()); + ok(test2.GetHandle() != NULL, "Expected handle, got %p\n", test2.GetHandle()); + ok(test2.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test2.GetMappingSize()); + + // test1 is not closed: + ok(test1.GetData() != NULL, "Expected ptr, got %p\n", test1.GetData()); + ok(test1.GetHandle() != NULL, "Expected handle, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test1.GetMappingSize()); + + // test2 does not equal test1 + ok(test1.GetData() != test2.GetData(), "Expected different ptrs\n"); + ok(test1.GetHandle() != test2.GetHandle(), "Expected different handles\n"); + + TestData* t1 = test1; + TestData* t2 = test2; + if (t1 && t2) + { + ok(t1->data[0] == 0x35353535, "Expected 0x35353535, got 0x%x\n", t1->data[0]); + ok(t2->data[0] == 0x35353535, "Expected 0x35353535, got 0x%x\n", t2->data[0]); + + t1->data[0] = 0xbeefbeef; + ok(t1->data[0] == (int)0xbeefbeef, "Expected 0xbeefbeef, got 0x%x\n", t1->data[0]); + ok(t2->data[0] == (int)0xbeefbeef, "Expected 0xbeefbeef, got 0x%x\n", t2->data[0]); + } + + hr = test3.OpenMapping(_T("TEST_MAPPING"), sizeof(TestData), offsetof(TestData, data[1])); + ok(hr == HRESULT_FROM_WIN32(ERROR_MAPPED_ALIGNMENT), "Expected HRESULT_FROM_WIN32(ERROR_MAPPED_ALIGNMENT), got 0x%lx\n", hr); + ok(test3.GetData() == NULL, "Expected NULL, got %p\n", test3.GetData()); + ok(test3.GetHandle() == NULL, "Expected NULL, got %p\n", test3.GetHandle()); + ok(test3.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test3.GetMappingSize()); + + hr = test2.Unmap(); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test2.GetData() == NULL, "Expected NULL, got %p\n", test2.GetData()); + ok(test2.GetHandle() == NULL, "Expected NULL, got %p\n", test2.GetHandle()); + ok(test2.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test2.GetMappingSize()); + + bAlreadyExisted = 123; + // Wrong access flag + hr = test2.MapSharedMem(sizeof(TestData), _T("TEST_MAPPING"), &bAlreadyExisted, (LPSECURITY_ATTRIBUTES)0, PAGE_EXECUTE_READ, FILE_MAP_ALL_ACCESS); + ok(hr == E_ACCESSDENIED, "Expected E_ACCESSDENIED, got 0x%lx\n", hr); + ok(test2.GetData() == NULL, "Expected NULL, got %p\n", test2.GetData()); + ok(test2.GetHandle() == NULL, "Expected NULL, got %p\n", test2.GetHandle()); + ok(test2.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test2.GetMappingSize()); + ok(bAlreadyExisted == TRUE, "Expected TRUE, got %u\n", bAlreadyExisted); + + bAlreadyExisted = 123; + hr = test2.MapSharedMem(sizeof(TestData), _T("TEST_MAPPING"), &bAlreadyExisted, (LPSECURITY_ATTRIBUTES)0, PAGE_READWRITE, FILE_MAP_ALL_ACCESS); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test2.GetData() != NULL, "Expected ptr, got %p\n", test2.GetData()); + ok(test2.GetHandle() != NULL, "Expected handle, got %p\n", test2.GetHandle()); + ok(test2.GetMappingSize() == sizeof(TestData), "Expected sizeof(TestData), got %lu\n", test2.GetMappingSize()); + ok(bAlreadyExisted == TRUE, "Expected TRUE, got %u\n", bAlreadyExisted); + + // test2 does not equal test1 + ok(test1.GetData() != test2.GetData(), "Expected different ptrs\n"); + ok(test1.GetHandle() != test2.GetHandle(), "Expected different handles\n"); + + t2 = test2; + if (t1 && t2) + { + ok(t1->data[0] == (int)0xbeefbeef, "Expected 0xbeefbeef, got 0x%x\n", t1->data[0]); + ok(t2->data[0] == (int)0xbeefbeef, "Expected 0xbeefbeef, got 0x%x\n", t2->data[0]); + + t1->data[0] = 0xdeaddead; + ok(t1->data[0] == (int)0xdeaddead, "Expected 0xdeaddead, got 0x%x\n", t1->data[0]); + ok(t2->data[0] == (int)0xdeaddead, "Expected 0xdeaddead, got 0x%x\n", t2->data[0]); + } +} + +static void test_FileMapping() +{ + WCHAR Buf[MAX_PATH] = {0}; + ULARGE_INTEGER FileSize; + + GetModuleFileNameW(NULL, Buf, _countof(Buf)); + + CAtlFileMapping<IMAGE_DOS_HEADER> test1, test2; + HRESULT hr; + + { + CHandle hFile(CreateFileW(Buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL)); + ok(hFile != INVALID_HANDLE_VALUE, "Could not open %S, aborting test\n", Buf); + if (hFile == INVALID_HANDLE_VALUE) + return; + + FileSize.LowPart = GetFileSize(hFile, &FileSize.HighPart); + + hr = test1.MapFile(hFile, 0, 0, PAGE_READONLY, FILE_MAP_READ); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test1.GetData() != NULL, "Expected ptr, got %p\n", test1.GetData()); + ok(test1.GetHandle() != NULL, "Expected handle, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == FileSize.LowPart, "Expected %lu, got %lu\n", FileSize.LowPart, test1.GetMappingSize()); + + hr = test2.MapFile(hFile, 0, 0x10000, PAGE_READONLY, FILE_MAP_READ); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test2.GetData() != NULL, "Expected ptr, got %p\n", test2.GetData()); + ok(test2.GetHandle() != NULL, "Expected handle, got %p\n", test2.GetHandle()); + // Offset is subtracted + ok(test2.GetMappingSize() == FileSize.LowPart - 0x10000, "Expected %lu, got %lu\n", FileSize.LowPart-0x10000, test2.GetMappingSize()); + + hr = test1.Unmap(); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test1.GetData() == NULL, "Expected NULL, got %p\n", test1.GetData()); + ok(test1.GetHandle() == NULL, "Expected NULL, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == FileSize.LowPart, "Expected %lu, got %lu\n", FileSize.LowPart, test1.GetMappingSize()); + + hr = test1.MapFile(hFile, 0x1000); + ok(hr == S_OK, "Expected S_OK, got 0x%lx\n", hr); + ok(test1.GetData() != NULL, "Expected ptr, got %p\n", test1.GetData()); + ok(test1.GetHandle() != NULL, "Expected handle, got %p\n", test1.GetHandle()); + ok(test1.GetMappingSize() == 0x1000, "Expected 0x1000, got %lu\n", test1.GetMappingSize()); + } + + // We can still access it after the file is closed + PIMAGE_DOS_HEADER dos = test1; + if (dos) + { + ok(dos->e_magic == IMAGE_DOS_SIGNATURE, "Expected IMAGE_DOS_SIGNATURE, got 0x%x\n", dos->e_magic); + } +} + + +START_TEST(CAtlFileMapping) +{ + test_SharedMem(); + test_FileMapping(); + +#ifndef __REACTOS__ + printf("CAtlFile: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); + return g_tests_failed; +#endif +} diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 3cbf35bc09..249724746c 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE atltypes.cpp + CAtlFileMapping.cpp CComBSTR.cpp CComHeapPtr.cpp CComObject.cpp diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index b36db07333..0244f71980 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComObject", "CComObject.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComQIPtr", "CComQIPtr.vcxproj", "{907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlFileMapping", "CAtlFile.vcxproj", "{3AE82A8E-D43D-41F6-8093-9C687283FAB6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -71,6 +73,14 @@ Global {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x64.Build.0 = Release|x64 {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.ActiveCfg = Release|Win32 {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.Build.0 = Release|Win32 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Debug|x64.ActiveCfg = Debug|x64 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Debug|x64.Build.0 = Debug|x64 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Debug|x86.ActiveCfg = Debug|Win32 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Debug|x86.Build.0 = Debug|Win32 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x64.ActiveCfg = Release|x64 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x64.Build.0 = Release|x64 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.ActiveCfg = Release|Win32 + {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj b/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj new file mode 100644 index 0000000000..e6214597f6 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\CAtlFileMapping.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{3AE82A8E-D43D-41F6-8093-9C687283FAB6}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + <ProjectName>CAtlFileMapping</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 232785a4b8..0fa460898a 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -2,6 +2,7 @@ #include <apitest.h> extern void func_atltypes(void); +extern void func_CAtlFileMapping(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); extern void func_CComObject(void); @@ -16,6 +17,7 @@ extern void func_CString(void); const struct test winetest_testlist[] = { { "atltypes", func_atltypes }, + { "CAtlFileMapping", func_CAtlFileMapping }, { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, { "CComObject", func_CComObject }, diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 598abc3f3d..abd0711503 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -20,10 +20,12 @@ #pragma once +#include "atldef.h" #include "atlcore.h" #include "statreg.h" #include "atlcomcli.h" #include "atlalloc.h" +#include "atlexcept.h" #include "comcat.h" #include "tchar.h" @@ -32,18 +34,6 @@ #pragma warning(disable:4355) #endif -#ifndef _ATL_PACKING -#define _ATL_PACKING 8 -#endif - -#ifndef _ATL_FREE_THREADED -#ifndef _ATL_APARTMENT_THREADED -#ifndef _ATL_SINGLE_THREADED -#define _ATL_FREE_THREADED -#endif -#endif -#endif - #ifndef ATLTRY #define ATLTRY(x) x; #endif @@ -58,7 +48,6 @@ #define ATL_DEPRECATED __declspec(deprecated) #endif -#define offsetofclass(base, derived) (reinterpret_cast<DWORD_PTR>(static_cast<base *>(reinterpret_cast<derived *>(_ATL_PACKING))) - _ATL_PACKING) namespace ATL { diff --git a/sdk/lib/atl/atlcomcli.h b/sdk/lib/atl/atlcomcli.h index ad1582a6ca..cba78101d2 100644 --- a/sdk/lib/atl/atlcomcli.h +++ b/sdk/lib/atl/atlcomcli.h @@ -53,6 +53,12 @@ namespace ATL { +inline HRESULT AtlHresultFromLastError() throw() +{ + DWORD dwError = ::GetLastError(); + return HRESULT_FROM_WIN32(dwError); +} + template<class T> class CComPtr diff --git a/sdk/lib/atl/atldef.h b/sdk/lib/atl/atldef.h new file mode 100644 index 0000000000..4ab2fec45d --- /dev/null +++ b/sdk/lib/atl/atldef.h @@ -0,0 +1,59 @@ +/* +* PROJECT: ReactOS ATL +* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +* PURPOSE: ATL Base definitions +* COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) +*/ + +#pragma once + + +#define _ATL_PACKING 8 + + +#ifndef AtlThrow +#ifndef _ATL_CUSTOM_THROW +#define AtlThrow(x) ATL::AtlThrowImp(x) +#endif +#endif + + +#ifndef ATLASSERT +#define ATLASSERT(expr) _ASSERTE(expr) +#endif + + +// ATLASSUME, ATLENSURE, ATLVERIFY, ... + + + + + +#ifdef _ATL_DISABLE_NO_VTABLE +#define ATL_NO_VTABLE +#else +#define ATL_NO_VTABLE __declspec(novtable) +#endif + +#ifndef ATL_DEPRECATED +#define ATL_DEPRECATED __declspec(deprecated) +#endif + +// ATL_NOTHROW, ATL_FORCEINLINE, ATL_NOINLINE + +// _ATL, ATL_VER, ATL_FILENAME_VER, ATL_FILENAME_VERNUM, ... + + + +#define offsetofclass(base, derived) (reinterpret_cast<DWORD_PTR>(static_cast<base *>(reinterpret_cast<derived *>(_ATL_PACKING))) - _ATL_PACKING) + + + +#ifndef _ATL_FREE_THREADED +#ifndef _ATL_APARTMENT_THREADED +#ifndef _ATL_SINGLE_THREADED +#define _ATL_FREE_THREADED +#endif +#endif +#endif + diff --git a/sdk/lib/atl/atlexcept.h b/sdk/lib/atl/atlexcept.h index 233dd09559..a71b4430d0 100644 --- a/sdk/lib/atl/atlexcept.h +++ b/sdk/lib/atl/atlexcept.h @@ -9,6 +9,9 @@ #endif #endif +namespace ATL +{ + //FIXME: Enable when RaiseException is marked as NORETURN //DECLSPEC_NORETURN @@ -37,9 +40,11 @@ inline void AtlThrowImp(HRESULT hr) } - #ifndef AtlThrow #define AtlThrow(x) AtlThrowImp(x) #endif + +}; // namespace ATL + #endif diff --git a/sdk/lib/atl/atlfile.h b/sdk/lib/atl/atlfile.h new file mode 100644 index 0000000000..cff0614d1c --- /dev/null +++ b/sdk/lib/atl/atlfile.h @@ -0,0 +1,281 @@ +/* +* PROJECT: ReactOS ATL +* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +* PURPOSE: ATL File implementation +* COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) +*/ + +#pragma once + +#include <atlbase.h> + +namespace ATL +{ + +//class CAtlFile: TODO +// public CHandle +//{ +//}; + + +//class CAtlTemporaryFile TODO +//{ +//}; + + + +class CAtlFileMappingBase +{ +private: + void* m_pData; + SIZE_T m_nMappingSize; + HANDLE m_hMapping; + ULARGE_INTEGER m_nOffset; + DWORD m_dwViewDesiredAccess; + +public: + CAtlFileMappingBase() throw() + :m_pData(NULL) + ,m_nMappingSize(0) + ,m_hMapping(NULL) + ,m_dwViewDesiredAccess(0) + { + m_nOffset.QuadPart = 0; + } + + ~CAtlFileMappingBase() throw() + { + Unmap(); + } + + CAtlFileMappingBase(CAtlFileMappingBase& orig) + { + HRESULT hr; + + m_pData = NULL; + m_nMappingSize = 0; + m_hMapping = NULL; + m_dwViewDesiredAccess = 0; + m_nOffset.QuadPart = 0; + + hr = CopyFrom(orig); + if (FAILED(hr)) + AtlThrow(hr); + } + + CAtlFileMappingBase& operator=(CAtlFileMappingBase& orig) + { + HRESULT hr; + + hr = CopyFrom(orig); + if (FAILED(hr)) + AtlThrow(hr); + + return *this; + } + + HRESULT CopyFrom(CAtlFileMappingBase& orig) throw() + { + HRESULT hr = S_OK; + + if (&orig == this) + return S_OK; + + ATLASSERT(m_pData == NULL); + ATLASSERT(m_hMapping == NULL); + ATLASSERT(orig.m_pData != NULL); + + m_nMappingSize = orig.m_nMappingSize; + m_nOffset.QuadPart = orig.m_nOffset.QuadPart; + m_dwViewDesiredAccess = orig.m_dwViewDesiredAccess; + + if (::DuplicateHandle(GetCurrentProcess(), orig.m_hMapping, GetCurrentProcess(), &m_hMapping, NULL, TRUE, DUPLICATE_SAME_ACCESS)) + { + m_pData = ::MapViewOfFile(m_hMapping, m_dwViewDesiredAccess, m_nOffset.HighPart, m_nOffset.LowPart, m_nMappingSize); + if (!m_pData) + { + hr = AtlHresultFromLastError(); + ::CloseHandle(m_hMapping); + m_hMapping = NULL; + } + } + else + { + hr = AtlHresultFromLastError(); + } + + return hr; + } + + HRESULT MapFile( + HANDLE hFile, + SIZE_T nMappingSize = 0, + ULONGLONG nOffset = 0, + DWORD dwMappingProtection = PAGE_READONLY, + DWORD dwViewDesiredAccess = FILE_MAP_READ) throw() + { + HRESULT hr = S_OK; + ULARGE_INTEGER FileSize; + + ATLASSERT(hFile != INVALID_HANDLE_VALUE); + ATLASSERT(m_pData == NULL); + ATLASSERT(m_hMapping == NULL); + + FileSize.LowPart = ::GetFileSize(hFile, &FileSize.HighPart); + FileSize.QuadPart = nMappingSize > FileSize.QuadPart ? nMappingSize : FileSize.QuadPart; + + m_hMapping = ::CreateFileMapping(hFile, NULL, dwMappingProtection, FileSize.HighPart, FileSize.LowPart, 0); + if (m_hMapping) + { + m_nMappingSize = nMappingSize == 0 ? (SIZE_T)(FileSize.QuadPart - nOffset) : nMappingSize; + m_nOffset.QuadPart = nOffset; + m_dwViewDesiredAccess = dwViewDesiredAccess; + + m_pData = ::MapViewOfFile(m_hMapping, m_dwViewDesiredAccess, m_nOffset.HighPart, m_nOffset.LowPart, m_nMappingSize); + if (!m_pData) + { + hr = AtlHresultFromLastError(); + ::CloseHandle(m_hMapping); + m_hMapping = NULL; + } + } + else + { + hr = AtlHresultFromLastError(); + } + + return hr; + } + + HRESULT MapSharedMem( + SIZE_T nMappingSize, + LPCTSTR szName, + BOOL* pbAlreadyExisted = NULL, + LPSECURITY_ATTRIBUTES lpsa = NULL, + DWORD dwMappingProtection = PAGE_READWRITE, + DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) throw() + { + HRESULT hr = S_OK; + ULARGE_INTEGER Size; + + ATLASSERT(nMappingSize > 0); + ATLASSERT(szName != NULL); + ATLASSERT(m_pData == NULL); + ATLASSERT(m_hMapping == NULL); + + m_nMappingSize = nMappingSize; + m_dwViewDesiredAccess = dwViewDesiredAccess; + m_nOffset.QuadPart = 0; + Size.QuadPart = nMappingSize; + + m_hMapping = ::CreateFileMapping(NULL, lpsa, dwMappingProtection, Size.HighPart, Size.LowPart, szName); + if (m_hMapping != NULL) + { + if (pbAlreadyExisted) + *pbAlreadyExisted = GetLastError() == ERROR_ALREADY_EXISTS; + + m_pData = ::MapViewOfFile(m_hMapping, dwViewDesiredAccess, m_nOffset.HighPart, m_nOffset.LowPart, m_nMappingSize); + if (!m_pData) + { + hr = AtlHresultFromLastError(); + ::CloseHandle(m_hMapping); + m_hMapping = NULL; + } + } + else + { + hr = AtlHresultFromLastError(); + } + + return hr; + } + + HRESULT OpenMapping( + LPCTSTR szName, + SIZE_T nMappingSize, + ULONGLONG nOffset = 0, + DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) throw() + { + HRESULT hr = S_OK; + + ATLASSERT(szName != NULL); + ATLASSERT(m_pData == NULL); + ATLASSERT(m_hMapping == NULL); + + m_nMappingSize = nMappingSize; + m_dwViewDesiredAccess = dwViewDesiredAccess; + m_nOffset.QuadPart = nOffset; + + m_hMapping = ::OpenFileMapping(m_dwViewDesiredAccess, FALSE, szName); + if (m_hMapping) + { + m_pData = ::MapViewOfFile(m_hMapping, dwViewDesiredAccess, m_nOffset.HighPart, m_nOffset.LowPart, m_nMappingSize); + if (!m_pData) + { + hr = AtlHresultFromLastError(); + ::CloseHandle(m_hMapping); + m_hMapping = NULL; + } + } + else + { + hr = AtlHresultFromLastError(); + } + + return hr; + } + + HRESULT Unmap() throw() + { + HRESULT hr = S_OK; + + if (m_pData) + { + if (!::UnmapViewOfFile(m_pData)) + hr = AtlHresultFromLastError(); + + m_pData = NULL; + } + if (m_hMapping) + { + // If we already had an error, do not overwrite it + if (!::CloseHandle(m_hMapping) && SUCCEEDED(hr)) + hr = AtlHresultFromLastError(); + + m_hMapping = NULL; + } + + return hr; + } + + void* GetData() const throw() + { + return m_pData; + } + + HANDLE GetHandle() throw () + { + return m_hMapping; + } + + SIZE_T GetMappingSize() throw() + { + return m_nMappingSize; + } + +}; + + +template <typename T = char> +class CAtlFileMapping: + public CAtlFileMappingBase +{ +public: + operator T*() const throw() + { + return reinterpret_cast<T*>(GetData()); + } +}; + + +}

1 0

[reactos] 01/01: [NTOSKRNL] Drop the no longer needed Dirty field
by Pierre Schweitzer 18 Apr '19

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd759473727d563f1cbe3… commit bd759473727d563f1cbe3e31afb88f0dfffdd94b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Apr 18 08:14:41 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Apr 18 08:14:41 2019 +0200 [NTOSKRNL] Drop the no longer needed Dirty field CORE-15954 --- ntoskrnl/cc/pin.c | 2 -- ntoskrnl/include/internal/cc.h | 1 - 2 files changed, 3 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 044458f7b4..b839e71daf 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -216,7 +216,6 @@ CcpGetAppropriateBcb( iBcb->PFCB.MappedLength = Length; iBcb->PFCB.MappedFileOffset = *FileOffset; iBcb->Vacb = Vacb; - iBcb->Dirty = FALSE; iBcb->PinCount = 0; iBcb->RefCount = 1; ExInitializeResourceLite(&iBcb->Lock); @@ -579,7 +578,6 @@ CcSetDirtyPinnedData ( CCTRACE(CC_API_DEBUG, "Bcb=%p Lsn=%p\n", Bcb, Lsn); - iBcb->Dirty = TRUE; if (!iBcb->Vacb->Dirty) { CcRosMarkDirtyVacb(iBcb->Vacb); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 332ad524c4..42b24e2572 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -233,7 +233,6 @@ typedef struct _INTERNAL_BCB ERESOURCE Lock; PUBLIC_BCB PFCB; PROS_VACB Vacb; - BOOLEAN Dirty; ULONG PinCount; CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ LIST_ENTRY BcbEntry;

1 0

[reactos] 01/01: [NTOSKRNL] Don't mark VACB dirty on unpin
by Pierre Schweitzer 17 Apr '19

17 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b6696fcdb5897d41a169… commit 8b6696fcdb5897d41a1692e1bf43f464c4ef3996 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Apr 17 22:23:57 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Apr 17 22:35:19 2019 +0200 [NTOSKRNL] Don't mark VACB dirty on unpin This could happen if BCB was marked dirty previously. Marking VACB dirty on unpin could lead to a double write of the VACB, even if clean. Indeed, now that setting BCB dirty leads to marking VACB dirty, the VACB can be flushed in between by the lazy-writer. The BCB state is not reset on VACB flush, contrary to the VACB state. Thus, on unpin even if the VACB was already flushed, we were setting back the dirty state, leading the VACB to be flushed again. This could bring a small performance downgrade. Though it remains limited since this is mostly used for FS metadata. Possibly it could lead to metadata corruption, but this is likely less possible. CORE-15954 --- ntoskrnl/cc/pin.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 775b105a2f..044458f7b4 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -169,10 +169,15 @@ CcpDereferenceBcb( KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); ASSERT(Bcb->PinCount == 0); + /* + * Don't mark dirty, if it was dirty, + * the VACB was already marked as such + * following the call to CcSetDirtyPinnedData + */ CcRosReleaseVacb(SharedCacheMap, Bcb->Vacb, TRUE, - Bcb->Dirty, + FALSE, FALSE); ExDeleteResourceLite(&Bcb->Lock); @@ -682,10 +687,15 @@ CcUnpinRepinnedBcb ( ASSERT(iBcb->PinCount == 0); } + /* + * Don't mark dirty, if it was dirty, + * the VACB was already marked as such + * following the call to CcSetDirtyPinnedData + */ CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, iBcb->Vacb, TRUE, - iBcb->Dirty, + FALSE, FALSE); ExDeleteResourceLite(&iBcb->Lock);

1 0

[reactos] 01/01: [NtGDI] Update Region code
by jimtabor 17 Apr '19

17 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feb9c045cf92f4de0f7a9… commit feb9c045cf92f4de0f7a96581de5691ade1960f6 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Apr 17 14:43:24 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Apr 17 14:43:24 2019 -0500 [NtGDI] Update Region code Wine Sync/Port and update for Regions. See CORE-15906. --- win32ss/gdi/ntgdi/region.c | 315 ++++++++++++++++++++++------------------- win32ss/gdi/ntgdi/region.h | 8 +- win32ss/user/ntuser/painting.h | 6 - 3 files changed, 180 insertions(+), 149 deletions(-) diff --git a/win32ss/gdi/ntgdi/region.c b/win32ss/gdi/ntgdi/region.c index 79712182c7..1456602852 100644 --- a/win32ss/gdi/ntgdi/region.c +++ b/win32ss/gdi/ntgdi/region.c @@ -113,6 +113,14 @@ SOFTWARE. * the y-x-banding that's so nice to have... */ +// X11 sources for ReactOS region processing. +// +// libX11/src/PolyReg.c +// libX11/src/Region.c +// +// + + #include <win32k.h> #include <suppress.h> @@ -402,8 +410,8 @@ typedef struct _SCANLINE_LISTBLOCK * *************************************************************************/ -#define LARGE_COORDINATE 0x7fffffff /* FIXME */ -#define SMALL_COORDINATE 0x80000000 +#define LARGE_COORDINATE INT_MAX +#define SMALL_COORDINATE INT_MIN static BOOL @@ -509,8 +517,8 @@ REGION_bAddRect( return TRUE; } -typedef VOID (FASTCALL *overlapProcp)(PREGION, PRECT, PRECT, PRECT, PRECT, INT, INT); -typedef VOID (FASTCALL *nonOverlapProcp)(PREGION, PRECT, PRECT, INT, INT); +typedef BOOL (FASTCALL *overlapProcp)(PREGION, PRECT, PRECT, PRECT, PRECT, INT, INT); +typedef BOOL (FASTCALL *nonOverlapProcp)(PREGION, PRECT, PRECT, INT, INT); // Number of points to buffer before sending them off to scanlines() : Must be an even number #define NUMPTSTOBUFFER 200 @@ -947,7 +955,7 @@ REGION_Coalesce( * */ static -VOID +BOOL FASTCALL REGION_RegionOp( PREGION newReg, /* Place to store result */ @@ -1001,7 +1009,7 @@ REGION_RegionOp( if (newReg->Buffer == NULL) { newReg->rdh.nRgnSize = 0; - return; + return FALSE; } /* Initialize ybot and ytop. @@ -1062,7 +1070,7 @@ REGION_RegionOp( if ((top != bot) && (nonOverlap1Func != NULL)) { - (*nonOverlap1Func)(newReg, r1, r1BandEnd, top, bot); + if (!(*nonOverlap1Func)(newReg, r1, r1BandEnd, top, bot)) return FALSE; } ytop = r2->top; @@ -1074,7 +1082,7 @@ REGION_RegionOp( if ((top != bot) && (nonOverlap2Func != NULL)) { - (*nonOverlap2Func)(newReg, r2, r2BandEnd, top, bot); + if (!(*nonOverlap2Func)(newReg, r2, r2BandEnd, top, bot) ) return FALSE; } ytop = r1->top; @@ -1099,7 +1107,7 @@ REGION_RegionOp( curBand = newReg->rdh.nCount; if (ybot > ytop) { - (*overlapFunc)(newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot); + if (!(*overlapFunc)(newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot)) return FALSE; } if (newReg->rdh.nCount != curBand) @@ -1134,11 +1142,12 @@ REGION_RegionOp( r1BandEnd++; } - (*nonOverlap1Func)(newReg, + if (!(*nonOverlap1Func)(newReg, r1, r1BandEnd, max(r1->top,ybot), - r1->bottom); + r1->bottom)) + return FALSE; r1 = r1BandEnd; } while (r1 != r1End); @@ -1154,11 +1163,12 @@ REGION_RegionOp( r2BandEnd++; } - (*nonOverlap2Func)(newReg, + if (!(*nonOverlap2Func)(newReg, r2, r2BandEnd, max(r2->top,ybot), - r2->bottom); + r2->bottom)) + return FALSE; r2 = r2BandEnd; } while (r2 != r2End); @@ -1216,7 +1226,7 @@ REGION_RegionOp( if (oldRects != &newReg->rdh.rcBound) ExFreePoolWithTag(oldRects, TAG_REGION); - return; + return TRUE; } /*********************************************************************** @@ -1235,7 +1245,7 @@ REGION_RegionOp( * */ static -VOID +BOOL FASTCALL REGION_IntersectO( PREGION pReg, @@ -1262,7 +1272,7 @@ REGION_IntersectO( { if (!REGION_bAddRect(pReg, left, top, right, bottom)) { - return; + return FALSE; } } @@ -1284,14 +1294,14 @@ REGION_IntersectO( } } - return; + return TRUE; } /*********************************************************************** * REGION_IntersectRegion */ static -VOID +BOOL FASTCALL REGION_IntersectRegion( PREGION newReg, @@ -1307,12 +1317,13 @@ REGION_IntersectRegion( } else { - REGION_RegionOp(newReg, + if (!REGION_RegionOp(newReg, reg1, reg2, REGION_IntersectO, NULL, - NULL); + NULL)) + return FALSE; } /* Can't alter newReg's extents before we call miRegionOp because @@ -1321,6 +1332,7 @@ REGION_IntersectRegion( * way there's no checking against rectangles that will be nuked * due to coalescing, so we have to examine fewer rectangles. */ REGION_SetExtents(newReg); + return TRUE; } /*********************************************************************** @@ -1341,7 +1353,7 @@ REGION_IntersectRegion( * */ static -VOID +BOOL FASTCALL REGION_UnionNonO( PREGION pReg, @@ -1354,7 +1366,7 @@ REGION_UnionNonO( { if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (rEnd - r))) { - return; + return FALSE; } do @@ -1365,7 +1377,7 @@ REGION_UnionNonO( while (r != rEnd); } - return; + return TRUE; } static __inline @@ -1411,7 +1423,7 @@ REGION_bMergeRect( * */ static -VOID +BOOL FASTCALL REGION_UnionO ( PREGION pReg, @@ -1426,12 +1438,12 @@ REGION_UnionO ( { if (r1->left < r2->left) { - REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom); + if (!REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom)) return FALSE; r1++; } else { - REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom); + if (!REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom)) return FALSE; r2++; } } @@ -1440,7 +1452,7 @@ REGION_UnionO ( { do { - REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom); + if (!REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom)) return FALSE; r1++; } while (r1 != r1End); @@ -1449,25 +1461,27 @@ REGION_UnionO ( { while (r2 != r2End) { - REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom); + if (!REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom)) return FALSE; r2++; } } - return; + return TRUE; } /*********************************************************************** * REGION_UnionRegion */ static -VOID +BOOL FASTCALL REGION_UnionRegion( PREGION newReg, PREGION reg1, PREGION reg2) { + BOOL ret = TRUE; + /* Checks all the simple cases * Region 1 and 2 are the same or region 1 is empty */ if ((reg1 == reg2) || (reg1->rdh.nCount == 0) || @@ -1476,10 +1490,10 @@ REGION_UnionRegion( { if (newReg != reg2) { - REGION_CopyRegion(newReg, reg2); + ret = REGION_CopyRegion(newReg, reg2); } - return; + return ret; } /* If nothing to union (region 2 empty) */ @@ -1489,10 +1503,10 @@ REGION_UnionRegion( { if (newReg != reg1) { - REGION_CopyRegion(newReg, reg1); + ret = REGION_CopyRegion(newReg, reg1); } - return; + return ret; } /* Region 1 completely subsumes region 2 */ @@ -1504,10 +1518,10 @@ REGION_UnionRegion( { if (newReg != reg1) { - REGION_CopyRegion(newReg, reg1); + ret = REGION_CopyRegion(newReg, reg1); } - return; + return ret; } /* Region 2 completely subsumes region 1 */ @@ -1519,23 +1533,25 @@ REGION_UnionRegion( { if (newReg != reg2) { - REGION_CopyRegion(newReg, reg2); + ret = REGION_CopyRegion(newReg, reg2); } - return; + return ret; } - REGION_RegionOp(newReg, + if ((ret = REGION_RegionOp(newReg, reg1, reg2, REGION_UnionO, REGION_UnionNonO, - REGION_UnionNonO); - + REGION_UnionNonO))) + { newReg->rdh.rcBound.left = min(reg1->rdh.rcBound.left, reg2->rdh.rcBound.left); newReg->rdh.rcBound.top = min(reg1->rdh.rcBound.top, reg2->rdh.rcBound.top); newReg->rdh.rcBound.right = max(reg1->rdh.rcBound.right, reg2->rdh.rcBound.right); newReg->rdh.rcBound.bottom = max(reg1->rdh.rcBound.bottom, reg2->rdh.rcBound.bottom); + } + return ret; } /*********************************************************************** @@ -1554,7 +1570,7 @@ REGION_UnionRegion( * */ static -VOID +BOOL FASTCALL REGION_SubtractNonO1( PREGION pReg, @@ -1567,7 +1583,7 @@ REGION_SubtractNonO1( { if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (rEnd - r))) { - return; + return FALSE; } do @@ -1578,7 +1594,7 @@ REGION_SubtractNonO1( while (r != rEnd); } - return; + return TRUE; } @@ -1594,7 +1610,7 @@ REGION_SubtractNonO1( * */ static -VOID +BOOL FASTCALL REGION_SubtractO( PREGION pReg, @@ -1641,7 +1657,7 @@ REGION_SubtractO( * part of minuend to region and skip to next subtrahend. */ if (!REGION_bAddRect(pReg, left, top, r2->left, bottom)) { - return; + return FALSE; } left = r2->right; @@ -1665,7 +1681,7 @@ REGION_SubtractO( { if (!REGION_bAddRect(pReg, left, top, r1->right, bottom)) { - return; + return FALSE; } } @@ -1680,7 +1696,7 @@ REGION_SubtractO( { if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (r1End - r1))) { - return; + return FALSE; } /* Add remaining minuend rectangles to region. */ @@ -1696,7 +1712,7 @@ REGION_SubtractO( while (r1 != r1End); } - return; + return TRUE; } /*! @@ -1711,7 +1727,7 @@ REGION_SubtractO( * */ static -VOID +BOOL FASTCALL REGION_SubtractRegion( PREGION regD, @@ -1723,16 +1739,16 @@ REGION_SubtractRegion( (regS->rdh.nCount == 0) || (EXTENTCHECK(&regM->rdh.rcBound, &regS->rdh.rcBound) == 0)) { - REGION_CopyRegion(regD, regM); - return; + return REGION_CopyRegion(regD, regM); } - REGION_RegionOp(regD, + if (!REGION_RegionOp(regD, regM, regS, REGION_SubtractO, REGION_SubtractNonO1, - NULL); + NULL)) + return FALSE; /* Can't alter newReg's extents before we call miRegionOp because * it might be one of the source regions and miRegionOp depends @@ -1740,13 +1756,14 @@ REGION_SubtractRegion( * way there's no checking against rectangles that will be nuked * due to coalescing, so we have to examine fewer rectangles. */ REGION_SetExtents(regD); + return TRUE; } /*********************************************************************** * REGION_XorRegion */ static -VOID +BOOL FASTCALL REGION_XorRegion( PREGION dr, @@ -1755,12 +1772,13 @@ REGION_XorRegion( { HRGN htra, htrb; PREGION tra, trb; + BOOL ret; // FIXME: Don't use a handle tra = REGION_AllocRgnWithHandle(sra->rdh.nCount + 1); if (tra == NULL) { - return; + return FALSE; } htra = tra->BaseObject.hHmgr; @@ -1770,26 +1788,26 @@ REGION_XorRegion( { REGION_UnlockRgn(tra); GreDeleteObject(htra); - return; + return FALSE; } htrb = trb->BaseObject.hHmgr; - REGION_SubtractRegion(tra, sra, srb); - REGION_SubtractRegion(trb, srb, sra); - REGION_UnionRegion(dr, tra, trb); + ret = REGION_SubtractRegion(tra, sra, srb) && + REGION_SubtractRegion(trb, srb, sra) && + REGION_UnionRegion(dr, tra, trb); REGION_UnlockRgn(tra); REGION_UnlockRgn(trb); GreDeleteObject(htra); GreDeleteObject(htrb); - return; + return ret; } /*! * Adds a rectangle to a REGION */ -VOID +BOOL FASTCALL REGION_UnionRectWithRgn( PREGION rgn, @@ -1801,7 +1819,7 @@ REGION_UnionRectWithRgn( region.rdh.nCount = 1; region.rdh.nRgnSize = sizeof(RECT); region.rdh.rcBound = *rect; - REGION_UnionRegion(rgn, rgn, &region); + return REGION_UnionRegion(rgn, rgn, &region); } INT @@ -1821,6 +1839,27 @@ REGION_SubtractRectFromRgn( return REGION_Complexity(prgnDest); } +BOOL +FASTCALL +REGION_bCopy( + PREGION dst, + PREGION src) +{ + if ( !dst || !src ) return FALSE; + return REGION_CopyRegion( dst, src); +} + +BOOL +FASTCALL +REGION_bIntersectRegion( + PREGION newReg, + PREGION reg1, + PREGION reg2) +{ + if ( !newReg || !reg1 || !reg2 ) return FALSE; + return REGION_IntersectRegion( newReg, reg1, reg2); +} + static BOOL REGION_bMakeSimpleFrameRgn( @@ -2098,9 +2137,13 @@ REGION_bXformRgn( RECTL_vMakeWellOrdered(&prgn->Buffer[i]); /* Update bounds */ - RECTL_bUnionRect(&prgn->rdh.rcBound, + if (!RECTL_bUnionRect(&prgn->rdh.rcBound, &prgn->rdh.rcBound, - &prgn->Buffer[i]); + &prgn->Buffer[i])) + { + DPRINT1("NULL Set in Union Rects\n"); + return FALSE; + } } /* Loop all rects in the region */ @@ -2469,6 +2512,7 @@ IntGdiCombineRgn( PREGION prgnSrc2, INT iCombineMode) { + BOOL Ret = TRUE; if (prgnDest == NULL) { @@ -2500,20 +2544,20 @@ IntGdiCombineRgn( switch (iCombineMode) { case RGN_AND: - REGION_IntersectRegion(prgnDest, prgnSrc1, prgnSrc2); + Ret = REGION_IntersectRegion(prgnDest, prgnSrc1, prgnSrc2); break; case RGN_OR: - REGION_UnionRegion(prgnDest, prgnSrc1, prgnSrc2); + Ret = REGION_UnionRegion(prgnDest, prgnSrc1, prgnSrc2); break; case RGN_XOR: - REGION_XorRegion(prgnDest, prgnSrc1, prgnSrc2); + Ret = REGION_XorRegion(prgnDest, prgnSrc1, prgnSrc2); break; case RGN_DIFF: - REGION_SubtractRegion(prgnDest, prgnSrc1, prgnSrc2); + Ret = REGION_SubtractRegion(prgnDest, prgnSrc1, prgnSrc2); break; } - return REGION_Complexity(prgnDest); + return Ret ? REGION_Complexity(prgnDest) : ERROR; } INT @@ -3600,8 +3644,9 @@ NtGdiCreateRoundRectRgn( { PREGION obj; HRGN hrgn; - INT asq, bsq, d, xd, yd; - RECTL rect; + int a, b, i, x, y; + INT64 asq, bsq, dx, dy, err; + RECT *rects; /* Make the dimensions sensible */ if (left > right) @@ -3618,95 +3663,75 @@ NtGdiCreateRoundRectRgn( bottom = tmp; } - ellipse_width = abs(ellipse_width); - ellipse_height = abs(ellipse_height); + /* the region is for the rectangle interior, but only at right and bottom for some reason */ + right--; + bottom--; - /* Check parameters */ - if (ellipse_width > right-left) - ellipse_width = right-left; - if (ellipse_height > bottom-top) - ellipse_height = bottom-top; + ellipse_width = min( right - left, abs( ellipse_width )); + ellipse_height = min( bottom - top, abs( ellipse_height )); /* Check if we can do a normal rectangle instead */ + if ((ellipse_width < 2) || (ellipse_height < 2)) return NtGdiCreateRectRgn(left, top, right, bottom); - /* Create region */ - d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - obj = REGION_AllocUserRgnWithHandle(d); + obj = REGION_AllocUserRgnWithHandle( ellipse_height ); if (obj == NULL) return 0; hrgn = obj->BaseObject.hHmgr; - /* Ellipse algorithm, based on an article by K. Porter - in DDJ Graphics Programming Column, 8/89 */ - asq = ellipse_width * ellipse_width / 4; /* a^2 */ - bsq = ellipse_height * ellipse_height / 4; /* b^2 */ - d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ - xd = 0; - yd = asq * ellipse_height; /* 2a^2b */ + obj->rdh.rcBound.left = left; + obj->rdh.rcBound.top = top; + obj->rdh.rcBound.right = right; + obj->rdh.rcBound.bottom = bottom; + rects = obj->Buffer; - rect.left = left + ellipse_width / 2; - rect.right = right - ellipse_width / 2; + /* based on an algorithm by Alois Zingl */ - /* Loop to draw first half of quadrant */ - while (xd < yd) - { - /* If nearest pixel is toward the center */ - if (d > 0) - { - /* Move toward center */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - yd -= 2*asq; - d -= yd; - } + a = ellipse_width - 1; + b = ellipse_height - 1; + asq = (INT64)8 * a * a; + bsq = (INT64)8 * b * b; + dx = (INT64)4 * b * b * (1 - a); + dy = (INT64)4 * a * a * (1 + (b % 2)); + err = dx + dy + a * a * (b % 2); - /* Next horiz point */ - rect.left--; - rect.right++; - xd += 2*bsq; - d += bsq + xd; - } + x = 0; + y = ellipse_height / 2; - /* Loop to draw second half of quadrant */ - d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; - while (yd >= 0) - { - /* next vertical point */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); + rects[y].left = left; + rects[y].right = right; - /* If nearest pixel is outside ellipse */ - if (d < 0) + while (x <= ellipse_width / 2) + { + INT64 e2 = 2 * err; + if (e2 >= dx) { - /* Move away from center */ - rect.left--; - rect.right++; - xd += 2*bsq; - d += xd; + x++; + err += dx += bsq; + } + if (e2 <= dy) + { + y++; + err += dy += asq; + rects[y].left = left + x; + rects[y].right = right - x; } - - yd -= 2*asq; - d += asq - yd; } - - /* Add the inside rectangle */ - if (top <= bottom) + for (i = 0; i < ellipse_height / 2; i++) + { + rects[i].left = rects[b - i].left; + rects[i].right = rects[b - i].right; + rects[i].top = top + i; + rects[i].bottom = rects[i].top + 1; + } + for (; i < ellipse_height; i++) { - rect.top = top; - rect.bottom = bottom; - REGION_UnionRectWithRgn(obj, &rect); + rects[i].top = bottom - ellipse_height + i; + rects[i].bottom = rects[i].top + 1; } + rects[ellipse_height / 2].top = top + ellipse_height / 2; /* extend to top of rectangle */ REGION_UnlockRgn(obj); return hrgn; @@ -3860,7 +3885,13 @@ NtGdiExtCreateRegion( { if ( rects[i].left < rects[i].right && rects[i].top < rects[i].bottom ) { - REGION_UnionRectWithRgn(Region, &rects[i]); + if (!REGION_UnionRectWithRgn(Region, &rects[i])) + { + REGION_UnlockRgn(Region); + GreDeleteObject(hRgn); + hRgn = NULL; + _SEH2_LEAVE; + } } } @@ -3901,7 +3932,7 @@ NtGdiExtCreateRegion( return NULL; } - REGION_UnlockRgn(Region); + if (hRgn) REGION_UnlockRgn(Region); return hRgn; } diff --git a/win32ss/gdi/ntgdi/region.h b/win32ss/gdi/ntgdi/region.h index 0d4f454daa..39badd8e30 100644 --- a/win32ss/gdi/ntgdi/region.h +++ b/win32ss/gdi/ntgdi/region.h @@ -25,7 +25,7 @@ extern HRGN hrgnDefault; PREGION FASTCALL REGION_AllocRgnWithHandle(INT n); PREGION FASTCALL REGION_AllocUserRgnWithHandle(INT n); -VOID FASTCALL REGION_UnionRectWithRgn(PREGION rgn, const RECTL *rect); +BOOL FASTCALL REGION_UnionRectWithRgn(PREGION rgn, const RECTL *rect); INT FASTCALL REGION_SubtractRectFromRgn(PREGION prgnDest, PREGION prgnSrc, const RECTL *prcl); INT FASTCALL REGION_GetRgnBox(PREGION Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PREGION Rgn, const RECTL *rc); @@ -93,6 +93,12 @@ GreCreateFrameRgn( #define IntSysCreateRectpRgnIndirect(prc) \ IntSysCreateRectpRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) +#define GreCreateRectRgnIndirect(prc) \ + NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) + +#define GreSetRectRgnIndirect(hRgn, prc) \ + NtGdiSetRectRgn(hRgn, (prc)->left, (prc)->top, (prc)->right, (prc)->bottom); + PREGION FASTCALL IntSysCreateRectpRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); diff --git a/win32ss/user/ntuser/painting.h b/win32ss/user/ntuser/painting.h index 8ab6a66c1a..48d8406424 100644 --- a/win32ss/user/ntuser/painting.h +++ b/win32ss/user/ntuser/painting.h @@ -15,12 +15,6 @@ #define RDW_CLIPCHILDREN 4096 #define RDW_NOUPDATEDIRTY 32768 -#define GreCreateRectRgnIndirect(prc) \ - NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) - -#define GreSetRectRgnIndirect(hRgn, prc) \ - NtGdiSetRectRgn(hRgn, (prc)->left, (prc)->top, (prc)->right, (prc)->bottom); - BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags); BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove);

1 0

[reactos] 01/01: [GDI] Fixup attribute support for Regions
by jimtabor 17 Apr '19

17 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fabc51d739db471380ce… commit 7fabc51d739db471380cedbd7697e3939fc4b681 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Apr 17 14:09:58 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Apr 17 14:09:58 2019 -0500 [GDI] Fixup attribute support for Regions Start to fix CORE-13817 when GDI batch is turn on for SelectClipRgn. --- win32ss/gdi/gdi32/objects/region.c | 257 ++++++++++++++----------------------- 1 file changed, 93 insertions(+), 164 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/region.c b/win32ss/gdi/gdi32/objects/region.c index ce593b26dc..ef1e892bdd 100644 --- a/win32ss/gdi/gdi32/objects/region.c +++ b/win32ss/gdi/gdi32/objects/region.c @@ -3,69 +3,26 @@ #define NDEBUG #include <debug.h> +// +// "Windows Graphics Programming: Win32 GDI and DirectDraw", +// Chp 9 Areas, Region, Set Operations on Regions, hard copy pg 560. +// universal set's bounding box to be [-(1 << 27), -(1 << 27), (1 << 27) -1, (1 << 27) -1]. +// +#define MIN_COORD (INT_MIN/16) // See also ntgdi/region.c +#define MAX_COORD (INT_MAX/16) + #define INRECT(r, x, y) \ ( ( ((r).right > x)) && \ ( ((r).left <= x)) && \ ( ((r).bottom > y)) && \ ( ((r).top <= y)) ) -#define OVERLAPPING_RGN 0 -#define INVERTED_RGN 1 -#define SAME_RGN 2 -#define DIFF_RGN 3 -/* - From tests, there are four results based on normalized coordinates. - If the rects are overlapping and normalized, it's OVERLAPPING_RGN. - If the rects are overlapping in anyway or same in dimension and one is inverted, - it's INVERTED_RGN. - If the rects are same in dimension or NULL, it's SAME_RGN. - If the rects are overlapping and not normalized or displace in different areas, - it's DIFF_RGN. - */ -INT -FASTCALL -ComplexityFromRects( PRECTL prc1, PRECTL prc2) -{ - if ( prc2->left >= prc1->left ) - { - if ( ( prc1->right >= prc2->right) && - ( prc1->top <= prc2->top ) && - ( prc1->bottom >= prc2->bottom ) ) - return SAME_RGN; - - if ( prc2->left > prc1->left ) - { - if ( ( prc1->left >= prc2->right ) || - ( prc1->right <= prc2->left ) || - ( prc1->top >= prc2->bottom ) || - ( prc1->bottom <= prc2->top ) ) - return DIFF_RGN; - } - } - - if ( ( prc2->right < prc1->right ) || - ( prc2->top > prc1->top ) || - ( prc2->bottom < prc1->bottom ) ) - { - if ( ( prc1->left >= prc2->right ) || - ( prc1->right <= prc2->left ) || - ( prc1->top >= prc2->bottom ) || - ( prc1->bottom <= prc2->top ) ) - return DIFF_RGN; - } - else - { - return INVERTED_RGN; - } - return OVERLAPPING_RGN; -} - static VOID FASTCALL SortRects(PRECT pRect, INT nCount) { - INT i = 0, a = 0, b = 0, c, s; + INT i, a, b, c, s; RECT sRect; if (nCount > 0) @@ -77,19 +34,19 @@ SortRects(PRECT pRect, INT nCount) s = i; // set sort count if ( i < nCount ) { - a = i - 1; - b = i; + a = i - 1; // [0] + b = i; // [1] do { - if(pRect[b].top != pRect[i].bottom) break; - if(pRect[b].left < pRect[a].left) + if ( pRect[a].top != pRect[b].top ) break; + if ( pRect[a].left > pRect[b].left ) { sRect = pRect[a]; pRect[a] = pRect[b]; pRect[b] = sRect; } ++s; - ++b; + b++; } while ( s < nCount ); } @@ -108,10 +65,9 @@ DeleteRegion( _In_ HRGN hrgn) { #if 0 - PRGN_ATTR Rgn_Attr; + PRGN_ATTR Rgn_Attr = GdiGetRgnAttr(hrgn); - if ((GdiGetHandleUserData(hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && - ( Rgn_Attr != NULL )) + if ( Rgn_Attr ) { PGDIBSOBJECT pgO; @@ -140,7 +96,7 @@ MirrorRgnByWidth( if (cRgnDSize) { - pRgnData = LocalAlloc(LMEM_FIXED, cRgnDSize * sizeof(LONG)); + pRgnData = HeapAlloc(GetProcessHeap(), 0, cRgnDSize * sizeof(LONG)); if (pRgnData) { if ( GetRegionData(hrgn, cRgnDSize, pRgnData) ) @@ -173,7 +129,7 @@ MirrorRgnByWidth( Ret = 1; } } - LocalFree(pRgnData); + HeapFree( GetProcessHeap(), 0, pRgnData); } } return Ret; @@ -202,6 +158,7 @@ IntSetNullRgn( { prgnattr->iComplexity = NULLREGION; prgnattr->AttrFlags |= ATTR_RGN_DIRTY; + prgnattr->Rect.left = prgnattr->Rect.top = prgnattr->Rect.right = prgnattr->Rect.bottom = 0; return NULLREGION; } @@ -599,39 +556,39 @@ WINAPI CreateRectRgn(int x1, int y1, int x2, int y2) { PRGN_ATTR pRgn_Attr; - HRGN hrgn; + HRGN hrgn = NULL; int tmp; -/// <- -//// Remove when Brush/Pen/Rgn Attr is ready! - return NtGdiCreateRectRgn(x1,y1,x2,y2); -//// - - /* Normalize points */ - tmp = x1; + /* Normalize points, REGION_SetRectRgn does this too. */ if ( x1 > x2 ) { + tmp = x1; x1 = x2; x2 = tmp; } - tmp = y1; if ( y1 > y2 ) { + tmp = y1; y1 = y2; y2 = tmp; } - /* Check outside 24 bit limit for universal set. Chp 9 Areas, pg 560.*/ - if ( x1 < -(1<<27) || - y1 < -(1<<27) || - x2 > (1<<27)-1 || - y2 > (1<<27)-1 ) + /* Check outside 28 bit limit for universal set bound box. REGION_SetRectRgn doesn't do this! */ + if ( x1 < MIN_COORD || + y1 < MIN_COORD || + x2 > MAX_COORD || + y2 > MAX_COORD ) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } hrgn = hGetPEBHandle(hctRegionHandle, 0); + if (hrgn) + { + DPRINT1("PEB Handle Cache Test return hrgn %p, should be NULL!\n",hrgn); + hrgn = NULL; + } if (!hrgn) hrgn = NtGdiCreateRectRgn(0, 0, 1, 1); @@ -639,29 +596,16 @@ CreateRectRgn(int x1, int y1, int x2, int y2) if (!hrgn) return hrgn; - if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) + if (!(pRgn_Attr = GdiGetRgnAttr(hrgn)) ) { DPRINT1("No Attr for Region handle!!!\n"); DeleteRegion(hrgn); return NULL; } - if (( x1 == x2) || (y1 == y2)) - { - pRgn_Attr->iComplexity = NULLREGION; - pRgn_Attr->Rect.left = pRgn_Attr->Rect.top = - pRgn_Attr->Rect.right = pRgn_Attr->Rect.bottom = 0; - } - else - { - pRgn_Attr->iComplexity = SIMPLEREGION; - pRgn_Attr->Rect.left = x1; - pRgn_Attr->Rect.top = y1; - pRgn_Attr->Rect.right = x2; - pRgn_Attr->Rect.bottom = y2; - } + pRgn_Attr->AttrFlags = ATTR_RGN_VALID; - pRgn_Attr->AttrFlags = (ATTR_RGN_DIRTY|ATTR_RGN_VALID); + IntSetRectRgn( pRgn_Attr, x1, y1, x2, y2 ); return hrgn; } @@ -751,67 +695,52 @@ ExtSelectClipRgn( /* Batch handles RGN_COPY only! */ if (iMode == RGN_COPY) { -#if 0 - PDC_ATTR pDc_Attr; + PDC_ATTR pdcattr; PRGN_ATTR pRgn_Attr = NULL; - /* hrgn can be NULL unless the RGN_COPY mode is specified. */ - if (hrgn) - GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr); - - if ( GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &pDc_Attr) && - pDc_Attr ) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if ( pdcattr ) { PGDI_TABLE_ENTRY pEntry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hdc); - PTEB pTeb = NtCurrentTeb(); - if ( pTeb->Win32ThreadInfo != NULL && - pTeb->GdiTebBatch.HDC == hdc && - !(pDc_Attr->ulDirty_ & DC_DIBSECTION) && - !(pEntry->Flags & GDI_ENTRY_VALIDATE_VIS) ) + /* hrgn can be NULL unless the RGN_COPY mode is specified. */ + if (hrgn) pRgn_Attr = GdiGetRgnAttr(hrgn); + + if ( !(pdcattr->ulDirty_ & DC_DIBSECTION) && + !(pEntry->Flags & GDI_ENTRY_VALIDATE_VIS) ) { - if (!hrgn || - (hrgn && pRgn_Attr && pRgn_Attr->iComplexity <= SIMPLEREGION) ) + if (!hrgn || (hrgn && pRgn_Attr && pRgn_Attr->iComplexity <= SIMPLEREGION) ) { - if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSEXTSELCLPRGN)) <= GDIBATCHBUFSIZE) + PGDIBSEXTSELCLPRGN pgO = GdiAllocBatchCommand(hdc, GdiBCExtSelClipRgn); + if (pgO) { - // FIXME: This is broken, use GdiAllocBatchCommand! - PGDIBSEXTSELCLPRGN pgO = (PGDIBSEXTSELCLPRGN)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - pgO->gbHdr.Cmd = GdiBCExtSelClipRgn; - pgO->gbHdr.Size = sizeof(GDIBSEXTSELCLPRGN); pgO->fnMode = iMode; if ( hrgn && pRgn_Attr ) { Ret = pRgn_Attr->iComplexity; - - if ( pDc_Attr->VisRectRegion.Rect.left >= pRgn_Attr->Rect.right || - pDc_Attr->VisRectRegion.Rect.top >= pRgn_Attr->Rect.bottom || - pDc_Attr->VisRectRegion.Rect.right <= pRgn_Attr->Rect.left || - pDc_Attr->VisRectRegion.Rect.bottom <= pRgn_Attr->Rect.top ) + // Note from ntgdi/dcstate.c : "The VisRectRegion field needs to be set to a valid state." + if ( pdcattr->VisRectRegion.Rect.left >= pRgn_Attr->Rect.right || + pdcattr->VisRectRegion.Rect.top >= pRgn_Attr->Rect.bottom || + pdcattr->VisRectRegion.Rect.right <= pRgn_Attr->Rect.left || + pdcattr->VisRectRegion.Rect.bottom <= pRgn_Attr->Rect.top ) Ret = NULLREGION; - pgO->left = pRgn_Attr->Rect.left; - pgO->top = pRgn_Attr->Rect.top; - pgO->right = pRgn_Attr->Rect.right; - pgO->bottom = pRgn_Attr->Rect.bottom; + // Pass the rect since this region will go away. + pgO->rcl = pRgn_Attr->Rect; } else { - Ret = pDc_Attr->VisRectRegion.Flags; - pgO->fnMode |= 0x80000000; // Set no hrgn mode. + Ret = pdcattr->VisRectRegion.iComplexity; + pgO->fnMode |= GDIBS_NORECT; // Set no hrgn mode. } - pTeb->GdiTebBatch.Offset += sizeof(GDIBSEXTSELCLPRGN); - pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); if ( NewRgn ) DeleteObject(NewRgn); return Ret; } } } } -#endif } Ret = NtGdiExtSelectClipRgn(hdc, hrgn, iMode); @@ -889,8 +818,8 @@ GetRgnBox(HRGN hrgn, { PRGN_ATTR Rgn_Attr; - //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) - return NtGdiGetRgnBox(hrgn, prcOut); + if (!(Rgn_Attr = GdiGetRgnAttr(hrgn))) + return NtGdiGetRgnBox(hrgn, prcOut); if (Rgn_Attr->iComplexity == NULLREGION) { @@ -932,9 +861,12 @@ BOOL WINAPI MirrorRgn(HWND hwnd, HRGN hrgn) { + INT l; RECT Rect; GetWindowRect(hwnd, &Rect); - return MirrorRgnByWidth(hrgn, Rect.right - Rect.left, NULL); + l = Rect.right - Rect.left; + Rect.right -= Rect.left; + return MirrorRgnByWidth(hrgn, l, NULL); } /* @@ -962,11 +894,10 @@ OffsetRgn( HRGN hrgn, int nYOffset) { PRGN_ATTR pRgn_Attr; - int nLeftRect, nTopRect, nRightRect, nBottomRect; + RECTL rc; -// HACKFIX -// if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) - return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); + if (!(pRgn_Attr = GdiGetRgnAttr(hrgn))) + return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); if ( pRgn_Attr->iComplexity == NULLREGION) return pRgn_Attr->iComplexity; @@ -974,33 +905,28 @@ OffsetRgn( HRGN hrgn, if ( pRgn_Attr->iComplexity != SIMPLEREGION) return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); - nLeftRect = pRgn_Attr->Rect.left; - nTopRect = pRgn_Attr->Rect.top; - nRightRect = pRgn_Attr->Rect.right; - nBottomRect = pRgn_Attr->Rect.bottom; + rc = pRgn_Attr->Rect; - if (nLeftRect < nRightRect) + if (rc.left < rc.right) { - if (nTopRect < nBottomRect) + if (rc.top < rc.bottom) { - nLeftRect = nXOffset + nLeftRect; - nTopRect = nYOffset + nTopRect; - nRightRect = nXOffset + nRightRect; - nBottomRect = nYOffset + nBottomRect; - - /* Check 28 bit limit. Chp 9 Areas, pg 560. */ - if ( nLeftRect < -(1<<27) || - nTopRect < -(1<<27) || - nRightRect > (1<<27)-1 || - nBottomRect > (1<<27)-1 ) + rc.left += nXOffset; + rc.top += nYOffset; + rc.right += nXOffset; + rc.bottom += nYOffset; + + /* Make sure the offset is within the legal range */ + if ( (rc.left & MIN_COORD && ((rc.left & MIN_COORD) != MIN_COORD)) || + (rc.top & MIN_COORD && ((rc.top & MIN_COORD) != MIN_COORD)) || + (rc.right & MIN_COORD && ((rc.right & MIN_COORD) != MIN_COORD)) || + (rc.bottom & MIN_COORD && ((rc.bottom & MIN_COORD) != MIN_COORD)) ) { + DPRINT("OffsetRgn ERROR\n"); return ERROR; } - pRgn_Attr->Rect.top = nTopRect; - pRgn_Attr->Rect.left = nLeftRect; - pRgn_Attr->Rect.right = nRightRect; - pRgn_Attr->Rect.bottom = nBottomRect; + pRgn_Attr->Rect = rc; pRgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; } } @@ -1018,9 +944,8 @@ PtInRegion(IN HRGN hrgn, { PRGN_ATTR pRgn_Attr; - // HACKFIX - //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) - return NtGdiPtInRegion(hrgn,x,y); + if (!(pRgn_Attr = GdiGetRgnAttr(hrgn))) + return NtGdiPtInRegion(hrgn,x,y); if ( pRgn_Attr->iComplexity == NULLREGION) return FALSE; @@ -1042,9 +967,8 @@ RectInRegion(HRGN hrgn, PRGN_ATTR pRgn_Attr; RECTL rc; - // HACKFIX - //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) - return NtGdiRectInRegion(hrgn, (LPRECT) prcl); + if (!(pRgn_Attr = GdiGetRgnAttr(hrgn))) + return NtGdiRectInRegion(hrgn, (LPRECT) prcl); if ( pRgn_Attr->iComplexity == NULLREGION) return FALSE; @@ -1075,10 +999,15 @@ RectInRegion(HRGN hrgn, rc.left = prcl->left; } - if ( ComplexityFromRects( &pRgn_Attr->Rect, &rc) != DIFF_RGN ) - return TRUE; + if ( ( pRgn_Attr->Rect.left >= rc.right ) || + ( pRgn_Attr->Rect.right <= rc.left ) || + ( pRgn_Attr->Rect.top >= rc.bottom ) || + ( pRgn_Attr->Rect.bottom <= rc.top ) ) + { + return FALSE; + } - return FALSE; + return TRUE; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs