Sync to winehq

reactos/lib/shell32

diff -u -r1.22 -r1.23
--- shell32_main.h	20 Sep 2004 19:47:13 -0000	1.22
+++ shell32_main.h	21 Sep 2004 19:11:35 -0000	1.23
@@ -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 @@

 
 /* 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 @@

 	(((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);

reactos/lib/shell32

diff -u -r1.3 -r1.4
--- winehq2ros.patch	21 Sep 2004 19:02:01 -0000	1.3
+++ winehq2ros.patch	21 Sep 2004 19:11:35 -0000	1.4
@@ -51,3 +51,21 @@

  	    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);