Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 12/12: [RAPPS] Fix compilation
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f46ab2104ee2e426d995… commit 2f46ab2104ee2e426d995e75ea9bea1c161a5d3b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 23:04:46 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [RAPPS] Fix compilation DPA_Search() function requires 6 parameters, not 4! --- base/applications/rapps/include/rosui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/include/rosui.h b/base/applications/rapps/include/rosui.h index 0d7cd296b3..378e677c05 100644 --- a/base/applications/rapps/include/rosui.h +++ b/base/applications/rapps/include/rosui.h @@ -114,7 +114,7 @@ public: INT Search(T* item, INT iStart, UINT uFlags) { - return DPA_Search(m_hDpa, s_OnCompareItems, (LPARAM)this); + return DPA_Search(m_hDpa, item, 0, s_OnCompareItems, (LPARAM)this, 0); } };

1 0

[reactos] 11/12: [SETUPAPI] SetupDiGetDeviceInfoListClass: fix buffer overflow (and return correct results)
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cc607bac293451d78942… commit 6cc607bac293451d7894204a8c32ef53b769fadb Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:31:21 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [SETUPAPI] SetupDiGetDeviceInfoListClass: fix buffer overflow (and return correct results) --- dll/win32/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 10ffd29251..f9a307e07c 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -4440,7 +4440,7 @@ SetupDiGetDeviceInfoListClass( SetLastError(ERROR_NO_ASSOCIATED_CLASS); else { - memcpy(&ClassGuid, &list->ClassGuid, sizeof(GUID)); + *ClassGuid = list->ClassGuid; ret = TRUE; }

1 0

[reactos] 10/12: [USERENV] Initialize variable before using it
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faa938e9dc8a50a9852a0… commit faa938e9dc8a50a9852a0075f2a1ca0b2be7f89c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:32:41 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [USERENV] Initialize variable before using it --- dll/win32/userenv/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 6c9d29ee26..6e829527b2 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -357,7 +357,7 @@ CheckForGuestsAndAdmins( PTOKEN_GROUPS pGroupInfo = NULL; PSID pAdministratorsSID = NULL; PSID pGuestsSID = NULL; - DWORD i, dwSize; + DWORD i, dwSize = 0; DWORD dwError = ERROR_SUCCESS; DPRINT("CheckForGuestsAndAdmins(%p %p)\n", hToken, pdwState);

1 0

[reactos] 09/12: [GLU32] Prevent a warning when comparing 'this' against 0
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a1c78b37b94954610828… commit 6a1c78b37b9495461082891bc5cf46bac7f0a0af Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 10:40:06 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [GLU32] Prevent a warning when comparing 'this' against 0 --- dll/opengl/glu32/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index f9e0a4793c..df3a5bb5af 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -121,6 +121,8 @@ set_module_type(glu32 win32dll) if(NOT MSVC) add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + # Prevent a warning when comparing 'this' against 0 + set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") elseif(USE_CLANG_CL) add_target_compile_flags(glu32 "-Wno-self-assign -Wno-unused-function -Wno-microsoft-include") add_target_compile_flags(glu32 "-Wno-deprecated-register -Wno-tautological-undefined-compare")

1 0

[reactos] 08/12: [DXG] Define GUIDs only once
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a78dd4b3158cd535d561… commit 3a78dd4b3158cd535d561e7a95fbb55863a1a669 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:37:56 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [DXG] Define GUIDs only once --- win32ss/reactx/dxg/dxg_int.h | 1 - win32ss/reactx/dxg/main.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/win32ss/reactx/dxg/dxg_int.h b/win32ss/reactx/dxg/dxg_int.h index fa9c3170a8..b2dd3b7d4d 100644 --- a/win32ss/reactx/dxg/dxg_int.h +++ b/win32ss/reactx/dxg/dxg_int.h @@ -19,7 +19,6 @@ #include <wingdi.h> #include <winddi.h> #include <ddkernel.h> -#include <initguid.h> #include <ddrawi.h> #include <ntgdityp.h> #include <psfuncs.h> diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c index 7bcd329b9e..deeb49260c 100644 --- a/win32ss/reactx/dxg/main.c +++ b/win32ss/reactx/dxg/main.c @@ -8,6 +8,20 @@ * 15/10-2007 Magnus Olsen */ +#include <ntifs.h> + +/* Win32 Headers */ +#define WINBASEAPI +#define STARTF_USESIZE 2 +#define STARTF_USEPOSITION 4 +#define INTERNAL_CALL NTAPI +#define NT_BUILD_ENVIRONMENT + +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <initguid.h> #include <dxg_int.h> #include "dxg_driver.h"

1 0

[reactos] 07/12: [UDFS] Really use 'logical or' when meant to
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12c70fb4cf17ab6a6d7a2… commit 12c70fb4cf17ab6a6d7a246eb210e88f54546b20 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 08:39:22 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [UDFS] Really use 'logical or' when meant to 'binary or' was also working, but it is less clear. --- drivers/filesystems/udfs/Include/wcache_lib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/Include/wcache_lib.cpp b/drivers/filesystems/udfs/Include/wcache_lib.cpp index b00dc50357..e23ae295de 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.cpp +++ b/drivers/filesystems/udfs/Include/wcache_lib.cpp @@ -1113,7 +1113,7 @@ WCacheUpdatePacket( // If we didn't read packet from media, we can't // perform comparison to assure that packet was really modified. // Thus, assume that it is modified in this case. - mod = !read | Cache->DoNotCompare; + mod = !read || Cache->DoNotCompare; Lba0 = Lba - firstLba; for(i=0; i<PSs; i++, Lba0++) { if( WCacheGetModFlag(block_array, Lba0) ||

1 0

[reactos] 06/12: [EXT2] Correctly zero memory before using it
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76910c358f7197a6b8e28… commit 76910c358f7197a6b8e283ea267faf7b5c1812ff Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 23:06:27 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [EXT2] Correctly zero memory before using it --- drivers/filesystems/ext2/src/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/ext2/src/memory.c b/drivers/filesystems/ext2/src/memory.c index 8915dfeccb..cf569f40cd 100644 --- a/drivers/filesystems/ext2/src/memory.c +++ b/drivers/filesystems/ext2/src/memory.c @@ -2072,9 +2072,9 @@ Ext2ParseRegistryVolumeParams( USHORT i, j, k; - RtlZeroMemory(Codepage, CODEPAGE_MAXLEN); - RtlZeroMemory(Prefix, HIDINGPAT_LEN); - RtlZeroMemory(Suffix, HIDINGPAT_LEN); + RtlZeroMemory(Codepage, sizeof(WCHAR) * CODEPAGE_MAXLEN); + RtlZeroMemory(Prefix, sizeof(WCHAR) * HIDINGPAT_LEN); + RtlZeroMemory(Suffix, sizeof(WCHAR) * HIDINGPAT_LEN); RtlZeroMemory(MountPoint, sizeof(USHORT) * 4); RtlZeroMemory(DrvLetter, sizeof(CHAR) * 4);

1 0

[reactos] 05/12: [CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8719ee865e429b130ee3… commit c8719ee865e429b130ee3823c3c981c23aeafe05 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:33:33 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units This fixes the following compiler errors: ../sdk/lib/crt/stdio/stat64.c:7:13: error: inline function 'release_ioinfo' declared but never defined [-Werror] inline void release_ioinfo(ioinfo *info); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/stat64.c:6:16: error: inline function 'get_ioinfo' declared but never defined [-Werror] inline ioinfo* get_ioinfo(int fd); ^~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:186:5: error: 'init_ioinfo_cs' is static but used in inline function 'get_ioinfo' which is not static [-Werror] init_ioinfo_cs(ret); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:183:19: error: 'get_ioinfo_nolock' is static but used in inline function 'get_ioinfo' which is not static [-Werror] ioinfo *ret = get_ioinfo_nolock(fd); --- sdk/lib/crt/stdio/file.c | 4 ++-- sdk/lib/crt/stdio/stat64.c | 4 ++-- sdk/lib/crt/time/futime.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/lib/crt/stdio/file.c b/sdk/lib/crt/stdio/file.c index 2357d99bfc..0793a3fffa 100644 --- a/sdk/lib/crt/stdio/file.c +++ b/sdk/lib/crt/stdio/file.c @@ -178,7 +178,7 @@ static inline void init_ioinfo_cs(ioinfo *info) } } -/*static*/ inline ioinfo* get_ioinfo(int fd) +ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); if(ret == &__badioinfo) @@ -260,7 +260,7 @@ static inline ioinfo* get_ioinfo_alloc(int *fd) return &__badioinfo; } -/*static*/ inline void release_ioinfo(ioinfo *info) +void release_ioinfo(ioinfo *info) { if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT) LeaveCriticalSection(&info->crit); diff --git a/sdk/lib/crt/stdio/stat64.c b/sdk/lib/crt/stdio/stat64.c index 26feb528a5..b0791c5700 100644 --- a/sdk/lib/crt/stdio/stat64.c +++ b/sdk/lib/crt/stdio/stat64.c @@ -3,8 +3,8 @@ #include <direct.h> #include <internal/wine/msvcrt.h> -inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info); #define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) #define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) diff --git a/sdk/lib/crt/time/futime.c b/sdk/lib/crt/time/futime.c index 535012c05e..3c6a20409a 100644 --- a/sdk/lib/crt/time/futime.c +++ b/sdk/lib/crt/time/futime.c @@ -41,8 +41,8 @@ #include "bitsfixup.h" #include <internal/wine/msvcrt.h> -inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info); /****************************************************************************** * \name _futime

1 0

[reactos] 04/12: [SDK] Fix compilation error
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3e2a547897d28754668b… commit c3e2a547897d28754668baa4ffde00a2cf3db658 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 30 22:49:16 2019 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [SDK] Fix compilation error ../sdk/include/reactos/rosctrls.h:283:59: error: no matching function for call to 'CToolbar<TItemData>::SendMessageW(int, HWND__*&, int)' return SendMessageW(TB_SETTOOLTIPS, hWndTooltip, 0); ../sdk/include/psdk/winuser.h:5543:21: note: candidate: LRESULT ATL::CWindow::SendMessageW(UINT, WPARAM, LPARAM) <near match> ../sdk/include/psdk/winuser.h:5543:21: note: conversion of argument 2 would be ill-formed --- sdk/include/reactos/rosctrls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index 6d3481a042..e81a0c4cfb 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -280,7 +280,7 @@ public: // Configuration methods DWORD SetTooltip(HWND hWndTooltip) { - return SendMessageW(TB_SETTOOLTIPS, hWndTooltip, 0); + return SendMessageW(TB_SETTOOLTIPS, reinterpret_cast<WPARAM>(hWndTooltip), 0); } INT GetHotItem()

1 0

[reactos] 03/12: [FREELDR] Prevent a warning in Xbox memory initialization
by Hervé Poussineau 01 Apr '19

01 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a15160cd4550bd19b53c6… commit a15160cd4550bd19b53c6cfc6de451a2bc8c24cd Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 31 10:30:45 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 1 11:38:32 2019 +0200 [FREELDR] Prevent a warning in Xbox memory initialization --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 74a9b444c2..1030710479 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -195,6 +195,10 @@ if(USE_CLANG_CL) # We need to reduce the binary size add_target_compile_flags(freeldr_common "/Os") endif() +if(NOT MSVC AND ARCH STREQUAL "i386") + # Prevent a warning when doing a memcmp with address 0 + set_source_files_properties(arch/i386/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") +endif() set(PCH_SOURCE ${FREELDR_BOOTLIB_SOURCE}

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