ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cleanup.

This commit is contained in:
Juergen Schmied 1998-12-14 17:40:25 +00:00 committed by Alexandre Julliard
parent 4e4608e3dd
commit 882c1bef62
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/shell32/shell32_main.h
View File

@ -19,8 +19,8 @@ extern HIMAGELIST ShellBigIconList;
extern void (CALLBACK* pDLLInitComctl)(void); extern void (CALLBACK* pDLLInitComctl)(void);
extern INT32 (CALLBACK* pImageList_AddIcon) (HIMAGELIST himl, HICON32 hIcon); extern INT32 (CALLBACK* pImageList_AddIcon) (HIMAGELIST himl, HICON32 hIcon);
extern INT32 (CALLBACK* pImageList_ReplaceIcon) (HIMAGELIST, INT32, HICON32); extern INT32 (CALLBACK* pImageList_ReplaceIcon) (HIMAGELIST, INT32, HICON32);
extern HIMAGELIST (CALLBACK * pImageList_Create) (INT32,INT32,UINT32,INT32,INT32); extern HIMAGELIST (CALLBACK* pImageList_Create) (INT32,INT32,UINT32,INT32,INT32);
extern HICON32 (CALLBACK * pImageList_GetIcon) (HIMAGELIST, INT32, UINT32); extern HICON32 (CALLBACK* pImageList_GetIcon) (HIMAGELIST, INT32, UINT32);
extern INT32 (CALLBACK* pImageList_GetImageCount)(HIMAGELIST); extern INT32 (CALLBACK* pImageList_GetImageCount)(HIMAGELIST);
extern LPVOID (CALLBACK* pCOMCTL32_Alloc) (INT32); extern LPVOID (CALLBACK* pCOMCTL32_Alloc) (INT32);
@ -31,21 +31,44 @@ extern INT32 (CALLBACK* pDPA_InsertPtr) (const HDPA, INT32, LPVOID);
extern BOOL32 (CALLBACK* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); extern BOOL32 (CALLBACK* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM);
extern LPVOID (CALLBACK* pDPA_GetPtr) (const HDPA, INT32); extern LPVOID (CALLBACK* pDPA_GetPtr) (const HDPA, INT32);
extern BOOL32 (CALLBACK* pDPA_Destroy) (const HDPA); extern BOOL32 (CALLBACK* pDPA_Destroy) (const HDPA);
extern INT32 (CALLBACK *pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32); extern INT32 (CALLBACK* pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32);
/* Iconcache */ /* Iconcache */
extern BOOL32 WINAPI SIC_Initialize(void); BOOL32 SIC_Initialize(void);
extern HICON32 WINAPI SIC_GetIcon (LPSTR sSourceFile, DWORD dwSourceIndex, BOOL32 bSmallIcon );
/* Classes Root */ /* Classes Root */
extern BOOL32 WINAPI HCR_MapTypeToValue ( LPSTR szExtension, LPSTR szFileType, DWORD len); BOOL32 HCR_MapTypeToValue ( LPSTR szExtension, LPSTR szFileType, DWORD len);
extern BOOL32 WINAPI HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len ); BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len );
BOOL32 HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
DWORD WINAPI ParseField32A(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
HGLOBAL32 WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID); HGLOBAL32 WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID);
LPVOID WINAPI SHLockShared(HANDLE32 hmem, DWORD procID); LPVOID WINAPI SHLockShared(HANDLE32 hmem, DWORD procID);
BOOL32 WINAPI SHUnlockShared(HANDLE32 pmem); BOOL32 WINAPI SHUnlockShared(HANDLE32 pmem);
HANDLE32 WINAPI SHFreeShared(HANDLE32 hmem, DWORD procID); HANDLE32 WINAPI SHFreeShared(HANDLE32 hmem, DWORD procID);
/****************************************************************************
* Class constructors
*/
#ifdef __WINE__
extern LPDATAOBJECT IDataObject_Constructor(HWND32 hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT32 cidl);
extern LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT32, const FORMATETC32 []);
extern LPCLASSFACTORY IShellLink_CF_Constructor(void);
extern LPCLASSFACTORY IShellLinkW_CF_Constructor(void);
extern LPCLASSFACTORY IClassFactory_Constructor(void);
extern LPCONTEXTMENU IContextMenu_Constructor(LPSHELLFOLDER, LPCITEMIDLIST *, UINT32);
extern LPSHELLFOLDER IShellFolder_Constructor(LPSHELLFOLDER,LPITEMIDLIST);
extern LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER, LPCITEMIDLIST);
extern LPSHELLLINK IShellLink_Constructor(void);
extern LPSHELLLINKW IShellLinkW_Constructor(void);
extern LPENUMIDLIST IEnumIDList_Constructor(LPCSTR,DWORD);
extern LPEXTRACTICON IExtractIcon_Constructor(LPITEMIDLIST);
#endif
/* FIXME should be moved to a header file. IsEqualGUID /* FIXME should be moved to a header file. IsEqualGUID
is declared but not exported in compobj.c !!!*/ is declared but not exported in compobj.c !!!*/
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))

4
dlls/shell32/shellord.c
View File

@ -64,8 +64,8 @@ SHChangeNotifyDeregister(LONG x1)
* ParseField [SHELL32.58] * ParseField [SHELL32.58]
* *
*/ */
DWORD WINAPI ParseField(LPCSTR src,DWORD field,LPSTR dst,DWORD len) DWORD WINAPI ParseField32A(LPCSTR src, DWORD field, LPSTR dst, DWORD len)
{ FIXME(shell,"(%s,0x%08lx,%p,%ld):stub.\n",src,field,dst,len); { WARN(shell,"('%s',0x%08lx,%p,%ld) semi-stub.\n",src,field,dst,len);
if (!src || !src[0] || !dst || !len) if (!src || !src[0] || !dst || !len)
return 0; return 0;

4
dlls/shell32/shlfolder.c
View File

@ -4,8 +4,6 @@
* Copyright 1997 Marcus Meissner * Copyright 1997 Marcus Meissner
* Copyright 1998 Juergen Schmied * Copyright 1998 Juergen Schmied
* *
* !!! currently work in progress on all classes 980930 !!!
* <contact juergen.schmied@metronet.de>
*/ */
#include <ctype.h> #include <ctype.h>
@ -559,7 +557,7 @@ static HRESULT WINAPI IShellFolder_GetUIObjectOf( LPSHELLFOLDER this,HWND32 hwnd
WINE_StringFromCLSID(riid,xclsid); WINE_StringFromCLSID(riid,xclsid);
TRACE(shell,"(%p)->(%u,%u,pidl=%p,\n\tIID:%s,%p,%p)\n", TRACE(shell,"(%p)->(%u,%u,apidl=%p,\n\tIID:%s,%p,%p)\n",
this,hwndOwner,cidl,apidl,xclsid,prgfInOut,ppvOut); this,hwndOwner,cidl,apidl,xclsid,prgfInOut,ppvOut);
*ppvOut = NULL; *ppvOut = NULL;

2
dlls/shell32/shlview.c
View File

@ -327,7 +327,7 @@ BOOL32 ShellView_InitList(LPSHELLVIEW this)
* NOTES * NOTES
* internal, CALLBACK for DSA_Sort * internal, CALLBACK for DSA_Sort
*/ */
int CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData) INT32 CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData)
{ int ret; { int ret;
TRACE(shell,"pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData); TRACE(shell,"pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData);

2
relay32/shell32.spec
View File

@ -63,7 +63,7 @@ init Shell32LibMain
55 stdcall PathQuoteSpaces (ptr) PathQuoteSpaces32AW 55 stdcall PathQuoteSpaces (ptr) PathQuoteSpaces32AW
56 stdcall PathUnquoteSpaces(str) PathUnquoteSpaces 56 stdcall PathUnquoteSpaces(str) PathUnquoteSpaces
57 stdcall PathGetDriveNumber (str) PathGetDriveNumber32 57 stdcall PathGetDriveNumber (str) PathGetDriveNumber32
58 stdcall ParseField(str long str long) ParseField 58 stdcall ParseField(str long str long) ParseField32A
59 stub RestartDialog@12 59 stub RestartDialog@12
60 stdcall ExitWindowsDialog(long) ExitWindowsDialog 60 stdcall ExitWindowsDialog(long) ExitWindowsDialog
61 stdcall RunFileDlg(long long long str str long) RunFileDlg 61 stdcall RunFileDlg(long long long str str long) RunFileDlg