Module: wine Branch: master Commit: 55355d2def15f9cfd5cdf4a6834f19fefb68b450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55355d2def15f9cfd5cdf4a683...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Mar 22 18:27:53 2007 +0000
shell32: Replace inline static with static inline.
---
dlls/shell32/shell32_main.h | 10 +++++----- dlls/shell32/shelllink.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 2937065..c974c8e 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -175,7 +175,7 @@ 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) +static inline BOOL SHELL_OsIsUnicode(void) { /* if high-bit of version is 0, we are emulating NT */ return !(GetVersion() & 0x80000000); @@ -186,26 +186,26 @@ inline static BOOL SHELL_OsIsUnicode(void) SHFree(*ptr); \ *ptr = NULL; \ }; -inline static void __SHCloneStrA(char ** target,const char * source) +static inline void __SHCloneStrA(char ** target,const char * source) { *target = SHAlloc(strlen(source)+1); strcpy(*target, source); }
-inline static void __SHCloneStrWtoA(char ** target, const WCHAR * source) +static inline void __SHCloneStrWtoA(char ** target, const WCHAR * source) { int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); *target = SHAlloc(len); WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL); }
-inline static void __SHCloneStrW(WCHAR ** target, const WCHAR * source) +static inline void __SHCloneStrW(WCHAR ** target, const WCHAR * source) { *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); lstrcpyW(*target, source); }
-inline static WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) +static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) { int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); *target = SHAlloc(len*sizeof(WCHAR)); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 61885ed..f7c9c59 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -201,7 +201,7 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite( IObjectWithSite *iface static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath);
/* strdup on the process heap */ -inline static LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); @@ -211,7 +211,7 @@ inline static LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) return p; }
-inline static LPWSTR strdupW( LPCWSTR src ) +static inline LPWSTR strdupW( LPCWSTR src ) { LPWSTR dest; if (!src) return NULL;