diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index fb221dc3e13..458d73a9b00 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -34,7 +34,7 @@ CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer, BOOL WINAPI CryptSetKeyParam( HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags) { - FIXME_(advapi)("(%x, %lx, %p, %lx): stub!\n", + FIXME_(advapi)("(%lx, %lx, %p, %lx): stub!\n", hKey, dwParam, pbData, dwFlags); return FALSE; } diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index ca9f7026108..e1ad05f4f32 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -4,6 +4,8 @@ * Copyright 1998 Patrik Stridvall */ +#include + #include "winbase.h" #include "winuser.h" #include "winerror.h" diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 5ba1694933e..f450f5bd8e2 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -302,7 +302,7 @@ HRESULT WINAPI SHILCreateFromPathW (LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * if (SUCCEEDED (SHGetDesktopFolder(&sf))) { - ret = IShellFolder_ParseDisplayName(sf,0, NULL, path, &pchEaten, ppidl, attributes); + ret = IShellFolder_ParseDisplayName(sf,0, NULL, (LPWSTR) path, &pchEaten, ppidl, attributes); IShellFolder_Release(sf); } return ret; diff --git a/include/wine/winestring.h b/include/wine/winestring.h index a8eca1b6822..d6d2979c0ce 100644 --- a/include/wine/winestring.h +++ b/include/wine/winestring.h @@ -3,8 +3,8 @@ #include "windef.h" -INT WINAPI WideCharToLocal(LPSTR,LPWSTR,INT); -INT WINAPI LocalToWideChar(LPWSTR,LPSTR,INT); +INT WINAPI WideCharToLocal(LPSTR,LPCWSTR,INT); +INT WINAPI LocalToWideChar(LPWSTR,LPCSTR,INT); LPWSTR WINAPI lstrcpyAtoW(LPWSTR,LPCSTR); LPSTR WINAPI lstrcpyWtoA(LPSTR,LPCWSTR); LPWSTR WINAPI lstrcpynAtoW(LPWSTR,LPCSTR,INT); diff --git a/memory/string.c b/memory/string.c index a90621a15ec..41addcfd784 100644 --- a/memory/string.c +++ b/memory/string.c @@ -638,7 +638,7 @@ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) INT WINAPI WideCharToLocal( LPSTR pLocal, - LPWSTR pWide, + LPCWSTR pWide, INT dwChars) { *pLocal = 0; TRACE("(%p, %s, %i)\n", pLocal, debugstr_w(pWide),dwChars); @@ -654,7 +654,7 @@ INT WINAPI WideCharToLocal( */ INT WINAPI LocalToWideChar( LPWSTR pWide, - LPSTR pLocal, + LPCSTR pLocal, INT dwChars) { *pWide = 0; TRACE("(%p, %s, %i)\n",pWide, pLocal, dwChars);