Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge in WineHQ changes

Browse source 
svn path=/trunk/; revision=7496
This commit is contained in:
Martin Fuchs 2004-01-07 07:43:19 +00:00
parent c7b79d1742
commit 0e1aea5234
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/shell32/brsfolder.c
View file

@ -202,7 +202,7 @@ static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, LPC
lptvid->pEnumIL = pEnumIL; lptvid->pEnumIL = pEnumIL;
GetNormalAndSelectedIcons(lptvid->lpifq, &tvi); GetNormalAndSelectedIcons(lptvid->lpifq, &tvi);
tvins.DUMMYUNIONNAME.item = tvi; tvins.u.item = tvi;
tvins.hInsertAfter = NULL; tvins.hInsertAfter = NULL;
tvins.hParent = hParent; tvins.hParent = hParent;

8
reactos/lib/shell32/pidl.h
View file

@ -57,11 +57,11 @@
* network 0x1F mycomp * network 0x1F mycomp
* bitbucket 0x1F mycomp * bitbucket 0x1F mycomp
* drive 0x23/25 drive (usual) * drive 0x23/25 drive (usual)
* drive 0x25/25 drive (lnk/persistant) * drive 0x25/25 drive (lnk/persistent)
* drive 0x29/25 drive * drive 0x29/25 drive
* shell extension 0x2E mycomp * shell extension 0x2E mycomp
* drive 0x2F drive (lnk/persistant) * drive 0x2F drive (lnk/persistent)
* folder/file 0x30 folder/file (1) (lnk/persistant) * folder/file 0x30 folder/file (1) (lnk/persistent)
* folder 0x31 folder (usual) * folder 0x31 folder (usual)
* valueA 0x32 file (ANSI file name) * valueA 0x32 file (ANSI file name)
* valueW 0x34 file (Unicode file name) * valueW 0x34 file (Unicode file name)
@ -73,7 +73,7 @@
* history/favorites 0xb1 file * history/favorites 0xb1 file
* share 0xc3 network (6) * share 0xc3 network (6)
* *
* guess: the persistant elements are non tracking * guess: the persistent elements are non tracking
* *
* (1) dummy byte is used, attributes are empty * (1) dummy byte is used, attributes are empty
* (2) IID_MyComputer = 20D04FE0L-3AEA-1069-A2D8-08002B30309D * (2) IID_MyComputer = 20D04FE0L-3AEA-1069-A2D8-08002B30309D

2
reactos/lib/shell32/shlexec.c
View file

@ -431,7 +431,7 @@ UINT SHELL_FindExecutable(LPCSTR lpPath, LPCSTR lpFile, LPCSTR lpOperation,
LPSTR lpResult, LPSTR key, void **env, LPITEMIDLIST pidl, LPCSTR args) LPSTR lpResult, LPSTR key, void **env, LPITEMIDLIST pidl, LPCSTR args)
{ {
char *extension = NULL; /* pointer to file extension */ char *extension = NULL; /* pointer to file extension */
char tmpext[5]; /* local copy to mung as we please */ char tmpext[5]; /* local copy to munge as we please */
char filetype[256]; /* registry name for this filetype */ char filetype[256]; /* registry name for this filetype */
LONG filetypelen = 256; /* length of above */ LONG filetypelen = 256; /* length of above */
char command[256]; /* command from registry */ char command[256]; /* command from registry */

2
reactos/lib/shell32/shlmenu.c
View file

@ -427,7 +427,7 @@ int WINAPI FileMenu_InsertUsingPidl (
/************************************************************************* /*************************************************************************
* FileMenu_ReplaceUsingPidl [SHELL32.113] * FileMenu_ReplaceUsingPidl [SHELL32.113]
* *
* FIXME: the static items are deleted but wont be refreshed * FIXME: the static items are deleted but won't be refreshed
*/ */
int WINAPI FileMenu_ReplaceUsingPidl( int WINAPI FileMenu_ReplaceUsingPidl(
HMENU hmenu, HMENU hmenu,