diff --git a/sdk-api-src/content/shlobj_core/nc-shlobj_core-lpfndfmcallback.md b/sdk-api-src/content/shlobj_core/nc-shlobj_core-lpfndfmcallback.md
index e6cb899e017..8db60cb99fb 100644
--- a/sdk-api-src/content/shlobj_core/nc-shlobj_core-lpfndfmcallback.md
+++ b/sdk-api-src/content/shlobj_core/nc-shlobj_core-lpfndfmcallback.md
@@ -90,19 +90,19 @@ One of the following notifications.
|
-DFM_MERGECONTEXTMENU
+DFM_MERGECONTEXTMENU
|
-Sent by the default context menu implementation to allow LPFNDFMCALLBACK to add items to the menu. |
+Sent by the default context menu implementation to allow LPFNDFMCALLBACK to add items to the menu. Notification can be processed using S_OK return value to add the default extension to the menu. |
|
-DFM_INVOKECOMMAND
+DFM_INVOKECOMMAND
|
-Sent by the default context menu implementation to request LPFNDFMCALLBACK to invoke a menu command. |
+Sent by the default context menu implementation to request LPFNDFMCALLBACK to invoke a menu command. Notification can be processed using S_FALSE return value to invoke the default command handler. |
|
-DFM_GETDEFSTATICID
+DFM_GETDEFSTATICID
|
Sent by the default context menu implementation when the default menu command is being created, allowing an alternate choice to be made. |
@@ -134,6 +134,16 @@ Returns S_OK if the message was handled, or an error value otherwise, including
+- S_FALSE
+
+ |
+
+DFM_INVOKECOMMAND notification: invoke the default command handler.
+ |
+
+
+
+
- E_NOTIMPL
|
diff --git a/sdk-api-src/content/shlobj_core/nf-shlobj_core-cdeffoldermenu_create2.md b/sdk-api-src/content/shlobj_core/nf-shlobj_core-cdeffoldermenu_create2.md
index 4f71e19c0bc..82ea3c67e87 100644
--- a/sdk-api-src/content/shlobj_core/nf-shlobj_core-cdeffoldermenu_create2.md
+++ b/sdk-api-src/content/shlobj_core/nf-shlobj_core-cdeffoldermenu_create2.md
@@ -58,13 +58,13 @@ Creates a context menu for a selected group of file folder objects.
Type: PCIDLIST_ABSOLUTE
-An ITEMIDLIST structure for the parent folder. This value can be NULL.
+An ITEMIDLIST structure for the parent folder. The value is passed to the shell extension IShellExtInit::Initialize method. This value can be NULL.
### -param hwnd [in, optional]
Type: HWND
-A handle to the parent window. This value can be NULL.
+A handle to the parent window. The value is passed to LPFNDFMCALLBACK callback and IShellFolder::GetUIObjectOf method. This value can be NULL.
### -param cidl
@@ -76,13 +76,13 @@ The number of ITEMI
Type: PCUITEMID_CHILD_ARRAY*
-A pointer to an array of ITEMIDLIST structures, one for each item that is selected.
+A pointer to an array of ITEMIDLIST structures, one for each item that is selected. Absolute ITEMIDLIST are supported, which can be used when psf represents the desktop folder.
### -param psf [in, optional]
Type: IShellFolder*
-A pointer to the parent folder's IShellFolder interface. This IShellFolder must support the IDataObject interface. If it does not, CDefFolderMenu_Create2 fails and returns E_NOINTERFACE. This value can be NULL.
+A pointer to the parent folder's IShellFolder interface. This IShellFolder must support the IDataObject interface. If it does not, CDefFolderMenu_Create2 fails and returns IShellFolder::GetUIObjectOf result value. This value can be NULL. If this value is NULL, there will be no items in the context menu.
### -param pfn [in, optional]
@@ -90,6 +90,17 @@ Type: LPFNDFMCALLBACK callback object. This value can be NULL if the callback object is not needed.
+Common callback use cases:
+
+
+-
+Processing DFM_MERGECONTEXTMENU notification and returning S_OK to add the default extension to the menu.
+
+-
+Processing DFM_INVOKECOMMAND notification and returning S_FALSE to invoke the default command handler.
+
+
+
### -param nKeys
Type: UINT
@@ -105,7 +116,28 @@ The number of registry keys in the array pointed to by ahkeys.
Type: const HKEY*
-A pointer to an array of registry keys that specify the context menu handlers used with the menu's entries. For more information on context menu handlers, see Creating Context Menu Handlers. This array can contain a maximum of 16 registry keys.
+A pointer to an array of registry keys that specify the context menu handlers used with the menu's entries. For more information on context menu handlers, see Creating Context Menu Handlers and Registering Shell Extension Handlers. This array can contain a maximum of 16 registry keys.
+
+Common subkeys of HKEY_CLASSES_ROOT that can be used:
+
+
+
+| Subkey |
+Description |
+
+
+| AllFileSystemObjects |
+All files and file folders |
+
+
+| * |
+All files |
+
+
+| Directory |
+File folders |
+
+
### -param ppcm [out]