Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 04/179: [WINESYNC]: revert wine-staging patchset for dbghelp

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7431b80ae6bde63f2120d… commit 7431b80ae6bde63f2120db5bcb91b97c6b3c4b13 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 12:54:01 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [WINESYNC]: revert wine-staging patchset for dbghelp --- dll/win32/dbghelp/elf_module.c | 8 +++--- ...-Always-check-for-debug-symbols-in-BINDIR.patch | 31 ---------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index 066c2f5166d..e841b1b707a 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1489,11 +1489,9 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, if (!ret && !strchrW(filename, '/')) { ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("PATH"), elf_info); - if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("LD_LIBRARY_PATH"), elf_info); - if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - BINDIR, elf_info); + getenv("PATH"), elf_info) || + elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, + getenv("LD_LIBRARY_PATH"), elf_info); if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, dyn_addr, elf_info); } diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch deleted file mode 100644 index b16a465972a..00000000000 --- a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <sebastian(a)fds-team.de> -Date: Mon, 6 Oct 2014 05:06:06 +0200 -Subject: dbghelp: Always check for debug symbols in BINDIR. - ---- - dll/win32/dbghelp/elf_module.c | 8 +++++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c -index 6428955941c..75c0a4c2453 100644 ---- a/dll/win32/dbghelp/elf_module.c -+++ b/dll/win32/dbghelp/elf_module.c -@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, - if (!ret && !strchrW(filename, '/')) - { - ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -- getenv("PATH"), elf_info) || -- elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -- getenv("LD_LIBRARY_PATH"), elf_info); -+ getenv("PATH"), elf_info); -+ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -+ getenv("LD_LIBRARY_PATH"), elf_info); -+ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, -+ BINDIR, elf_info); - if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, - load_offset, dyn_addr, elf_info); - } --- -2.11.0 -

4 years

[reactos] 03/179: [WINESYNC] Add dbghelp entry

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cce4bdebafbd04509f24… commit 6cce4bdebafbd04509f24b36cfd3c78bf7832525 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 12:45:58 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [WINESYNC] Add dbghelp entry --- sdk/tools/winesync/dbghelp.cfg | 6 +++++ ...-Always-check-for-debug-symbols-in-BINDIR.patch | 31 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg new file mode 100644 index 00000000000..c06d6c5981e --- /dev/null +++ b/sdk/tools/winesync/dbghelp.cfg @@ -0,0 +1,6 @@ +directories: + dlls/dbghelp: dll/win32/dbghelp +files: + include/dbghelp.h: sdk/include/psdk/dbghelp.h +tags: + wine: wine-3.9 diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch new file mode 100644 index 00000000000..b16a465972a --- /dev/null +++ b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -0,0 +1,31 @@ +From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner <sebastian(a)fds-team.de> +Date: Mon, 6 Oct 2014 05:06:06 +0200 +Subject: dbghelp: Always check for debug symbols in BINDIR. + +--- + dll/win32/dbghelp/elf_module.c | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c +index 6428955941c..75c0a4c2453 100644 +--- a/dll/win32/dbghelp/elf_module.c ++++ b/dll/win32/dbghelp/elf_module.c +@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, + if (!ret && !strchrW(filename, '/')) + { + ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("PATH"), elf_info) || +- elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, +- getenv("LD_LIBRARY_PATH"), elf_info); ++ getenv("PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ getenv("LD_LIBRARY_PATH"), elf_info); ++ if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, ++ BINDIR, elf_info); + if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, + load_offset, dyn_addr, elf_info); + } +-- +2.11.0 +

4 years

[reactos] 02/179: [LIBWINE] make wine_get_dos_file_name available

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a84b0dbe6b8a4f78f271e… commit a84b0dbe6b8a4f78f271ef0cd8331d9b5252134d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 14 10:01:15 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:30 2020 +0200 [LIBWINE] make wine_get_dos_file_name available And complain loudly when we get a *real* unix file name --- sdk/include/psdk/winbase.h | 5 ++ sdk/lib/3rdparty/libwine/CMakeLists.txt | 4 +- sdk/lib/3rdparty/libwine/path.c | 82 +++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index f803ff178de..0f653ea835f 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3945,6 +3945,11 @@ QueryDepthSList( #endif /* _SLIST_HEADER_ */ +#ifdef __WINESRC__ +/* Wine specific. Basically MultiByteToWideChar for us. */ +WCHAR * CDECL wine_get_dos_file_name(LPCSTR str); +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/sdk/lib/3rdparty/libwine/CMakeLists.txt b/sdk/lib/3rdparty/libwine/CMakeLists.txt index 809893c3bd9..bed7ca764eb 100644 --- a/sdk/lib/3rdparty/libwine/CMakeLists.txt +++ b/sdk/lib/3rdparty/libwine/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) list(APPEND SOURCE config.c @@ -10,12 +9,15 @@ list(APPEND SOURCE isnan.c loader.c ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/wctype.c + path.c register.c # string.c implements _stricmp, already shipped with crt ) add_library(wine ${SOURCE}) add_dependencies(wine psdk) +target_compile_definitions(wine PRIVATE __WINESRC__ _WINE) add_library(wineldr loader.c) add_dependencies(wineldr xdk) +target_compile_definitions(wineldr PRIVATE __WINESRC__) diff --git a/sdk/lib/3rdparty/libwine/path.c b/sdk/lib/3rdparty/libwine/path.c new file mode 100644 index 00000000000..d8f11bdafc5 --- /dev/null +++ b/sdk/lib/3rdparty/libwine/path.c @@ -0,0 +1,82 @@ +/* Copyright 1993 Erik Bos + * Copyright 1996, 2004 Alexandre Julliard + * Copyright 2003 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> + +#include <wine/winternl.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(path); + +static inline BOOL set_ntstatus( NTSTATUS status ) +{ + if (status) SetLastError( RtlNtStatusToDosError( status )); + return !status; +} + +/*********************************************************************** + * wine_get_dos_file_name (KERNEL32.@) Not a Windows API + * + * Return the full DOS file name for a given Unix path. + * Returned buffer must be freed by caller. + */ +WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) +{ + UNICODE_STRING nt_name; + NTSTATUS status; + WCHAR *buffer; + SIZE_T len = strlen(str) + 1; + + if (str[0] != '/') /* relative path name */ + { + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_UNIXCP, 0, str, len, buffer, len ); + status = RtlDosPathNameToNtPathName_U_WithStatus( buffer, &nt_name, NULL, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + if (!set_ntstatus( status )) return NULL; + buffer = nt_name.Buffer; + len = nt_name.Length / sizeof(WCHAR) + 1; + } + else + { +#ifdef __REACTOS__ + ERR("Got absolute UNIX path name in function wine_get_dos_file_name. This is not UNIX. Please fix the caller!\n"); + ERR("File name: %s\n", str); +#else + len += 8; /* \??\unix prefix */ + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + if (!set_ntstatus( wine_unix_to_nt_file_name( str, buffer, &len ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; + } +#endif + } + if (buffer[5] == ':') + { + /* get rid of the \??\ prefix */ + /* FIXME: should implement RtlNtPathNameToDosPathName and use that instead */ + memmove( buffer, buffer + 4, (len - 4) * sizeof(WCHAR) ); + } + else buffer[1] = '\\'; + return buffer; +}

4 years

[reactos] 01/179: [CRT] Let's have llabs for every compiler out there

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fc0c7a372a6b448efa73… commit 9fc0c7a372a6b448efa735e023e74a4895f6e9a9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 14 09:23:50 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:29 2020 +0200 [CRT] Let's have llabs for every compiler out there --- sdk/include/crt/stdlib.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/include/crt/stdlib.h b/sdk/include/crt/stdlib.h index 2ad4300c95c..a9fdbf604e7 100644 --- a/sdk/include/crt/stdlib.h +++ b/sdk/include/crt/stdlib.h @@ -1440,9 +1440,7 @@ extern "C" { _Check_return_ __MINGW_EXTENSION lldiv_t __cdecl lldiv(_In_ long long, _In_ long long); -#ifndef _MSC_VER __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(_In_ long long _j) { return (_j >= 0 ? _j : -_j); } -#endif __MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int); __MINGW_EXTENSION unsigned long long __cdecl strtoull(const char* __restrict__, char** __restrict__, int);

4 years

[reactos] 01/01: [RAPPS] Fix of unhandled exception when trying to modify/uninstall without selection (#3185)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=579f5012156b23510b15c… commit 579f5012156b23510b15cd0633c9c84381414f9e Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 15 22:50:12 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 22:50:12 2020 +0200 [RAPPS] Fix of unhandled exception when trying to modify/uninstall without selection (#3185) CORE-17279 --- base/applications/rapps/gui.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index fb414504fc7..ed0689aac2a 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -278,6 +278,9 @@ BOOL CMainWindow::RemoveSelectedAppFromRegistry() if (MessageBoxW(szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) { CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + if (!InstalledApp) + return FALSE; + LSTATUS Result = InstalledApp->RemoveFromRegistry(); if (Result != ERROR_SUCCESS) { @@ -299,6 +302,8 @@ BOOL CMainWindow::UninstallSelectedApp(BOOL bModify) return FALSE; CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + if (!InstalledApp) + return FALSE; return InstalledApp->UninstallApplication(bModify); }

4 years

[reactos] 01/01: [MMIXER] Fix NULL dereference CORE-17276

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a27f0debca4c0fe8cd916… commit a27f0debca4c0fe8cd916d2406124f9d30ae5dbe Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Sep 15 20:54:50 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Sep 15 20:54:50 2020 +0200 [MMIXER] Fix NULL dereference CORE-17276 This lead to a crash of winmm:mixer during "GCCLin_x86 on Test VBox". The crash was exposed when new code paths were activated by 0.4.15-dev-791-g 6d7ebc20481a587bd19e8a8049317113071b0817 I do intend to port this commit back into 0.4.14RC. --- sdk/lib/drivers/sound/mmixer/sup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c index 06f342b12e8..4fa8c080309 100644 --- a/sdk/lib/drivers/sound/mmixer/sup.c +++ b/sdk/lib/drivers/sound/mmixer/sup.c @@ -690,6 +690,8 @@ MMixerSetGetVolumeControlDetails( /* get input */ Input = (LPMIXERCONTROLDETAILS_UNSIGNED)MixerControlDetails->paDetails; + if (!Input) + return MM_STATUS_UNSUCCESSFUL; /* to prevent dereferencing NULL */ if (bSet) {

4 years

[reactos] 01/01: [VIDEOPRT] Add global variable for debugging video drivers (#3080)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dfc7f06b7119a3713352… commit 0dfc7f06b7119a3713352efc8d1b2b6d122c0d12 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Sep 15 18:24:42 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 15:24:42 2020 +0300 [VIDEOPRT] Add global variable for debugging video drivers (#3080) Reference: https://docs.microsoft.com/en-us/previous-versions/ff570170(v=vs.85) --- win32ss/drivers/videoprt/videoprt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index a59d0442017..edce0febccd 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -31,6 +31,8 @@ /* GLOBAL VARIABLES ***********************************************************/ +ULONG VideoDebugLevel = 0; + BOOLEAN VpBaseVideo = FALSE; BOOLEAN VpNoVesa = FALSE; @@ -294,6 +296,8 @@ IntVideoPortFindAdapter( SystemBasicInfo.PageSize; } + // FIXME: Check the adapter key and update VideoDebugLevel variable. + /* * Call miniport HwVidFindAdapter entry point to detect if * particular device is present. There are two possible code @@ -794,6 +798,9 @@ VideoPortDebugPrint( { va_list ap; + if (VideoDebugLevel >= DebugPrintLevel) + DebugPrintLevel = Error; + va_start(ap, DebugMessage); vDbgPrintEx(DPFLTR_IHVVIDEO_ID, DebugPrintLevel, DebugMessage, ap); va_end(ap);

4 years

[reactos] 01/01: [PCIIDEX] Implement missing PciIdeXDebugPrint function (#3146)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8de896aaabd54f8fae5… commit 0f8de896aaabd54f8fae579b98525d7c648dddfa Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Sep 15 18:10:52 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 15:10:52 2020 +0300 [PCIIDEX] Implement missing PciIdeXDebugPrint function (#3146) It's useful for debugging IDE controller minidrivers, and it makes pciidex.sys work on Windows XP/2003. - https://user-images.githubusercontent.com/37072976/92856412-39d56b80-f415-1… CORE-17256 --- drivers/storage/ide/pciidex/miniport.c | 29 +++++++++++++++++++++++++++++ drivers/storage/ide/pciidex/pciidex.spec | 1 + drivers/storage/inc/ide.h | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/storage/ide/pciidex/miniport.c b/drivers/storage/ide/pciidex/miniport.c index bb0ea2afbf7..c58f3d1397b 100644 --- a/drivers/storage/ide/pciidex/miniport.c +++ b/drivers/storage/ide/pciidex/miniport.c @@ -11,6 +11,9 @@ #define NDEBUG #include <debug.h> +/** @brief Global debugging level. Valid values are between 0 (Error) and 3 (Trace). */ +ULONG PciIdeDebug = 0; + static DRIVER_DISPATCH PciIdeXForwardOrIgnore; static NTSTATUS NTAPI PciIdeXForwardOrIgnore( @@ -90,6 +93,32 @@ PciIdeXPnpDispatch( return PciIdeXPdoPnpDispatch(DeviceObject, Irp); } +/** + * @brief Prints the given string with printf-like formatting to the kernel debugger. + * @param[in] DebugPrintLevel Level of the debug message. + * Valid values are between 0 (Error) and 3 (Trace). + * @param[in] DebugMessage Format of the string/arguments. + * @param[in] ... Variable number of arguments matching the format + * specified in \a DebugMessage. + * @sa PciIdeDebug + */ +VOID +PciIdeXDebugPrint( + _In_ ULONG DebugPrintLevel, + _In_z_ _Printf_format_string_ PCCHAR DebugMessage, + ...) +{ + va_list ap; + + /* Check if we can print anything */ + if (DebugPrintLevel <= PciIdeDebug) + DebugPrintLevel = 0; + + va_start(ap, DebugMessage); + vDbgPrintEx(DPFLTR_PCIIDE_ID, DebugPrintLevel, DebugMessage, ap); + va_end(ap); +} + NTSTATUS NTAPI PciIdeXInitialize( IN PDRIVER_OBJECT DriverObject, diff --git a/drivers/storage/ide/pciidex/pciidex.spec b/drivers/storage/ide/pciidex/pciidex.spec index b31793550f3..a5dd343ba7a 100644 --- a/drivers/storage/ide/pciidex/pciidex.spec +++ b/drivers/storage/ide/pciidex/pciidex.spec @@ -1,3 +1,4 @@ +@ varargs PciIdeXDebugPrint(long str) @ stdcall PciIdeXGetBusData(ptr ptr long long) @ stdcall PciIdeXInitialize(ptr ptr ptr long) @ stdcall PciIdeXSetBusData(ptr ptr ptr long long) diff --git a/drivers/storage/inc/ide.h b/drivers/storage/inc/ide.h index b4912499fe7..53f40d0447c 100644 --- a/drivers/storage/inc/ide.h +++ b/drivers/storage/inc/ide.h @@ -478,8 +478,8 @@ typedef struct _PCIIDE_CONFIG_HEADER { VOID PciIdeXDebugPrint( - ULONG DebugPrintLevel, - PCCHAR DebugMessage, + _In_ ULONG DebugPrintLevel, + _In_z_ _Printf_format_string_ PCCHAR DebugMessage, ... );

4 years

[reactos] 01/01: [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=345ad55319f410b509429… commit 345ad55319f410b50942994a0ccef6174d61f351 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Sep 15 13:56:51 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 15 14:56:51 2020 +0300 [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192) --- dll/win32/browseui/addressband.cpp | 6 +++--- dll/win32/browseui/toolsband.cpp | 4 ++-- win32ss/user/user32/windows/cursoricon.c | 2 +- win32ss/user/user32/windows/menu.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 820773495fe..2f0dfe36619 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -548,10 +548,10 @@ void CAddressBand::CreateGoButton() HINSTANCE shellInstance; shellInstance = _AtlBaseModule.GetResourceInstance(); - m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp index 5e98f7b2f1a..d0eb76a0dc7 100644 --- a/dll/win32/browseui/toolsband.cpp +++ b/dll/win32/browseui/toolsband.cpp @@ -290,11 +290,11 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){ SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG_HOT), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index e64e0374a17..6299c839006 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -2615,7 +2615,7 @@ BOOL WINAPI SetSystemCursor( { if (hcur == NULL) { - hcur = LoadImageW( 0, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); + hcur = LoadImageW(NULL, MAKEINTRESOURCEW(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE); if (hcur == NULL) { return FALSE; diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 231c2f78ae7..59c687f4c3a 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -669,7 +669,7 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength) Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW( Common->hModule, Common->InterSource ? MAKEINTRESOURCE(Common->InterSource) : (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW(Common->hModule, Common->InterSource ? MAKEINTRESOURCEW(Common->InterSource) : (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); }

4 years

[reactos] 01/01: [KDBG] Fixed handle leak in KdbpSymLoadModuleSymbols() when RosSymCreateFromFile() fails (#3184)

by Michael Stamper

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b43e4c981e41f26726fe2… commit b43e4c981e41f26726fe214cacde7d7ec5738907 Author: Michael Stamper <michaelstamper1(a)gmail.com> AuthorDate: Mon Sep 14 20:48:06 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 14 21:48:06 2020 +0200 [KDBG] Fixed handle leak in KdbpSymLoadModuleSymbols() when RosSymCreateFromFile() fails (#3184) --- ntoskrnl/kdbg/kdb_symbols.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 1b2d8f695c8..3baafaf7b78 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -363,6 +363,7 @@ KdbpSymLoadModuleSymbols( HANDLE FileHandle; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN Result; /* Allow KDB to break on module load */ KdbModuleLoaded(FileName); @@ -404,14 +405,15 @@ KdbpSymLoadModuleSymbols( DPRINT("Loading symbols from %wZ...\n", FileName); - if (!RosSymCreateFromFile(&FileHandle, RosSymInfo)) + Result = RosSymCreateFromFile(&FileHandle, RosSymInfo); + ZwClose(FileHandle); + + if (!Result) { DPRINT("Failed to load symbols from %wZ\n", FileName); return; } - ZwClose(FileHandle); - DPRINT("Symbols loaded.\n"); /* add file to cache */

4 years

← Newer
1
...
25
26
27
28
29
30
31
...
39
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 September 2020