From 0f3bd44e32e7c1211f490e1d237a391f6d4a3e49 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 16 Mar 2022 12:25:32 +1100
Subject: [PATCH] Updated shell32-NewMenu_Interface patchset

Warning fixes.
---
 ...plement-NewMenu-with-new-folder-item.patch | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch
index 44e92c73..2554d470 100644
--- a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch
+++ b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch
@@ -1,4 +1,4 @@
-From 98b6fa0725d376b912932352637968f8e53432de Mon Sep 17 00:00:00 2001
+From ad46f8fd4e3d8e064606922e9f6fe8f9bbc1450f 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,7 +21,7 @@ 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 7cc704e56b6..40df42aaaf2 100644
+index eeb6cd63d60..619b33837ab 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
 @@ -29,6 +29,7 @@ C_SRCS = \
@@ -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 c39520371ec..26034777f0e 100644
+index ca93293e50b..073bb7e9b2b 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
@@ -62,7 +62,7 @@ index c39520371ec..26034777f0e 100644
  HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN;
 diff --git a/dlls/shell32/shellnew.c b/dlls/shell32/shellnew.c
 new file mode 100644
-index 00000000000..a825d5a39a9
+index 00000000000..ba31b3787f8
 --- /dev/null
 +++ b/dlls/shell32/shellnew.c
 @@ -0,0 +1,497 @@
@@ -182,7 +182,7 @@ index 00000000000..a825d5a39a9
 +    NewMenuImpl *This = impl_from_IShellExtInit(iface);
 +    ULONG ref = InterlockedIncrement(&This->ref);
 +
-+    TRACE("(%p), refcount=%i\n", iface, ref);
++    TRACE("(%p), refcount=%lu\n", iface, ref);
 +
 +    return ref;
 +}
@@ -193,7 +193,7 @@ index 00000000000..a825d5a39a9
 +    NewMenuImpl *This = impl_from_IShellExtInit(iface);
 +    ULONG ref = InterlockedDecrement(&This->ref);
 +
-+    TRACE("(%p), refcount=%i\n", iface, ref);
++    TRACE("(%p), refcount=%lu\n", iface, ref);
 +
 +    if (!ref)
 +    {
@@ -320,7 +320,7 @@ index 00000000000..a825d5a39a9
 +{
 +    NewMenuImpl *This = impl_from_IContextMenu3(iface);
 +
-+    FIXME("(%p)->(%lu %u %p %p %u): stub\n", This, cmd, type, reserved, name, max_len);
++    FIXME("(%p)->(%Iu %u %p %p %u): stub\n", This, cmd, type, reserved, name, max_len);
 +
 +    return E_NOTIMPL;
 +}
@@ -472,7 +472,7 @@ index 00000000000..a825d5a39a9
 +{
 +    NewMenuImpl *This = impl_from_IContextMenu3(iface);
 +
-+    TRACE("(%p)->(%u, %lx, %lx, %p)\n", This, uMsg, wParam, lParam, result);
++    TRACE("(%p)->(%u, %Ix, %Ix, %p)\n", This, uMsg, wParam, lParam, result);
 +
 +    switch (uMsg)
 +    {
@@ -576,7 +576,7 @@ 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..c5849965777 100644
+index b405a84bc19..4870dc11bcf 100644
 --- a/dlls/shell32/tests/shlview.c
 +++ b/dlls/shell32/tests/shlview.c
 @@ -1479,7 +1479,6 @@ static void test_newmenu(void)
@@ -592,11 +592,11 @@ index b405a84bc19..c5849965777 100644
      IUnknown_Release(unk2);
  
 +    hr = IUnknown_QueryInterface(unk, &IID_IContextMenu, (void **)&unk2);
-+    ok(hr == S_OK, "Failed to get IContextMenu, hr %#x.\n", hr);
++    ok(hr == S_OK, "Failed to get IContextMenu, hr %#lx.\n", hr);
 +    IUnknown_Release(unk2);
 +
 +    hr = IUnknown_QueryInterface(unk, &IID_IContextMenu2, (void **)&unk2);
-+    ok(hr == S_OK, "Failed to get IContextMenu2, hr %#x.\n", hr);
++    ok(hr == S_OK, "Failed to get IContextMenu2, hr %#lx.\n", hr);
 +    IUnknown_Release(unk2);
 +
      hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2);