wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 16c6c249a5134de2422fbd3471ead7425c968301.

Browse Source
This commit is contained in:
Zebediah Figura
2022-10-10 22:27:34 -05:00
parent 0ea57a0262
commit e6f9a449cd
13 changed files with 58 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch
View File

@@ -1,4 +1,4 @@
From ad46f8fd4e3d8e064606922e9f6fe8f9bbc1450f Mon Sep 17 00:00:00 2001
From 69b8c9461157d1b988ec039c4f7e7a467cb9e951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 16 Aug 2015 17:34:22 +0200
Subject: [PATCH] shell32: Implement NewMenu with new folder item.
@@ -21,10 +21,10 @@ Correct header issue when compiling i386 (var_arg)
create mode 100644 dlls/shell32/shellnew.c
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index eeb6cd63d60..619b33837ab 100644
index 9e2395126fc..3bba1b0e3fd 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -29,6 +29,7 @@ C_SRCS = \
@@ -28,6 +28,7 @@ C_SRCS = \
shelldispatch.c \
shellitem.c \
shelllink.c \
@@ -33,7 +33,7 @@ index eeb6cd63d60..619b33837ab 100644
shellord.c \
shellpath.c \
diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl
index 22ef49ae5c7..699ad1a2f03 100644
index dc65ed3728d..c5f4215196f 100644
--- a/dlls/shell32/shell32_classes.idl
+++ b/dlls/shell32/shell32_classes.idl
@@ -86,6 +86,11 @@ coclass KnownFolderManager { interface IKnownFolderManager; }
@@ -49,7 +49,7 @@ index 22ef49ae5c7..699ad1a2f03 100644
threading(apartment),
uuid(00bb2763-6a77-11d0-a535-00c04fd7d062)
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index ca93293e50b..073bb7e9b2b 100644
index 7bb26e46a6e..f539a1b1e00 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -101,6 +101,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID
@@ -58,8 +58,8 @@ index ca93293e50b..073bb7e9b2b 100644
HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out) DECLSPEC_HIDDEN;
extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN;
HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN;
HRESULT WINAPI ActiveDesktop_Constructor(IUnknown *outer, REFIID riid, void **out) DECLSPEC_HIDDEN;
diff --git a/dlls/shell32/shellnew.c b/dlls/shell32/shellnew.c
new file mode 100644
index 00000000000..ba31b3787f8
@@ -564,7 +564,7 @@ index 00000000000..ba31b3787f8
+ return hr;
+}
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 7cd46ba2d98..7265e1660ac 100644
index 589e5c5170a..2984e691c17 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -72,6 +72,7 @@ static const struct {
@@ -576,10 +576,10 @@ index 7cd46ba2d98..7265e1660ac 100644
{&CLSID_QueryAssociations, QueryAssociations_Constructor},
{&CLSID_RecycleBin, RecycleBin_Constructor},
diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index b405a84bc19..4870dc11bcf 100644
index a83f3137509..2781c2152f9 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -1479,7 +1479,6 @@ static void test_newmenu(void)
@@ -1478,7 +1478,6 @@ static void test_newmenu(void)
HRESULT hr;
hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);
@@ -587,7 +587,7 @@ index b405a84bc19..4870dc11bcf 100644
ok(hr == S_OK, "Failed to create NewMenu object, hr %#lx.\n", hr);
if (hr != S_OK)
{
@@ -1491,6 +1490,14 @@ static void test_newmenu(void)
@@ -1490,6 +1489,14 @@ static void test_newmenu(void)
ok(hr == S_OK, "Failed to get IShellExtInit, hr %#lx.\n", hr);
IUnknown_Release(unk2);