Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 02/02: [CMAKE] Set KDBG define only where required (fastfat, win32k, ntoskrnl)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6d7571ebba5997ba6fb0… commit b6d7571ebba5997ba6fb0ef18da3eee0e57da500 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Jun 25 19:01:08 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Sep 10 23:16:27 2022 +0200 [CMAKE] Set KDBG define only where required (fastfat, win32k, ntoskrnl) --- CMakeLists.txt | 4 ---- drivers/filesystems/fastfat/CMakeLists.txt | 3 +++ ntoskrnl/ntos.cmake | 4 ++++ win32ss/CMakeLists.txt | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1e95dfd5b5..3b6cfae73a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,10 +217,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to add_definitions(-DDBG=0) endif() - if(KDBG) - add_definitions(-DKDBG) - endif() - if(ENABLE_CCACHE) message(WARNING "-- Disabling precompiled headers support (ccache).") option(PCH "Whether to use precompiled headers" OFF) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 123845f813d..4eb78bf29a6 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -24,6 +24,9 @@ list(APPEND SOURCE volume.c vfat.h) +if(KDBG) + add_definitions(-DKDBG) +endif() add_library(fastfat MODULE ${SOURCE} vfatfs.rc) set_module_type(fastfat kernelmodedriver) target_link_libraries(fastfat ${PSEH_LIB}) diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 0c666cfeb8f..38af3b2b81b 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -378,6 +378,10 @@ elseif(ARCH STREQUAL "arm") endif() if(NOT _WINKD_) + if(KDBG) + add_definitions(-DKDBG) + endif() + if(ARCH STREQUAL "i386") list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index 16026d6275e..f771bdd3771 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -226,6 +226,7 @@ list(APPEND SOURCE endif() if(KDBG) + add_definitions(-DKDBG) list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c) endif()

2 years, 2 months

[reactos] 01/02: [CMAKE] Set _WINKD_ define only where required (kernel and setuplib)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e193524925254650b1a2… commit 9e193524925254650b1a28253680b52ad44eb852 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Jun 25 18:44:37 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Sep 10 23:16:26 2022 +0200 [CMAKE] Set _WINKD_ define only where required (kernel and setuplib) --- CMakeLists.txt | 4 ---- base/setup/lib/CMakeLists.txt | 3 +++ ntoskrnl/ntos.cmake | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63353f0c58b..a1e95dfd5b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,10 +221,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to add_definitions(-DKDBG) endif() - if(_WINKD_) - add_definitions(-D_WINKD_) - endif() - if(ENABLE_CCACHE) message(WARNING "-- Disabling precompiled headers support (ccache).") option(PCH "Whether to use precompiled headers" OFF) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index a79bebf4940..cc79ec83ef8 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,5 +1,8 @@ add_definitions(${I18N_DEFS}) +if(_WINKD_) + add_definitions(-D_WINKD_) +endif() include_directories(spapisup utils) diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index af8217bc480..0c666cfeb8f 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -411,4 +411,6 @@ if(NOT _WINKD_) ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c) +else() + add_definitions(-D_WINKD_) endif()

2 years, 2 months

[reactos] 01/01: [FLOPPY] Correctly return media changed information

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0676247932d1f707e9b02… commit 0676247932d1f707e9b02d46073d022c02a7893b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Sep 10 22:25:19 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Sep 10 22:52:00 2022 +0200 [FLOPPY] Correctly return media changed information If disk changed since last time, we must either return STATUS_IO_DEVICE_ERROR or STATUS_VERIFY_REQUIRED, depending of VPB_MOUNTED flag. This is already handled by the SignalMediaChanged() function. CORE-18244 --- drivers/storage/floppy/floppy/ioctl.c | 12 +++--------- drivers/storage/floppy/floppy/readwrite.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/storage/floppy/floppy/ioctl.c b/drivers/storage/floppy/floppy/ioctl.c index 11875e51838..7673a0fd0f0 100644 --- a/drivers/storage/floppy/floppy/ioctl.c +++ b/drivers/storage/floppy/floppy/ioctl.c @@ -153,16 +153,10 @@ DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp) if(DiskChanged) { INFO_(FLOPPY, "DeviceIoctl(): detected disk changed; signalling media change and completing\n"); - SignalMediaChanged(DriveInfo->DeviceObject, Irp); - /* - * Just guessing here - I have a choice of returning NO_MEDIA or VERIFY_REQUIRED. If there's - * really no disk in the drive, I'm thinking I can save time by just reporting that fact, rather - * than forcing windows to ask me twice. If this doesn't work, we'll need to split this up and - * handle the CHECK_VERIFY IOCTL separately. - */ - if(ResetChangeFlag(DriveInfo) == STATUS_NO_MEDIA_IN_DEVICE) - Irp->IoStatus.Status = STATUS_NO_MEDIA_IN_DEVICE; + /* The following call sets IoStatus.Status and IoStatus.Information */ + SignalMediaChanged(DriveInfo->DeviceObject, Irp); + ResetChangeFlag(DriveInfo); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); diff --git a/drivers/storage/floppy/floppy/readwrite.c b/drivers/storage/floppy/floppy/readwrite.c index 2ce3a6ccf17..35d1c60d79b 100644 --- a/drivers/storage/floppy/floppy/readwrite.c +++ b/drivers/storage/floppy/floppy/readwrite.c @@ -478,16 +478,11 @@ ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp) if(DiskChanged) { - INFO_(FLOPPY, "ReadWritePhase1(): signalling media changed; Completing with STATUS_MEDIA_CHANGED\n"); + INFO_(FLOPPY, "ReadWritePhase1(): detected disk changed: signalling media change and completing\n"); /* The following call sets IoStatus.Status and IoStatus.Information */ SignalMediaChanged(DeviceObject, Irp); - - /* - * Guessing at something... see ioctl.c for more info - */ - if(ResetChangeFlag(DriveInfo) == STATUS_NO_MEDIA_IN_DEVICE) - Irp->IoStatus.Status = STATUS_NO_MEDIA_IN_DEVICE; + ResetChangeFlag(DriveInfo); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo);

2 years, 2 months

[reactos] 01/01: [MSPAINT][EXPLORER][SHELL32] Enable ATL asserts in CMake

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55343f04b084931a20c39… commit 55343f04b084931a20c396b76645f38cad94ea1b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 10 17:27:50 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 10 17:27:50 2022 +0200 [MSPAINT][EXPLORER][SHELL32] Enable ATL asserts in CMake CORE-17505 In MSVC builds they would not work reliably when enabled in the precompiled header --- base/applications/mspaint/CMakeLists.txt | 4 ++++ base/applications/mspaint/precomp.h | 4 ---- base/shell/explorer/CMakeLists.txt | 4 ++++ base/shell/explorer/precomp.h | 4 ---- dll/win32/shell32/CMakeLists.txt | 4 ++++ dll/win32/shell32/precomp.h | 4 ---- dll/win32/shell32/shellmenu/CMakeLists.txt | 4 ++++ 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 03c71c21359..99215c5295b 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -2,6 +2,10 @@ project(MSPAINT) add_definitions(-DINITGUID) +if(DBG) + add_definitions(-D_DEBUG=1) # CORE-17505 +endif() + list(APPEND SOURCE dialogs.cpp dib.cpp diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index df5b929bd82..25fd0329d36 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -6,10 +6,6 @@ #undef _DEBUG #endif -#if DBG && !defined(_DEBUG) - #define _DEBUG -#endif - #include <stdarg.h> #include <windef.h> diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index 743c10d33b2..222d3a6653a 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -1,5 +1,9 @@ PROJECT(SHELL) +if(DBG) + add_definitions(-D_DEBUG=1) # CORE-17505 +endif() + list(APPEND SOURCE appbar.cpp desktop.cpp diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 0080f6806e0..efce3c2a233 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -9,10 +9,6 @@ #define WIN7_COMPAT_MODE 1 #endif -#if DBG && !defined(_DEBUG) - #define _DEBUG // CORE-17505 -#endif - #include <stdio.h> #include <tchar.h> diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 2b1f658bacd..4e1d4f63804 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -13,6 +13,10 @@ add_definitions( -D_SHELL32_ -D_WINE) +if(DBG) + add_definitions(-D_DEBUG=1) # CORE-17505 +endif() + list(APPEND SOURCE CActiveDesktop.cpp CActiveDesktop.h diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 983e619d358..9b422353e6c 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -1,10 +1,6 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ -#if DBG && !defined(_DEBUG) - #define _DEBUG // CORE-17505 -#endif - #include <stdarg.h> #include <assert.h> diff --git a/dll/win32/shell32/shellmenu/CMakeLists.txt b/dll/win32/shell32/shellmenu/CMakeLists.txt index 01b813afa0f..f3a63b72fef 100644 --- a/dll/win32/shell32/shellmenu/CMakeLists.txt +++ b/dll/win32/shell32/shellmenu/CMakeLists.txt @@ -4,6 +4,10 @@ add_definitions( -DUNICODE -D_UNICODE) +if(DBG) + add_definitions(-D_DEBUG=1) # CORE-17505 +endif() + list(APPEND SOURCE CMenuBand.cpp CMenuDeskBar.cpp

2 years, 2 months

[reactos] 01/01: [SHELL32] Fix Assertion when opening "File" menu in MyComputer twice (#4675)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86addae3cc6653d2e04e0… commit 86addae3cc6653d2e04e0d62ab4eb82db8b40ad9 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 10 15:59:00 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 10 15:59:00 2022 +0200 [SHELL32] Fix Assertion when opening "File" menu in MyComputer twice (#4675) ReactOS explorer shell asserts when opening the "File" menu in MyComputer for the second time. This is due to the cached copy of IContextMenu not being released before attempting to cache it again. Fix based on the patch proposed by JIRA user I_Kill_Bugs CORE-18353 Signed-off by: I_Kill_Bugs (original patch author) --- dll/win32/shell32/CDefView.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index a152ac6c263..98b597c59d4 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1310,6 +1310,13 @@ HRESULT CDefView::FillFileMenu() if (!hFileMenu) return E_FAIL; + /* Release cached IContextMenu */ + if (m_pCM) + { + IUnknown_SetSite(m_pCM, NULL); + m_pCM.Release(); + } + /* Cleanup the items added previously */ for (int i = GetMenuItemCount(hFileMenu) - 1; i >= 0; i--) {

2 years, 2 months

[reactos] 01/01: [NETSHELL] Fix Network Tray icon activity indication (#4669)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dcc07c18d042c2651766… commit 6dcc07c18d042c26517665042191db2fc3c080d5 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 9 23:51:51 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 9 23:51:51 2022 +0200 [NETSHELL] Fix Network Tray icon activity indication (#4669) The network activity tray icon wasn't showing activity until the Properties dialog was opened at least once. This was due to the fact that the tray icon was initialized once with missing initialization parameters for pContext (default state and Adapter index). Fix this problem by adding the missing initialization. CORE-4497, CORE-9017, CORE-15744 --- dll/shellext/netshell/lanstatusui.cpp | 8 ++++++-- dll/shellext/netshell/resource.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 64f38ef4a0f..a6d3b96e744 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -9,6 +9,8 @@ #include <winsock.h> +#define NETTIMERID 0xFABC + CLanStatus::CLanStatus() : m_lpNetMan(NULL), m_pHead(NULL) @@ -116,7 +118,7 @@ UpdateLanStatusUiDlg( } VOID -UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) +UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) { MIB_IFROW IfEntry; HICON hIcon, hOldIcon = NULL; @@ -839,7 +841,7 @@ LANStatusDlg( case WM_INITDIALOG: pContext = (LANSTATUSUI_CONTEXT *)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam); - pContext->nIDEvent = SetTimer(hwndDlg, 0xFABC, 1000, NULL); + pContext->nIDEvent = SetTimer(hwndDlg, NETTIMERID, 1000, NULL); return TRUE; case WM_TIMER: pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -946,6 +948,8 @@ CLanStatus::InitializeNetTaskbarNotifications() ZeroMemory(pContext, sizeof(LANSTATUSUI_CONTEXT)); pContext->uID = Index; pContext->pNet = pNetCon; + pContext->Status = -1; + pContext->dwAdapterIndex = Index; pItem->uID = Index; pItem->pNext = NULL; pItem->pNet = pNetCon; diff --git a/dll/shellext/netshell/resource.h b/dll/shellext/netshell/resource.h index 2d4fb6dfa2a..1519c473099 100644 --- a/dll/shellext/netshell/resource.h +++ b/dll/shellext/netshell/resource.h @@ -125,3 +125,4 @@ #define IDS_WZD_DOMAIN_NAME 13457 #define IDR_NETSHELL 20000 +

2 years, 2 months

[reactos] 01/01: [ZIPFLDR] Show icon on the taskbar (#4670)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5382f91e605b6917d71d… commit d5382f91e605b6917d71d3077bf761a83691e541 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sat Sep 10 01:26:39 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 9 20:26:39 2022 +0200 [ZIPFLDR] Show icon on the taskbar (#4670) --- dll/shellext/zipfldr/CZipExtract.cpp | 3 ++- dll/shellext/zipfldr/resource.h | 5 ++++- dll/shellext/zipfldr/zipfldr.rc | 9 +++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 8f9381e9f83..24a744f2e2d 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -334,7 +334,7 @@ public: void runWizard() { PROPSHEETHEADERW psh = { sizeof(psh), 0 }; - psh.dwFlags = PSH_WIZARD97 | PSH_HEADER; + psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID; psh.hInstance = _AtlBaseModule.GetResourceInstance(); CExtractSettingsPage extractPage(this, &m_Password); @@ -347,6 +347,7 @@ public: psh.phpage = hpsp; psh.nPages = _countof(hpsp); + psh.pszIcon = MAKEINTRESOURCE(IDI_ZIPFLDR); psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index 7a9566e1f47..d8e2861fd88 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -1,12 +1,15 @@ #pragma once +/* Icons */ +#define IDI_ZIPFLDR 1 + /* Bitmaps */ #define IDB_ZIPFLDR 164 #define IDB_HEADER 200 #define IDB_WATERMARK 201 /* registry stuff */ -#define IDR_ZIPFLDR 8000 +#define IDR_ZIPFLDR 8000 /* Dialogs */ diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 420f8d9e358..83d736fefd4 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -3,10 +3,11 @@ #include "resource.h" -164 BITMAP "res/zipfldr.bmp" -200 BITMAP "res/header.bmp" -201 BITMAP "res/watermark.bmp" -1 ICON "res/zipfldr.ico" +IDI_ZIPFLDR ICON "res/zipfldr.ico" + +IDB_ZIPFLDR BITMAP "res/zipfldr.bmp" +IDB_HEADER BITMAP "res/header.bmp" +IDB_WATERMARK BITMAP "res/watermark.bmp" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Zip Shell Extension"

2 years, 2 months

[reactos] 01/01: [EXPLORER] Fix Start Menu context menu actions (#4643)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1f6d8a3f6f1fa4f36c00… commit a1f6d8a3f6f1fa4f36c0076163cde0ed870da32b Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 9 20:23:11 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 9 20:23:11 2022 +0200 [EXPLORER] Fix Start Menu context menu actions (#4643) CORE-18336 The current design was not processing actions verbs correctly for some Start Menu context menu actions (Properties, Open all users, Explore all users), despite associated code being implemented. This was due by incorrectly filtering command IDs, not routing to the appropriate processing. --- base/shell/explorer/startctxmnu.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/startctxmnu.cpp b/base/shell/explorer/startctxmnu.cpp index a404cb4ba1f..935c8d7773d 100644 --- a/base/shell/explorer/startctxmnu.cpp +++ b/base/shell/explorer/startctxmnu.cpp @@ -32,6 +32,7 @@ class CStartMenuBtnCtxMenu : CComPtr<ITrayWindow> m_TrayWnd; CComPtr<IContextMenu> m_Inner; CComPtr<IShellFolder> m_Folder; + UINT m_idCmdCmLast; HWND m_Owner; LPITEMIDLIST m_FolderPidl; @@ -167,7 +168,8 @@ public: hRet = psfDesktop->BindToObject(pidlStart, NULL, IID_PPV_ARG(IShellFolder, &m_Folder)); if (SUCCEEDED(hRet)) { - CreateContextMenuFromShellFolderPidl(hPopup); + hRet = CreateContextMenuFromShellFolderPidl(hPopup); + m_idCmdCmLast = (SUCCEEDED(hRet)) ? HRESULT_CODE(hRet) : ID_SHELL_CMD_LAST; AddStartContextMenuItems(hPopup); } } @@ -185,7 +187,7 @@ public: UINT uiCmdId = PtrToUlong(lpici->lpVerb); if (uiCmdId != 0) { - if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) + if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId < m_idCmdCmLast)) { CMINVOKECOMMANDINFO cmici = { 0 }; CHAR szDir[MAX_PATH]; @@ -224,6 +226,7 @@ public: CStartMenuBtnCtxMenu() { + m_idCmdCmLast = ID_SHELL_CMD_LAST; } virtual ~CStartMenuBtnCtxMenu()

2 years, 2 months

[reactos] 01/01: [NTUSER] Implement IntReorderKeyboardLayouts

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bd03d8b97c4a3c0344f8… commit 5bd03d8b97c4a3c0344f864dd36feb735f2103a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 8 11:00:04 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 8 11:00:04 2022 +0900 [NTUSER] Implement IntReorderKeyboardLayouts This function is provided for KLF_REORDER flag. CORE-11700 --- win32ss/user/ntuser/kbdlayout.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index d41f53d3472..45e055d8758 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -745,10 +745,20 @@ co_UserActivateKeyboardLayout( VOID FASTCALL IntReorderKeyboardLayouts( _Inout_ PWINSTATION_OBJECT pWinSta, - _Inout_ PKL pKL) + _Inout_ PKL pNewKL) { - /* FIXME */ - gspklBaseLayout = pKL; + PKL pOldKL = gspklBaseLayout; + + if ((pWinSta->Flags & WSS_NOIO) || pNewKL == pOldKL) + return; + + pNewKL->pklPrev->pklNext = pNewKL->pklNext; + pNewKL->pklNext->pklPrev = pNewKL->pklPrev; + pNewKL->pklNext = pOldKL; + pNewKL->pklPrev = pOldKL->pklPrev; + pOldKL->pklPrev->pklNext = pNewKL; + pOldKL->pklPrev = pNewKL; + gspklBaseLayout = pNewKL; /* Should we use UserAssignmentLock? */ } /* Win: xxxActivateKeyboardLayout */

2 years, 2 months

[reactos] 01/01: [IMM32] s/Ime32LoadImeDpi/Imm32LoadImeDpi/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4fa5ef435d24b3ef632b… commit a4fa5ef435d24b3ef632b92a591b5f230a175aaf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 8 10:50:49 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 8 10:50:49 2022 +0900 [IMM32] s/Ime32LoadImeDpi/Imm32LoadImeDpi/ Typo. CORE-11700 --- dll/win32/imm32/ime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 5d6eb7bb374..de34b8d90ce 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -229,7 +229,7 @@ Failed: } // Win: LoadImeDpi -PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) +PIMEDPI APIENTRY Imm32LoadImeDpi(HKL hKL, BOOL bLock) { IMEINFOEX ImeInfoEx; CHARSETINFO ci; @@ -301,7 +301,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL) pImeDpi = ImmLockImeDpi(hKL); if (pImeDpi == NULL) - pImeDpi = Ime32LoadImeDpi(hKL, TRUE); + pImeDpi = Imm32LoadImeDpi(hKL, TRUE); return pImeDpi; } @@ -999,7 +999,7 @@ BOOL WINAPI ImmLoadIME(HKL hKL) pImeDpi = Imm32FindImeDpi(hKL); if (pImeDpi == NULL) - pImeDpi = Ime32LoadImeDpi(hKL, FALSE); + pImeDpi = Imm32LoadImeDpi(hKL, FALSE); return (pImeDpi != NULL); }

2 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
15
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 2022