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

- Figured i'd go ahead and commit these changes...reduces the cludge that is shell32.dll under ROS. Still needs ALOT of work (which i actually plan on doing :) )

Browse source 
svn path=/trunk/; revision=5869
This commit is contained in:
Richard Campbell 2003-08-26 13:44:12 +00:00
parent 4825f80147
commit 9efc96ea08
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/shell32/control/control.h
View file

@ -147,6 +147,7 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet);
#ifdef __GNUC__ #ifdef __GNUC__
/*
typedef struct tagNMITEMACTIVATE{ typedef struct tagNMITEMACTIVATE{
NMHDR hdr; NMHDR hdr;
int iItem; int iItem;
@ -158,11 +159,14 @@ typedef struct tagNMITEMACTIVATE{
LPARAM lParam; LPARAM lParam;
UINT uKeyFlags; UINT uKeyFlags;
} NMITEMACTIVATE, FAR *LPNMITEMACTIVATE; } NMITEMACTIVATE, FAR *LPNMITEMACTIVATE;
*/
#define HDITEM HD_ITEM #define HDITEM HD_ITEM
#define LPNMLISTVIEW LPNM_LISTVIEW #define LPNMLISTVIEW LPNM_LISTVIEW
#define NMLISTVIEW NM_LISTVIEW #define NMLISTVIEW NM_LISTVIEW
/*
#define HDN_ENDDRAG TBN_ENDDRAG #define HDN_ENDDRAG TBN_ENDDRAG
#define LVSICF_NOSCROLL LVS_NOSCROLL #define LVSICF_NOSCROLL LVS_NOSCROLL
*/
#define HDM_GETORDERARRAY (HDM_FIRST+19) // TODO: FIX ME #define HDM_GETORDERARRAY (HDM_FIRST+19) // TODO: FIX ME
#endif #endif

3
reactos/lib/shell32/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.6 2002/09/24 15:06:09 robd Exp $ # $Id: makefile,v 1.7 2003/08/26 13:44:12 rcampbell Exp $
PATH_TO_TOP = ../.. PATH_TO_TOP = ../..
@ -29,7 +29,6 @@ TARGET_BASE = 0x77260000
MISC_OBJECTS = \ MISC_OBJECTS = \
misc/dllmain.o \ misc/dllmain.o \
misc/_stubs.o \
misc/stubs.o misc/stubs.o
CONTROL_OBJECTS = \ CONTROL_OBJECTS = \

23
reactos/lib/shell32/misc/stubs.c
View file

@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: stubs.c,v 1.4 2003/01/07 17:35:56 robd Exp $ /* $Id: stubs.c,v 1.5 2003/08/26 13:44:12 rcampbell Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -41,13 +41,13 @@
#include "shell32.h" #include "shell32.h"
#include <malloc.h> #include <malloc.h>
/*
#ifdef __GNUC__ #ifdef __GNUC__
void* _alloca(size_t); void* _alloca(size_t);
#else #else
#define __FUNCTION__ "unknown" #define __FUNCTION__ "unknown"
#endif #endif
*/
#define NO_SHLWAPI_STREAM #define NO_SHLWAPI_STREAM
#include "shlwapi.h" #include "shlwapi.h"
//#include <shellapi.h> //#include <shellapi.h>
@ -2572,7 +2572,8 @@ WOWShellExecute(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4,
STUB; STUB;
} }
STDAPI
INT WINAPI
DllCanUnloadNow(VOID) DllCanUnloadNow(VOID)
{ {
STUB; STUB;
@ -2585,6 +2586,20 @@ DllGetVersion(DWORD Unknown1)
STUB; STUB;
} }
VOID WINAPI
DllGetClassObject(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3)
{
STUB;
}
HWND WINAPI CreateStatusWindowW( LONG style,
LPCTSTR lpszText,
HWND hwndParent,
UINT wID )
{
STUB;
}
VOID WINAPI VOID WINAPI
SHGetFreeDiskSpace(VOID) SHGetFreeDiskSpace(VOID)
{ {

2
reactos/lib/shell32/shell32.def
View file

@ -378,4 +378,4 @@ SHGetSpecialFolderPathA@16
SHGetFolderPathA@20 SHGetFolderPathA@20
SHGetFolderPathW@20 SHGetFolderPathW@20
SHGetFolderLocation@20 SHGetFolderLocation@20
CreateStatusWindowW@16