Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 12/12: [NTOBJSHEX] Reorder include files in the precompiled header

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0efcfec0440a8a373753c… commit 0efcfec0440a8a373753c1e94507d6c6bec19bbb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 18 21:17:00 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 21:17:00 2019 +0200 [NTOBJSHEX] Reorder include files in the precompiled header --- dll/shellext/ntobjshex/ntobjenum.h | 6 +----- dll/shellext/ntobjshex/precomp.h | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/shellext/ntobjshex/ntobjenum.h b/dll/shellext/ntobjshex/ntobjenum.h index 51937df1b5..253c483c12 100644 --- a/dll/shellext/ntobjshex/ntobjenum.h +++ b/dll/shellext/ntobjshex/ntobjenum.h @@ -15,12 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#pragma once -extern "C" { -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <ndk/rtlfuncs.h> -} // All the possible values are defined here because I want the type field to be // "persistable" and not change if more types are added in the future. diff --git a/dll/shellext/ntobjshex/precomp.h b/dll/shellext/ntobjshex/precomp.h index 55a055723e..d221a8c671 100644 --- a/dll/shellext/ntobjshex/precomp.h +++ b/dll/shellext/ntobjshex/precomp.h @@ -10,6 +10,12 @@ #define COM_NO_WINDOWS_H #define NTOS_MODE_USER +extern "C" +{ +#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> +} + #include <windef.h> #include <winbase.h> #include <winreg.h>

5 years, 8 months

[reactos] 11/12: [APPHELP] Fix warnings

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91ba017dfc7f6d4e39bef… commit 91ba017dfc7f6d4e39befbb9645f57bfa3735978 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 18 19:21:25 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:39 2019 +0200 [APPHELP] Fix warnings --- dll/appcompat/apphelp/apphelp.c | 4 ++-- dll/appcompat/apphelp/sdbapi.c | 2 +- dll/appcompat/apphelp/sdbwrite.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.c b/dll/appcompat/apphelp/apphelp.c index e05c1fd9eb..5df880ce6c 100644 --- a/dll/appcompat/apphelp/apphelp.c +++ b/dll/appcompat/apphelp/apphelp.c @@ -314,7 +314,7 @@ BOOL WINAPI SdbRegisterDatabaseEx( UNICODE_STRING DatabaseDescriptionKey = RTL_CONSTANT_STRING(L"DatabaseDescription"); Status = NtSetValueKey(DbKey, &DatabasePathKey, 0, REG_SZ, - (PVOID)pszDatabasePath, (wcslen(pszDatabasePath) + 1) * sizeof(WCHAR)); + (PVOID)pszDatabasePath, ((ULONG)wcslen(pszDatabasePath) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) SHIM_ERR("Unable to write %wZ\n", &DatabasePathKey); @@ -349,7 +349,7 @@ BOOL WINAPI SdbRegisterDatabaseEx( if (NT_SUCCESS(Status) && Information.Description) { Status = NtSetValueKey(DbKey, &DatabaseDescriptionKey, 0, REG_SZ, - (PVOID)Information.Description, (wcslen(Information.Description) + 1) * sizeof(WCHAR)); + (PVOID)Information.Description, ((ULONG)wcslen(Information.Description) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) SHIM_ERR("Unable to write %wZ\n", &DatabaseDescriptionKey); } diff --git a/dll/appcompat/apphelp/sdbapi.c b/dll/appcompat/apphelp/sdbapi.c index 1a14424ca3..5ddf98938c 100644 --- a/dll/appcompat/apphelp/sdbapi.c +++ b/dll/appcompat/apphelp/sdbapi.c @@ -151,7 +151,7 @@ void WINAPI SdbpFlush(PDB pdb) DWORD SdbpStrlen(PCWSTR string) { - return wcslen(string); + return (DWORD)wcslen(string); } DWORD SdbpStrsize(PCWSTR string) diff --git a/dll/appcompat/apphelp/sdbwrite.c b/dll/appcompat/apphelp/sdbwrite.c index 860208454d..8f68e7630e 100644 --- a/dll/appcompat/apphelp/sdbwrite.c +++ b/dll/appcompat/apphelp/sdbwrite.c @@ -111,12 +111,12 @@ PDB WINAPI SdbCreateDatabase(LPCWSTR path, PATH_TYPE type) if (!pdb) return NULL; - pdb->size = sizeof(DWORD) + sizeof(DWORD) + strlen(magic); + pdb->size = sizeof(DWORD) + sizeof(DWORD) + (DWORD)strlen(magic); pdb->data = SdbAlloc(pdb->size); SdbpWrite(pdb, &version_major, sizeof(DWORD)); SdbpWrite(pdb, &version_minor, sizeof(DWORD)); - SdbpWrite(pdb, magic, strlen(magic)); + SdbpWrite(pdb, magic, (DWORD)strlen(magic)); return pdb; }

5 years, 8 months

[reactos] 10/12: [RSHELL] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aff8581f6df667814a61a… commit aff8581f6df667814a61a980dfdfe602e2dacce9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 18 19:21:00 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:39 2019 +0200 [RSHELL] Disable exceptions in atl when compiling without exceptions --- base/shell/rshell/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt index 5d4170d58e..a2722178bb 100644 --- a/base/shell/rshell/CMakeLists.txt +++ b/base/shell/rshell/CMakeLists.txt @@ -1,5 +1,8 @@ PROJECT(SHELL) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) include_directories(

5 years, 8 months

[reactos] 09/12: [SHELL32_APITEST] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10fa9bfe0ab3aee8e6135… commit 10fa9bfe0ab3aee8e613540d127504c48c33ba86 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 23:04:07 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:39 2019 +0200 [SHELL32_APITEST] Disable exceptions in atl when compiling without exceptions --- modules/rostests/apitests/shell32/CMakeLists.txt | 3 +++ modules/rostests/apitests/shell32/shelltest.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 8201a6f12e..868b686630 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -1,4 +1,7 @@ +add_definitions( + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) spec2def(shell32_apitest.exe shell32_apitest.spec) diff --git a/modules/rostests/apitests/shell32/shelltest.h b/modules/rostests/apitests/shell32/shelltest.h index 75951cbac4..2271b51aa4 100644 --- a/modules/rostests/apitests/shell32/shelltest.h +++ b/modules/rostests/apitests/shell32/shelltest.h @@ -1,7 +1,7 @@ #ifndef _SHELLTEST_H_ #define _SHELLTEST_H_ -#define _INC_WINDOWS +//#define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <ntstatus.h>

5 years, 8 months

[reactos] 08/12: [MSGINA_APITEST] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a255e1d693cfd7940109a… commit a255e1d693cfd7940109a117240a6322a38232c2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 23:03:42 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:38 2019 +0200 [MSGINA_APITEST] Disable exceptions in atl when compiling without exceptions --- modules/rostests/apitests/msgina/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rostests/apitests/msgina/CMakeLists.txt b/modules/rostests/apitests/msgina/CMakeLists.txt index 524521db13..0d64a0c233 100644 --- a/modules/rostests/apitests/msgina/CMakeLists.txt +++ b/modules/rostests/apitests/msgina/CMakeLists.txt @@ -1,4 +1,7 @@ +add_definitions( + -D_ATL_NO_EXCEPTIONS) + set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)

5 years, 8 months

[reactos] 07/12: [NETREG] Use exceptions with stl

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=537f4c219571b789ac1eb… commit 537f4c219571b789ac1eb41f9963189c691b8307 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 16 23:03:22 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 18 19:21:38 2019 +0200 [NETREG] Use exceptions with stl --- modules/rosapps/applications/net/netreg/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/net/netreg/CMakeLists.txt b/modules/rosapps/applications/net/netreg/CMakeLists.txt index ce7e2fc6af..36425680b7 100644 --- a/modules/rosapps/applications/net/netreg/CMakeLists.txt +++ b/modules/rosapps/applications/net/netreg/CMakeLists.txt @@ -1,5 +1,5 @@ -set_cpp(WITH_RUNTIME WITH_STL) +set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS) add_executable(netreg netreg.cpp netreg.rc) set_module_type(netreg win32cui) add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32 ntdll)

5 years, 8 months

[reactos] 06/12: [MSGINA] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

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

5 years, 8 months

[reactos] 05/12: [NTOBJSHEX] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

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

5 years, 8 months

[reactos] 04/12: [APPHELP_APITEST] Disable exceptions in atl when compiling without exceptions

by Mark Jansen

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

5 years, 8 months

[reactos] 03/12: [SHELL32] Use the same definitions for shell32 and it's static libs

by Mark Jansen

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

5 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019