wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

shell32-Context_Menu: Rebase.

Browse Source
This commit is contained in:
Zebediah Figura 2018-02-17 19:05:54 -06:00
parent 469d9bb7bf
commit 81174370bb
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
patches/shell32-Context_Menu/0003-shell32-Implement-insert-paste-for-item-context-menu.patch
View File

@ -1,15 +1,15 @@
From f378913d8cb2e40abb4e24d4bfaf0cbe7ea8134a Mon Sep 17 00:00:00 2001
From 103583fcc07412ede80a00edc1f07a9d0ada28e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 2 Apr 2016 01:39:40 +0200
Subject: shell32: Implement insert/paste for item context menus.
Subject: [PATCH 3/7] shell32: Implement insert/paste for item context menus.
---
dlls/shell32/shell32.rc | 1 +
dlls/shell32/shlview_cmenu.c | 68 +++++++++++++++++++++++++++++++++++++++-----
2 files changed, 62 insertions(+), 7 deletions(-)
dlls/shell32/shlview_cmenu.c | 64 +++++++++++++++++++++++++++++++++++++++-----
2 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index bfba962..4f2015b 100644
index 6585416..0c75786 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -99,6 +99,7 @@ BEGIN
@ -21,7 +21,7 @@ index bfba962..4f2015b 100644
MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
index 7ce6cd9..d972922 100644
index 677bb3f..0394da3 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -59,6 +59,8 @@ typedef struct
@ -113,29 +113,25 @@ index 7ce6cd9..d972922 100644
case FCIDM_SHVIEW_PROPERTIES:
TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n");
DoOpenProperties(This, lpcmi->hwnd);
@@ -510,6 +542,10 @@ static HRESULT WINAPI ItemMenu_GetCommandString(
strcpy(lpszName, "copy");
hr = S_OK;
break;
+ case FCIDM_SHVIEW_INSERT:
+ strcpy(lpszName, "paste");
+ hr = S_OK;
+ break;
case FCIDM_SHVIEW_CREATELINK:
strcpy(lpszName, "link");
hr = S_OK;
@@ -550,6 +586,10 @@ static HRESULT WINAPI ItemMenu_GetCommandString(
MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen);
hr = S_OK;
break;
+ case FCIDM_SHVIEW_INSERT:
+ MultiByteToWideChar(CP_ACP, 0, "paste", -1, (LPWSTR)lpszName, uMaxNameLen);
+ hr = S_OK;
+ break;
case FCIDM_SHVIEW_CREATELINK:
MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen);
hr = S_OK;
@@ -757,8 +797,22 @@ static BOOL DoPaste(ContextMenu *This)
@@ -478,6 +510,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c
static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0};
static const WCHAR cutW[] = {'c','u','t',0};
static const WCHAR copyW[] = {'c','o','p','y',0};
+ static const WCHAR pasteW[] = {'p','a','s','t','e',0};
static const WCHAR linkW[] = {'l','i','n','k',0};
static const WCHAR deleteW[] = {'d','e','l','e','t','e',0};
static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0};
@@ -511,6 +544,9 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c
case FCIDM_SHVIEW_COPY:
cmdW = copyW;
break;
+ case FCIDM_SHVIEW_INSERT:
+ cmdW = pasteW;
+ break;
case FCIDM_SHVIEW_CREATELINK:
cmdW = linkW;
break;
@@ -726,8 +762,22 @@ static BOOL DoPaste(ContextMenu *This)
if (psfFrom)
{
/* get source and destination shellfolder */
@ -161,5 +157,5 @@ index 7ce6cd9..d972922 100644
/* do the copy/move */
--
2.7.1
2.7.4