Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RAPPS] Fix of unhandled exception when trying to modify/uninstall without selection (#3185)
by Kyle Katarn 15 Sep '20

15 Sep '20

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

1 0

[reactos] 01/01: [MMIXER] Fix NULL dereference CORE-17276
by Joachim Henze 15 Sep '20

15 Sep '20

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) {

1 0

[reactos] 01/01: [VIDEOPRT] Add global variable for debugging video drivers (#3080)
by Dmitry Borisov 15 Sep '20

15 Sep '20

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

1 0

[reactos] 01/01: [PCIIDEX] Implement missing PciIdeXDebugPrint function (#3146)
by Dmitry Borisov 15 Sep '20

15 Sep '20

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, ... );

1 0

[reactos] 01/01: [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192)
by Serge Gautherie 15 Sep '20

15 Sep '20

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

1 0

[reactos] 01/01: [KDBG] Fixed handle leak in KdbpSymLoadModuleSymbols() when RosSymCreateFromFile() fails (#3184)
by Michael Stamper 14 Sep '20

14 Sep '20

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 */

1 0

[reactos] 01/01: [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps
by Joachim Henze 14 Sep '20

14 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d7ebc20481a587bd19e8… commit 6d7ebc20481a587bd19e8a8049317113071b0817 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 14 17:12:16 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 14 17:12:16 2020 +0200 [WDMAUD.DRV] Workaround multiple issues with AC97 driver from rapps By taking alternative code-paths in WdmAud and bypassing Sysaudio. This relies on the patch 0.4.15-dev-765-g b8e936a57b4770e133772cf2dd66f30671a1524b It fixes the following bugs/regressions: -CORE-13202 Unhandled exception from wdmaud.drv when recording sound in Scratch 1.4 leads to app-crash -CORE-13488 A deadlock in "DiabloII" character selection screen and "The Lion King II" -CORE-8726/CORE-9986/CORE-16564 AC97 driver is now working in the same session where driver was installed, no reboot-orgies needed anymore -CORE-9981 almost 100% fixed, DosBox + Commander Keen6 properly plays music instead of garbled output, same improvement for ScummVM 2.0 with Monkey Island 2 The playback is not yet *entirely* perfect, still a few hiccups now and then, but by orders of magnitude better than before. --- dll/win32/wdmaud.drv/wdmaud.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/wdmaud.drv/wdmaud.c b/dll/win32/wdmaud.drv/wdmaud.c index dfd8ea0361e..45308b3aff2 100644 --- a/dll/win32/wdmaud.drv/wdmaud.c +++ b/dll/win32/wdmaud.drv/wdmaud.c @@ -18,6 +18,7 @@ #include <debug.h> #include <mmebuddy_debug.h> +#define USE_MMIXER_LIB #ifndef USE_MMIXER_LIB #define FUNC_NAME(x) x##ByLegacy #else

1 0

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164)
by Katayama Hirofumi MZ 14 Sep '20

14 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78edea816477ac7d088a8… commit 78edea816477ac7d088a86ec1743d7a649c0c025 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 14 13:25:45 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 14 13:25:45 2020 +0900 [SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164) - Add tests for "My Documents" and "Control Panel". - Add some comments for usability. CORE-16939 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 63 ++++++++++++---------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 770c71c365f..1ec15fa02c2 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -13,8 +13,6 @@ #include <debug.h> #include <stdio.h> -//#define ShellExecCmdLine ShellExecCmdLine - #ifndef SECL_NO_UI #define SECL_NO_UI 0x2 #define SECL_LOG_USAGE 0x8 @@ -23,7 +21,7 @@ #define SECL_RUNAS 0x40 #endif -#ifdef ShellExecCmdLine +#define ShellExecCmdLine proxy_ShellExecCmdLine #define shell32_hInstance GetModuleHandle(NULL) #define IDS_FILE_NOT_FOUND (-1) @@ -38,6 +36,7 @@ static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source) lstrcpyW(*target, source); } +// NOTE: You have to sync the following code to dll/win32/shell32/shlexec.cpp. static LPCWSTR SplitParams(LPCWSTR psz, LPWSTR pszArg0, size_t cchArg0) { @@ -236,10 +235,11 @@ HRESULT WINAPI ShellExecCmdLine( return HRESULT_FROM_WIN32(dwError); } -#else - typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); - SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; -#endif + +#undef ShellExecCmdLine + +typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD); +SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; typedef struct TEST_ENTRY { @@ -396,6 +396,12 @@ static const TEST_ENTRY s_entries[] = { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL }, { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." }, + // My Documents + { __LINE__, S_OK, TRUE, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + // Control Panel + { __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, + { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, }; static void DoEntry(const TEST_ENTRY *pEntry) @@ -410,13 +416,16 @@ static void DoEntry(const TEST_ENTRY *pEntry) _SEH2_TRY { -#ifdef ShellExecCmdLine - hr = ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#else - hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, - SW_SHOWNORMAL, NULL, dwSeclFlags); -#endif + if (IsReactOS()) + { + hr = proxy_ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } + else + { + hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir, + SW_SHOWNORMAL, NULL, dwSeclFlags); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -454,22 +463,22 @@ START_TEST(ShellExecCmdLine) { using namespace std; -#ifndef ShellExecCmdLine - // CHECKME - if (!IsWindowsVistaOrGreater()) + if (!IsReactOS()) { - skip("ShellExecCmdLine is not available on this platform\n"); - return; - } + if (!IsWindowsVistaOrGreater()) + { + skip("ShellExecCmdLine is not available on this platform\n"); + return; + } - HMODULE hShell32 = GetModuleHandleA("shell32"); - g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); - if (!g_pShellExecCmdLine) - { - skip("ShellExecCmdLine is not found\n"); - return; + HMODULE hShell32 = GetModuleHandleA("shell32"); + g_pShellExecCmdLine = (SHELLEXECCMDLINE)GetProcAddress(hShell32, (LPCSTR)(INT_PTR)265); + if (!g_pShellExecCmdLine) + { + skip("ShellExecCmdLine is not found\n"); + return; + } } -#endif // s_testfile1 FILE *fp = fopen(s_testfile1, "wb");

1 0

[reactos] 01/01: [SHELL32] Fix boot to shell, addendum to commit 14599b0a.
by Hermès Bélusca-Maïto 14 Sep '20

14 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3731984199872416fa2a… commit a3731984199872416fa2a53fd7b3867fede3135d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 14 05:39:48 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 14 05:54:13 2020 +0200 [SHELL32] Fix boot to shell, addendum to commit 14599b0a. shell32.ShellMessageBoxW redirects to shlwapi.ShellMessageBoxWrapW. However the latter one (shlwapi) is exported by ordinal only. Trying to use in shell32.spec file the following syntax: 182 varargs ShellMessageBoxW() shlwapi.ShellMessageBoxWrapW will therefore fail at runtime, because Windows/ReactOS will fail to snap shlwapi.ShellMessageBoxWrapW. Using instead an export by orginal: 182 varargs ShellMessageBoxW() shlwapi.#388 actually fails as well, but at link time, by both MSVC' LINK and GNU's dlltool. This generates a .def file containing the line: ShellMessageBoxW=shlwapi.#388 @182 It is not clear why it fails, because according to: https://docs.microsoft.com/en-us/cpp/build/reference/exports?view=vs-2019 and https://devblogs.microsoft.com/oldnewthing/20121116-00/?p=6073 this should be possible. However one encounters the same errors as those described at: https://groups.google.com/forum/#!topic/microsoft.public.vc.language/AVnx-E… and https://www.xspdf.com/questions/22333.shtml ... So instead we use another trick, that appears to be already in use in the shell32.spec. Since the shlwapi functions are imported because we link to it, this means that ShellMessageBoxWrapW() is already available through this import. So we can specify it in the .spec file as is, without a full name prefixed with "shlwapi." . Therefore the associated shell32.ShellMessageBoxW function will instead link to the small ShellMessageBoxWrapW() import stub that is generated automatically. --- dll/win32/shell32/shell32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 110ac17c69c..f5270cc103f 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,7 +178,7 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) shlwapi.ShellMessageBoxWrapW +182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long)

1 0

[reactos] 01/01: [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)
by Serge Gautherie 13 Sep '20

13 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a04831677eaaf62a7d7a9… commit a04831677eaaf62a7d7a99583f6f5e788687d9d2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 13 23:42:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 23:42:09 2020 +0200 [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152) CORE-12004 --- base/shell/progman/dialog.c | 4 ++-- sdk/lib/crt/misc/dbgrpt.cpp | 2 +- win32ss/user/user32/windows/cursoricon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/progman/dialog.c b/base/shell/progman/dialog.c index 3aebd71356f..452b1bc4c7b 100644 --- a/base/shell/progman/dialog.c +++ b/base/shell/progman/dialog.c @@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName); SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32); - pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, @@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, PM_ICON_FILE, filename); DestroyIconList(pIconContext->hDlgCtrl); - pIconContext->hLibrary = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + pIconContext->hLibrary = LoadLibraryExW(filename, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index 9259ff8edab..a349687d475 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -113,7 +113,7 @@ HMODULE _CrtGetUser32() { if (_CrtUser32Handle == NULL) { - HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, 0 /* NT6+: LOAD_LIBRARY_SEARCH_SYSTEM32 */); if (mod == NULL) mod = (HMODULE)INVALID_HANDLE_VALUE; diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index ad0ac4d6d05..e64e0374a17 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -1866,7 +1866,7 @@ CURSORICON_CopyImage( ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); /* Get the module handle or load the module */ - hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(ustrModule.Buffer, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { DWORD err = GetLastError();

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