Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [3RDPARTY] Addendum to 146096cd: Make some warnings non-fatal.
by Hermès Bélusca-Maïto 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a96e0adbc9b4ac64fb50… commit 4a96e0adbc9b4ac64fb5020e678ea636ef6edfc3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 13 18:24:01 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 18:24:01 2019 +0200 [3RDPARTY] Addendum to 146096cd: Make some warnings non-fatal. --- dll/3rdparty/libtirpc/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index a48db75fdb..dd636c9928 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -6,6 +6,11 @@ add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup -D_CRT_NONSTDC_NO_ include_directories(${REACTOS_SOURCE_DIR}/dll/3rdparty/libtirpc/tirpc) +if(MSVC) + # error C4133: '=': incompatible types - from 'char *' to 'int32_t *' + replace_compile_flags("/we4133" " ") +endif() + list(APPEND SOURCE src/asprintf.c # src/auth_des.c

1 0

[reactos] 01/01: [OPENGLCFG] Edit the applet name so it uses the same capitalization scheme as the other Control Panel applets.
by Jared Smudde 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca72c931f3313787e539f… commit ca72c931f3313787e539fd75a068ae82b3962e3b Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Fri Apr 12 18:20:59 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:55 2019 +0200 [OPENGLCFG] Edit the applet name so it uses the same capitalization scheme as the other Control Panel applets. --- dll/cpl/openglcfg/lang/en-US.rc | 2 +- dll/cpl/openglcfg/lang/tr-TR.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/openglcfg/lang/en-US.rc b/dll/cpl/openglcfg/lang/en-US.rc index 9a79f3ea02..f7bfdd7a51 100644 --- a/dll/cpl/openglcfg/lang/en-US.rc +++ b/dll/cpl/openglcfg/lang/en-US.rc @@ -20,7 +20,7 @@ STRINGTABLE BEGIN IDS_RENDERER_DEFAULT "System default" IDS_RENDERER_RSWR "ReactOS Software Implementation" - IDS_CPLNAME "OpenGL configuration" + IDS_CPLNAME "OpenGL Configuration" IDS_CPLDESCRIPTION "Configures OpenGL renderer." IDS_DEBUG_SET "Set" IDS_DEBUG_CLEAR "Clear" diff --git a/dll/cpl/openglcfg/lang/tr-TR.rc b/dll/cpl/openglcfg/lang/tr-TR.rc index 84479007e3..31543db881 100644 --- a/dll/cpl/openglcfg/lang/tr-TR.rc +++ b/dll/cpl/openglcfg/lang/tr-TR.rc @@ -22,7 +22,7 @@ STRINGTABLE BEGIN IDS_RENDERER_DEFAULT "Dizge Ön Tanımlı" IDS_RENDERER_RSWR "ReactOS Yazılım Gerçekleştirmesi" - IDS_CPLNAME "OpenGL yapılandırması" + IDS_CPLNAME "OpenGL Yapılandırması" IDS_CPLDESCRIPTION "OpenGL işleyicisini yapılandırır." IDS_DEBUG_SET "Ayarla" IDS_DEBUG_CLEAR "Sil"

1 0

[reactos] 01/01: [RAPPS] Fix blurry Theme category icon.
by Jared Smudde 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a7dcb24adf648e05bdfa… commit 1a7dcb24adf648e05bdfa70a76efa5a8ca757951 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Fri Apr 12 18:47:31 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:30 2019 +0200 [RAPPS] Fix blurry Theme category icon. --- base/applications/rapps/res/cats/themes.ico | Bin 2462 -> 2462 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/rapps/res/cats/themes.ico b/base/applications/rapps/res/cats/themes.ico index a9320d6abe..0ed14c07de 100644 Binary files a/base/applications/rapps/res/cats/themes.ico and b/base/applications/rapps/res/cats/themes.ico differ

1 0

[reactos] 01/01: [DIRECTX] Fix typos in readme.txt (#1498)
by Oleg Dubinskiy 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a88727570635c015cd93… commit 7a88727570635c015cd9352f5c26432f70466083 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Apr 13 18:07:02 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:02 2019 +0200 [DIRECTX] Fix typos in readme.txt (#1498) See also PR #687. --- dll/directx/wine/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/directx/wine/readme.txt b/dll/directx/wine/readme.txt index 2bb71f0b6b..99308ae012 100644 --- a/dll/directx/wine/readme.txt +++ b/dll/directx/wine/readme.txt @@ -2,7 +2,7 @@ This Is wine DirectX support. It works in reactos and windows When ReactOS own ReactX are inplace this file will be remove from our SVN -for now they stay as tempary sovlotions +for now they stay as temporary solutions People that have help getting this thing

1 0

[reactos] 01/01: [CMAKE] Don't use the PCH for generated files.
by Thomas Faber 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5685ad4a123bee7731fd9… commit 5685ad4a123bee7731fd9911d1ec96b3471b8e02 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 8 07:12:20 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Apr 13 15:58:22 2019 +0200 [CMAKE] Don't use the PCH for generated files. The PCH must be used with the same compiler flags it was generated with, so don't use it for files that use modified flags. --- base/applications/winhlp32/CMakeLists.txt | 5 ++--- dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 10 +++++----- dll/win32/jscript/CMakeLists.txt | 6 +++--- dll/win32/msi/CMakeLists.txt | 6 +++--- dll/win32/msxml3/CMakeLists.txt | 6 +++--- dll/win32/vbscript/CMakeLists.txt | 4 ++-- dll/win32/wbemprox/CMakeLists.txt | 4 ++-- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index e248a0e18a7..0deaeafee5d 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE callback.c hlpfile.c macro.c - macro.lex.yy.c winhelp.c precomp.h) @@ -19,9 +18,9 @@ list(APPEND SOURCE set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) -add_executable(winhlp32 ${SOURCE} string.c rsrc.rc) +add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) -#add_pch(winhlp32 precomp.h SOURCE) +add_pch(winhlp32 precomp.h SOURCE) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index efae762ef65..88d2383b7b6 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -13,13 +13,9 @@ spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) list(APPEND SOURCE asmparser.c - asmshader.tab.c - asmshader.yy.c blob.c bytecodewriter.c compiler.c - hlsl.tab.c - hlsl.yy.c main.c reflection.c utils.c @@ -28,6 +24,10 @@ list(APPEND SOURCE add_library(d3dcompiler_43 MODULE ${SOURCE} + asmshader.tab.c + asmshader.yy.c + hlsl.tab.c + hlsl.yy.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def) @@ -43,5 +43,5 @@ set_module_type(d3dcompiler_43 win32dll) target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp) add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll) add_dependencies(d3dcompiler_43 d3d_idl_headers) -#add_pch(d3dcompiler_43 precomp.h SOURCE) +add_pch(d3dcompiler_43 precomp.h SOURCE) add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index c97df1f8d49..cb4041f0020 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -10,7 +10,6 @@ list(APPEND SOURCE activex.c array.c bool.c - cc_parser.tab.c compile.c date.c decode.c @@ -29,7 +28,6 @@ list(APPEND SOURCE math.c number.c object.c - parser.tab.c regexp.c string.c vbarray.c @@ -48,6 +46,8 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps add_library(jscript MODULE ${SOURCE} + cc_parser.tab.c + parser.tab.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) @@ -57,5 +57,5 @@ add_dependencies(jscript jscript_idlheader stdole2) set_module_type(jscript win32dll) target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) -#add_pch(jscript precomp.h SOURCE) +add_pch(jscript precomp.h SOURCE) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 15697e5037c..e4f586db632 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -22,7 +22,6 @@ list(APPEND SOURCE assembly.c automation.c classes.c - cond.tab.c create.c custom.c database.c @@ -47,7 +46,6 @@ list(APPEND SOURCE script.c select.c source.c - sql.tab.c storages.c streams.c string.c @@ -64,6 +62,8 @@ set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREA add_library(msi MODULE ${SOURCE} + cond.tab.c + sql.tab.c ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c msi.rc @@ -84,5 +84,5 @@ add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 kernel32 ntdll) -#add_pch(msi precomp.h SOURCE) +add_pch(msi precomp.h SOURCE) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index 1e0e20abc1e..e61ac57f6cd 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -47,8 +47,6 @@ list(APPEND SOURCE xmlelem.c xmlparser.c xmlview.c - xslpattern.tab.c - xslpattern.yy.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c) @@ -65,6 +63,8 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_de add_library(msxml3 MODULE ${SOURCE} + xslpattern.tab.c + xslpattern.yy.c factory.c uuid.c version.rc @@ -75,5 +75,5 @@ set_module_type(msxml3 win32dll) target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib) add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb -#add_pch(msxml3 precomp.h SOURCE) +add_pch(msxml3 precomp.h SOURCE) add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index bd530e7d109..b95e66abae6 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -8,7 +8,6 @@ list(APPEND SOURCE global.c interp.c lex.c - parser.tab.c regexp.c utils.c vbdisp.c @@ -35,6 +34,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript MODULE ${SOURCE} + parser.tab.c vbscript.rc ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def) @@ -42,5 +42,5 @@ set_module_type(vbscript win32dll) target_link_libraries(vbscript uuid wine) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(vbscript vbscript_idlheader stdole2) -#add_pch(vbscript precomp.h SOURCE) +add_pch(vbscript precomp.h SOURCE) add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 49df8d0e1eb..3f48d3e6d5c 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -19,7 +19,6 @@ list(APPEND SOURCE services.c table.c wbemlocator.c - wql.tab.c precomp.h) # wql.tab.c has been generated with relative file paths... @@ -27,6 +26,7 @@ set_source_files_properties(wql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE add_library(wbemprox MODULE ${SOURCE} + wql.tab.c guid.c wbemprox.rc ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def) @@ -36,5 +36,5 @@ set_module_type(wbemprox win32dll) target_link_libraries(wbemprox uuid wine) add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) -#add_pch(wbemprox precomp.h SOURCE) +add_pch(wbemprox precomp.h SOURCE) add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)

1 0

[reactos] 05/05: [CMAKE] Add 3 more critical warnings for MSVC - C4311: pointer truncation from '<pointer>' to '<integer>' - C4312: conversion from '<integer>' to '<pointer>' of greater size - C4133: incompatible types - from '<x> *' to '<y> *' - C4028: formal parameter different from declaration
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=545a2c79367e1457e4bc7… commit 545a2c79367e1457e4bc7ac14d3c0f840c7e063c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Feb 27 22:00:40 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [CMAKE] Add 3 more critical warnings for MSVC - C4311: pointer truncation from '<pointer>' to '<integer>' - C4312: conversion from '<integer>' to '<pointer>' of greater size - C4133: incompatible types - from '<x> *' to '<y> *' - C4028: formal parameter different from declaration --- sdk/cmake/msvc.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 6eec2b15bcd..8419591b8b5 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -90,13 +90,15 @@ add_compile_flags("/wd4018") # - C4098: void function returning a value # - C4113: parameter lists differ # - C4129: unrecognized escape sequence -# - TODO: C4133: incompatible types +# - C4133: incompatible types - from '<x> *' to '<y> *' # - C4163: 'identifier': not available as an intrinsic function # - C4229: modifiers on data are ignored -# - C4700: uninitialized variable usage +# - C4311: pointer truncation from '<pointer>' to '<integer>' +# - C4312: conversion from '<integer>' to '<pointer>' of greater size # - C4603: macro is not defined or definition is different after precompiled header use +# - C4700: uninitialized variable usage # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4716") # TODO: Check and fix other architectures. if(ARCH STREQUAL "i386") add_compile_flags("/we4028")

1 0

[reactos] 04/05: [3RDPARTY] Make some warnings non-fatal
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=146096cd2e25d1c63d183… commit 146096cd2e25d1c63d183342875ab0d2938047d8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 1 17:55:03 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [3RDPARTY] Make some warnings non-fatal --- dll/3rdparty/libtiff/CMakeLists.txt | 8 ++++++++ dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 5 +++++ dll/directx/wine/wined3d/CMakeLists.txt | 5 +++++ dll/win32/clusapi/CMakeLists.txt | 5 +++++ dll/win32/crypt32/CMakeLists.txt | 5 +++++ dll/win32/mshtml/CMakeLists.txt | 5 +++++ dll/win32/msi/CMakeLists.txt | 8 ++++++++ dll/win32/msrle32/CMakeLists.txt | 5 +++++ dll/win32/shell32/CMakeLists.txt | 5 +++++ dll/win32/windowscodecs/CMakeLists.txt | 5 +++++ dll/win32/winmm/CMakeLists.txt | 5 +++++ dll/win32/winmm/midimap/CMakeLists.txt | 5 +++++ modules/rostests/winetests/gdiplus/CMakeLists.txt | 5 +++++ sdk/lib/3rdparty/freetype/CMakeLists.txt | 5 +++++ 14 files changed, 76 insertions(+) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 10fd5e33b06..1c8255a9990 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -5,6 +5,14 @@ add_definitions( -DUSE_WIN32_FILEIO -DTIF_PLATFORM_CONSOLE) +if(MSVC) + # error C4311: 'type cast': pointer truncation from 'thandle_t' to 'int' + replace_compile_flags("/we4311" " ") + + # error C4312: 'type cast': conversion from 'int' to 'thandle_t' of greater size + replace_compile_flags("/we4312" " ") +endif() + include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libtiff ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index 7c5cb428400..efae762ef65 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions( -D__WINESRC__ -DDIRECT3D_VERSION=0x0900) +if(MSVC) + # error C4133: 'function': incompatible types - from 'D3D_CBUFFER_TYPE *' to 'DWORD *' + replace_compile_flags("/we4133" " ") +endif() + include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 29b337e3bd1..6a6bf74e108 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -7,6 +7,11 @@ add_definitions( include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +if(MSVC) + # error C4312: 'type cast': conversion from 'LONG' to 'void *' of greater size + replace_compile_flags("/we4312" " ") +endif() + # We name this d3dwine.dll, because the Virtualbox additions ship with a custom wined3d.dll # and it breaks everything if it is installed. spec2def(d3dwine.dll wined3d.spec ADD_IMPORTLIB) diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt index 6d474658c52..40cfdd21f24 100644 --- a/dll/win32/clusapi/CMakeLists.txt +++ b/dll/win32/clusapi/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(clusapi.dll clusapi.spec) +if(MSVC) + # error C4312: 'type cast': conversion from 'unsigned int' to 'HCLUSTER' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE clusapi.c ${CMAKE_CURRENT_BINARY_DIR}/clusapi_stubs.c diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index e53c2f9e3be..b00ef45ed70 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -10,6 +10,11 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) +if(MSVC) + # error C4312: 'type cast': conversion from 'unsigned int' to 'void *' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE base64.c cert.c diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index e89b34b5ae3..08e23da71b4 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -10,6 +10,11 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_idl_headers(mshtml_nsiface_header nsiface.idl) spec2def(mshtml.dll mshtml.spec ADD_IMPORTLIB) +if(MSVC) + # error C4028: formal parameter 3 different from declaration + replace_compile_flags("/we4028" " ") +endif() + list(APPEND SOURCE conpoint.c dispex.c diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index be27062273f..15697e5037c 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -7,6 +7,14 @@ add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl) +if(MSVC) + # error C4133: 'function': incompatible types - from 'UINT *' to 'MSIINSTALLCONTEXT *' + replace_compile_flags("/we4133" " ") + + # error C4312: 'type cast': conversion from 'unsigned int' to 'HANDLE' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE action.c alter.c diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt index 8db9998c3bb..04706201560 100644 --- a/dll/win32/msrle32/CMakeLists.txt +++ b/dll/win32/msrle32/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(msrle32.dll msrle32.spec) +if(MSVC) + # error C4312: 'type cast': conversion from 'unsigned int' to 'LPVOID' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE msrle32.c ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 871e9247031..60d0fc9a3d7 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -12,6 +12,11 @@ if(NOT MSVC) add_compile_flags_language("-std=c++11" "CXX") endif() +if(MSVC) + # error C4311: 'type cast': pointer truncation from 'HANDLE' to 'INT' + replace_compile_flags("/we4311" " ") +endif() + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index 72cea6d42ad..611334ac2d5 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -8,6 +8,11 @@ add_definitions( remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +if(MSVC) + # error C4133: 'function': incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *' + replace_compile_flags("/we4133" " ") +endif() + include_directories( BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libjpeg diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 616680b2ec6..8d697b4e6df 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions(-D_WINE) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) +if(MSVC) + # error C4312: 'type cast': conversion from 'DWORD' to 'HTASK' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE driver.c joystick.c diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt index 755b22018a6..cc35e2b0809 100644 --- a/dll/win32/winmm/midimap/CMakeLists.txt +++ b/dll/win32/winmm/midimap/CMakeLists.txt @@ -1,6 +1,11 @@ spec2def(midimap.dll midimap.spec) +if(MSVC) + # error C4133: 'function': incompatible types - from 'LPDWORD' to 'DWORD_PTR *' + replace_compile_flags("/we4133" " ") +endif() + add_library(midimap MODULE midimap.c midimap.rc diff --git a/modules/rostests/winetests/gdiplus/CMakeLists.txt b/modules/rostests/winetests/gdiplus/CMakeLists.txt index d73d3137ccc..151f56629fb 100644 --- a/modules/rostests/winetests/gdiplus/CMakeLists.txt +++ b/modules/rostests/winetests/gdiplus/CMakeLists.txt @@ -1,6 +1,11 @@ add_definitions(-DUSE_WINE_TODOS) +if(MSVC) + # error C4133: 'function': incompatible types - from 'ImageFlags *' to 'UINT *' + replace_compile_flags("/we4133" " ") +endif() + list(APPEND SOURCE brush.c customlinecap.c diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index 0f2f5a34c34..f7e3313c5cd 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -5,6 +5,11 @@ add_definitions( include_directories(include) +if(MSVC) + # error C4312: 'type cast': conversion from 'unsigned long' to 'void *' of greater size + replace_compile_flags("/we4312" " ") +endif() + list(APPEND SOURCE src/autofit/autofit.c src/base/ftadvanc.c

1 0

[reactos] 03/05: [DBGHELP] Fix 64 bit issue
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2e16abc91a0a900e57c2… commit c2e16abc91a0a900e57c2ff185d78bdb4a5c5435 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 7 18:17:18 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [DBGHELP] Fix 64 bit issue --- dll/win32/dbghelp/dbghelp_private.h | 4 ++++ dll/win32/dbghelp/dwarf.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 9848acb1104..9eb0592fcab 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -151,7 +151,11 @@ struct location { unsigned kind : 8, reg; +#ifndef __REACTOS__ unsigned long offset; +#else + uintptr_t offset; +#endif }; struct symt diff --git a/dll/win32/dbghelp/dwarf.c b/dll/win32/dbghelp/dwarf.c index 0d517929186..04438f74a95 100644 --- a/dll/win32/dbghelp/dwarf.c +++ b/dll/win32/dbghelp/dwarf.c @@ -948,7 +948,11 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, sizeof(unsigned) + xloc.u.block.size); *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); +#ifndef __REACTOS__ loc->offset = (unsigned long)ptr; +#else + loc->offset = (uintptr_t)ptr; +#endif } } return TRUE;

1 0

[reactos] 02/05: [REACTOS] Fix misc 64 bit issues
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9a967b2ae48fbe1a6bfd… commit f9a967b2ae48fbe1a6bfde76935d2bba67e2330b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 1 14:24:05 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [REACTOS] Fix misc 64 bit issues --- boot/freeldr/freeldr/arch/i386/drivemap.c | 8 ++++--- dll/win32/iphlpapi/iphlpapi_main.c | 40 +++++++++++++++---------------- dll/win32/shell32/shelldesktop/dde.cpp | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/drivemap.c b/boot/freeldr/freeldr/arch/i386/drivemap.c index c1ea58742ca..f03d14e783e 100644 --- a/boot/freeldr/freeldr/arch/i386/drivemap.c +++ b/boot/freeldr/freeldr/arch/i386/drivemap.c @@ -172,8 +172,8 @@ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { - ULONG* RealModeIVT = (ULONG*)0x00000000; - USHORT* BiosLowMemorySize = (USHORT*)0x00000413; + ULONG* RealModeIVT = (ULONG*)UlongToPtr(0x00000000); + USHORT* BiosLowMemorySize = (USHORT*)ULongToPtr(0x00000413); if (!DriveMapInstalled) { @@ -197,7 +197,9 @@ VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) DriveMapOldInt13HandlerAddress = OldInt13HandlerAddress; // Copy the code to our reserved area - RtlCopyMemory((PVOID)DriveMapHandlerAddress, &DriveMapInt13HandlerStart, ((ULONG)&DriveMapInt13HandlerEnd - (ULONG)&DriveMapInt13HandlerStart)); + RtlCopyMemory(UlongToPtr(DriveMapHandlerAddress), + &DriveMapInt13HandlerStart, + ((PUCHAR)&DriveMapInt13HandlerEnd - (PUCHAR)&DriveMapInt13HandlerStart)); // Update the IVT RealModeIVT[0x13] = DriveMapHandlerSegOff; diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 327b31717ab..242fb3bbd55 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -109,8 +109,8 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, { DWORD ret; - TRACE("ppIfTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", ppIfTable, - (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIfTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", ppIfTable, + (DWORD)bOrder, heap, flags); if (!ppIfTable) ret = ERROR_INVALID_PARAMETER; else { @@ -153,8 +153,8 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, { DWORD ret; - TRACE("ppIpAddrTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpAddrTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpAddrTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", + ppIpAddrTable, (DWORD)bOrder, heap, flags); if (!ppIpAddrTable) ret = ERROR_INVALID_PARAMETER; else { @@ -195,8 +195,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * { DWORD ret; - TRACE("ppIpForwardTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpForwardTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpForwardTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", + ppIpForwardTable, (DWORD)bOrder, heap, flags); if (!ppIpForwardTable) ret = ERROR_INVALID_PARAMETER; else { @@ -239,8 +239,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, { DWORD ret; - TRACE("ppIpNetTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpNetTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpNetTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", + ppIpNetTable, (DWORD)bOrder, heap, flags); if (!ppIpNetTable) ret = ERROR_INVALID_PARAMETER; else { @@ -283,8 +283,8 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, { DWORD ret; - TRACE("ppTcpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppTcpTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppTcpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", + ppTcpTable, (DWORD)bOrder, heap, flags); if (!ppTcpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -328,8 +328,8 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, { DWORD ret; - TRACE("ppTcpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx, family 0x%08lx\n", - ppTcpTable, (DWORD)bOrder, (DWORD)heap, flags, family); + TRACE("ppTcpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx, family 0x%08lx\n", + ppTcpTable, (DWORD)bOrder, heap, flags, family); if (!ppTcpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -374,8 +374,8 @@ DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable, { DWORD ret; - TRACE("ppTcpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx, family %ld, class %ld\n", - ppTcpTable, (DWORD)bOrder, (DWORD)heap, flags, family, class); + TRACE("ppTcpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx, family %ld, class %ld\n", + ppTcpTable, (DWORD)bOrder, heap, flags, family, class); if (!ppTcpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -418,8 +418,8 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, { DWORD ret; - TRACE("ppUdpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppUdpTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppUdpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx\n", + ppUdpTable, (DWORD)bOrder, heap, flags); if (!ppUdpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -463,8 +463,8 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, { DWORD ret; - TRACE("ppUdpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx, family 0x%08lx\n", - ppUdpTable, (DWORD)bOrder, (DWORD)heap, flags, family); + TRACE("ppUdpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx, family 0x%08lx\n", + ppUdpTable, (DWORD)bOrder, heap, flags, family); if (!ppUdpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -509,8 +509,8 @@ DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable, { DWORD ret; - TRACE("ppUdpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx, family %ld, class %ld\n", - ppUdpTable, (DWORD)bOrder, (DWORD)heap, flags, family, class); + TRACE("ppUdpTable %p, bOrder %ld, heap 0x%p, flags 0x%08lx, family %ld, class %ld\n", + ppUdpTable, (DWORD)bOrder, heap, flags, family, class); if (!ppUdpTable) ret = ERROR_INVALID_PARAMETER; else { diff --git a/dll/win32/shell32/shelldesktop/dde.cpp b/dll/win32/shell32/shelldesktop/dde.cpp index c4e930be8f0..a9e103c076a 100644 --- a/dll/win32/shell32/shelldesktop/dde.cpp +++ b/dll/win32/shell32/shelldesktop/dde.cpp @@ -106,7 +106,7 @@ static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) if (*strField != L':') return NULL; - HANDLE hData = (HANDLE) StrToIntW(strField + 1); + HANDLE hData = UlongToHandle(StrToIntW(strField + 1)); PWSTR strSecond = StrChrW(strField + 1, L':'); if (strSecond)

1 0

[reactos] 01/05: [TREELIST] Fix 64 bit warnings
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2feba3d53415150f16c9… commit d2feba3d53415150f16c9a4b453e7bfa7c6ac3f1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 4 14:48:25 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [TREELIST] Fix 64 bit warnings --- base/setup/reactos/treelist.c | 104 +++++++++++++++++++++--------------------- base/setup/reactos/treelist.h | 12 ++--- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/base/setup/reactos/treelist.c b/base/setup/reactos/treelist.c index 1681b6189a2..d39924e0c09 100644 --- a/base/setup/reactos/treelist.c +++ b/base/setup/reactos/treelist.c @@ -111,7 +111,7 @@ #define FIRST_LINE 0xFFFFFFFE #define FROM_HEADER 0x88776655 #define I_CCB I_CHILDRENCALLBACK -#define U(h) ((unsigned)(h)) +#define U(h) ((unsigned)(ULONG_PTR)(h)) #define THEMEIMGLIST ((HIMAGELIST)1) #define GetHandle(h) ((TreeListData*)GetWindowLongPtr(h,0)) #define TVIF_ALL (TVIF_CHILDREN|TVIF_HANDLE|TVIF_IMAGE|TVIF_PARAM|TVIF_SELECTEDIMAGE|TVIF_STATE|TVIF_TEXT) @@ -553,7 +553,7 @@ static void CallbackEntry(TreeListData *pData, BaseItem *pEntry, unsigned uItem, sInfo.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | uFlags; sInfo.item.lParam = pEntry->lParam; - sInfo.item.hItem = (HTREEITEM)uItem; + sInfo.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sInfo.item.state = pEntry->uState; sInfo.item.stateMask = 0xFFFFFFFF; sInfo.item.iImage = I_IMAGECALLBACK; @@ -642,7 +642,7 @@ static void CallbackExtra(TreeListData *pData, BaseItem *pEntry, ExtraItem *pExt sInfo.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | uFlags; sInfo.item.lParam = pEntry->lParam; - sInfo.item.hItem = (HTREEITEM)uItem; + sInfo.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sInfo.item.state = pExtra->uState; sInfo.item.state |= (pEntry->uState & TVIS_BASEFLAGS); sInfo.item.stateMask = 0xFFFFFFFF; @@ -1813,7 +1813,7 @@ static void UpdateToolTip(TreeListData *pData, unsigned uItem, unsigned uFlags) sNotify.hdr.code = TVN_ITEMTOOLTIP; sNotify.action = 0; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -1834,7 +1834,7 @@ static void UpdateToolTip(TreeListData *pData, unsigned uItem, unsigned uFlags) if(pData->uStyle & TVS_INFOTIP) { // Tooltip-Daten via normalem Notify holen sToolNv.hdr.code = TVN_GETINFOTIP; sToolNv.cchTextMax = INFOTIPSIZE; - sToolNv.hItem = (HTREEITEM)uItem; + sToolNv.hItem = (HTREEITEM)(ULONG_PTR)uItem; sToolNv.lParam = pEntry->lParam; sToolNv.pszText = cTemp; @@ -1846,7 +1846,7 @@ static void UpdateToolTip(TreeListData *pData, unsigned uItem, unsigned uFlags) LOCK(pData); sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.pszText = sToolNv.pszText; sNotify.itemNew.cchTextMax = str_len(sToolNv.pszText); sNotify.itemNew.cChildren = 0; @@ -1945,7 +1945,7 @@ static void UpdateToolTip(TreeListData *pData, unsigned uItem, unsigned uFlags) sNotify.action = 0; sNotify.itemNew.lParam = pEntry->lParam; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.cChildren = uCol; sNotify.itemOld.mask = 0; @@ -2618,7 +2618,7 @@ static int TreeListToggleItem(TreeListData *pData, unsigned uItem, unsigned uAdd sNotify.action = uAction; sNotify.hdr.code = TVN_ITEMEXPANDING; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -2691,7 +2691,7 @@ static int TreeListToggleItem(TreeListData *pData, unsigned uItem, unsigned uAdd sNotify.action = uAction; sNotify.hdr.code = TVN_ITEMEXPANDED; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -3145,7 +3145,7 @@ static int TreeListDeleteItem(TreeListData *pData, unsigned uItem, int iMode) { sNotify.hdr.code = TVN_SELCHANGED; sNotify.action = TVC_UNKNOWN; sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemOld.hItem = (HTREEITEM)uItem; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemOld.stateMask = 0xFFFFFFFF; sNotify.itemOld.state = pEntry->uState&~TVIS_SELECTED; sNotify.itemOld.lParam = pEntry->lParam; @@ -3174,7 +3174,7 @@ static int TreeListDeleteItem(TreeListData *pData, unsigned uItem, int iMode) { sNotify.hdr.code = TVN_DELETEITEM; sNotify.itemNew.mask = 0; sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; - sNotify.itemOld.hItem = (HTREEITEM)uItem; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemOld.lParam = pEntry->lParam; sNotify.itemOld.pszText = (LPTSTR) - 1; sNotify.itemNew.stateMask = 0xFFFFFFFF; @@ -3332,7 +3332,7 @@ static int TreeListXorSelectItem(TreeListData *pData, unsigned uItem, int iMode) sNotify.hdr.code = TVN_SELCHANGING; sNotify.action = iMode; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -3365,7 +3365,7 @@ static int TreeListXorSelectItem(TreeListData *pData, unsigned uItem, int iMode) sNotify.hdr.code = TVN_SELCHANGED; sNotify.action = iMode; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -3683,7 +3683,7 @@ static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.hdr.code = TVN_SELCHANGING; sNotify.action = iMode; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = uState; sNotify.itemNew.lParam = lParam; @@ -3691,7 +3691,7 @@ static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.itemNew.pszText = (LPTSTR) - 1; sNotify.itemNew.cchTextMax = -1; sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)uOld; sNotify.itemOld.stateMask = 0xFFFFFFFF; sNotify.itemOld.state = uStOld; sNotify.itemNew.lParam = lPaOld; @@ -3797,7 +3797,7 @@ static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.hdr.code = TVN_SELCHANGED; sNotify.action = iMode; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = uState; sNotify.itemNew.lParam = lParam; @@ -3805,7 +3805,7 @@ static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.itemNew.pszText = (LPTSTR) - 1; sNotify.itemNew.cchTextMax = -1; sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; - sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)uOld; sNotify.itemOld.stateMask = 0xFFFFFFFF; sNotify.itemOld.state = uStOld; sNotify.itemOld.lParam = lPaOld; @@ -3835,14 +3835,14 @@ static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.hdr.code = TVN_SINGLEEXPAND; sNotify.action = iMode; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = (pEntry) ? pEntry->uState : 0; sNotify.itemNew.cChildren = 0; sNotify.itemNew.pszText = (LPTSTR) - 1; sNotify.itemNew.cchTextMax = -1; sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; - sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)uOld; sNotify.itemOld.stateMask = 0xFFFFFFFF; sNotify.itemOld.state = (pTemp) ? pTemp->uState : 0; sNotify.itemOld.cChildren = 0; @@ -4342,7 +4342,7 @@ static unsigned TreeListInsertItem(TreeListData *pData, TV_INSERTSTRUCT *pInsert pTextTemp = pEntry->pText; } - iCmp = pCompare(pData->hWnd, (HTREEITEM)uNext, pTextTemp, pText, pEntry->lParam, pInsert->item.lParam); + iCmp = pCompare(pData->hWnd, (HTREEITEM)(ULONG_PTR)uNext, pTextTemp, pText, pEntry->lParam, pInsert->item.lParam); if(iCmp < 0) { iCount -= (iCount + 1) / 2; continue; @@ -5604,7 +5604,7 @@ static int TreeListInsertColumn(TreeListData *pData, unsigned uCol, TV_COLUMN *p ExtraItem *pExtra; sSet.mask = TVIF_SUBITEM; - sSet.hItem = (HTREEITEM)pData->uInsertMark; + sSet.hItem = (HTREEITEM)(ULONG_PTR)pData->uInsertMark; sSet.cChildren = uCol; TreeListSetItem(pData, &sSet); @@ -5766,7 +5766,7 @@ static unsigned TreeListHitTest(TreeListData *pData, TV_HITTESTINFO *pInfo) { iXpos += pData->uScrollX; uItem = pData->pItemPos [iZpos]; pEntry = pData->pTreeItems[uItem]; - pInfo->hItem = (HTREEITEM)uItem; + pInfo->hItem = (HTREEITEM)(ULONG_PTR)uItem; if(!pEntry) return 0; @@ -5950,8 +5950,8 @@ static unsigned TreeListSetInsertMark(TreeListData *pData, unsigned uItem, int i uItem = U(TVI_FIRST); } - sInsert.hParent = (HTREEITEM)pEntry->uParent; - sInsert.hInsertAfter = (HTREEITEM)uItem; + sInsert.hParent = (HTREEITEM)(ULONG_PTR)pEntry->uParent; + sInsert.hInsertAfter = (HTREEITEM)(ULONG_PTR)uItem; sInsert.item.mask = TVIF_SELECTEDIMAGE | TVIF_IMAGE; sInsert.item.iImage = TV_NOIMAGE; sInsert.item.iSelectedImage = TV_NOIMAGE; @@ -5964,7 +5964,7 @@ static unsigned TreeListSetInsertMark(TreeListData *pData, unsigned uItem, int i pEntry->uColorBk = pData->uColors[TVC_INSERT]; pEntry->bFlags |= TVIX_BKCOLOR; sInsert.item.mask |= TVIF_SUBITEM; - sInsert.item.hItem = (HTREEITEM)uItem; + sInsert.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; for(uSub = 1; uSub < pData->uColumnCount; uSub++) { sInsert.item.cChildren = uSub; @@ -6070,7 +6070,7 @@ static COLORREF TreeListSetItemColor(TreeListData *pData, unsigned uItem, unsign pExtra = pData->pExtraItems[uSub - 1][uItem]; if(!pExtra) { // Extra-Eintrag erzeugen sSet.mask = TVIF_SUBITEM; - sSet.hItem = (HTREEITEM)uItem; + sSet.hItem = (HTREEITEM)(ULONG_PTR)uItem; sSet.cChildren = uSub; if(!TreeListSetItem(pData, &sSet)) @@ -6822,7 +6822,7 @@ static void TreeListChangeCheckbox(TreeListData *pData, UINT uItem, int iPosX, i } } else if(pData->uSingleSel && pTemp) { // Anderer Eintrag gew�hlt - sItem.hItem = (HTREEITEM)pData->uSingleSel; + sItem.hItem = (HTREEITEM)(ULONG_PTR)pData->uSingleSel; sItem.mask = TVIF_STATE; sItem.stateMask = TVIS_STATEIMAGEMASK; sItem.state = (pData->uStyleEx & TVS_EX_BITCHECKBOX) ? 0x0000 : 0x1000; @@ -6830,7 +6830,7 @@ static void TreeListChangeCheckbox(TreeListData *pData, UINT uItem, int iPosX, i TreeListSetItem(pData, &sItem); sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_TEXT; - sNotify.itemOld.hItem = (HTREEITEM)pData->uSingleSel; + sNotify.itemOld.hItem = (HTREEITEM)(ULONG_PTR)pData->uSingleSel; sNotify.itemOld.stateMask = 0xFFFFFFFF; sNotify.itemOld.state = pTemp->uState; sNotify.itemOld.lParam = pTemp->lParam; @@ -6840,7 +6840,7 @@ static void TreeListChangeCheckbox(TreeListData *pData, UINT uItem, int iPosX, i } } - sItem.hItem = (HTREEITEM)uItem; + sItem.hItem = (HTREEITEM)(ULONG_PTR)uItem; sItem.mask = TVIF_STATE; sItem.stateMask = TVIS_STATEIMAGEMASK; @@ -6855,7 +6855,7 @@ static void TreeListChangeCheckbox(TreeListData *pData, UINT uItem, int iPosX, i sNotify.hdr.code = TVN_CBSTATECHANGED; sNotify.action = VK_DBLCLK; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_TEXT; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; @@ -6907,7 +6907,7 @@ static void TreeListMouseNotify(TreeListData *pData, UINT uMsg, WPARAM wParam, L sNotify.action = 0; sNotify.hdr.code = uMsg; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBNUMBER; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.pszText = (LPTSTR) - 1; sNotify.itemNew.cchTextMax = -1; sNotify.itemOld.mask = 0; @@ -7461,7 +7461,7 @@ End: sNotify.action = 0; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBNUMBER; - sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.itemNew.pszText = (LPTSTR) - 1; sNotify.itemNew.cchTextMax = -1; sNotify.itemOld.mask = 0; @@ -8140,7 +8140,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM if(!pNext->uFirstChild) return 1; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; TreeListSortItemsEx(pData, &sSort, iMode); @@ -8163,7 +8163,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM if(!pNext->uFirstChild) return 1; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; TreeListSortItemsEx(pData, &sSort, iMode); @@ -8173,7 +8173,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM if(iMode) { // Sortiere die Untereintr�ge pNext = pList[uFirst]; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; @@ -8182,7 +8182,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM TreeListSortItemsEx(pData, &sSort, SORT_NOUPDATE); } - sSort.hParent = (HTREEITEM)pNext->uNextItem; + sSort.hParent = (HTREEITEM)(ULONG_PTR)pNext->uNextItem; pNext = pList[pNext->uNextItem]; } } @@ -8234,7 +8234,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM XCHANGE_MEM(iMiddle, iLower); uItem = pItemList[iStart]; - hItemTemp = (HTREEITEM)uItem; + hItemTemp = (HTREEITEM)(ULONG_PTR)uItem; lParamTemp = pList[uItem]->lParam; for(;;) { @@ -8243,7 +8243,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM if(iLower > iLast) break; uItem = pItemList[iLower]; - iCmp = pCompare(hTreeWnd, (HTREEITEM)uItem, hItemTemp, pList[uItem]->lParam, lParamTemp, lParamSort); + iCmp = pCompare(hTreeWnd, (HTREEITEM)(ULONG_PTR)uItem, hItemTemp, pList[uItem]->lParam, lParamTemp, lParamSort); } while(iCmp <= 0); do { @@ -8251,7 +8251,7 @@ static int TreeListSortItemsEx(TreeListData *pData, TV_SORTEX *pSortData, int iM if(iUpper <= iStart) break; uItem = pItemList[iUpper]; - iCmp = pCompare(hTreeWnd, (HTREEITEM)uItem, hItemTemp, pList[uItem]->lParam, lParamTemp, lParamSort); + iCmp = pCompare(hTreeWnd, (HTREEITEM)(ULONG_PTR)uItem, hItemTemp, pList[uItem]->lParam, lParamTemp, lParamSort); } while(iCmp >= 0); if(iUpper < iLower) @@ -8399,7 +8399,7 @@ static int TreeListSortItemsCb(TreeListData *pData, TV_SORTCB *pSortData, int iM if(!pNext->uFirstChild) return 1; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; TreeListSortItemsCb(pData, &sSort, iMode); @@ -8422,7 +8422,7 @@ static int TreeListSortItemsCb(TreeListData *pData, TV_SORTCB *pSortData, int iM if(!pNext->uFirstChild) return 1; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; TreeListSortItemsCb(pData, &sSort, iMode); @@ -8432,7 +8432,7 @@ static int TreeListSortItemsCb(TreeListData *pData, TV_SORTCB *pSortData, int iM if(iMode) { // Sortiere die Untereintr�ge pNext = pList[uFirst]; - sSort.hParent = (HTREEITEM)uFirst; + sSort.hParent = (HTREEITEM)(ULONG_PTR)uFirst; sSort.lParam = pSortData->lParam; sSort.lpfnCompare = pSortData->lpfnCompare; @@ -8441,7 +8441,7 @@ static int TreeListSortItemsCb(TreeListData *pData, TV_SORTCB *pSortData, int iM TreeListSortItemsCb(pData, &sSort, SORT_NOUPDATE); } - sSort.hParent = (HTREEITEM)pNext->uNextItem; + sSort.hParent = (HTREEITEM)(ULONG_PTR)pNext->uNextItem; pNext = pList[pNext->uNextItem]; } } @@ -8946,7 +8946,7 @@ static int TreeListEndLabelEdit(TreeListData *pData, int iMode) { } sNotify.hdr.code = TVN_ENDLABELEDIT; - sNotify.item.hItem = (HTREEITEM)uItem; + sNotify.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.item.stateMask = 0xFFFFFFFF; sNotify.item.cChildren = uSub; @@ -8977,7 +8977,7 @@ static int TreeListEndLabelEdit(TreeListData *pData, int iMode) { sNotify.hdr.code = TVN_SETDISPINFO; sNotify.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_TEXT | TVIF_SUBITEM; sNotify.item.stateMask = (UINT)~TVIS_BASEFLAGS; - sNotify.item.hItem = (HTREEITEM)uItem; + sNotify.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.item.cChildren = uSub; UNLOCK(pData); @@ -8987,7 +8987,7 @@ static int TreeListEndLabelEdit(TreeListData *pData, int iMode) { pGetT = sNotify.item.pszText; sSet.mask = TVIF_SUBITEM | TVIF_TEXT; sSet.cchTextMax = sNotify.item.cchTextMax; - sSet.hItem = (HTREEITEM)uItem; + sSet.hItem = (HTREEITEM)(ULONG_PTR)uItem; sSet.pszText = pGetT; sSet.cChildren = uSub; @@ -9342,7 +9342,7 @@ static HWND TreeListEditLabel(TreeListData *pData, unsigned uItem, unsigned uSub sNotify.hdr.code = TVN_BEGINLABELEDIT; sNotify.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_TEXT | TVIF_SUBITEM; - sNotify.item.hItem = (HTREEITEM)uItem; + sNotify.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.item.pszText = (LPTSTR)pText; sNotify.item.lParam = lParam; sNotify.item.state = uState; @@ -9523,7 +9523,7 @@ static int TreeListStartNotifyEdit(TreeListData *pData, unsigned uItem, unsigned sNotify.hdr.code = TVN_STARTEDIT; sNotify.uAction = (UINT)wParam; sNotify.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; - sNotify.item.hItem = (HTREEITEM)uItem; + sNotify.item.hItem = (HTREEITEM)(ULONG_PTR)uItem; sNotify.item.stateMask = 0xFFFFFFFF; sNotify.item.lParam = pEntry->lParam; sNotify.item.cChildren = uSub; @@ -9760,7 +9760,7 @@ static int TreeListStartAutoEdit(TreeListData *pData, unsigned uColumn, WPARAM w if(uMode >= TVAX_STEP) { sItem.mask = TVIF_TEXT | TVIF_SUBITEM | TVIF_TEXTPTR | ((uMode < TVAX_CHECK) ? 0 : TVIF_STATE | TVIF_PARAM); sItem.stateMask = 0xFFFFFFFF; - sItem.hItem = (HTREEITEM)pData->uSelectedItem; + sItem.hItem = (HTREEITEM)(ULONG_PTR)pData->uSelectedItem; sItem.cChildren = uColumn; if(!TreeListGetItem(pData, &sItem)) @@ -9890,7 +9890,7 @@ NoTextChange: sItem.mask &= ~TVIF_TEXTPTR; sItem.stateMask &= TVIS_STATEIMAGEMASK; - sItem.hItem = (HTREEITEM)pData->uSelectedItem; + sItem.hItem = (HTREEITEM)(ULONG_PTR)pData->uSelectedItem; sItem.pszText = pText; sItem.cchTextMax = 256; sItem.cChildren = uColumn; @@ -9948,7 +9948,7 @@ EditField: if(uMode != TVAX_EDIT) { iSel = (uMode != TVAX_CBLIST) ? -1 : 0; sItem.mask = TVIF_TEXT | TVIF_SUBITEM | TVIF_TEXTPTR; - sItem.hItem = (HTREEITEM)pData->uSelectedItem; + sItem.hItem = (HTREEITEM)(ULONG_PTR)pData->uSelectedItem; sItem.cChildren = uColumn; if(!TreeListGetItem(pData, &sItem)) @@ -10494,7 +10494,7 @@ static LRESULT CALLBACK TreeListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM sNotify.hdr.code = TVN_BEGINDRAG; sNotify.action = (pEntry->uState & TVIS_EXPANDED) ? TVE_COLLAPSE : TVE_EXPAND; sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBNUMBER; - sNotify.itemNew.hItem = (HTREEITEM)pData->uDragItem; + sNotify.itemNew.hItem = (HTREEITEM)(ULONG_PTR)pData->uDragItem; sNotify.itemNew.stateMask = 0xFFFFFFFF; sNotify.itemNew.state = pEntry->uState; sNotify.itemNew.lParam = pEntry->lParam; diff --git a/base/setup/reactos/treelist.h b/base/setup/reactos/treelist.h index c6dd4dbac08..c37993cf135 100644 --- a/base/setup/reactos/treelist.h +++ b/base/setup/reactos/treelist.h @@ -112,10 +112,10 @@ typedef TVSORTEX TV_SORTEX; #define TVE_EXPANDNEXT (0x20000000) #define TVE_ALLCHILDS (0x10000000) #define TVE_ONLYCHILDS (0x00000008) -#define TVI_SORTEX ((HTREEITEM) 0xFFFF0007) -#define TVI_BEFORE ((HTREEITEM) 0xFFFF0006) -#define TVI_AFTER ((HTREEITEM) 0xFFFF0005) -#define TVI_ROW(n) ((HTREEITEM)(0xFFE00000+(n))) +#define TVI_SORTEX ((HTREEITEM)(ULONG_PTR)0xFFFF0007) +#define TVI_BEFORE ((HTREEITEM)(ULONG_PTR)0xFFFF0006) +#define TVI_AFTER ((HTREEITEM)(ULONG_PTR)0xFFFF0005) +#define TVI_ROW(n) ((HTREEITEM)(ULONG_PTR)(0xFFE00000+(n))) #ifndef VK_DBLCLK #define VK_DBLCLK 0x10000 // Edit with doubleclick #endif @@ -404,7 +404,7 @@ typedef TVSORTEX TV_SORTEX; #define TreeList_FindItem(h,p,f) ((HTREEITEM )SNDMSG(h,TVM_FINDITEM ,(WPARAM)p,(LPARAM)f)) #define TreeList_CreateDragImage(h,i) ((HIMAGELIST)SNDMSG(h,TVM_CREATEDRAGIMAGE, 0, (LPARAM)(HTREEITEM)(i))) #define TreeList_CreateDragImageEx(h,i,s) ((HIMAGELIST)SNDMSG(h,TVM_CREATEDRAGIMAGE, s, (LPARAM)(HTREEITEM)(i))) -#define TreeList_SetImageList(h,l,i) ((HIMAGELIST)SNDMSG(h,TVM_SETIMAGELIST,i,(LPARAM)(UINT)(HIMAGELIST)(l))) +#define TreeList_SetImageList(h,l,i) ((HIMAGELIST)SNDMSG(h,TVM_SETIMAGELIST,i,(LPARAM)(HIMAGELIST)(l))) #define TreeList_SetIndent(h,i) ((BOOL )SNDMSG(h,TVM_SETINDENT,(WPARAM)(i),0)) #define TreeList_SetItem(h,p) ((BOOL )SNDMSG(h,TVM_SETITEM,0,(LPARAM)(const TV_ITEM*)(p))) #define TreeList_SortChildren(h,i,r) ((BOOL )SNDMSG(h,TVM_SORTCHILDREN ,(WPARAM)r,(LPARAM)(HTREEITEM)(i))) @@ -484,7 +484,7 @@ extern BOOL TreeListUnregister(HINSTANCE hInstance); _ms_tvi.hItem = (hItem_); \ _ms_tvi.stateMask = 0; \ _ms_tvi.pszText = _my_pszText; \ - _ms_tvi.cchTextMax = _my_pszText ? wcslen(_my_pszText) : 0; \ + _ms_tvi.cchTextMax = _my_pszText ? (int)wcslen(_my_pszText) : 0; \ _ms_tvi.cChildren = (iSubItem_); \ TreeList_SetItem((hwndLV), &_ms_tvi); \ }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019