wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

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

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 : 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

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

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

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

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

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

26 Mar '07

Module: wine Branch: master Commit: 3c78748cc16655f05691f315e0d88e496ca5458c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c78748cc16655f05691f315e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:10:05 2007 +0000 winmm: Replace inline static with static inline. --- dlls/winmm/driver.c | 2 +- dlls/winmm/mci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index d200b57..cf1c0ab 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -131,7 +131,7 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) /************************************************************************** * DRIVER_SendMessage [internal] */ -inline static LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, +static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, LPARAM lParam1, LPARAM lParam2) { LRESULT ret = 0; diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 4eb4a72..5ca5c97 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -85,7 +85,7 @@ static const WCHAR wszOpen [] = {'o','p','e','n',0}; static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0}; /* dup a string and uppercase it */ -inline static LPWSTR str_dup_upper( LPCWSTR str ) +static inline LPWSTR str_dup_upper( LPCWSTR str ) { INT len = (strlenW(str) + 1) * sizeof(WCHAR); LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len );

1 0

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

26 Mar '07

Module: wine Branch: master Commit: 57746f9592a611c430fdf970ca0a07ad3f7df652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57746f9592a611c430fdf970c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:09:23 2007 +0000 wininet: Replace inline static with static inline. --- dlls/wininet/internet.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 55e480b..49c7930 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -71,14 +71,14 @@ typedef struct #endif } WININET_NETCONNECTION; -inline static LPWSTR WININET_strdupW( LPCWSTR str ) +static inline LPWSTR WININET_strdupW( LPCWSTR str ) { LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1)*sizeof(WCHAR) ); if (ret) strcpyW( ret, str ); return ret; } -inline static LPWSTR WININET_strdup_AtoW( LPCSTR str ) +static inline LPWSTR WININET_strdup_AtoW( LPCSTR str ) { int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0); LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); @@ -87,7 +87,7 @@ inline static LPWSTR WININET_strdup_AtoW( LPCSTR str ) return ret; } -inline static LPSTR WININET_strdup_WtoA( LPCWSTR str ) +static inline LPSTR WININET_strdup_WtoA( LPCWSTR str ) { int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len ); @@ -96,7 +96,7 @@ inline static LPSTR WININET_strdup_WtoA( LPCWSTR str ) return ret; } -inline static void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA) +static inline void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA) { dataA->dwFileAttributes = dataW->dwFileAttributes; dataA->ftCreationTime = dataW->ftCreationTime;

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

← Newer
1
...
11
12
13
14
15
16
17
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007