shell32: Make some variables static and/or const.

This commit is contained in:
Alexandre Julliard 2006-06-12 13:44:21 +02:00
parent ec6a1653aa
commit 7a0396afd1
3 changed files with 5 additions and 6 deletions

View File

@ -64,7 +64,7 @@ static void FillTreeView(browse_info*, LPSHELLFOLDER,
static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *, static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *,
LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM);
const WCHAR szBrowseFolderInfo[] = { static const WCHAR szBrowseFolderInfo[] = {
'_','_','W','I','N','E','_', '_','_','W','I','N','E','_',
'B','R','S','F','O','L','D','E','R','D','L','G','_', 'B','R','S','F','O','L','D','E','R','D','L','G','_',
'I','N','F','O',0 'I','N','F','O',0

View File

@ -49,10 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'};
const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'}; static const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'};
HINSTANCE hShellOle32 = 0;
/************************************************************************** /**************************************************************************
* Default ClassFactory types * Default ClassFactory types
*/ */
@ -60,7 +59,7 @@ typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid,
IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst);
/* this table contains all CLSID's of shell32 objects */ /* this table contains all CLSID's of shell32 objects */
struct { static const struct {
REFIID riid; REFIID riid;
LPFNCREATEINSTANCE lpfnCI; LPFNCREATEINSTANCE lpfnCI;
} InterfaceTable[] = { } InterfaceTable[] = {

View File

@ -167,7 +167,7 @@ typedef struct
BYTE bStyle; BYTE bStyle;
} MYTOOLINFO, *LPMYTOOLINFO; } MYTOOLINFO, *LPMYTOOLINFO;
MYTOOLINFO Tools[] = static const MYTOOLINFO Tools[] =
{ {
{ FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON }, { FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON },
{ FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON }, { FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON },