Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[reactos] 01/01: [WIN32SS][NTUSER] Fix message time (#1259)
by Katayama Hirofumi MZ 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94a42d43b59e59aa39952… commit 94a42d43b59e59aa3995248577e74588af6727ea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 12 07:56:04 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 12 07:56:04 2019 +0900 [WIN32SS][NTUSER] Fix message time (#1259) Fix CORE-15565 and make #1245 GetMessageTime testcase successful. CORE-15565 - Erase MsqCalculateMessageTime function. - Use (DWORD)EngGetTickCount() instead. - Ghosting is temporarily disabled. --- win32ss/gdi/eng/eng.h | 2 ++ win32ss/user/ntuser/event.c | 4 ++-- win32ss/user/ntuser/input.c | 8 ++------ win32ss/user/ntuser/keyboard.c | 8 ++------ win32ss/user/ntuser/main.c | 5 +---- win32ss/user/ntuser/message.c | 24 +++++++----------------- win32ss/user/ntuser/misc.c | 6 ++---- win32ss/user/ntuser/mouse.c | 4 +--- win32ss/user/ntuser/msgqueue.c | 14 +++----------- win32ss/user/ntuser/msgqueue.h | 6 ------ win32ss/user/ntuser/timer.c | 10 +++------- 11 files changed, 25 insertions(+), 66 deletions(-) diff --git a/win32ss/gdi/eng/eng.h b/win32ss/gdi/eng/eng.h index 2a467b15115..213e2733671 100644 --- a/win32ss/gdi/eng/eng.h +++ b/win32ss/gdi/eng/eng.h @@ -40,6 +40,8 @@ APIENTRY EngGetTickCount( VOID); +#define EngGetTickCount32() (ULONG)EngGetTickCount() + HANDLE APIENTRY EngSecureMemForRead( diff --git a/win32ss/user/ntuser/event.c b/win32ss/user/ntuser/event.c index a82516cdcf0..f5a3a65c3bc 100644 --- a/win32ss/user/ntuser/event.c +++ b/win32ss/user/ntuser/event.c @@ -165,7 +165,7 @@ co_EVENT_CallEvents( DWORD event, pEP->idObject, pEP->idChild, pEP->idThread, - (DWORD)EngGetTickCount(), + EngGetTickCount32(), pEH->Proc, pEH->ihmod, pEH->offPfn); @@ -229,7 +229,7 @@ IntNotifyWinEvent( idObject, idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), - (DWORD)EngGetTickCount(), + EngGetTickCount32(), pEH->Proc, pEH->ihmod, pEH->offPfn); diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index 520ccca9ebb..2cc63634e7e 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -33,9 +33,7 @@ IntLastInputTick(BOOL bUpdate) { if (bUpdate) { - LARGE_INTEGER TickCount; - KeQueryTickCount(&TickCount); - LastInputTick = MsqCalculateMessageTime(&TickCount); + LastInputTick = EngGetTickCount32(); if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick; } return LastInputTick; @@ -49,13 +47,11 @@ IntLastInputTick(BOOL bUpdate) VOID FASTCALL DoTheScreenSaver(VOID) { - LARGE_INTEGER TickCount; DWORD Test, TO; if (gspv.iScrSaverTimeout > 0) // Zero means Off. { - KeQueryTickCount(&TickCount); - Test = MsqCalculateMessageTime(&TickCount); + Test = EngGetTickCount32(); Test = Test - LastInputTick; TO = 1000 * gspv.iScrSaverTimeout; if (Test > TO) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index f72e275cf2d..33cf53e491c 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -976,7 +976,6 @@ UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) PKL pKl = NULL; PKBDTABLES pKbdTbl; PUSER_MESSAGE_QUEUE pFocusQueue; - LARGE_INTEGER LargeTickCount; DWORD dwTime; BOOL bExt = (pKbdInput->dwFlags & KEYEVENTF_EXTENDEDKEY) ? TRUE : FALSE; @@ -1030,8 +1029,7 @@ UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) dwTime = pKbdInput->time; else { - KeQueryTickCount(&LargeTickCount); - dwTime = MsqCalculateMessageTime(&LargeTickCount); + dwTime = EngGetTickCount32(); } if (wVk == VK_RMENU && (pKbdTbl->fLocaleFlags & KLLF_ALTGR)) @@ -1143,7 +1141,6 @@ IntTranslateKbdMessage(LPMSG lpMsg, WCHAR wch[3] = { 0 }; MSG NewMsg = { 0 }; PKBDTABLES pKbdTbl; - LARGE_INTEGER LargeTickCount; BOOL bResult = FALSE; switch(lpMsg->message) @@ -1176,8 +1173,7 @@ IntTranslateKbdMessage(LPMSG lpMsg, /* Init pt, hwnd and time msg fields */ NewMsg.pt = gpsi->ptCursor; NewMsg.hwnd = lpMsg->hwnd; - KeQueryTickCount(&LargeTickCount); - NewMsg.time = MsqCalculateMessageTime(&LargeTickCount); + NewMsg.time = EngGetTickCount32(); TRACE("Enter IntTranslateKbdMessage msg %s, vk %x\n", lpMsg->message == WM_SYSKEYDOWN ? "WM_SYSKEYDOWN" : "WM_KEYDOWN", lpMsg->wParam); diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index b790fd84ef5..9e63ce8f22e 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -443,7 +443,6 @@ InitThreadCallback(PETHREAD Thread) int i; NTSTATUS Status = STATUS_SUCCESS; PTEB pTeb; - LARGE_INTEGER LargeTickCount; PRTL_USER_PROCESS_PARAMETERS ProcessParams; Process = Thread->ThreadsProcess; @@ -504,9 +503,7 @@ InitThreadCallback(PETHREAD Thread) goto error; } - KeQueryTickCount(&LargeTickCount); - ptiCurrent->timeLast = LargeTickCount.u.LowPart; - + ptiCurrent->timeLast = EngGetTickCount32(); ptiCurrent->MessageQueue = MsqCreateMessageQueue(ptiCurrent); if (ptiCurrent->MessageQueue == NULL) { diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 7564109c47d..2fd47c4fd8d 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -681,7 +681,6 @@ static LRESULT handle_internal_events( PTHREADINFO pti, PWND pWnd, DWORD dwQEven LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) { - LARGE_INTEGER TickCount; LONG Time; LRESULT retval = 0; PTHREADINFO pti; @@ -710,8 +709,7 @@ IntDispatchMessage(PMSG pMsg) { if (ValidateTimerCallback(pti,pMsg->lParam)) { - KeQueryTickCount(&TickCount); - Time = MsqCalculateMessageTime(&TickCount); + Time = EngGetTickCount32(); retval = co_IntCallWindowProc((WNDPROC)pMsg->lParam, TRUE, pMsg->hwnd, @@ -727,8 +725,7 @@ IntDispatchMessage(PMSG pMsg) PTIMER pTimer = FindSystemTimer(pMsg); if (pTimer && pTimer->pfn) { - KeQueryTickCount(&TickCount); - Time = MsqCalculateMessageTime(&TickCount); + Time = EngGetTickCount32(); pTimer->pfn(pMsg->hwnd, WM_SYSTIMER, (UINT)pMsg->wParam, Time); } return 0; @@ -815,7 +812,6 @@ co_IntPeekMessage( PMSG Msg, BOOL bGMSG ) { PTHREADINFO pti; - LARGE_INTEGER LargeTickCount; BOOL RemoveMessages; UINT ProcessMask; BOOL Hit = FALSE; @@ -833,9 +829,8 @@ co_IntPeekMessage( PMSG Msg, do { - KeQueryTickCount(&LargeTickCount); - pti->timeLast = LargeTickCount.u.LowPart; - pti->pcti->tickLastMsgChecked = LargeTickCount.u.LowPart; + pti->timeLast = EngGetTickCount32(); + pti->pcti->tickLastMsgChecked = pti->timeLast; // Post mouse moves while looping through peek messages. if (pti->MessageQueue->QF_flags & QF_MOUSEMOVED) @@ -1152,7 +1147,6 @@ UserPostThreadMessage( PTHREADINFO pti, LPARAM lParam ) { MSG Message; - LARGE_INTEGER LargeTickCount; if (is_pointer_message(Msg)) { @@ -1164,9 +1158,7 @@ UserPostThreadMessage( PTHREADINFO pti, Message.wParam = wParam; Message.lParam = lParam; Message.pt = gpsi->ptCursor; - - KeQueryTickCount(&LargeTickCount); - Message.time = MsqCalculateMessageTime(&LargeTickCount); + Message.time = EngGetTickCount32(); MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, 0); return TRUE; } @@ -1193,7 +1185,6 @@ UserPostMessage( HWND Wnd, { PTHREADINFO pti; MSG Message; - LARGE_INTEGER LargeTickCount; LONG_PTR ExtraInfo = 0; Message.hwnd = Wnd; @@ -1201,8 +1192,7 @@ UserPostMessage( HWND Wnd, Message.wParam = wParam; Message.lParam = lParam; Message.pt = gpsi->ptCursor; - KeQueryTickCount(&LargeTickCount); - Message.time = MsqCalculateMessageTime(&LargeTickCount); + Message.time = EngGetTickCount32(); if (is_pointer_message(Message.message)) { @@ -1468,7 +1458,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (Status == STATUS_TIMEOUT) { - if (MsqIsHung(ptiSendTo)) + if (0 && MsqIsHung(ptiSendTo)) { TRACE("Let's go Ghost!\n"); IntMakeHungWindowGhosted(hWnd); diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 83d0ad1fe58..78408cac7a7 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -295,11 +295,9 @@ NtUserGetThreadState( case THREADSTATE_UPTIMELASTREAD: { PTHREADINFO pti; - LARGE_INTEGER LargeTickCount; pti = PsGetCurrentThreadWin32Thread(); - KeQueryTickCount(&LargeTickCount); - pti->timeLast = LargeTickCount.u.LowPart; - pti->pcti->tickLastMsgChecked = LargeTickCount.u.LowPart; + pti->timeLast = EngGetTickCount32(); + pti->pcti->tickLastMsgChecked = pti->timeLast; } break; diff --git a/win32ss/user/ntuser/mouse.c b/win32ss/user/ntuser/mouse.c index 46dfcfdd4ff..df8d7a6cc70 100644 --- a/win32ss/user/ntuser/mouse.c +++ b/win32ss/user/ntuser/mouse.c @@ -210,9 +210,7 @@ UserSendMouseInput(MOUSEINPUT *pmi, BOOL bInjected) Msg.time = pmi->time; if (!Msg.time) { - LARGE_INTEGER LargeTickCount; - KeQueryTickCount(&LargeTickCount); - Msg.time = MsqCalculateMessageTime(&LargeTickCount); + Msg.time = EngGetTickCount32(); } /* Do GetMouseMovePointsEx FIFO. */ diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index 446895915c4..2baa5a5ae49 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -551,13 +551,11 @@ VOID FASTCALL IntCoalesceMouseMove(PTHREADINFO pti) { MSG Msg; - LARGE_INTEGER LargeTickCount; // Force time stamp to update, keeping message time in sync. if (gdwMouseMoveTimeStamp == 0) { - KeQueryTickCount(&LargeTickCount); - gdwMouseMoveTimeStamp = MsqCalculateMessageTime(&LargeTickCount); + gdwMouseMoveTimeStamp = EngGetTickCount32(); } // Build mouse move message. @@ -581,7 +579,6 @@ IntCoalesceMouseMove(PTHREADINFO pti) VOID FASTCALL co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook) { - LARGE_INTEGER LargeTickCount; MSLLHOOKSTRUCT MouseHookData; // PDESKTOP pDesk; PWND pwnd, pwndDesktop; @@ -590,8 +587,7 @@ co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook PUSER_MESSAGE_QUEUE MessageQueue; PSYSTEM_CURSORINFO CurInfo; - KeQueryTickCount(&LargeTickCount); - Msg->time = MsqCalculateMessageTime(&LargeTickCount); + Msg->time = EngGetTickCount32(); MouseHookData.pt.x = LOWORD(Msg->lParam); MouseHookData.pt.y = HIWORD(Msg->lParam); @@ -2197,11 +2193,7 @@ co_MsqWaitForNewMessages(PTHREADINFO pti, PWND WndFilter, BOOL FASTCALL MsqIsHung(PTHREADINFO pti) { - LARGE_INTEGER LargeTickCount; - - KeQueryTickCount(&LargeTickCount); - - if ((LargeTickCount.u.LowPart - pti->timeLast) > MSQ_HUNG && + if (EngGetTickCount32() - pti->timeLast > MSQ_HUNG && !(pti->pcti->fsWakeMask & QS_INPUT) && !PsGetThreadFreezeCount(pti->pEThread) && !(pti->ppi->W32PF_flags & W32PF_APPSTARTING)) diff --git a/win32ss/user/ntuser/msgqueue.h b/win32ss/user/ntuser/msgqueue.h index 8b9d486675e..0927354165b 100644 --- a/win32ss/user/ntuser/msgqueue.h +++ b/win32ss/user/ntuser/msgqueue.h @@ -249,12 +249,6 @@ VOID APIENTRY MsqRemoveWindowMessagesFromQueue(PWND pWindow); HANDLE FASTCALL IntMsqSetWakeMask(DWORD WakeMask); BOOL FASTCALL IntMsqClearWakeMask(VOID); -static __inline LONG -MsqCalculateMessageTime(IN PLARGE_INTEGER TickCount) -{ - return (LONG)(TickCount->QuadPart * (KeQueryTimeIncrement() / 10000)); -} - VOID FASTCALL IdlePing(VOID); VOID FASTCALL IdlePong(VOID); BOOL FASTCALL co_MsqReplyMessage(LRESULT); diff --git a/win32ss/user/ntuser/timer.c b/win32ss/user/ntuser/timer.c index fc348eeba17..9a7789d9aec 100644 --- a/win32ss/user/ntuser/timer.c +++ b/win32ss/user/ntuser/timer.c @@ -399,7 +399,6 @@ PostTimerMessages(PWND Window) PTHREADINFO pti; BOOL Hit = FALSE; PTIMER pTmr; - LARGE_INTEGER TickCount; pti = PsGetCurrentThreadWin32Thread(); @@ -412,13 +411,11 @@ PostTimerMessages(PWND Window) (pTmr->pti == pti) && ((pTmr->pWnd == Window) || (Window == NULL)) ) { - KeQueryTickCount(&TickCount); - Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->head.h : 0; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - Msg.time = MsqCalculateMessageTime(&TickCount); + Msg.time = EngGetTickCount32(); // Fix all wine win:test_GetMessagePos WM_TIMER tests. See CORE-10867. Msg.pt = gpsi->ptCursor; @@ -448,7 +445,7 @@ VOID FASTCALL ProcessTimers(VOID) { - LARGE_INTEGER TickCount, DueTime; + LARGE_INTEGER DueTime; LONG Time; PLIST_ENTRY pLE; PTIMER pTmr; @@ -456,8 +453,7 @@ ProcessTimers(VOID) TimerEnterExclusive(); pLE = TimersListHead.Flink; - KeQueryTickCount(&TickCount); - Time = MsqCalculateMessageTime(&TickCount); + Time = EngGetTickCount32(); DueTime.QuadPart = (LONGLONG)(-97656); // 1024hz .9765625 ms set to 10.0 ms

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Delete unnecessary (ULONG) cast CORE-15755
by Katayama Hirofumi MZ 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=983cd57c1eaae41383f85… commit 983cd57c1eaae41383f850d2372170bb0b4a5efb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 11 18:23:32 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Apr 11 18:23:32 2019 +0900 [WIN32SS][NTGDI] Delete unnecessary (ULONG) cast CORE-15755 --- win32ss/gdi/ntgdi/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 2f699cdacbe..b5433d38441 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5492,7 +5492,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Allocate space for a safe copy */ Status = RtlULongMult(SafeInfoCount, sizeof(FONTFAMILYINFO), &DataSize); - if (!NT_SUCCESS(Status) || (ULONG)DataSize > LONG_MAX) + if (!NT_SUCCESS(Status) || DataSize > LONG_MAX) { DPRINT1("Overflowed.\n"); EngSetLastError(ERROR_INVALID_PARAMETER);

1 0

[reactos] 01/01: [GDI32][NTGDI] Avoid integer overflow (follow-up of #1492) (#1495)
by Katayama Hirofumi MZ 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc9f3ed887861dfcc935a… commit bc9f3ed887861dfcc935ab077eaeea38b4cf1b1d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 11 17:57:57 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 11 17:57:57 2019 +0900 [GDI32][NTGDI] Avoid integer overflow (follow-up of #1492) (#1495) Follow up of #1492. CORE-15755 - Use RtlULongMult function to check integer overflows. --- win32ss/gdi/gdi32/include/precomp.h | 1 + win32ss/gdi/gdi32/objects/font.c | 12 ++++++++++-- win32ss/gdi/ntgdi/freetype.c | 13 ++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/win32ss/gdi/gdi32/include/precomp.h b/win32ss/gdi/gdi32/include/precomp.h index 5f8614b3a92..3d4b823c2fe 100644 --- a/win32ss/gdi/gdi32/include/precomp.h +++ b/win32ss/gdi/gdi32/include/precomp.h @@ -58,5 +58,6 @@ #include <ntgdibad.h> #include <undocgdi.h> +#include <ntintsafe.h> #endif /* _GDI32_PCH_ */ diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index e20c0702fb9..1b6cfa7296f 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -295,7 +295,9 @@ IntEnumFontFamilies(HDC Dc, const LOGFONTW *LogFont, PVOID EnumProc, LPARAM lPar ENUMLOGFONTEXA EnumLogFontExA; NEWTEXTMETRICEXA NewTextMetricExA; LOGFONTW lfW; - LONG DataSize, InfoCount; + LONG InfoCount; + ULONG DataSize; + NTSTATUS Status; DataSize = INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO); Info = RtlAllocateHeap(GetProcessHeap(), 0, DataSize); @@ -330,7 +332,13 @@ IntEnumFontFamilies(HDC Dc, const LOGFONTW *LogFont, PVOID EnumProc, LPARAM lPar if (INITIAL_FAMILY_COUNT < InfoCount) { RtlFreeHeap(GetProcessHeap(), 0, Info); - DataSize = InfoCount * sizeof(FONTFAMILYINFO); + + Status = RtlULongMult(InfoCount, sizeof(FONTFAMILYINFO), &DataSize); + if (!NT_SUCCESS(Status) || DataSize > LONG_MAX) + { + DPRINT1("Overflowed.\n"); + return 1; + } Info = RtlAllocateHeap(GetProcessHeap(), 0, DataSize); if (Info == NULL) { diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 298c1fa12ca..2f699cdacbe 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5456,7 +5456,8 @@ NtGdiGetFontFamilyInfo(HDC Dc, NTSTATUS Status; LOGFONTW LogFont; PFONTFAMILYINFO Info; - LONG GotCount, AvailCount, DataSize, SafeInfoCount; + LONG GotCount, AvailCount, SafeInfoCount; + ULONG DataSize; if (UnsafeLogFont == NULL || UnsafeInfo == NULL || UnsafeInfoCount == NULL) { @@ -5490,9 +5491,10 @@ NtGdiGetFontFamilyInfo(HDC Dc, } /* Allocate space for a safe copy */ - DataSize = SafeInfoCount * sizeof(FONTFAMILYINFO); - if (DataSize <= 0) + Status = RtlULongMult(SafeInfoCount, sizeof(FONTFAMILYINFO), &DataSize); + if (!NT_SUCCESS(Status) || (ULONG)DataSize > LONG_MAX) { + DPRINT1("Overflowed.\n"); EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } @@ -5511,9 +5513,10 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Return data to caller */ if (GotCount > 0) { - DataSize = GotCount * sizeof(FONTFAMILYINFO); - if (DataSize <= 0) + Status = RtlULongMult(GotCount, sizeof(FONTFAMILYINFO), &DataSize); + if (!NT_SUCCESS(Status) || DataSize > LONG_MAX) { + DPRINT1("Overflowed.\n"); ExFreePoolWithTag(Info, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_PARAMETER); return -1;

1 0

[reactos] 01/01: [GDI32][NTGDI][SETUP] Fix font enumeration part 2 (#1492)
by Katayama Hirofumi MZ 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=811faed421a798659af3c… commit 811faed421a798659af3cb3f09369af84fc4edf0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 11 11:46:52 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 11 11:46:52 2019 +0900 [GDI32][NTGDI][SETUP] Fix font enumeration part 2 (#1492) Eliminate some bugs about font enumeration. CORE-15755 - Add "Microsoft Sans Serif" font substitution. - Fix and improve the treatment of the nominal font names. - Split IntGetFontFamilyInfo function from NtGdiGetFontFamilyInfo. - Add DoFontSystemUnittest function for font system unittest to GDI32. - Call DoFontSystemUnittest function at CreateFontIndirectW first call. --- base/setup/lib/muifonts.h | 10 +++ boot/bootdata/livecd.inf | 1 + win32ss/gdi/gdi32/objects/font.c | 140 +++++++++++++++++++++++------ win32ss/gdi/ntgdi/freetype.c | 186 +++++++++++++++++++++++++-------------- win32ss/include/ntgdibad.h | 7 +- 5 files changed, 250 insertions(+), 94 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 72292afc466..826d512bdc1 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -11,6 +11,7 @@ MUI_SUBFONT LatinFonts[] = { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -37,6 +38,7 @@ MUI_SUBFONT CyrillicFonts[] = { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -63,6 +65,7 @@ MUI_SUBFONT GreekFonts[] = { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -89,6 +92,7 @@ MUI_SUBFONT HebrewFonts[] = { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -121,6 +125,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, @@ -163,6 +168,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, @@ -206,6 +212,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, @@ -250,6 +257,7 @@ MUI_SUBFONT KoreanFonts[] = { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, @@ -293,6 +301,7 @@ MUI_SUBFONT UnicodeFonts[] = { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -320,6 +329,7 @@ MUI_SUBFONT HindiFonts[] = { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"Microsoft Sans Serif", L"FreeSans" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index fda2356a978..dd44f0ed533 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -50,6 +50,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Microsoft Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 2f187b0edbc..e20c0702fb9 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -218,6 +218,13 @@ IntFontFamilyCompareEx(const FONTFAMILYINFO *ffi1, int cmp = _wcsicmp(plf1->lfFaceName, plf2->lfFaceName); if (cmp) return cmp; + if (dwCompareFlags & IFFCX_CHARSET) + { + if (plf1->lfCharSet < plf2->lfCharSet) + return -1; + if (plf1->lfCharSet > plf2->lfCharSet) + return 1; + } if (dwCompareFlags & IFFCX_STYLE) { WeightDiff1 = labs(plf1->lfWeight - FW_NORMAL); @@ -231,13 +238,6 @@ IntFontFamilyCompareEx(const FONTFAMILYINFO *ffi1, if (plf1->lfItalic > plf2->lfItalic) return 1; } - if (dwCompareFlags & IFFCX_CHARSET) - { - if (plf1->lfCharSet < plf2->lfCharSet) - return -1; - if (plf1->lfCharSet > plf2->lfCharSet) - return 1; - } return 0; } @@ -267,7 +267,7 @@ IntFontFamilyListUnique(FONTFAMILYINFO *InfoList, INT nCount, first = InfoList; last = &InfoList[nCount]; - // std::unique(first, last, IntFontFamilyCompareEx); + /* std::unique(first, last, IntFontFamilyCompareEx); */ if (first == last) return 0; @@ -285,60 +285,70 @@ IntFontFamilyListUnique(FONTFAMILYINFO *InfoList, INT nCount, } static int FASTCALL -IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, +IntEnumFontFamilies(HDC Dc, const LOGFONTW *LogFont, PVOID EnumProc, LPARAM lParam, DWORD dwFlags) { int FontFamilyCount; - int FontFamilySize; PFONTFAMILYINFO Info; int Ret = 1; int i; ENUMLOGFONTEXA EnumLogFontExA; NEWTEXTMETRICEXA NewTextMetricExA; LOGFONTW lfW; + LONG DataSize, InfoCount; - Info = RtlAllocateHeap(GetProcessHeap(), 0, - INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); - if (NULL == Info) + DataSize = INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO); + Info = RtlAllocateHeap(GetProcessHeap(), 0, DataSize); + if (Info == NULL) { return 1; } + /* Initialize the LOGFONT structure */ + ZeroMemory(&lfW, sizeof(lfW)); if (!LogFont) { lfW.lfCharSet = DEFAULT_CHARSET; - lfW.lfPitchAndFamily = 0; - lfW.lfFaceName[0] = 0; - LogFont = &lfW; + } + else + { + lfW.lfCharSet = LogFont->lfCharSet; + lfW.lfPitchAndFamily = LogFont->lfPitchAndFamily; + StringCbCopyW(lfW.lfFaceName, sizeof(lfW.lfFaceName), LogFont->lfFaceName); } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT); + /* Retrieve the font information */ + InfoCount = INITIAL_FAMILY_COUNT; + FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, &lfW, Info, &InfoCount); if (FontFamilyCount < 0) { RtlFreeHeap(GetProcessHeap(), 0, Info); return 1; } - if (INITIAL_FAMILY_COUNT < FontFamilyCount) + + /* Resize the buffer if the buffer is too small */ + if (INITIAL_FAMILY_COUNT < InfoCount) { - FontFamilySize = FontFamilyCount; RtlFreeHeap(GetProcessHeap(), 0, Info); - Info = RtlAllocateHeap(GetProcessHeap(), 0, - FontFamilyCount * sizeof(FONTFAMILYINFO)); - if (NULL == Info) + DataSize = InfoCount * sizeof(FONTFAMILYINFO); + Info = RtlAllocateHeap(GetProcessHeap(), 0, DataSize); + if (Info == NULL) { return 1; } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, FontFamilySize); - if (FontFamilyCount < 0 || FontFamilySize < FontFamilyCount) + FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, &lfW, Info, &InfoCount); + if (FontFamilyCount < 0 || FontFamilyCount < InfoCount) { RtlFreeHeap(GetProcessHeap(), 0, Info); return 1; } } + /* Sort and remove redundant information */ qsort(Info, FontFamilyCount, sizeof(*Info), IntFontFamilyCompare); - FontFamilyCount = IntFontFamilyListUnique(Info, FontFamilyCount, LogFont, dwFlags); + FontFamilyCount = IntFontFamilyListUnique(Info, FontFamilyCount, &lfW, dwFlags); + /* call the callback */ for (i = 0; i < FontFamilyCount; i++) { if (dwFlags & IEFF_UNICODE) @@ -1693,6 +1703,78 @@ CreateFontIndirectA( } +#if DBG +VOID DumpFamilyInfo(const FONTFAMILYINFO *Info, LONG Count) +{ + LONG i; + const LOGFONTW *plf; + + DPRINT1("---\n"); + DPRINT1("Count: %d\n", Count); + for (i = 0; i < Count; ++i) + { + plf = &Info[i].EnumLogFontEx.elfLogFont; + DPRINT1("%d: '%S',%u,'%S', %ld:%ld, %ld, %d, %d\n", i, + plf->lfFaceName, plf->lfCharSet, Info[i].EnumLogFontEx.elfFullName, + plf->lfHeight, plf->lfWidth, plf->lfWeight, plf->lfItalic, plf->lfPitchAndFamily); + } +} + +VOID DoFontSystemUnittest(VOID) +{ + LOGFONTW LogFont; + FONTFAMILYINFO Info[4]; + UNICODE_STRING Str1, Str2; + LONG ret, InfoCount; + + //DumpFontInfo(TRUE); + + /* L"" DEFAULT_CHARSET */ + RtlZeroMemory(&LogFont, sizeof(LogFont)); + LogFont.lfCharSet = DEFAULT_CHARSET; + InfoCount = RTL_NUMBER_OF(Info); + ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); + DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); + DumpFamilyInfo(Info, ret); + ASSERT(ret == RTL_NUMBER_OF(Info)); + ASSERT(InfoCount > 32); + + /* L"Microsoft Sans Serif" ANSI_CHARSET */ + RtlZeroMemory(&LogFont, sizeof(LogFont)); + LogFont.lfCharSet = ANSI_CHARSET; + StringCbCopyW(LogFont.lfFaceName, sizeof(LogFont.lfFaceName), L"Microsoft Sans Serif"); + InfoCount = RTL_NUMBER_OF(Info); + ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); + DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); + DumpFamilyInfo(Info, ret); + ASSERT(ret != -1); + ASSERT(InfoCount > 0); + ASSERT(InfoCount < 16); + + RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfLogFont.lfFaceName); + RtlInitUnicodeString(&Str2, L"Microsoft Sans Serif"); + ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); + ASSERT(ret == 0); + + RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfFullName); + RtlInitUnicodeString(&Str2, L"Tahoma"); + ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); + ASSERT(ret == 0); + + /* L"Non-Existent" DEFAULT_CHARSET */ + RtlZeroMemory(&LogFont, sizeof(LogFont)); + LogFont.lfCharSet = ANSI_CHARSET; + StringCbCopyW(LogFont.lfFaceName, sizeof(LogFont.lfFaceName), L"Non-Existent"); + InfoCount = RTL_NUMBER_OF(Info); + ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); + DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); + DumpFamilyInfo(Info, ret); + ASSERT(ret == 0); + ASSERT(InfoCount == 0); +} +#endif + +/* EOF */ /* * @implemented */ @@ -1702,6 +1784,14 @@ CreateFontIndirectW( CONST LOGFONTW *lplf ) { +#if DBG + static BOOL bDidTest = FALSE; + if (!bDidTest) + { + DoFontSystemUnittest(); + bDidTest = TRUE; + } +#endif if (lplf) { ENUMLOGFONTEXDVW Logfont; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index a5f93e92c8f..298c1fa12ca 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2675,18 +2675,18 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, } static BOOLEAN FASTCALL -GetFontFamilyInfoForList(LPLOGFONTW LogFont, +GetFontFamilyInfoForList(const LOGFONTW *LogFont, PFONTFAMILYINFO Info, LPCWSTR NominalName, - DWORD *pCount, - DWORD MaxCount, + LONG *pCount, + LONG MaxCount, PLIST_ENTRY Head) { PLIST_ENTRY Entry; PFONT_ENTRY CurrentEntry; FONTGDI *FontGDI; FONTFAMILYINFO InfoEntry; - DWORD Count = *pCount; + LONG Count = *pCount; for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) { @@ -2697,29 +2697,15 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != FontGDI->CharSet) { - continue; - } - - if (LogFont->lfFaceName[0] == UNICODE_NULL) - { - if (Count < MaxCount) - { - FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI); - } - Count++; - continue; + continue; /* charset mismatch */ } - FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI); + /* get one info entry */ + FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI); - if (NominalName) - { - RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, - RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), - NominalName); - } - else + if (LogFont->lfFaceName[0] != UNICODE_NULL) { + /* check name */ if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 && @@ -2731,7 +2717,16 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, } } - if (Count < MaxCount) + if (NominalName) + { + /* store the nominal name */ + RtlStringCbCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, + sizeof(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), + NominalName); + } + + /* store one entry to Info */ + if (0 <= Count && Count < MaxCount) { RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); } @@ -2744,10 +2739,10 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, } static BOOLEAN FASTCALL -GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, +GetFontFamilyInfoForSubstitutes(const LOGFONTW *LogFont, PFONTFAMILYINFO Info, - DWORD *pCount, - DWORD MaxCount) + LONG *pCount, + LONG MaxCount) { PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; PFONTSUBST_ENTRY pCurrentEntry; @@ -2762,6 +2757,7 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; if (LogFont->lfFaceName[0] != UNICODE_NULL) { + /* check name */ if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0) continue; /* mismatch */ } @@ -2771,18 +2767,22 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, pCurrentEntry->CharSets[FONTSUBST_FROM] == pCurrentEntry->CharSets[FONTSUBST_TO]) { + /* identical mapping */ continue; } + /* substitute and get the real name */ IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); SubstituteFontRecurse(&lf); if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet) continue; + /* search in global fonts */ IntLockGlobalFonts(); GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead); IntUnLockGlobalFonts(); + /* search in private fonts */ IntLockProcessPrivateFonts(Win32Process); GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &Win32Process->PrivateFontListHead); @@ -5407,70 +5407,126 @@ ftGdiGetKerningPairs( PFONTGDI Font, // Functions needing sorting. // /////////////////////////////////////////////////////////////////////////// -int APIENTRY + +LONG FASTCALL +IntGetFontFamilyInfo(HDC Dc, + const LOGFONTW *SafeLogFont, + PFONTFAMILYINFO SafeInfo, + LONG InfoCount) +{ + LONG AvailCount = 0; + PPROCESSINFO Win32Process; + + /* Enumerate font families in the global list */ + IntLockGlobalFonts(); + if (!GetFontFamilyInfoForList(SafeLogFont, SafeInfo, NULL, &AvailCount, + InfoCount, &g_FontListHead)) + { + IntUnLockGlobalFonts(); + return -1; + } + IntUnLockGlobalFonts(); + + /* Enumerate font families in the process local list */ + Win32Process = PsGetCurrentProcessWin32Process(); + IntLockProcessPrivateFonts(Win32Process); + if (!GetFontFamilyInfoForList(SafeLogFont, SafeInfo, NULL, &AvailCount, InfoCount, + &Win32Process->PrivateFontListHead)) + { + IntUnLockProcessPrivateFonts(Win32Process); + return -1; + } + IntUnLockProcessPrivateFonts(Win32Process); + + /* Enumerate font families in the registry */ + if (!GetFontFamilyInfoForSubstitutes(SafeLogFont, SafeInfo, &AvailCount, InfoCount)) + { + return -1; + } + + return AvailCount; +} + +LONG NTAPI NtGdiGetFontFamilyInfo(HDC Dc, - LPLOGFONTW UnsafeLogFont, + const LOGFONTW *UnsafeLogFont, PFONTFAMILYINFO UnsafeInfo, - DWORD Size) + LPLONG UnsafeInfoCount) { NTSTATUS Status; LOGFONTW LogFont; PFONTFAMILYINFO Info; - DWORD Count; - PPROCESSINFO Win32Process; + LONG GotCount, AvailCount, DataSize, SafeInfoCount; - /* Make a safe copy */ - Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW)); - if (! NT_SUCCESS(Status)) + if (UnsafeLogFont == NULL || UnsafeInfo == NULL || UnsafeInfoCount == NULL) { EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } - /* Allocate space for a safe copy */ - Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), GDITAG_TEXT); - if (NULL == Info) + Status = MmCopyFromCaller(&SafeInfoCount, UnsafeInfoCount, sizeof(SafeInfoCount)); + if (!NT_SUCCESS(Status)) { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } - - /* Enumerate font families in the global list */ - IntLockGlobalFonts(); - Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) ) + GotCount = 0; + Status = MmCopyToCaller(UnsafeInfoCount, &GotCount, sizeof(*UnsafeInfoCount)); + if (!NT_SUCCESS(Status)) { - IntUnLockGlobalFonts(); - ExFreePoolWithTag(Info, GDITAG_TEXT); + EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } - IntUnLockGlobalFonts(); - - /* Enumerate font families in the process local list */ - Win32Process = PsGetCurrentProcessWin32Process(); - IntLockProcessPrivateFonts(Win32Process); - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, - &Win32Process->PrivateFontListHead)) + Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW)); + if (!NT_SUCCESS(Status)) { - IntUnLockProcessPrivateFonts(Win32Process); - ExFreePoolWithTag(Info, GDITAG_TEXT); + EngSetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + if (SafeInfoCount <= 0) + { + EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } - IntUnLockProcessPrivateFonts(Win32Process); - /* Enumerate font families in the registry */ - if (! GetFontFamilyInfoForSubstitutes(&LogFont, Info, &Count, Size)) + /* Allocate space for a safe copy */ + DataSize = SafeInfoCount * sizeof(FONTFAMILYINFO); + if (DataSize <= 0) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + Info = ExAllocatePoolWithTag(PagedPool, DataSize, GDITAG_TEXT); + if (Info == NULL) { - ExFreePoolWithTag(Info, GDITAG_TEXT); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return -1; } + /* Retrieve the information */ + AvailCount = IntGetFontFamilyInfo(Dc, &LogFont, Info, SafeInfoCount); + GotCount = min(AvailCount, SafeInfoCount); + SafeInfoCount = AvailCount; + /* Return data to caller */ - if (0 != Count) + if (GotCount > 0) { - Status = MmCopyToCaller(UnsafeInfo, Info, - (Count < Size ? Count : Size) * sizeof(FONTFAMILYINFO)); - if (! NT_SUCCESS(Status)) + DataSize = GotCount * sizeof(FONTFAMILYINFO); + if (DataSize <= 0) + { + ExFreePoolWithTag(Info, GDITAG_TEXT); + EngSetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + Status = MmCopyToCaller(UnsafeInfo, Info, DataSize); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Info, GDITAG_TEXT); + EngSetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + Status = MmCopyToCaller(UnsafeInfoCount, &SafeInfoCount, sizeof(*UnsafeInfoCount)); + if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Info, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_PARAMETER); @@ -5480,7 +5536,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, ExFreePoolWithTag(Info, GDITAG_TEXT); - return Count; + return GotCount; } FORCEINLINE @@ -6618,7 +6674,7 @@ NtGdiGetCharABCWidthsW( if(Safepwch) ExFreePoolWithTag(Safepwch , GDITAG_TEXT); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); return FALSE; diff --git a/win32ss/include/ntgdibad.h b/win32ss/include/ntgdibad.h index ba8588f2f96..58d644e68e9 100644 --- a/win32ss/include/ntgdibad.h +++ b/win32ss/include/ntgdibad.h @@ -50,14 +50,13 @@ typedef struct tagFONTFAMILYINFO } FONTFAMILYINFO, *PFONTFAMILYINFO; /* Should be using NtGdiEnumFontChunk */ -INT +LONG NTAPI NtGdiGetFontFamilyInfo( HDC Dc, - LPLOGFONTW LogFont, + const LOGFONTW *LogFont, PFONTFAMILYINFO Info, - DWORD Size -); + LPLONG UnsafeInfoCount); /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL APIENTRY NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt);

1 0

[reactos] 01/01: [NtUser] Fix Theme Non Client Painting.
by jimtabor 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfdf36e44250048b3377f… commit cfdf36e44250048b3377f333c93bc311e424ac3d Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Apr 10 20:52:01 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Apr 10 20:52:01 2019 -0500 [NtUser] Fix Theme Non Client Painting. See CORE-7166 & CORE-15934. --- win32ss/user/ntuser/painting.h | 1 + win32ss/user/ntuser/winpos.c | 78 +++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 51 deletions(-) diff --git a/win32ss/user/ntuser/painting.h b/win32ss/user/ntuser/painting.h index e885028d303..8ab6a66c1ae 100644 --- a/win32ss/user/ntuser/painting.h +++ b/win32ss/user/ntuser/painting.h @@ -41,3 +41,4 @@ BOOL UserDrawCaption(PWND,HDC,RECTL*,HFONT,HICON,const PUNICODE_STRING,UINT); VOID FASTCALL UpdateThreadWindows(PWND,PTHREADINFO,HRGN); VOID FASTCALL UserSyncAndPaintWindows(PWND pWnd, ULONG Flags); VOID FASTCALL IntPaintWindow(PWND); +VOID FASTCALL IntSendNCPaint(PWND,HRGN); diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index d7f5ad6a639..6c54f3c2662 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1053,16 +1053,8 @@ static BOOL IntValidateParent(PWND Child, PREGION ValidateRgn) { - PWND ParentWnd = Child; + PWND ParentWnd = Child->spwndParent; - if (ParentWnd->style & WS_CHILD) - { - do - ParentWnd = ParentWnd->spwndParent; - while (ParentWnd->style & WS_CHILD); - } - - ParentWnd = Child->spwndParent; while (ParentWnd) { if (ParentWnd->style & WS_CLIPCHILDREN) @@ -1898,8 +1890,7 @@ co_WinPosSetWindowPos( VisAfter != NULL && !(WinPos.flags & SWP_NOCOPYBITS) && ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && - !(Window->ExStyle & WS_EX_TRANSPARENT) ) || - ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore) ) + !(Window->ExStyle & WS_EX_TRANSPARENT) ) ) { /* @@ -1987,43 +1978,7 @@ co_WinPosSetWindowPos( CopyRgn = NULL; } - if ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore ) - { - PWND pwnd = Window; - PWND Parent = pwnd->spwndParent; - - TRACE("SWP_FRAMECHANGED no chg\n"); - - if ( pwnd->style & WS_CHILD ) // Fix ProgMan menu bar drawing. - { - TRACE("SWP_FRAMECHANGED win child %p Parent %p\n",pwnd,Parent); - pwnd = Parent ? Parent : pwnd; - } - - if ( !(pwnd->style & WS_CHILD) ) - { - HDC hdc; - HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - PREGION DcRgnObj = REGION_LockRgn(DcRgn); - - TRACE("SWP_FRAMECHANGED Draw\n"); - - IntGdiCombineRgn(DcRgnObj, VisBefore, NULL, RGN_COPY); - REGION_UnlockRgn(DcRgnObj); - - hdc = UserGetDCEx( pwnd, - DcRgn, - DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); // DCX_WINDOW, see note above.... - - NC_DoNCPaint(pwnd, hdc, -1); // Force full redraw of nonclient area. - - UserReleaseDC(pwnd, hdc, FALSE); - IntValidateParent(pwnd, DcRgnObj); - GreDeleteObject(DcRgn); - } - } - - /* We need to redraw what wasn't visible before */ + /* We need to redraw what wasn't visible before or force a redraw */ if (VisAfter != NULL) { PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); @@ -2038,7 +1993,7 @@ co_WinPosSetWindowPos( RgnType = IntGdiCombineRgn(DirtyRgn, VisAfter, 0, RGN_COPY); } - if (RgnType != ERROR && RgnType != NULLREGION) + if (RgnType != ERROR && RgnType != NULLREGION) // Regions moved. { /* old code NtGdiOffsetRgn(DirtyRgn, Window->rcWindow.left, Window->rcWindow.top); @@ -2063,6 +2018,27 @@ co_WinPosSetWindowPos( IntInvalidateWindows( Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } } + else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934 + { + if ( !PosChanged && + !(WinPos.flags & SWP_DEFERERASE) && + (WinPos.flags & SWP_FRAMECHANGED) ) + { + PWND pwnd = Window; + PWND Parent = Window->spwndParent; + + if ( pwnd->style & WS_CHILD ) // Fix ProgMan menu bar drawing. + { + TRACE("SWP_FRAMECHANGED win child %p Parent %p\n",pwnd,Parent); + pwnd = Parent ? Parent : pwnd; + } + + if ( !(pwnd->style & WS_CHILD) ) + { + IntSendNCPaint(pwnd, HRGN_WINDOW); // Paint the whole frame. + } + } + } REGION_Delete(DirtyRgn); } } @@ -2073,7 +2049,7 @@ co_WinPosSetWindowPos( } /* Expose what was covered before but not covered anymore */ - if (VisBefore != NULL) + if ( VisBefore != NULL ) { PREGION ExposedRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (ExposedRgn) @@ -2083,7 +2059,7 @@ co_WinPosSetWindowPos( OldWindowRect.left - NewWindowRect.left, OldWindowRect.top - NewWindowRect.top); - if (VisAfter != NULL) + if ( VisAfter != NULL ) RgnType = IntGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); if (RgnType != ERROR && RgnType != NULLREGION)

1 0

[reactos] 01/01: [DDraw] Fix DxDiag tests.
by jimtabor 11 Apr '19

11 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84d518b19089c04f0423a… commit 84d518b19089c04f0423a7e99dda2728fc7670a7 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Apr 10 19:24:50 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Apr 10 19:24:50 2019 -0500 [DDraw] Fix DxDiag tests. After the DC work is done while before releasing the DC flush the GDI batch. See CORE-15905. Someone may need to notify wine about this change. --- dll/directx/wine/ddraw/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/directx/wine/ddraw/surface.c b/dll/directx/wine/ddraw/surface.c index e188396eb3f..df8d0380093 100644 --- a/dll/directx/wine/ddraw/surface.c +++ b/dll/directx/wine/ddraw/surface.c @@ -2346,7 +2346,9 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h HRESULT hr; TRACE("iface %p, dc %p.\n", iface, hdc); - +#ifdef __REACTOS__ + GdiFlush(); +#endif wined3d_mutex_lock(); if (!surface->dc) {

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