Commit b64186ad authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

Warning fixes for -Wmissing-declarations and -Wwrite-strings.

parent f5ae644f
......@@ -295,8 +295,8 @@ static char shdebugstr_buf2[100];
static char * shdebugstr_buf = shdebugstr_buf1;
static struct {
REFIID riid;
char *name;
REFIID riid;
const char *name;
} InterfaceDesc[] = {
{&IID_IUnknown, "IID_IUnknown"},
{&IID_IClassFactory, "IID_IClassFactory"},
......@@ -325,7 +325,7 @@ static struct {
const char * shdebugstr_guid( const struct _GUID *id )
{
int i;
char* name = NULL;
const char* name = NULL;
char clsidbuf[100];
shdebugstr_buf = (shdebugstr_buf == shdebugstr_buf1) ? shdebugstr_buf2 : shdebugstr_buf1;
......
......@@ -171,6 +171,9 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16);
BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition,
UINT wID, UINT fType, LPCSTR dwTypeData, UINT fState);
inline static BOOL SHELL_OsIsUnicode(void)
{
/* if high-bit of version is 0, we are emulating NT */
......
......@@ -1050,7 +1050,7 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPSTR lpName, UINT uLen)
IEnumIDList *penum;
HRESULT hr;
char szText[MAX_PATH];
char *szNewFolder = "New Folder";
const char *szNewFolder = "New Folder";
TRACE ("(%p)(%s %u)\n", This, lpName, uLen);
......
......@@ -140,9 +140,6 @@ static const IViewObjectVtbl vovt;
#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp)
#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp)
extern void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition,
UINT wID, UINT fType, LPSTR dwTypeData, UINT fState);
/*
Items merged into the toolbar and and the filemenu
*/
......
......@@ -186,7 +186,7 @@ void WINAPI _InsertMenuItem (
BOOL fByPosition,
UINT wID,
UINT fType,
LPSTR dwTypeData,
LPCSTR dwTypeData,
UINT fState)
{
MENUITEMINFOA mii;
......
......@@ -38,10 +38,10 @@
#include "wine/test.h"
IMalloc *ppM;
static IMalloc *ppM;
/* creates a file with the specified name for tests */
void CreateTestFile(const CHAR *name)
static void CreateTestFile(const CHAR *name)
{
HANDLE file;
DWORD written;
......@@ -57,7 +57,7 @@ void CreateTestFile(const CHAR *name)
/* initializes the tests */
void CreateFilesFolders(void)
static void CreateFilesFolders(void)
{
CreateDirectoryA(".\\testdir", NULL);
CreateDirectoryA(".\\testdir\\test.txt", NULL);
......@@ -69,7 +69,7 @@ void CreateFilesFolders(void)
}
/* cleans after tests */
void Cleanup(void)
static void Cleanup(void)
{
DeleteFileA(".\\testdir\\test1.txt");
DeleteFileA(".\\testdir\\test2.txt");
......@@ -82,7 +82,7 @@ void Cleanup(void)
/* perform test */
void test_EnumObjects(IShellFolder *iFolder)
static void test_EnumObjects(IShellFolder *iFolder)
{
IEnumIDList *iEnumList;
ITEMIDLIST *newPIDL, *(idlArr [5]);
......@@ -150,7 +150,7 @@ void test_EnumObjects(IShellFolder *iFolder)
IMalloc_Free(ppM, idlArr[i]);
}
void test_BindToObject()
static void test_BindToObject(void)
{
HRESULT hr;
UINT cChars;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment