From: mohr@elektron.ikp.physik.tu-darmstadt.de (Andreas Mohr)
Newsgroups: local.list.wine.patches
Subject: shlmenu fix
Date: 16 Nov 1999 19:32:35 +0100
Organization: home
Lines: 54
Message-ID: <199911161303.OAA13412@hertz.ikp.physik.tu-darmstadt.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM942757435-13379-0_
Content-Transfer-Encoding: 7bit
X-Resent-Date: Tue, 16 Nov 1999 06:04:08 -0700
X-To: wine-patches@winehq.com
X-Mailer: ELM [version 2.4ME+ PL47 (25)]
X-Resent-Message-ID: <JN9fkD.A.GjD.IZVM4@ursula.gmcl.com>
X-Resent-From: wine-patches@winehq.com
X-Reply-To: wine-devel@winehq.com
X-Mailing-List: <wine-patches@winehq.com> archive/latest/2132
X-Loop: wine-patches@winehq.com
X-Precedence: list
X-Resent-Sender: wine-patches-request@winehq.com


--ELM942757435-13379-0_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi,

SHFind_InitMenuPopup is supposed to return a pointer.
Makes my Explorer version happy again.

Andreas Mohr

--ELM942757435-13379-0_
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=diff.shlmenu
Content-Description: /home/mohr/diff.shlmenu
Content-Transfer-Encoding: 7bit

Index: dlls/shell32/shlmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlmenu.c,v
retrieving revision 1.7
diff -u -w -r1.7 shlmenu.c
--- dlls/shell32/shlmenu.c	1999/10/13 12:28:25	1.7
+++ dlls/shell32/shlmenu.c	1999/11/16 13:55:36
@@ -764,15 +764,19 @@
  *
  *
  * PARAMETERS
- *  hMenu		[in] handel of menu previously created
+ *  hMenu		[in] handle of menu previously created
  *  hWndParent	[in] parent window
- *  w			[in] no pointer
- *  x			[in] no pointer
+ *  w			[in] no pointer (0x209 over here) perhaps menu IDs ???
+ *  x			[in] no pointer (0x226 over here)
+ *
+ * RETURNS
+ *  LPXXXXX			 pointer to struct containing a func addr at offset 8
+ *					 or NULL at failure.
  */
-HRESULT WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
+LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
 {	FIXME("hmenu=0x%08x hwnd=0x%08x 0x%08lx 0x%08lx stub\n",
 		hMenu,hWndParent,w,x);
-	return TRUE;
+	return NULL; /* this is supposed to be a pointer */
 }
 
 /*************************************************************************

--ELM942757435-13379-0_--

---
