Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 18:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to winehq

Browse source 
svn path=/trunk/; revision=10957
This commit is contained in:
Gé van Geldorp 2004-09-21 19:11:35 +00:00
parent e74c23bc36
commit d0fa47278d
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/lib/shell32/shell32_main.h
View file

@ -30,6 +30,7 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "commctrl.h" #include "commctrl.h"
#include "objbase.h"
#include "docobj.h" #include "docobj.h"
#include "undocshell.h" #include "undocshell.h"
#include "shlobj.h" #include "shlobj.h"
@ -127,12 +128,6 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
(((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\ (((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\
DROPEFFECT_MOVE) DROPEFFECT_MOVE)
#ifndef __REACTOS__
/* Systray */
BOOL SYSTRAY_Init(void);
#endif
HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);

18
reactos/lib/shell32/winehq2ros.patch
View file

@ -51,3 +51,21 @@ diff -u -r1.136 shell32_main.c
InitChangeNotifications(); InitChangeNotifications();
break; 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);