Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [LOG2LINES] Use translate_line() for command line input too

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5d8d8d28903578f7421e… commit c5d8d8d28903578f7421e72f1dd1bd18fce65fe7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Dec 22 02:12:46 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:39:02 2019 +0100 [LOG2LINES] Use translate_line() for command line input too NB: Last step would be to re-use translate_files()... --- sdk/tools/log2lines/log2lines.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index 7213781c15..4ee66bb5c9 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -634,22 +634,20 @@ main(int argc, const char **argv) const char *exefile = NULL; const char *offset = NULL; char Line[LINESIZE + 1]; + char PathBuffer[LINESIZE + 1]; + char LineOutBuffer[LINESIZE + 1]; while (i < argc) { - Line[0] = '\0'; offset = argv[optCount + i++]; if (isOffset(offset)) { if (exefile) { l2l_dbg(2, "translating %s %s\n", exefile, offset); - printf("<%s:%s", exefile, offset); - if (!translate_file(exefile, my_atoi(offset), Line)) - { - printf(" (%s)", Line); - } - printf(">\n"); + + sprintf(Line, "<%s:%s>\n", exefile, offset); + translate_line(conOut, Line, PathBuffer, LineOutBuffer); report(conOut); } else

6 years

[reactos] 01/01: [NTDLL][RTL] Implement RtlGetFullPathName_UEx

by Andrew Boyarshin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04c851194c0179010b81d… commit 04c851194c0179010b81d367658e5022cf1095c3 Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Mon Nov 26 19:50:40 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:33:28 2019 +0100 [NTDLL][RTL] Implement RtlGetFullPathName_UEx --- sdk/lib/rtl/path.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index 7639424d0a..4ac9ba78aa 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -1672,6 +1672,37 @@ Leave: return Status; } +/* + * @implemented + */ +ULONG +NTAPI +RtlGetFullPathName_UEx( + _In_ PWSTR FileName, + _In_ ULONG BufferLength, + _Out_writes_bytes_(BufferLength) PWSTR Buffer, + _Out_opt_ PWSTR *FilePart, + _Out_opt_ RTL_PATH_TYPE *InputPathType) +{ + UNICODE_STRING FileNameString; + NTSTATUS status; + + if (InputPathType) + *InputPathType = 0; + + /* Build the string */ + status = RtlInitUnicodeStringEx(&FileNameString, FileName); + if (!NT_SUCCESS(status)) return 0; + + /* Call the extended function */ + return RtlGetFullPathName_Ustr( + &FileNameString, + BufferLength, + Buffer, + (PCWSTR*)FilePart, + NULL, + InputPathType); +} /****************************************************************** * RtlGetFullPathName_U (NTDLL.@) @@ -1697,20 +1728,13 @@ RtlGetFullPathName_U( _Out_z_bytecap_(Size) PWSTR Buffer, _Out_opt_ PWSTR *ShortName) { - NTSTATUS Status; - UNICODE_STRING FileNameString; RTL_PATH_TYPE PathType; - /* Build the string */ - Status = RtlInitUnicodeStringEx(&FileNameString, FileName); - if (!NT_SUCCESS(Status)) return 0; - /* Call the extended function */ - return RtlGetFullPathName_Ustr(&FileNameString, + return RtlGetFullPathName_UEx((PWSTR)FileName, Size, Buffer, - (PCWSTR*)ShortName, - NULL, + ShortName, &PathType); }

6 years

[reactos] 06/06: [APPHELP] Prevent a nullptr dereference

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e984cabad211bc70c7495… commit e984cabad211bc70c749571e0d8507e542936d52 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jan 3 22:17:54 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:36 2019 +0100 [APPHELP] Prevent a nullptr dereference --- dll/appcompat/apphelp/hsdb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 62cd92fd05..f04312e034 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shim matching / data (un)packing * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS @@ -416,8 +416,11 @@ HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) */ void WINAPI SdbReleaseDatabase(HSDB hsdb) { - SdbCloseDatabase(hsdb->pdb); - SdbFree(hsdb); + if (hsdb) + { + SdbCloseDatabase(hsdb->pdb); + SdbFree(hsdb); + } } /**

6 years

[reactos] 05/06: [SHIMENG] Prevent a nullptr dereference

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6969e85b29ebc1bfcf289… commit 6969e85b29ebc1bfcf289de83cd238eb4ff9229c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jan 3 22:17:01 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:35 2019 +0100 [SHIMENG] Prevent a nullptr dereference --- dll/appcompat/apphelp/shimeng.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 0351ac399d..3520266133 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shim engine core - * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS @@ -585,7 +585,8 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) } } pHookApi = ARRAY_Append(&HookModuleInfo->HookApis, PHOOKAPIEX); - *pHookApi = hook; + if (pHookApi) + *pHookApi = hook; } }

6 years

[reactos] 04/06: [APPCOMPAT] Move sdbtagid.h and sdbtypes.h to a shared location

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1692ab3fe3d26deff353a… commit 1692ab3fe3d26deff353a20e52c39c5e86f9a571 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jan 3 22:11:13 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:35 2019 +0100 [APPCOMPAT] Move sdbtagid.h and sdbtypes.h to a shared location --- dll/appcompat/apphelp/CMakeLists.txt | 4 ++-- dll/appcompat/apphelp/apphelp.h | 8 ++++---- dll/appcompat/apphelp/sdbstringtable.c | 6 +++--- dll/appcompat/apphelp/sdbwrite.c | 11 +++++++---- .../apphelp => sdk/include/reactos/appcompat}/sdbtagid.h | 11 +++++++++-- .../apphelp => sdk/include/reactos/appcompat}/sdbtypes.h | 4 ++-- sdk/tools/xml2sdb/CMakeLists.txt | 4 +++- sdk/tools/xml2sdb/xml2sdb.h | 8 ++++---- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dll/appcompat/apphelp/CMakeLists.txt b/dll/appcompat/apphelp/CMakeLists.txt index 57a26fdd9e..71cb783c74 100644 --- a/dll/appcompat/apphelp/CMakeLists.txt +++ b/dll/appcompat/apphelp/CMakeLists.txt @@ -25,8 +25,8 @@ list(APPEND HEADERS apphelp.h sdbpapi.h sdbstringtable.h - sdbtagid.h - sdbtypes.h + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtagid.h + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtypes.h sdbwrite.h shimeng.h) diff --git a/dll/appcompat/apphelp/apphelp.h b/dll/appcompat/apphelp/apphelp.h index 5d7e4c3b7f..fda2c501ad 100644 --- a/dll/appcompat/apphelp/apphelp.h +++ b/dll/appcompat/apphelp/apphelp.h @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: common structures / functions * COPYRIGHT: Copyright 2013 Mislav Blažević - * Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef APPHELP_H @@ -13,7 +13,7 @@ extern "C" { #endif -#include "sdbtypes.h" +#include <appcompat/sdbtypes.h> /* Flags for SdbInitDatabase */ #define HID_DOS_PATHS 0x1 @@ -126,7 +126,7 @@ DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWO #define ATTRIBUTE_AVAILABLE 0x1 #define ATTRIBUTE_FAILED 0x2 -#include "sdbtagid.h" +#include <appcompat/sdbtagid.h> #ifdef __cplusplus } // extern "C" diff --git a/dll/appcompat/apphelp/sdbstringtable.c b/dll/appcompat/apphelp/sdbstringtable.c index 8ad571d9eb..ae88c51aee 100644 --- a/dll/appcompat/apphelp/sdbstringtable.c +++ b/dll/appcompat/apphelp/sdbstringtable.c @@ -1,14 +1,14 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shim database string table builder - * COPYRIGHT: Copyright 2016 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2016-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #if !defined(SDBWRITE_HOSTTOOL) #define WIN32_NO_STATUS #include "windows.h" -#include "sdbtypes.h" +#include <appcompat/sdbtypes.h> #include "sdbpapi.h" #else /* !defined(SDBWRITE_HOSTTOOL) */ #include <typedefs.h> diff --git a/dll/appcompat/apphelp/sdbwrite.c b/dll/appcompat/apphelp/sdbwrite.c index 429d5b9fa7..860208454d 100644 --- a/dll/appcompat/apphelp/sdbwrite.c +++ b/dll/appcompat/apphelp/sdbwrite.c @@ -1,24 +1,27 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shim database manipulation functions * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blažević - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #if !defined(SDBWRITE_HOSTTOOL) #define WIN32_NO_STATUS #include "windef.h" #include "ntndk.h" +#include <appcompat/sdbtypes.h> +#include <appcompat/sdbtagid.h> #else #include <typedefs.h> #include <guiddef.h> +#include <sdbtypes.h> +#include <sdbtagid.h> #endif -#include "sdbtypes.h" + #include "sdbpapi.h" -#include "sdbtagid.h" #include "sdbstringtable.h" diff --git a/dll/appcompat/apphelp/sdbtagid.h b/sdk/include/reactos/appcompat/sdbtagid.h similarity index 97% rename from dll/appcompat/apphelp/sdbtagid.h rename to sdk/include/reactos/appcompat/sdbtagid.h index 2ac0e07685..8a3d86f586 100644 --- a/dll/appcompat/apphelp/sdbtagid.h +++ b/sdk/include/reactos/appcompat/sdbtagid.h @@ -1,14 +1,17 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: All tags * COPYRIGHT: Copyright 2013 Mislav Blažević - * Copyright 2015,2016 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBTAGID_H #define SDBTAGID_H +#ifdef __cplusplus +extern "C" { +#endif #define TAGID_NULL 0x0 #define TAGID_ROOT 0x0 @@ -203,4 +206,8 @@ #define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) #define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY) +#ifdef __cplusplus +} // extern "C" +#endif + #endif // SDBTAGID_H diff --git a/dll/appcompat/apphelp/sdbtypes.h b/sdk/include/reactos/appcompat/sdbtypes.h similarity index 84% rename from dll/appcompat/apphelp/sdbtypes.h rename to sdk/include/reactos/appcompat/sdbtypes.h index 6231b82847..22ef7ae751 100644 --- a/dll/appcompat/apphelp/sdbtypes.h +++ b/sdk/include/reactos/appcompat/sdbtypes.h @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Application compatibility module - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Sdb core definitions * COPYRIGHT: Copyright 2013 Mislav Blažević - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SDBTYPES_H diff --git a/sdk/tools/xml2sdb/CMakeLists.txt b/sdk/tools/xml2sdb/CMakeLists.txt index 576e4b6a8c..1a59e62fc4 100644 --- a/sdk/tools/xml2sdb/CMakeLists.txt +++ b/sdk/tools/xml2sdb/CMakeLists.txt @@ -9,7 +9,9 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbwrite.c ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbstringtable.c) -include_directories(${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp) +include_directories( + ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat) add_host_tool(xml2sdb ${SOURCE}) if(NOT MSVC) diff --git a/sdk/tools/xml2sdb/xml2sdb.h b/sdk/tools/xml2sdb/xml2sdb.h index 9958bc5155..43fec773b9 100644 --- a/sdk/tools/xml2sdb/xml2sdb.h +++ b/sdk/tools/xml2sdb/xml2sdb.h @@ -1,8 +1,8 @@ /* * PROJECT: xml2sdb - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Define mapping of all shim database types to xml - * COPYRIGHT: Copyright 2016-2018 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2016-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -14,9 +14,9 @@ #include <typedefs.h> #include <guiddef.h> -#include "sdbtypes.h" +#include <sdbtypes.h> #include "sdbwrite.h" -#include "sdbtagid.h" +#include <sdbtagid.h> namespace tinyxml2 {

6 years

[reactos] 03/06: [SHIMENG] Ignore shims that are loading

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=511e7935029fb3b50a4e3… commit 511e7935029fb3b50a4e3144b2484c7234c4a9af Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Nov 23 00:18:17 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:35 2019 +0100 [SHIMENG] Ignore shims that are loading --- dll/appcompat/apphelp/shimeng.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 8f3fe2bab0..0351ac399d 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -25,6 +25,7 @@ extern HMODULE g_hInstance; static UNICODE_STRING g_WindowsDirectory; static UNICODE_STRING g_System32Directory; static UNICODE_STRING g_SxsDirectory; +static UNICODE_STRING g_LoadingShimDll; ULONG g_ShimEngDebugLevel = 0xffffffff; BOOL g_bComPlusImage = FALSE; BOOL g_bShimDuringInit = FALSE; @@ -347,13 +348,15 @@ PHOOKMODULEINFO SeiFindHookModuleInfoForImportDescriptor(PBYTE DllBase, PIMAGE_I } Success = LdrGetDllHandle(NULL, NULL, &DllName, &DllHandle); - RtlFreeUnicodeString(&DllName); if (!NT_SUCCESS(Success)) { - SHIMENG_FAIL("Unable to get module handle for %wZ\n", &DllName); + SHIMENG_FAIL("Unable to get module handle for %wZ (%p)\n", &DllName, DllBase); + RtlFreeUnicodeString(&DllName); + return NULL; } + RtlFreeUnicodeString(&DllName); return SeiFindHookModuleInfo(NULL, DllHandle); } @@ -868,7 +871,8 @@ VOID SeiHookImports(PLDR_DATA_TABLE_ENTRY LdrEntry) PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; PBYTE DllBase = LdrEntry->DllBase; - if (SE_IsShimDll(DllBase) || g_hInstance == LdrEntry->DllBase) + if (SE_IsShimDll(DllBase) || g_hInstance == LdrEntry->DllBase || + (g_LoadingShimDll.Buffer && RtlEqualUnicodeString(&g_LoadingShimDll, &LdrEntry->BaseDllName, TRUE))) { SHIMENG_INFO("Skipping shim module 0x%p \"%wZ\"\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); return; @@ -1109,6 +1113,7 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) continue; } + RtlInitUnicodeString(&g_LoadingShimDll, DllName); RtlInitUnicodeString(&UnicodeDllName, FullNameBuffer); if (NT_SUCCESS(LdrGetDllHandle(NULL, NULL, &UnicodeDllName, &BaseAddress))) { @@ -1120,6 +1125,7 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SHIMENG_WARN("Failed to load %wZ for %S\n", &UnicodeDllName, ShimName); continue; } + RtlInitUnicodeString(&g_LoadingShimDll, NULL); /* No shim module found (or we just loaded it) */ if (!pShimModuleInfo) {

6 years

[reactos] 02/06: [APPHELP] Fix a typo in the logging

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58918686aa8bfc497ed77… commit 58918686aa8bfc497ed77dfbc07f762dd37d8992 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Nov 23 00:08:58 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:35 2019 +0100 [APPHELP] Fix a typo in the logging --- dll/appcompat/apphelp/hsdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index b450e30ac9..62cd92fd05 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -99,7 +99,7 @@ static BOOL SdbpMatchFileAttributes(PDB pdb, TAGID matching_file, PATTRINFO attr } } if (n == attr_count) - SHIM_WARN("Unhandled tag %ws in MACHING_FILE\n", SdbTagToString(tag)); + SHIM_WARN("Unhandled tag %ws in MATCHING_FILE\n", SdbTagToString(tag)); } return TRUE; }

6 years

[reactos] 01/06: [SHIMLIB] c++ compatibility

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aabefa30d5f613a39f9b5… commit aabefa30d5f613a39f9b54907cb19506cef1308e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Nov 22 22:20:21 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 5 13:11:09 2019 +0100 [SHIMLIB] c++ compatibility --- dll/appcompat/shims/shimlib/implement_shim.inl | 6 +++--- dll/appcompat/shims/shimlib/shimlib.h | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dll/appcompat/shims/shimlib/implement_shim.inl b/dll/appcompat/shims/shimlib/implement_shim.inl index e099f63779..26900f91b3 100644 --- a/dll/appcompat/shims/shimlib/implement_shim.inl +++ b/dll/appcompat/shims/shimlib/implement_shim.inl @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Shim helper library - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shimlib helper file, used to register shims setup with macro's from setup_shim.inl - * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2016-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef SHIM_NS @@ -37,7 +37,7 @@ PHOOKAPI WINAPI SHIM_OBJ_NAME(GetHookAPIs)(DWORD fdwReason, PCSTR pszCmdLine, PD { SHIM_OBJ_NAME(g_szCommandLine) = ""; } - SHIM_OBJ_NAME(g_pAPIHooks) = ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + SHIM_OBJ_NAME(g_pAPIHooks) = (PHOOKAPI)ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); if (SHIM_NUM_HOOKS) ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); *pdwHookCount = SHIM_NUM_HOOKS; diff --git a/dll/appcompat/shims/shimlib/shimlib.h b/dll/appcompat/shims/shimlib/shimlib.h index 5eaf1853ab..443f0b7964 100644 --- a/dll/appcompat/shims/shimlib/shimlib.h +++ b/dll/appcompat/shims/shimlib/shimlib.h @@ -1,12 +1,18 @@ /* * PROJECT: ReactOS Shim helper library - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: ReactOS Shim Engine common functions / structures - * COPYRIGHT: Copyright 2016-2018 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2016-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once + +#ifdef __cplusplus +extern "C" { +#endif + + typedef struct tagHOOKAPI { PCSTR LibraryName; @@ -91,3 +97,7 @@ typedef struct tagSHIMREG #error Your compiler is not supported. #endif +#ifdef __cplusplus +} // extern "C" +#endif +

6 years

[reactos] 01/01: [REACTOS] Fix misc 64 bit issues (#783)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfd164791496d3df8c959… commit cfd164791496d3df8c95972a82b4c68e785fe52e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jan 5 10:50:11 2019 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 5 10:50:11 2019 +0100 [REACTOS] Fix misc 64 bit issues (#783) * [WIN32K] Fix handle calculation in DbgGdiHTIntegrityCheck * [NOTEPAD] Fix MSVC warnings * [PSDK] Simplify *PROC definitions in windef.h * [VIDEOPRT] Don't try to use NtVdmControl on x64 * [FREELDR] Fix some macros * [CRT] Make qsort 64 bit compatible * [NTOS] Use #ifndef _WIN64 instead of #ifdef _M_IX86 around C_ASSERTs * [FAST486] Fix 64 bit warnings and change DWORD to ULONG, so it can be used in kernel mode * [APPHELP_APITEST] Fix 64 bit issue --- base/applications/atactl/atactl.cpp | 5 +++-- base/applications/notepad/dialog.c | 2 +- base/applications/notepad/main.h | 4 ---- base/applications/notepad/text.c | 12 ++++++------ boot/freeldr/freeldr/include/arch/amd64/amd64.h | 8 ++++---- dll/shellext/stobject/volume.cpp | 8 ++++---- dll/win32/kernel32/client/file/rw.c | 2 +- dll/win32/shell32/dialogs/view.cpp | 10 +++++----- dll/win32/ws2_32/src/rnr.c | 17 +++++++++++++++-- ntoskrnl/include/internal/ntoskrnl.h | 2 +- sdk/include/psdk/windef.h | 7 +------ sdk/include/reactos/libs/fast486/fast486.h | 2 +- sdk/lib/crt/stdlib/qsort.c | 7 +++++-- sdk/lib/fast486/fast486.c | 4 ++-- win32ss/drivers/videoprt/int10.c | 4 ++++ win32ss/gdi/ntgdi/gdidbg.c | 2 +- 16 files changed, 54 insertions(+), 42 deletions(-) diff --git a/base/applications/atactl/atactl.cpp b/base/applications/atactl/atactl.cpp index a315cac10d..3eac17a1e9 100644 --- a/base/applications/atactl/atactl.cpp +++ b/base/applications/atactl/atactl.cpp @@ -445,7 +445,7 @@ ata_str_to_mode( ) { int mode; - int len; + size_t len; if(!_stricmp(str, "SATA600")) return ATA_SA600; @@ -1688,7 +1688,8 @@ main ( ) { //ULONG Flags = 0; - int i, j; + int i; + uintptr_t j; char a; int bus_id = -1; int dev_id = -1; diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index a07a71d3f7..d3b5deeea8 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1095,7 +1095,7 @@ DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM lParam) switch(uMsg) { case WM_INITDIALOG: hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - _sntprintf(szText, ARRAY_SIZE(szText), _T("%ld"), lParam); + _sntprintf(szText, ARRAY_SIZE(szText), _T("%Id"), lParam); SetWindowText(hTextBox, szText); break; case WM_COMMAND: diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h index a84162fbc0..65a8782f90 100644 --- a/base/applications/notepad/main.h +++ b/base/applications/notepad/main.h @@ -42,10 +42,6 @@ typedef enum ENCODING_UTF16BE = 2, ENCODING_UTF8 = 3 } ENCODING; -// #define ENCODING_ANSI 0 -#define ENCODING_UNICODE 1 -#define ENCODING_UNICODE_BE 2 -// #define ENCODING_UTF8 3 // #define MIN_ENCODING 0 // #define MAX_ENCODING 3 diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 2c6ee8cd07..6e26a7ab47 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -85,12 +85,12 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, /* Look for Byte Order Marks */ if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) { - encFile = ENCODING_UNICODE; + encFile = ENCODING_UTF16LE; dwPos += 2; } else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) { - encFile = ENCODING_UNICODE_BE; + encFile = ENCODING_UTF16BE; dwPos += 2; } else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) @@ -101,7 +101,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, switch(encFile) { - case ENCODING_UNICODE_BE: + case ENCODING_UTF16BE: for (i = dwPos; i < dwSize-1; i += 2) { b = pBytes[i+0]; @@ -110,7 +110,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, } /* fall through */ - case ENCODING_UNICODE: + case ENCODING_UTF16LE: pszText = (LPWSTR) &pBytes[dwPos]; dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); break; @@ -239,13 +239,13 @@ static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENC { switch(encFile) { - case ENCODING_UNICODE: + case ENCODING_UTF16LE: pBytes = (LPBYTE) &pszText[dwPos]; dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); dwPos = dwTextLen; break; - case ENCODING_UNICODE_BE: + case ENCODING_UTF16BE: dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); if (dwByteCount > sizeof(buffer)) dwByteCount = sizeof(buffer); diff --git a/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/boot/freeldr/freeldr/include/arch/amd64/amd64.h index 482015777b..8a5ccddecc 100644 --- a/boot/freeldr/freeldr/include/arch/amd64/amd64.h +++ b/boot/freeldr/freeldr/include/arch/amd64/amd64.h @@ -31,10 +31,10 @@ #define PtrToPfn(p) \ ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL) -#define VAtoPXI(va) ((((ULONG64)va) >> PXI_SHIFT) & 0x1FF) -#define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) -#define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) -#define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) +#define VAtoPXI(va) ((((ULONG64)(va)) >> PXI_SHIFT) & 0x1FF) +#define VAtoPPI(va) ((((ULONG64)(va)) >> PPI_SHIFT) & 0x1FF) +#define VAtoPDI(va) ((((ULONG64)(va)) >> PDI_SHIFT) & 0x1FF) +#define VAtoPTI(va) ((((ULONG64)(va)) >> PTI_SHIFT) & 0x1FF) #ifndef ASM diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index 931cd2e2ae..c30df9cae0 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -32,7 +32,7 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) TRACE("Volume_FindDefaultMixerID\n"); - result = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&waveOutId, (DWORD_PTR)&param2); + result = waveOutMessage((HWAVEOUT)UlongToHandle(WAVE_MAPPER), DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&waveOutId, (DWORD_PTR)&param2); if (result) return E_FAIL; @@ -46,7 +46,7 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) { TRACE("waveOut default device is %d\n", waveOutId); - result = mixerGetID((HMIXEROBJ)waveOutId, &mixerId, MIXER_OBJECTF_WAVEOUT); + result = mixerGetID((HMIXEROBJ)UlongToHandle(waveOutId), &mixerId, MIXER_OBJECTF_WAVEOUT); if (result) return E_FAIL; @@ -77,7 +77,7 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) { mixerLine.cbStruct = sizeof(mixerLine); mixerLine.dwDestination = idx; - if (!mixerGetLineInfoW((HMIXEROBJ)g_mixerId, &mixerLine, 0)) + if (!mixerGetLineInfoW((HMIXEROBJ)UlongToHandle(g_mixerId), &mixerLine, 0)) { if (mixerLine.dwComponentType >= MIXERLINE_COMPONENTTYPE_DST_SPEAKERS && mixerLine.dwComponentType <= MIXERLINE_COMPONENTTYPE_DST_HEADPHONES) @@ -100,7 +100,7 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) mixerLineControls.pamxctrl = &mixerControl; mixerLineControls.cbmxctrl = sizeof(mixerControl); - if (mixerGetLineControlsW((HMIXEROBJ)g_mixerId, &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) + if (mixerGetLineControlsW((HMIXEROBJ)UlongToHandle(g_mixerId), &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) return E_FAIL; TRACE("Found control id %d for mute: %d\n", mixerControl.dwControlID); diff --git a/dll/win32/kernel32/client/file/rw.c b/dll/win32/kernel32/client/file/rw.c index da41eed597..0c6905723e 100644 --- a/dll/win32/kernel32/client/file/rw.c +++ b/dll/win32/kernel32/client/file/rw.c @@ -24,7 +24,7 @@ BOOL WINAPI WriteFile(IN HANDLE hFile, IN LPCVOID lpBuffer, IN DWORD nNumberOfBytesToWrite OPTIONAL, - OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, + OUT LPDWORD lpNumberOfBytesWritten, IN LPOVERLAPPED lpOverlapped OPTIONAL) { NTSTATUS Status; diff --git a/dll/win32/shell32/dialogs/view.cpp b/dll/win32/shell32/dialogs/view.cpp index 264ef5f872..648915a044 100644 --- a/dll/win32/shell32/dialogs/view.cpp +++ b/dll/win32/shell32/dialogs/view.cpp @@ -342,10 +342,10 @@ ViewTree_LoadTree(HKEY hKey, LPCWSTR pszKeyName, DWORD dwParentID) else { // HKeyRoot - Value = DWORD(HKEY_CURRENT_USER); - Size = sizeof(Value); - RegQueryValueExW(hKey, L"HKeyRoot", NULL, NULL, LPBYTE(&Value), &Size); - pEntry->hkeyRoot = HKEY(Value); + HKEY HKeyRoot = HKEY_CURRENT_USER; + Size = sizeof(HKeyRoot); + RegQueryValueExW(hKey, L"HKeyRoot", NULL, NULL, LPBYTE(&HKeyRoot), &Size); + pEntry->hkeyRoot = HKeyRoot; // RegPath pEntry->szRegPath[0] = 0; @@ -782,7 +782,7 @@ ViewDlg_RestoreDefaults(HWND hwndDlg) continue; } RegSetValueExW(hKey, pEntry->szValueName, 0, REG_DWORD, - LPBYTE(pEntry->dwDefaultValue), sizeof(DWORD)); + LPBYTE(&pEntry->dwDefaultValue), sizeof(DWORD)); RegCloseKey(hKey); // update check status diff --git a/dll/win32/ws2_32/src/rnr.c b/dll/win32/ws2_32/src/rnr.c index 34e8619df3..43ebea276c 100644 --- a/dll/win32/ws2_32/src/rnr.c +++ b/dll/win32/ws2_32/src/rnr.c @@ -248,7 +248,7 @@ WSALookupServiceBeginA(IN LPWSAQUERYSETA lpqsRestrictions, { INT ErrorCode; LPWSAQUERYSETW UnicodeQuerySet = NULL; - DWORD UnicodeQuerySetSize = 0; + SIZE_T UnicodeQuerySetSize = 0; DPRINT("WSALookupServiceBeginA: %p\n", lpqsRestrictions); @@ -523,12 +523,25 @@ WSALookupServiceNextA(IN HANDLE hLookup, if (ErrorCode == ERROR_SUCCESS) { + SIZE_T SetSize = *lpdwBufferLength; + /* Now convert back to ANSI */ ErrorCode = MapUnicodeQuerySetToAnsi(UnicodeQuerySet, - lpdwBufferLength, + &SetSize, lpqsResults); if (ErrorCode != ERROR_SUCCESS) + { + SetLastError(ErrorCode); + } + else if (SetSize > MAXDWORD) + { + ErrorCode = ERROR_ARITHMETIC_OVERFLOW; SetLastError(ErrorCode); + } + else + { + *lpdwBufferLength = SetSize; + } } else { diff --git a/ntoskrnl/include/internal/ntoskrnl.h b/ntoskrnl/include/internal/ntoskrnl.h index c16a4b5ad2..d0dfe4dbde 100644 --- a/ntoskrnl/include/internal/ntoskrnl.h +++ b/ntoskrnl/include/internal/ntoskrnl.h @@ -136,7 +136,7 @@ typedef struct _INFORMATION_CLASS_INFO #endif -#ifdef _M_IX86 +#ifndef _WIN64 C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); diff --git a/sdk/include/psdk/windef.h b/sdk/include/psdk/windef.h index a456269b55..bd0278a218 100644 --- a/sdk/include/psdk/windef.h +++ b/sdk/include/psdk/windef.h @@ -244,15 +244,10 @@ typedef HANDLE HGLOBAL; typedef HANDLE HLOCAL; typedef HANDLE GLOBALHANDLE; typedef HANDLE LOCALHANDLE; -#ifdef _WIN64 + typedef INT_PTR (WINAPI *FARPROC)(); typedef INT_PTR (WINAPI *NEARPROC)(); typedef INT_PTR (WINAPI *PROC)(); -#else -typedef int (WINAPI *FARPROC)(); -typedef int (WINAPI *NEARPROC)(); -typedef int (WINAPI *PROC)(); -#endif typedef void *HGDIOBJ; diff --git a/sdk/include/reactos/libs/fast486/fast486.h b/sdk/include/reactos/libs/fast486/fast486.h index 5f7e3ce1c4..db1cc7a1e0 100644 --- a/sdk/include/reactos/libs/fast486/fast486.h +++ b/sdk/include/reactos/libs/fast486/fast486.h @@ -113,7 +113,7 @@ * (by reading outside of the prefetch buffer). The prefetch cache must * also not cross a page boundary. */ -C_ASSERT((FAST486_CACHE_SIZE >= sizeof(DWORD)) +C_ASSERT((FAST486_CACHE_SIZE >= sizeof(ULONG)) && (FAST486_CACHE_SIZE <= FAST486_PAGE_SIZE)); struct _FAST486_STATE; diff --git a/sdk/lib/crt/stdlib/qsort.c b/sdk/lib/crt/stdlib/qsort.c index d6bca5f06c..ed3d95acee 100644 --- a/sdk/lib/crt/stdlib/qsort.c +++ b/sdk/lib/crt/stdlib/qsort.c @@ -30,6 +30,8 @@ #include <stdlib.h> #include <search.h> +#define long intptr_t + #define min(a, b) (a) < (b) ? (a) : (b) /* @@ -50,7 +52,7 @@ es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; static __inline void -swapfunc(char *a, char *b, int n, int swaptype) +swapfunc(char *a, char *b, intptr_t n, int swaptype) { if(swaptype <= 1) swapcode(long, a, b, n) @@ -91,7 +93,8 @@ __cdecl qsort(void *a, size_t n, size_t es, int (__cdecl *cmp)(const void*, const void*)) { char *pa, *pb, *pc, *pd, *pl, *pm, *pn; - int d, r, swaptype, swap_cnt; + int swaptype, swap_cnt; + intptr_t d, r; loop: SWAPINIT(a, es); swap_cnt = 0; diff --git a/sdk/lib/fast486/fast486.c b/sdk/lib/fast486/fast486.c index 8505bccbfb..4ee2103a6a 100644 --- a/sdk/lib/fast486/fast486.c +++ b/sdk/lib/fast486/fast486.c @@ -38,7 +38,7 @@ FASTCALL Fast486MemReadCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); - RtlMoveMemory(Buffer, (PVOID)Address, Size); + RtlMoveMemory(Buffer, UlongToPtr(Address), Size); } static VOID @@ -46,7 +46,7 @@ FASTCALL Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); - RtlMoveMemory((PVOID)Address, Buffer, Size); + RtlMoveMemory(UlongToPtr(Address), Buffer, Size); } static VOID diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index 0893db7ace..b8eebfa49e 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -40,7 +40,9 @@ IntInitializeVideoAddressSpace(VOID) PVOID BaseAddress; LARGE_INTEGER Offset; SIZE_T ViewSize; +#ifdef _M_IX86 CHAR IVTAndBda[1024+256]; +#endif // _M_IX86 /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ BaseAddress = 0; @@ -124,6 +126,7 @@ IntInitializeVideoAddressSpace(VOID) return 0; } +#ifdef _M_IX86 /* Get the real mode IVT and BDA from the kernel */ Status = NtVdmControl(VdmInitialize, IVTAndBda); if (!NT_SUCCESS(Status)) @@ -131,6 +134,7 @@ IntInitializeVideoAddressSpace(VOID) DPRINT1("NtVdmControl failed (status %x)\n", Status); return Status; } +#endif // _M_IX86 /* Return success */ return STATUS_SUCCESS; diff --git a/win32ss/gdi/ntgdi/gdidbg.c b/win32ss/gdi/ntgdi/gdidbg.c index 27297fb0ec..b75bb01c98 100644 --- a/win32ss/gdi/ntgdi/gdidbg.c +++ b/win32ss/gdi/ntgdi/gdidbg.c @@ -365,7 +365,7 @@ DbgGdiHTIntegrityCheck(VOID) pEntry = &GdiHandleTable->Entries[i]; Type = pEntry->Type; - Handle = (HGDIOBJ)(((ULONG_PTR)Type << GDI_ENTRY_UPPER_SHIFT) + i); + Handle = (HGDIOBJ)(ULONG_PTR)((Type << GDI_ENTRY_UPPER_SHIFT) + i); if (Type & GDI_ENTRY_BASETYPE_MASK) {

6 years

[reactos] 03/03: [MPG123] Update to version 1.25.10. CORE-15280

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d67156fa98f2e112379ae… commit d67156fa98f2e112379ae12c4a88be438a7ec854 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 1 18:43:56 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 5 09:20:40 2019 +0100 [MPG123] Update to version 1.25.10. CORE-15280 --- sdk/include/reactos/libs/libmpg123/config.h | 6 +++--- sdk/include/reactos/libs/libmpg123/mpg123.h | 2 +- sdk/lib/3rdparty/libmpg123/layer3.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/libs/libmpg123/config.h b/sdk/include/reactos/libs/libmpg123/config.h index 3f3fdbc9b8..2cda211c7d 100644 --- a/sdk/include/reactos/libs/libmpg123/config.h +++ b/sdk/include/reactos/libs/libmpg123/config.h @@ -356,7 +356,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.25.8" +#define PACKAGE_STRING "mpg123 1.25.10" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -365,7 +365,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.25.8" +#define PACKAGE_VERSION "1.25.10" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -398,7 +398,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.25.8" +#define VERSION "1.25.10" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 diff --git a/sdk/include/reactos/libs/libmpg123/mpg123.h b/sdk/include/reactos/libs/libmpg123/mpg123.h index f7dd4a5904..ff2138822e 100644 --- a/sdk/include/reactos/libs/libmpg123/mpg123.h +++ b/sdk/include/reactos/libs/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.25.8) + libmpg123: MPEG Audio Decoder library (version 1.25.10) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1 diff --git a/sdk/lib/3rdparty/libmpg123/layer3.c b/sdk/lib/3rdparty/libmpg123/layer3.c index 917f3abf91..f17e477d2c 100644 --- a/sdk/lib/3rdparty/libmpg123/layer3.c +++ b/sdk/lib/3rdparty/libmpg123/layer3.c @@ -1226,7 +1226,6 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in part2remain += num; backbits(fr, num); num = 0; - } else { @@ -1235,7 +1234,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in gr_info->maxband[0] = gr_info->maxband[1] = gr_info->maxband[2] = - gr_info->maxbandl = 0; + gr_info->maxbandl = 1; /* sfb=maxband[lwin]*3 + lwin - mixed_block_flag must be >= 0 */ gr_info->maxb = 1; }

6 years

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2019