October 2008 - Wine-commits

Rob Shearman : quartz: Don't use strlenW in array size declaration.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: e7ecfe28a1a4f074d16623e251c892b3f11e3c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ecfe28a1a4f074d16623e25… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:21:04 2008 +0100 quartz: Don't use strlenW in array size declaration. Use ARRAYSIZE() on the constant string arrays instead. --- dlls/quartz/filtermapper.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 9d8c9d6..a085b0a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1384,7 +1384,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c LPWSTR wszClsid = NULL; HKEY hKey; LONG lRet; - WCHAR wszKeyName[strlenW(wszFilterSlash) + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); @@ -1453,7 +1453,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin( HKEY hKey = NULL; HKEY hPinsKey = NULL; WCHAR * wszPinsKeyName; - WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); @@ -1614,7 +1614,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID LONG lRet; LPWSTR wszClsid = NULL; HKEY hKey; - WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); @@ -1676,7 +1676,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi LPWSTR wszClsid = NULL; HKEY hKey = NULL; WCHAR * wszPinNameKey; - WCHAR wszKeyName[strlenW(wszClsidSlash) + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));

1 0

Rob Shearman : quartz: Fix placement of WINAPI attribute in fnFoundSeek typedef.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 2fb89a4e36f6101182615f6b9d613577ef8f10e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb89a4e36f6101182615f6b9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:21:11 2008 +0100 quartz: Fix placement of WINAPI attribute in fnFoundSeek typedef. MSVC requires that calling conventions appear inside the brackets. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 42b6da8..c9e4e56 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2091,7 +2091,7 @@ static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface) { return Filtergraph_Release(This); } -typedef HRESULT WINAPI (*fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); +typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, DWORD_PTR arg) { BOOL allnotimpl = TRUE;

1 0

Rob Shearman : winhttp: Fix compilation with MinGW/MSVC.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: a14d34b2f632f7d489e14a936078c6a5636bfc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14d34b2f632f7d489e14a936… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:31 2008 +0100 winhttp: Fix compilation with MinGW/MSVC. --- dlls/winhttp/net.c | 10 ++++++---- dlls/winhttp/winhttp_private.h | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 450366b..b343050 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -50,12 +50,12 @@ #include "winhttp.h" #include "wincrypt.h" +#include "winhttp_private.h" + /* to avoid conflicts with the Unix socket headers */ #define USE_WS_PREFIX #include "winsock2.h" -#include "winhttp_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_SEND_TIMEOUT 30 @@ -115,6 +115,7 @@ MAKE_FUNCPTR( ERR_error_string ); /* translate a unix error code into a winsock error code */ static int sock_get_error( int err ) { +#if !defined(__MINGW32__) && !defined (_MSC_VER) switch (err) { case EINTR: return WSAEINTR; @@ -174,6 +175,7 @@ static int sock_get_error( int err ) #endif default: errno = err; perror( "sock_set_error" ); return WSAEFAULT; } +#endif return err; } @@ -282,7 +284,7 @@ BOOL netconn_close( netconn_t *conn ) conn->secure = FALSE; } #endif - res = close( conn->socket ); + res = closesocket( conn->socket ); conn->socket = -1; if (res == -1) { @@ -464,7 +466,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } #ifdef FIONREAD - if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) *available = unread; + if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread; #endif return TRUE; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 8f5e17c..b564d4f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -34,6 +34,12 @@ #endif #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> +# ifndef MSG_WAITALL +# define MSG_WAITALL 0 +# endif +#else +# define closesocket close +# define ioctlsocket ioctl #endif static const WCHAR getW[] = {'G','E','T',0};

1 0

Rob Shearman : urlmon: Compare HRESULT value explicitly against S_OK instead of using an implicit ! = 0 comparison.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: ee2281d37094d652dc567de089d45072431f6e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2281d37094d652dc567de08… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:43 2008 +0100 urlmon: Compare HRESULT value explicitly against S_OK instead of using an implicit != 0 comparison. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index d6a4242..793a8f0 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -237,7 +237,7 @@ static void Binding_FinishedDownload(Binding *This, HRESULT hr) IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, BINDSTATUS_ENDDOWNLOADDATA, This->URLName); IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg); - if (hr) + if (hr != S_OK) { WCHAR *pwchError = 0;

1 0

Rob Shearman : wininet: Compare HRESULT values explicitly against S_OK instead of using an implicit ! = 0 comparison.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: d31ce9ae37653cc199ba7bd017639a3d864fab5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31ce9ae37653cc199ba7bd01… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:49 2008 +0100 wininet: Compare HRESULT values explicitly against S_OK instead of using an implicit != 0 comparison. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7cb3961..c41aca6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1948,7 +1948,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhr->lpszPath = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); rc = UrlEscapeW(lpszObjectName, lpwhr->lpszPath, &len, URL_ESCAPE_SPACES_ONLY); - if (rc) + if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc); strcpyW(lpwhr->lpszPath,lpszObjectName); @@ -3045,7 +3045,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) lpwhr->lpszPath = HeapAlloc(GetProcessHeap(), 0, needed*sizeof(WCHAR)); rc = UrlEscapeW(path, lpwhr->lpszPath, &needed, URL_ESCAPE_SPACES_ONLY); - if (rc) + if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); strcpyW(lpwhr->lpszPath,path);

1 0

Rob Shearman : winedos: Compare HRESULT value explicitly against S_OK instead of using an implicit ! = 0 comparison.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 2c37baba0a4c692a93beef69e7456570a64923b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c37baba0a4c692a93beef69e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:53 2008 +0100 winedos: Compare HRESULT value explicitly against S_OK instead of using an implicit != 0 comparison. --- dlls/winedos/vga.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 288f867..96cadb9 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -459,7 +459,8 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) lpddraw=NULL; return; } - if ((res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette))) { + res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette); + if (res != S_OK) { ERR("Could not set default palette entries (res = 0x%x)\n", res); }

1 0

Alistair Leslie-Hughes : msxml3: Correct cast.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 2b5a59c092441123a2ffc09a90da62056a0302fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5a59c092441123a2ffc09a9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 1 14:23:05 2008 +1000 msxml3: Correct cast. --- dlls/msxml3/queryresult.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 56c1a53..d38cc19 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -340,7 +340,7 @@ static HRESULT queryresult_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl IXMLDOMNode *disp = NULL; queryresult_get_item(XMLQUERYRES(This), id - MSXML_DISPID_CUSTOM_MIN, &disp); - V_DISPATCH(res) = (IDispatch*)&disp; + V_DISPATCH(res) = (IDispatch*)disp; break; } default: @@ -350,6 +350,8 @@ static HRESULT queryresult_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl } } + TRACE("ret %p\n", V_DISPATCH(res)); + return S_OK; }

1 0

Rob Shearman : cabinet: Check buffer size before copying in NONEfdi_decomp.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 79ad9cbcdd91559c04a6d519c4d9e718bab970a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ad9cbcdd91559c04a6d519c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:19:31 2008 +0100 cabinet: Check buffer size before copying in NONEfdi_decomp. Check that the data will fit into the fixed sized buffer CAB(outbuf) and return an error if not before copying. --- dlls/cabinet/fdi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 4c499dd..35ad540 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -911,6 +911,7 @@ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { static int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { if (inlen != outlen) return DECR_ILLEGALDATA; + if (outlen > CAB_BLOCKMAX) return DECR_DATAFORMAT; memcpy(CAB(outbuf), CAB(inbuf), (size_t) inlen); return DECR_OK; }

1 0

Rob Shearman : include: Define DD_OK to S_OK instead of 0.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: fd4a8941032458a9b2870d0068e6fb020a9c9e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4a8941032458a9b2870d006… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:19:53 2008 +0100 include: Define DD_OK to S_OK instead of 0. Add define for DD_FALSE. --- include/ddraw.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 96246e3..f7d1d37 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -72,7 +72,8 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL; #define DDENUMRET_CANCEL 0 #define DDENUMRET_OK 1 -#define DD_OK 0 +#define DD_OK S_OK +#define DD_FALSE S_FALSE #define _FACDD 0x876

1 0

Rob Shearman : include: Wrap uses of u_* types in ws2tcpip.h with WS() macro.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: d82e36fa4a8185a52fc3ea91b413bd19f5b54fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82e36fa4a8185a52fc3ea91b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:09 2008 +0100 include: Wrap uses of u_* types in ws2tcpip.h with WS() macro. --- include/ws2tcpip.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 9a68e24..885b60e 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -80,30 +80,30 @@ struct WS(ip_mreq_source) { struct WS(ip_msfilter) { struct WS(in_addr) imsf_multiaddr; struct WS(in_addr) imsf_interface; - u_long imsf_fmode; - u_long imsf_numsrc; + WS(u_long) imsf_fmode; + WS(u_long) imsf_numsrc; struct WS(in_addr) imsf_slist[1]; }; typedef struct WS(in_addr6) { - u_char s6_addr[16]; /* IPv6 address */ + WS(u_char) s6_addr[16]; /* IPv6 address */ } IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; typedef struct WS(sockaddr_in6) { short sin6_family; /* AF_INET6 */ - u_short sin6_port; /* Transport level port number */ - u_long sin6_flowinfo; /* IPv6 flow information */ + WS(u_short) sin6_port; /* Transport level port number */ + WS(u_long) sin6_flowinfo; /* IPv6 flow information */ struct WS(in_addr6) sin6_addr; /* IPv6 address */ - u_long sin6_scope_id; /* IPv6 scope id */ + WS(u_long) sin6_scope_id; /* IPv6 scope id */ } SOCKADDR_IN6,*PSOCKADDR_IN6, *LPSOCKADDR_IN6; typedef struct WS(sockaddr_in6_old) { short sin6_family; /* AF_INET6 */ - u_short sin6_port; /* Transport level port number */ - u_long sin6_flowinfo; /* IPv6 flow information */ + WS(u_short) sin6_port; /* Transport level port number */ + WS(u_long) sin6_flowinfo; /* IPv6 flow information */ struct WS(in_addr6) sin6_addr; /* IPv6 address */ } SOCKADDR_IN6_OLD,*PSOCKADDR_IN6_OLD, *LPSOCKADDR_IN6_OLD; @@ -117,7 +117,7 @@ typedef union sockaddr_gen /* Structure to keep interface specific information */ typedef struct _INTERFACE_INFO { - u_long iiFlags; /* Interface flags */ + WS(u_long) iiFlags; /* Interface flags */ WS(sockaddr_gen) iiAddress; /* Interface address */ WS(sockaddr_gen) iiBroadcastAddress; /* Broadcast address */ WS(sockaddr_gen) iiNetmask; /* Network mask */

1 0