Alexandre Julliard : shell32: Make some variables static and/or const.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 12 07:10:20 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 7a0396afd1c37df665b061090bc39a3af0c9a3c3
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a0396afd1c37df665b061090bc39a3af0c9a3c3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 12 13:44:21 2006 +0200
shell32: Make some variables static and/or const.
---
dlls/shell32/brsfolder.c | 2 +-
dlls/shell32/shellole.c | 7 +++----
dlls/shell32/shlview.c | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 3d84d00..88516a2 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -64,7 +64,7 @@ static void FillTreeView(browse_info*, L
static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *,
LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM);
-const WCHAR szBrowseFolderInfo[] = {
+static const WCHAR szBrowseFolderInfo[] = {
'_','_','W','I','N','E','_',
'B','R','S','F','O','L','D','E','R','D','L','G','_',
'I','N','F','O',0
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 01336d1..d154cbe 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -49,10 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
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'};
-const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'};
+static const WCHAR sShell32[12] = {'S','H','E','L','L','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
*/
@@ -60,7 +59,7 @@ typedef HRESULT (CALLBACK *LPFNCREATEINS
IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst);
/* this table contains all CLSID's of shell32 objects */
-struct {
+static const struct {
REFIID riid;
LPFNCREATEINSTANCE lpfnCI;
} InterfaceTable[] = {
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 7eecb61..639306d 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -167,7 +167,7 @@ typedef struct
BYTE bStyle;
} MYTOOLINFO, *LPMYTOOLINFO;
-MYTOOLINFO Tools[] =
+static const MYTOOLINFO Tools[] =
{
{ FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON },
{ FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON },
More information about the wine-cvs
mailing list