Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/06: [DBGHELP] search for debugfiles in modulepath too.
by Andreas Maier 19 Apr '19

19 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183294a12e6a1b832ec99… commit 183294a12e6a1b832ec994399e5efd602ba2b81f Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Nov 3 21:26:48 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:38 2019 +0200 [DBGHELP] search for debugfiles in modulepath too. Debug symbols (like PDB, ...) could not be found if the direcory of the module and application differs. Applying this patch they will be found. Dbghelp searches the module path too. (See MS docs). --- dll/win32/dbghelp/dbghelp_private.h | 6 +++--- dll/win32/dbghelp/msc.c | 4 ++-- dll/win32/dbghelp/path.c | 35 ++++++++++++++++++++++++++++++++--- dll/win32/dbghelp/pe_module.c | 2 +- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 9eb0592fca..23ee3f4662 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -655,9 +655,9 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, CONTEXT* context, struct pdb_cmd_pair* cpair) DECLSPEC_HIDDEN; /* path.c */ -extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) DECLSPEC_HIDDEN; +extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index eba26498cb..58a4a55f2e 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2450,11 +2450,11 @@ static HANDLE map_pdb_file(const struct process* pcs, switch (lookup->kind) { case PDB_JG: - ret = path_find_symbol_file(pcs, lookup->filename, NULL, lookup->timestamp, + ret = path_find_symbol_file(pcs, module, lookup->filename, NULL, lookup->timestamp, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; case PDB_DS: - ret = path_find_symbol_file(pcs, lookup->filename, &lookup->guid, 0, + ret = path_find_symbol_file(pcs, module, lookup->filename, &lookup->guid, 0, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; } diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c index 8c74426eec..f8f268d8e9 100644 --- a/dll/win32/dbghelp/path.c +++ b/dll/win32/dbghelp/path.c @@ -49,6 +49,17 @@ static inline const WCHAR* file_nameW(const WCHAR* str) return p + 1; } +static inline void file_pathW(const WCHAR* srcFileNameW, + WCHAR* dstFilePathW) +{ + int len; + + for (len = strlenW(srcFileNameW) - 1; (len > 0) && (!is_sepW(srcFileNameW[len])); len--); + + strncpyW(dstFilePathW, srcFileNameW, len); + dstFilePathW[len] = L'\0'; +} + /****************************************************************** * FindDebugInfoFile (DBGHELP.@) * @@ -612,9 +623,9 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) return mf->matched == 2; } -BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) +BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) { struct module_find mf; WCHAR full_pathW[MAX_PATH]; @@ -643,6 +654,24 @@ BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, return TRUE; } + /* FIXME: Use Environment-Variables (see MS docs) + _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH + FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) + do a search for (every?) path-element like this ... + <path> + <path>\dll + <path>\symbols\dll + (dll may be exe, or sys depending on the file extension) */ + + /* 2. check module-path */ + file_pathW(module->module.LoadedImageName, tmp); + if (do_searchW(filename, tmp, FALSE, module_find_cb, &mf)) + { + WideCharToMultiByte(CP_ACP, 0, tmp, -1, buffer, MAX_PATH, NULL, NULL); + return TRUE; + } + + /* 3. check search-path */ while (searchPath) { ptr = strchrW(searchPath, ';'); diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 376a780653..4b9eac4f03 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -560,7 +560,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && + if (path_find_symbol_file(pcs, module, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) &&

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Remove now redundant '/we4028' special case
by Serge Gautherie 19 Apr '19

19 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f3eb1f9a21a874212a73… commit 9f3eb1f9a21a874212a73c6c4f29857937b01a1f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Apr 19 15:39:16 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 19 20:47:03 2019 +0200 [CMAKE] msvc.cmake: Remove now redundant '/we4028' special case Addendum to 545a2c79367e1457e4bc7ac14d3c0f840c7e063c. CORE-7538 --- sdk/cmake/msvc.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8419591b8b..e3319a1eee 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -99,10 +99,6 @@ add_compile_flags("/wd4018") # - C4700: uninitialized variable usage # - C4716: function must return a value add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4716") -# TODO: Check and fix other architectures. -if(ARCH STREQUAL "i386") - add_compile_flags("/we4028") -endif() # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

1 0

[reactos] 01/01: [APPVEYOR] Enable fast_finish (#1494)
by Katayama Hirofumi MZ 19 Apr '19

19 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48f98e88edc26688a3bac… commit 48f98e88edc26688a3bac5f5b7525cd90494f572 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 19 23:39:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 19 23:39:18 2019 +0900 [APPVEYOR] Enable fast_finish (#1494) It stops the remaining jobs if any error happened. It becomes less time for waiting for building. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 8e88b5e7b1..f4e1512326 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,8 @@ version: reactos.appveyor.{build} skip_branch_with_pr: true clone_depth: 5 clone_folder: c:\reactos-cov +matrix: + fast_finish: true init: - ps: (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/RosCMakeNinja.zip","C:\RosCMakeNinja.zip")

1 0

[reactos] 01/01: [BOOTDATA] AHKAppTests.cmd: Fix 'media' typo (#1502)
by Serge Gautherie 19 Apr '19

19 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4126817f7ffc06dc2fb15… commit 4126817f7ffc06dc2fb1521f8b8ed7dc57a59607 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 19 15:12:16 2019 +0200 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Apr 19 22:12:16 2019 +0900 [BOOTDATA] AHKAppTests.cmd: Fix 'media' typo (#1502) Addendum to df2a8c4. s/media/medium/ --- boot/bootdata/bootcdregtest/AHKAppTests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/bootcdregtest/AHKAppTests.cmd b/boot/bootdata/bootcdregtest/AHKAppTests.cmd index 2c969a6745..6c93dfe21d 100644 --- a/boot/bootdata/bootcdregtest/AHKAppTests.cmd +++ b/boot/bootdata/bootcdregtest/AHKAppTests.cmd @@ -5,7 +5,7 @@ for %%X in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (if exist %% if not defined DRIVE ( dbgprint "AHK Application testing suite not present, skipping." - dbgprint "Insert ReactOS boot media and try again." + dbgprint "Insert ReactOS boot medium and try again." exit /b 0 )

1 0

[reactos] 12/12: [NTOBJSHEX] Reorder include files in the precompiled header
by Mark Jansen 18 Apr '19

18 Apr '19

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>

1 0

[reactos] 11/12: [APPHELP] Fix warnings
by Mark Jansen 18 Apr '19

18 Apr '19

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; }

1 0

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

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=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(

1 0

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

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=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>

1 0

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

18 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=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)

1 0

[reactos] 07/12: [NETREG] Use exceptions with stl
by Mark Jansen 18 Apr '19

18 Apr '19

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)

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