March 2007 - Wine-commits - list.winehq.org

Hans Leidekker : ntdll: Fully initialize the security descriptor returned from RtlSelfRelativeToAbsoluteSD .
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 65c76849a7f3c2a3a51b41aee20b66092da1a429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c76849a7f3c2a3a51b41aee… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Mar 24 17:32:41 2007 +0100 ntdll: Fully initialize the security descriptor returned from RtlSelfRelativeToAbsoluteSD. Debugged by Anastasius Focht. --- dlls/ntdll/sec.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 64384cf..b88e198 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -955,9 +955,13 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD( if (status != STATUS_SUCCESS) return status; - /* Copy structures */ + /* Copy structures, and clear the ones we don't set */ pAbs->Revision = pRel->Revision; pAbs->Control = pRel->Control & ~SE_SELF_RELATIVE; + pAbs->Sacl = NULL; + pAbs->Dacl = NULL; + pAbs->Owner = NULL; + pAbs->Group = NULL; if (pRel->Control & SE_SACL_PRESENT) {

1 0

Hans Leidekker : shell32: Add a stub implementation for SHPathPrepareForWrite{A, W}.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: f86ff01d9b648230cf5e2b5d9a6e88155763f4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ff01d9b648230cf5e2b5d9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Mar 24 17:33:12 2007 +0100 shell32: Add a stub implementation for SHPathPrepareForWrite{A, W}. --- dlls/shell32/shell32.spec | 4 ++-- dlls/shell32/shell32_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c61d996..23004ce 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -362,8 +362,8 @@ @ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(long) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() -@ stub SHPathPrepareForWriteA -@ stub SHPathPrepareForWriteW +@ stdcall SHPathPrepareForWriteA(long ptr str long) +@ stdcall SHPathPrepareForWriteW(long ptr wstr long) @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHSetLocalizedName(wstr wstr long) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 565018f..70db342 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1236,3 +1236,21 @@ HRESULT WINAPI DllCanUnloadNow(void) FIXME("stub\n"); return S_FALSE; } + +/*********************************************************************** + * SHPathPrepareForWriteA (SHELL32.@) + */ +HRESULT WINAPI SHPathPrepareForWriteA(HWND hwnd, IUnknown *modless, LPCSTR path, DWORD flags) +{ + FIXME("%p %p %s 0x%08x\n", hwnd, modless, debugstr_a(path), flags); + return S_OK; +} + +/*********************************************************************** + * SHPathPrepareForWriteA (SHELL32.@) + */ +HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path, DWORD flags) +{ + FIXME("%p %p %s 0x%08x\n", hwnd, modless, debugstr_w(path), flags); + return S_OK; +}

1 0

Andrew Talbot : ws2_32: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: a85b3c9f71158a82ce1d219e4961eea3aacf5d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85b3c9f71158a82ce1d219e4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:11:35 2007 +0000 ws2_32: Replace inline static with static inline. --- dlls/ws2_32/socket.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a872f7a..4ad025e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -159,7 +159,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); /* critical section to protect some non-rentrant net function */ extern CRITICAL_SECTION csWSgetXXXbyYYY; -inline static const char *debugstr_sockaddr( const struct WS_sockaddr *a ) +static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) { if (!a) return "(nil)"; return wine_dbg_sprintf("{ family %d, address %s, port %d }", @@ -346,7 +346,7 @@ static const int ws_eai_map[][2] = { 0, 0 } }; -inline static DWORD NtStatusToWSAError( const DWORD status ) +static inline DWORD NtStatusToWSAError( const DWORD status ) { /* We only need to cover the status codes set by server async request handling */ DWORD wserr; @@ -374,7 +374,7 @@ inline static DWORD NtStatusToWSAError( const DWORD status ) } /* set last error code from NT status without mapping WSA errors */ -inline static unsigned int set_error( unsigned int err ) +static inline unsigned int set_error( unsigned int err ) { if (err) { @@ -384,7 +384,7 @@ inline static unsigned int set_error( unsigned int err ) return err; } -inline static int get_sock_fd( SOCKET s, DWORD access, int *flags ) +static inline int get_sock_fd( SOCKET s, DWORD access, int *flags ) { int fd; if (set_error( wine_server_handle_to_fd( SOCKET2HANDLE(s), access, &fd, flags ) )) @@ -392,7 +392,7 @@ inline static int get_sock_fd( SOCKET s, DWORD access, int *flags ) return fd; } -inline static void release_sock_fd( SOCKET s, int fd ) +static inline void release_sock_fd( SOCKET s, int fd ) { wine_server_release_fd( SOCKET2HANDLE(s), fd ); } @@ -590,7 +590,7 @@ static char *strdup_lower(const char *str) return ret; } -inline static int sock_error_p(int s) +static inline int sock_error_p(int s) { unsigned int optval, optlen; @@ -1074,7 +1074,7 @@ static void WINAPI WS2_async_recv(void*, IO_STATUS_BLOCK*, ULONG); static void WINAPI WS2_async_send(void*, IO_STATUS_BLOCK*, ULONG); static void WINAPI WS2_async_shutdown( void*, IO_STATUS_BLOCK*, ULONG); -inline static struct ws2_async* +static inline struct ws2_async* WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBufferCount, LPDWORD lpFlags, struct WS_sockaddr *addr, LPINT addrlen, LPWSAOVERLAPPED lpOverlapped,

1 0

Paul Vriens : shlwapi/path: Proper use of GetProcessHeap().
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 20291e082c39ef330b42ea1502bc7b35a47209d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20291e082c39ef330b42ea150… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 23 20:49:00 2007 +0100 shlwapi/path: Proper use of GetProcessHeap(). --- dlls/shlwapi/path.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index f958f56..b24c977 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1181,7 +1181,7 @@ static BOOL WINAPI SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) /* Try dirs listed in %PATH% */ dwLenPATH = GetEnvironmentVariableW(szPath, buff, MAX_PATH); - if (!dwLenPATH || !(lpszPATH = HeapAlloc(GetProcessHeap, 0, (dwLenPATH + 1) * sizeof (WCHAR)))) + if (!dwLenPATH || !(lpszPATH = HeapAlloc(GetProcessHeap(), 0, (dwLenPATH + 1) * sizeof (WCHAR)))) return FALSE; GetEnvironmentVariableW(szPath, lpszPATH, dwLenPATH + 1); @@ -1204,17 +1204,17 @@ static BOOL WINAPI SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) if (!PathAppendW(buff, lpszFile)) { - HeapFree(GetProcessHeap, 0, lpszPATH); + HeapFree(GetProcessHeap(), 0, lpszPATH); return FALSE; } if (PathFileExistsDefExtW(buff, dwWhich)) { strcpyW(lpszFile, buff); - HeapFree(GetProcessHeap, 0, lpszPATH); + HeapFree(GetProcessHeap(), 0, lpszPATH); return TRUE; } } - HeapFree(GetProcessHeap, 0, lpszPATH); + HeapFree(GetProcessHeap(), 0, lpszPATH); return FALSE; }

1 0

Paul Vriens : oleaut32/tests: Use skip.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 03d637a30509dfad2a315480ec9f62a8ff0881d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d637a30509dfad2a315480e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Mar 25 20:55:33 2007 +0200 oleaut32/tests: Use skip. --- dlls/oleaut32/tests/varformat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 0b09b78..afec605 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -83,7 +83,7 @@ static void test_VarFormatNumber(void) GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); if (buff[0] != '.' || buff[1]) { - trace("Skipping VarFormatNumber tests as decimal separator is '%s'\n", buff); + skip("Skipping VarFormatNumber tests as decimal separator is '%s'\n", buff); return; } @@ -241,19 +241,19 @@ static void test_VarFormat(void) if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH) { - trace("Skipping VarFormat tests for non english language\n"); + skip("Skipping VarFormat tests for non english language\n"); return; } GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); if (buff[0] != '.' || buff[1]) { - trace("Skipping VarFormat tests as decimal separator is '%s'\n", buff); + skip("Skipping VarFormat tests as decimal separator is '%s'\n", buff); return; } GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, buff, sizeof(buff)/sizeof(char)); if (buff[0] != '2' || buff[1]) { - trace("Skipping VarFormat tests as decimal places is '%s'\n", buff); + skip("Skipping VarFormat tests as decimal places is '%s'\n", buff); return; }

1 0

Hans Leidekker : mpr: Fix buffer size calculation in WNetGetUniversalNameW.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 82c154034445d8d6495bbe10601e3023a6c591da URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c154034445d8d6495bbe106… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Mar 24 17:32:02 2007 +0100 mpr: Fix buffer size calculation in WNetGetUniversalNameW. --- dlls/mpr/wnet.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index f20e318..7419258 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1713,8 +1713,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { - LPUNIVERSAL_NAME_INFOW uniw; - DWORD err, len; + DWORD err, size; FIXME( "(%s, 0x%08X, %p, %p): stub\n", debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); @@ -1722,23 +1721,28 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, switch (dwInfoLevel) { case UNIVERSAL_NAME_INFO_LEVEL: - err = WN_MORE_DATA; - len = sizeof (*uniw) + lstrlenW(lpLocalPath); - if (*lpBufferSize <= len) + { + LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer; + + size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); + if (*lpBufferSize < size) + { + err = WN_MORE_DATA; break; - uniw = lpBuffer; - uniw->lpUniversalName = (LPWSTR) &uniw[1]; - lstrcpyW(uniw->lpUniversalName, lpLocalPath); - *lpBufferSize = len; + } + info->lpUniversalName = (LPWSTR)((char *)info + sizeof(*info)); + lstrcpyW(info->lpUniversalName, lpLocalPath); + *lpBufferSize = size; err = WN_NO_ERROR; break; - + } case REMOTE_NAME_INFO_LEVEL: err = WN_NO_NETWORK; break; default: err = WN_BAD_VALUE; + break; } SetLastError(err);

1 0

Hans Leidekker : mpr: Add a stub implementation for WNetGetUniversalNameA.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: e834f8a2b09abc75da810a225f57c994289228ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e834f8a2b09abc75da810a225… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Mar 24 17:32:17 2007 +0100 mpr: Add a stub implementation for WNetGetUniversalNameA. --- dlls/mpr/wnet.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 7419258..79ddd22 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1700,11 +1700,40 @@ DWORD WINAPI WNetSetConnectionW( LPCWSTR lpName, DWORD dwProperty, DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { + DWORD err, size; + FIXME( "(%s, 0x%08X, %p, %p): stub\n", debugstr_a(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + switch (dwInfoLevel) + { + case UNIVERSAL_NAME_INFO_LEVEL: + { + LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer; + + size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; + if (*lpBufferSize < size) + { + err = WN_MORE_DATA; + break; + } + info->lpUniversalName = (char *)info + sizeof(*info); + lstrcpyA(info->lpUniversalName, lpLocalPath); + *lpBufferSize = size; + err = WN_NO_ERROR; + break; + } + case REMOTE_NAME_INFO_LEVEL: + err = WN_NO_NETWORK; + break; + + default: + err = WN_BAD_VALUE; + break; + } + + SetLastError(err); + return err; } /*****************************************************************

1 0

Andrew Talbot : include: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 7c6ef46cb900e2def802fbc0ccabc92d293cfab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6ef46cb900e2def802fbc0c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:12:17 2007 +0000 include: Replace inline static with static inline. --- include/vfw.h | 14 +++++++------- include/win.h | 4 ++-- include/wincon.h | 2 +- include/winsock.h | 4 ++-- include/winternl.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index ea17703..bfb6f0d 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -387,7 +387,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,L LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2); -inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst, @@ -411,7 +411,7 @@ inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic)); } -inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, @@ -439,7 +439,7 @@ inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, ic.dyDst = dyDst; return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic)); } -inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, @@ -519,14 +519,14 @@ HIC VFWAPI ICGetDisplayFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHE #define ICGetStateSize(hic) \ ICGetState(hic, NULL, 0) -inline static DWORD ICGetDefaultQuality(HIC hic) +static inline DWORD ICGetDefaultQuality(HIC hic) { DWORD dwICValue; ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); return dwICValue; } -inline static DWORD ICGetDefaultKeyFrameRate(HIC hic) +static inline DWORD ICGetDefaultKeyFrameRate(HIC hic) { DWORD dwICValue; ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); @@ -609,7 +609,7 @@ typedef struct { DWORD VFWAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime); -inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, +static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, int dxSrc, int dySrc, int dxDst, int dyDst, @@ -666,7 +666,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb #define ICDrawRenderBuffer(hic) \ ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0) -inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, +static inline LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG)) { ICSETSTATUSPROC ic; diff --git a/include/win.h b/include/win.h index 951eeac..1857422 100644 --- a/include/win.h +++ b/include/win.h @@ -90,14 +90,14 @@ extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, extern void USER_Lock(void); extern void USER_Unlock(void); -inline static HWND WIN_GetFullHandle( HWND hwnd ) +static inline HWND WIN_GetFullHandle( HWND hwnd ) { if (!HIWORD(hwnd) && hwnd) hwnd = WIN_Handle32( LOWORD(hwnd) ); return hwnd; } /* to release pointers retrieved by WIN_GetPtr */ -inline static void WIN_ReleasePtr( WND *ptr ) +static inline void WIN_ReleasePtr( WND *ptr ) { USER_Unlock(); } diff --git a/include/wincon.h b/include/wincon.h index 61bdea5..49130c3 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -176,7 +176,7 @@ typedef struct tagINPUT_RECORD * structures is different between Windows and gcc on i386. */ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE); -inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) +static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) { union { COORD c; diff --git a/include/winsock.h b/include/winsock.h index d31c84d..80266f2 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -523,11 +523,11 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*); #else /* WORDS_BIGENDIAN */ -inline static u_short __wine_ushort_swap(u_short s) +static inline u_short __wine_ushort_swap(u_short s) { return (s >> 8) | (s << 8); } -inline static u_long __wine_ulong_swap(u_long l) +static inline u_long __wine_ulong_swap(u_long l) { return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16)); } diff --git a/include/winternl.h b/include/winternl.h index e128268..1dc6011 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2278,7 +2278,7 @@ extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRI #define RtlRetrieveUlonglong(p,s) memcpy((p), (s), sizeof(ULONGLONG)) #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) -inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) +static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) { if (lpBits && ulBit < lpBits->SizeOfBitMap && lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31))) @@ -2287,11 +2287,11 @@ inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) } /* These are implemented as __fastcall, so we can't let Winelib apps link with them */ -inline static USHORT RtlUshortByteSwap(USHORT s) +static inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } -inline static ULONG RtlUlongByteSwap(ULONG i) +static inline ULONG RtlUlongByteSwap(ULONG i) { #if defined(__i386__) && defined(__GNUC__) ULONG ret;

1 0

Andrew Talbot : shlwapi: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 0810a923535d08f82cab92b648c07c74f80f5d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0810a923535d08f82cab92b64… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:08:37 2007 +0000 shlwapi: Replace inline static with static inline. --- dlls/shlwapi/clist.c | 2 +- dlls/shlwapi/string.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index a313074..0b59fb0 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -49,7 +49,7 @@ HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_CLIST*,LPCSHLWAPI_CLIST); * * Internal helper: move a DataBlock pointer to the next item. */ -inline static LPSHLWAPI_CLIST NextItem(LPSHLWAPI_CLIST lpList) +static inline LPSHLWAPI_CLIST NextItem(LPSHLWAPI_CLIST lpList) { char* address = (char*)lpList; address += lpList->ulSize; diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index fd85d07..a12c41e 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1958,7 +1958,7 @@ HRESULT WINAPI SHStrDupW(LPCWSTR src, LPWSTR * dest) * * Internal helper for SHLWAPI_WriteTimeClass. */ -inline static LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) +static inline LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) { *lpszOut-- = '\0'; @@ -1978,7 +1978,7 @@ inline static LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) * * Internal helper for SHLWAPI_WriteTimeClass. */ -inline static int SHLWAPI_FormatSignificant(LPWSTR lpszNum, int dwDigits) +static inline int SHLWAPI_FormatSignificant(LPWSTR lpszNum, int dwDigits) { /* Zero non significant digits, return remaining significant digits */ while (*lpszNum)

1 0

Andrew Talbot : wintab32: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 7e0137da536b2f4ac48df4a7848c04d93d3c229b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0137da536b2f4ac48df4a78… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:10:45 2007 +0000 wintab32: Replace inline static with static inline. --- dlls/wintab32/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index aea9c67..5b538ad 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -236,12 +236,12 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) /* * Flushes all packets from the queue. */ -inline static void TABLET_FlushQueue(LPOPENCONTEXT context) +static inline void TABLET_FlushQueue(LPOPENCONTEXT context) { context->PacketsQueued = 0; } -inline static int CopyTabletData(LPVOID target, LPVOID src, INT size) +static inline int CopyTabletData(LPVOID target, LPVOID src, INT size) { memcpy(target,src,size); return(size);

1 0