July 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Update Nvidia driver versions.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: c0e5c8f4819f3a1cbcd41074da14b987a53947d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e5c8f4819f3a1cbcd41074d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 7 17:24:34 2009 +0200 wined3d: Update Nvidia driver versions. --- dlls/wined3d/directx.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7ac0fa..1f5a750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -800,31 +800,31 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", 7, 1, 8, 6 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", 9, 6, 4, 3 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 6, 14, 10, 6764 },

1 0

Stefan Dösinger : wined3d: Add Intel GMA X3100 to our card DB.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: cfd06529809401bbf23c96483d8b54478b89ce28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd06529809401bbf23c96483… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 7 15:59:50 2009 +0200 wined3d: Add Intel GMA X3100 to our card DB. --- dlls/wined3d/directx.c | 9 +++++++-- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d3f56ce..c7ac0fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1858,8 +1858,13 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; case VENDOR_INTEL: - if (strstr(gl_renderer, "GMA 950") - || strstr(gl_renderer, "945GM")) + if(strstr(gl_renderer, "X3100")) + { + /* MacOS calls the card GMA X3100, Google findings also suggest the name GM965 */ + gl_info->gl_card = CARD_INTEL_X3100; + vidmem = 128; + } + else if (strstr(gl_renderer, "GMA 950") || strstr(gl_renderer, "945GM")) { /* MacOS calls the card GMA 950, but everywhere else the PCI ID is named 945GM */ gl_info->gl_card = CARD_INTEL_I945GM; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ee15d35..42efdf7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3378,6 +3378,7 @@ typedef enum _GL_Cards { CARD_INTEL_I915G = 0x2582, CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950?? */ + CARD_INTEL_X3100 = 0x2a02, /* found in macs. Same as GMA 965? */ } GL_Cards; #define WINE_DEFAULT_VIDMEM 64*1024*1024

1 0

Juan Lang : winhttp: Simplify netconn_resolve when using getaddrinfo.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 831c87c141aad3c006ec7765ef1fa93990ab91f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c87c141aad3c006ec7765e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:39:10 2009 -0700 winhttp: Simplify netconn_resolve when using getaddrinfo. --- dlls/winhttp/net.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index f362a8b..caa83bf 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -590,17 +590,21 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); return FALSE; } - if (*sa_len < sizeof(struct sockaddr_in)) + if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); freeaddrinfo( res ); return FALSE; } - *sa_len = sizeof(struct sockaddr_in); - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &((struct sockaddr_in *)sa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - ((struct sockaddr_in *)sa)->sin_family = res->ai_family; - ((struct sockaddr_in *)sa)->sin_port = htons( port ); + *sa_len = res->ai_addrlen; + memcpy( sa, res->ai_addr, res->ai_addrlen ); + /* Copy port */ + switch (res->ai_family) + { + case AF_INET: + ((struct sockaddr_in *)sa)->sin_port = htons( port ); + break; + } freeaddrinfo( res ); #else

1 0

Juan Lang : winhttp: Support IPv6 addresses in open_connection.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: d48eade7fbcfd554a31cbb5bfd1503a555f126ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48eade7fbcfd554a31cbb5bf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:40:04 2009 -0700 winhttp: Support IPv6 addresses in open_connection. --- dlls/winhttp/request.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d9147d3..af1d5ad 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -710,11 +710,15 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + static BOOL open_connection( request_t *request ) { connect_t *connect; const void *addr; - char address[32]; + char address[INET6_ADDRSTRLEN]; WCHAR *addressW; INTERNET_PORT port; socklen_t slen; @@ -733,6 +737,9 @@ static BOOL open_connection( request_t *request ) case AF_INET: addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&connect->sockaddr)->sin6_addr; + break; default: WARN("unsupported address family %d\n", connect->sockaddr.ss_family); return FALSE;

1 0

Stefan Dösinger : wined3d: An indirect address op can adjust min and max at the same time.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 37b73478f1876769943206571f11b4022a7d1f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b73478f1876769943206571… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 8 09:20:12 2009 +0200 wined3d: An indirect address op can adjust min and max at the same time. --- dlls/wined3d/baseshader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 12fc28c..411665e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -304,10 +304,14 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh { if (shader_type != WINED3D_SHADER_TYPE_PIXEL) { - if (reg->idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + if (reg->idx < ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + { ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = reg->idx; - else if (reg->idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + } + if (reg->idx > ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + { ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = reg->idx; + } } reg_maps->usesrelconstF = TRUE; }

1 0

Juan Lang : winhttp: Support IPv6 in netconn_resolve.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 3d9809b12996b97b3217e4d9eab4743313d962e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9809b12996b97b3217e4d9e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:41:17 2009 -0700 winhttp: Support IPv6 in netconn_resolve. --- dlls/winhttp/net.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index caa83bf..181ff02 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -581,15 +581,25 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, #ifdef HAVE_GETADDRINFO memset( &hints, 0, sizeof(struct addrinfo) ); + /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on + * their IPv6 addresses even though they have IPv6 addresses in the DNS. + */ hints.ai_family = AF_INET; ret = getaddrinfo( hostname, NULL, &hints, &res ); - heap_free( hostname ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - return FALSE; + TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + hints.ai_family = AF_INET6; + ret = getaddrinfo( hostname, NULL, &hints, &res ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); + heap_free( hostname ); + return FALSE; + } } + heap_free( hostname ); if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); @@ -604,9 +614,13 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, case AF_INET: ((struct sockaddr_in *)sa)->sin_port = htons( port ); break; + case AF_INET6: + ((struct sockaddr_in6 *)sa)->sin6_port = htons( port ); + break; } freeaddrinfo( res ); + return TRUE; #else EnterCriticalSection( &cs_gethostbyname ); @@ -631,8 +645,8 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, sin->sin_port = htons( port ); LeaveCriticalSection( &cs_gethostbyname ); -#endif return TRUE; +#endif } const void *netconn_get_certificate( netconn_t *conn )

1 0

Juan Lang : winhttp: Convert connect_t' s address type from a struct sockaddr_in to a struct sockaddr_storage.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 646b9cae800a3e7dfb944b132ed7ec94833c994b URL: http://source.winehq.org/git/wine.git/?a=commit;h=646b9cae800a3e7dfb944b132… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:39:37 2009 -0700 winhttp: Convert connect_t's address type from a struct sockaddr_in to a struct sockaddr_storage. --- dlls/winhttp/request.c | 16 +++++++++++++--- dlls/winhttp/winhttp_private.h | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f088c40..d9147d3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -713,6 +713,7 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, static BOOL open_connection( request_t *request ) { connect_t *connect; + const void *addr; char address[32]; WCHAR *addressW; INTERNET_PORT port; @@ -727,16 +728,25 @@ static BOOL open_connection( request_t *request ) slen = sizeof(connect->sockaddr); if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen )) return FALSE; - inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); + switch (connect->sockaddr.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; + break; + default: + WARN("unsupported address family %d\n", connect->sockaddr.ss_family); + return FALSE; + } + inet_ntop( connect->sockaddr.ss_family, addr, address, sizeof(address) ); addressW = strdupAW( address ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, strlenW(addressW) + 1 ); - TRACE("connecting to %s:%u\n", address, ntohs(connect->sockaddr.sin_port)); + TRACE("connecting to %s:%u\n", address, port); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!netconn_create( &request->netconn, connect->sockaddr.sin_family, SOCK_STREAM, 0 )) + if (!netconn_create( &request->netconn, connect->sockaddr.ss_family, SOCK_STREAM, 0 )) { heap_free( addressW ); return FALSE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 750acf5..2143953 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -110,7 +110,7 @@ typedef struct LPWSTR password; INTERNET_PORT hostport; INTERNET_PORT serverport; - struct sockaddr_in sockaddr; + struct sockaddr_storage sockaddr; } connect_t; typedef struct

1 0

Juan Lang : winhttp: Change type of netconn_resolve from struct sockaddr_in * to struct sockaddr * .
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: cc619639d2dcc4d375ec5fcef7a46216b3c113b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc619639d2dcc4d375ec5fcef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:35:01 2009 -0700 winhttp: Change type of netconn_resolve from struct sockaddr_in * to struct sockaddr *. --- dlls/winhttp/net.c | 29 ++++++++++++++++++++++------- dlls/winhttp/request.c | 4 +++- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 79e6789..f362a8b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -566,7 +566,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in *sa ) +BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -574,6 +574,7 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * int ret; #else struct hostent *he; + struct sockaddr_in *sin = (struct sockaddr_in *)sa; #endif if (!(hostname = strdupWA( hostnameW ))) return FALSE; @@ -589,10 +590,17 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + freeaddrinfo( res ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sa->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - sa->sin_family = res->ai_family; - sa->sin_port = htons( port ); + memcpy( &((struct sockaddr_in *)sa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); + ((struct sockaddr_in *)sa)->sin_family = res->ai_family; + ((struct sockaddr_in *)sa)->sin_port = htons( port ); freeaddrinfo( res ); #else @@ -606,10 +614,17 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + LeaveCriticalSection( &cs_gethostbyname ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sa->sin_addr, he->h_addr, he->h_length ); - sa->sin_family = he->h_addrtype; - sa->sin_port = htons( port ); + memcpy( &sin->sin_addr, he->h_addr, he->h_length ); + sin->sin_family = he->h_addrtype; + sin->sin_port = htons( port ); LeaveCriticalSection( &cs_gethostbyname ); #endif diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ddfac13..f088c40 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -716,6 +716,7 @@ static BOOL open_connection( request_t *request ) char address[32]; WCHAR *addressW; INTERNET_PORT port; + socklen_t slen; if (netconn_connected( &request->netconn )) return TRUE; @@ -724,7 +725,8 @@ static BOOL open_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - if (!netconn_resolve( connect->servername, port, &connect->sockaddr )) return FALSE; + slen = sizeof(connect->sockaddr); + if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen )) return FALSE; inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); addressW = strdupAW( address ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 823d0ae..750acf5 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -211,7 +211,7 @@ BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); BOOL netconn_init( netconn_t *, BOOL ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); -BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_in * ); +BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * ); BOOL netconn_secure_connect( netconn_t * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); DWORD netconn_set_timeout( netconn_t *, BOOL, int );

1 0

Francois Gouget : winapi: Modify parse_c_typedef() to get rid of the $finished variable.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: def8d4f40157bafd7a4ee0553750252ccfb6d98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=def8d4f40157bafd7a4ee0553… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:11 2009 +0200 winapi: Modify parse_c_typedef() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 60 ++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 39 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 27f5317..3a00039 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1569,60 +1569,49 @@ sub parse_c_typedef($$$$) my $line = $$refline; my $column = $$refcolumn; - my $type; - if (!$self->_parse_c("typedef", \$_, \$line, \$column)) { return 0; } - my $finished = 0; - - if ($finished) { - # Nothing - } elsif ($self->parse_c_enum(\$_, \$line, \$column)) { - $finished = 1; - } - - my $kind; - my $_name; - my @field_type_names; - my @field_names; - my @names; - if ($finished) { - # Nothing - } elsif ($self->parse_c_struct_union(\$_, \$line, \$column, - \$kind, \$_name, \@field_type_names, \@field_names, \@names)) + my ($kind, $name, @field_type_names, @field_names, @names); + my ($linkage, $type_name); + if ($self->parse_c_enum(\$_, \$line, \$column)) +{ + # Nothing to do + } + elsif ($self->parse_c_struct_union(\$_, \$line, \$column, + \$kind, \$name, \@field_type_names, \@field_names, \@names)) { my $base_name; - foreach my $name (@names) + foreach my $_name (@names) { - if ($name =~ /^\w+$/) + if ($_name =~ /^\w+$/) { - $base_name = $name; + $base_name = $_name; last; } } - $base_name="$kind $_name" if (!defined $base_name and defined $_name); + $base_name="$kind $name" if (!defined $base_name and defined $name); $base_name=$kind if (!defined $base_name); - foreach my $name (@names) { - if ($name =~ /^\w+$/) { + foreach my $_name (@names) { + if ($_name =~ /^\w+$/) { my $type = $self->{CREATE_TYPE}(); $type->kind($kind); - $type->_name($_name); - $type->name($name); + $type->_name($name); + $type->name($_name); $type->field_type_names([@field_type_names]); $type->field_names([@field_names]); $self->{FOUND_TYPE}($type); - } elsif ($name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { + } elsif ($_name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { my $type_name = "$base_name $1"; - $name = $2; + $_name = $2; my $type = $self->{CREATE_TYPE}(); $type->kind(""); - $type->name($name); + $type->name($_name); $type->field_type_names([$type_name]); $type->field_names([""]); @@ -1631,16 +1620,9 @@ sub parse_c_typedef($$$$) $self->_parse_c_error($_, $line, $column, "typedef 2"); } } - - $finished = 1; } - - my $linkage; - my $type_name; - my $name; - if ($finished) { - # Nothing - } elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) { + elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) + { $type_name =~ s/\s+/ /g; if(defined($type_name) && defined($name)) {

1 0

Henri Verbeet : wined3d: Rename "SHADER_BUFFER" to something sane.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 40b411958bd6dba819d92eea8b796da9762de804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b411958bd6dba819d92eea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:08 2009 +0200 wined3d: Rename "SHADER_BUFFER" to something sane. --- dlls/wined3d/arb_program_shader.c | 140 +++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 12 ++-- dlls/wined3d/glsl_shader.c | 50 +++++++------- dlls/wined3d/wined3d_private.h | 27 ++++---- 4 files changed, 116 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b411958bd6dba819d92…

1 0