From d0fa47278d714b622e509b79a08a046e14f7389d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 21 Sep 2004 19:11:35 +0000
Subject: [PATCH] Sync to winehq

svn path=/trunk/; revision=10957
---
 reactos/lib/shell32/shell32_main.h   |  9 ++-------
 reactos/lib/shell32/winehq2ros.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/reactos/lib/shell32/shell32_main.h b/reactos/lib/shell32/shell32_main.h
index 5b1e218aa81..e20c4f02e85 100644
--- a/reactos/lib/shell32/shell32_main.h
+++ b/reactos/lib/shell32/shell32_main.h
@@ -30,6 +30,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "commctrl.h"
+#include "objbase.h"
 #include "docobj.h"
 #include "undocshell.h"
 #include "shlobj.h"
@@ -56,7 +57,7 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex );
 
 /* Classes Root */
 BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL bPrependDot);
-BOOL HCR_GetExecuteCommandW(HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len);
+BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len );
 BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, LPDWORD dwNr);
 BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, LPDWORD dwNr);
 BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len);
@@ -127,12 +128,6 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
 	(((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\
 	DROPEFFECT_MOVE)
 
-#ifndef __REACTOS__
-/* Systray */
-BOOL SYSTRAY_Init(void);
-#endif
-
-
 HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
 HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
 HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
diff --git a/reactos/lib/shell32/winehq2ros.patch b/reactos/lib/shell32/winehq2ros.patch
index d879ae4adc6..4f14eee89b5 100644
--- a/reactos/lib/shell32/winehq2ros.patch
+++ b/reactos/lib/shell32/winehq2ros.patch
@@ -51,3 +51,21 @@ diff -u -r1.136 shell32_main.c
  	    InitChangeNotifications();
  	    break;
  
+Index: shell32_main.h
+===================================================================
+RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v
+retrieving revision 1.91
+diff -u -r1.91 shell32_main.h
+--- shell32_main.h	22 Aug 2004 21:38:46 -0000	1.91
++++ shell32_main.h	21 Sep 2004 19:24:47 -0000
+@@ -128,10 +128,6 @@
+ 	(((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\
+ 	DROPEFFECT_MOVE)
+ 
+-/* Systray */
+-BOOL SYSTRAY_Init(void);
+-
+-
+ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
+ HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
+ HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);