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

Frédéric Delanoy : wldap32: Fix French translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 90684e6f439471886b9c68a9a9e6dc7fdacf5e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90684e6f439471886b9c68a9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 13:48:05 2009 +0200 wldap32: Fix French translation. --- dlls/wldap32/wldap32_Fr.rc | 75 +++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 36 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index 7b62613..fa3d4f8 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -2,7 +2,7 @@ * French resources for WLDAP32 * * Copyright 2005 Jonathan Ernst - * Copyright 2009 Fr�d�ric Delanoy + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,31 +21,34 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 0 "Succ�s" - 1 "Erreur d'op�ration" + 0 "Succès" + 1 "Erreur d'opération" 2 "Erreur de protocole" - 3 "Limite de temps d�pass�e" - 4 "Limite de taille d�pass�e" + 3 "Limite de temps dépassée" + 4 "Limite de taille dépassée" 5 "Comparaison fausse" 6 "Comparaison vraie" - 7 "M�thode d'authentification non support�e" + 7 "Méthode d'authentification non prise en charge" 8 "Authentification forte requise" - 9 "R�f�rant (v2)" - 10 "R�f�rant" - 11 "Limite administrative d�pass�e" + 9 "Référant (v2)" + 10 "Référant" + 11 "Limite administrative dépassée" 12 "Extension critique indisponible" - 13 "Confidentialit� requise" + 13 "Confidentialité requise" 14 "" 15 "" 16 "Attribut inconnu" - 17 "Type ind�fini" - 18 "Correspondance inappropri�e" + 17 "Type non défini" + 18 "Correspondance inappropriée" 19 "Violation de contrainte" - 20 "Attribut ou valeur existant" + 20 "Attribut ou valeur préexistant(e)" 21 "Syntaxe invalide" 22 "" 23 "" @@ -58,10 +61,10 @@ STRINGTABLE DISCARDABLE 30 "" 31 "" 32 "Objet inconnu" - 33 "Probl�me d'alias" + 33 "Problème d'alias" 34 "Syntaxe DN invalide" 35 "Est une feuille" - 36 "Probl�me de d�r�f�rencement d'alias" + 36 "Problème de déréférencement d'alias" 37 "" 38 "" 39 "" @@ -73,29 +76,29 @@ STRINGTABLE DISCARDABLE 45 "" 46 "" 47 "" - 48 "Authentification inappropri�e" + 48 "Authentification inappropriée" 49 "Autorisations invalides" 50 "Droits insuffisants" - 51 "Occup�" + 51 "Occupé" 52 "Indisponible" - 53 "Ne souhaite pas s'ex�cuter" - 54 "Boucle d�tect�e" + 53 "Pas disposé à s'exécuter" + 54 "Boucle détectée" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "Contr�le de tri manquant" - 61 "Erreur d'intervalle d'index" + 60 "Contrôle de tri manquant" + 61 "Erreur de plage d'index" 62 "" 63 "" 64 "Violation de nomenclature" 65 "Violation de classe d'objet" 66 "Interdit sur des non-feuilles" 67 "Interdit sur RDN" - 68 "Existe d�j�" - 69 "Pas de Mods de classe d'objet" - 70 "R�sultats trop grands" + 68 "Existe déjà" + 69 "Pas de modification de classe d'objet" + 70 "Résultats trop grands" 71 "Affecte de multiples DSA" 72 "" 73 "" @@ -109,18 +112,18 @@ STRINGTABLE DISCARDABLE 81 "Serveur indisponible" 82 "Erreur locale" 83 "Erreur d'encodage" - 84 "Erreur de d�codage" - 85 "D�lai d'attente d�pass�" - 86 "Auth. inconnue" - 87 "Erreur de filtre" + 84 "Erreur de décodage" + 85 "Délai d'attente dépassé" + 86 "Méthode d'authentification inconnue" + 87 "Erreur de filtrage" 88 "Annulation par l'utilisateur" - 89 "Erreur de param�tre" - 90 "Pas de m�moire" + 89 "Erreur de paramètre" + 90 "Mémoire insuffisante" 91 "Impossible de se connecter au serveur LDAP" - 92 "Op�ration non support�e par cette version du protocole LDAP" - 93 "Le contr�le sp�cifi� n'a pas �t� trouv� dans le message" - 94 "Pas de r�sultat dans le message" - 95 "Plus de r�sultats retourn�s" - 96 "Boucle lors du traitement des r�f�rants" - 97 "Limite du nombre de r�f�rants d�pass�e" + 92 "Opération non supportée par cette version du protocole LDAP" + 93 "Le contrôle spécifié n'a pas été trouvé dans le message" + 94 "Aucun résultat dans le message" + 95 "Plus de résultats reçus" + 96 "Boucle lors du traitement des référants" + 97 "Limite du nombre de référants dépassée" }

1 0

Juan Lang : winhttp: Change type of netconn_resolve from struct sockaddr_in * to struct sockaddr * .
by Alexandre Julliard 09 Jul '09

09 Jul '09

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

Juan Lang : winhttp: Simplify netconn_resolve when using getaddrinfo.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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: Convert connect_t' s address type from a struct sockaddr_in to a struct sockaddr_storage.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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: Support IPv6 addresses in open_connection.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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

Juan Lang : winhttp: Support IPv6 in netconn_resolve.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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

Stefan Dösinger : wined3d: An indirect address op can adjust min and max at the same time.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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

Stefan Dösinger : wined3d: Add Intel GMA X3100 to our card DB.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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

Francois Gouget : winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 6f5ae45846584223f0cc97af6db87668235f1105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5ae45846584223f0cc97af6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:08 2009 +0200 winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 212 ++++++++++++++++++++++------------------------ 1 files changed, 103 insertions(+), 109 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 5841185..27f5317 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1710,126 +1710,120 @@ sub parse_c_variable($$$$$$$) } } - my $finished = 0; - - if($finished) { - # Nothing - } elsif(/^$/) { - return 0; - } elsif (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); - - if(defined($_name)) { - $type = "$kind $_name { }"; - } else { - $type = "$kind { }"; - } + return 0 if(/^$/); - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { - $type = "$sign$1"; - $name = $2; - - if (defined($3)) { - my $bits = $4; - local $_ = $3; - if (/^\[/) { - $type .= $_; - } elsif (/^:/) { - $type .= ":$bits"; - } elsif (/^\{/) { - # Nothing - } - } - - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { - $type = "$sign$1:$2"; - $name = ""; - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { - $type = $self->_format_c_type("$sign$1$3"); - $name = $2; - - $finished = 1; - } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific - $type = $match; - $finished = 1; - } else { - $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); - $finished = 1; - } - - if($finished) { - # Nothing - } elsif($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific - $type = $match; - $finished = 1; - } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific - \$_, \$line, \$column, \$match)) + finished: while (1) { - $type = $match; - $finished = 1; - } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { - $type = $match; - $finished = 1; - } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); + if (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "$kind $_name { }"; + } else { + $type = "$kind { }"; + } - if(defined($_name)) { - $type = "struct $_name { }"; - } else { - $type = "struct { }"; - } - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { - $type = $&; - $type =~ s/\s//g; - } else { - return 0; - } + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { + $type = "$sign$1"; + $name = $2; + + if (defined($3)) { + my $bits = $4; + local $_ = $3; + if (/^\[/) { + $type .= $_; + } elsif (/^:/) { + $type .= ":$bits"; + } elsif (/^\{/) { + # Nothing + } + } - # $output->write("*** $type: '$_'\n"); + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { + $type = "$sign$1:$2"; + $name = ""; + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + $type = $self->_format_c_type("$sign$1$3"); + $name = $2; + + last finished; + } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific + $type = $match; + last finished; + } else { + $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); + last finished; + } - # $self->_parse_c_warning($_, $line, $column, "variable2", ""); + if($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific + $type = $match; + last finished; + } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific + \$_, \$line, \$column, \$match)) + { + $type = $match; + last finished; + } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { + $type = $match; + last finished; + } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "struct $_name { }"; + } else { + $type = "struct { }"; + } + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { + $type = $&; + $type =~ s/\s//g; + } else { + return 0; + } - if($finished) { - # Nothing - } elsif(s/^WINAPI\s*//) { - $self->_update_c_position($&, \$line, \$column); - } + # $output->write("*** $type: '$_'\n"); - if($finished) { - # Nothing - } elsif(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { - $self->_update_c_position($&, \$line, \$column); + # $self->_parse_c_warning($_, $line, $column, "variable2", ""); - $name = $1; - $name =~ s/\s//g; + if(s/^WINAPI\s*//) { + $self->_update_c_position($&, \$line, \$column); + } - $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); - if(s/^\)//) { $column++; } - $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + if(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { + $self->_update_c_position($&, \$line, \$column); - if(!s/^(?:=\s*|,\s*|$)//) { - return 0; - } - } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { - $self->_update_c_position($&, \$line, \$column); + $name = $1; + $name =~ s/\s//g; - $name = $1; - $name =~ s/\s//g; - } elsif(/^$/) { - $name = ""; - } else { - return 0; + $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); + if(s/^\)//) { $column++; } + $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + + if(!s/^(?:=\s*|,\s*|$)//) { + return 0; + } + } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { + $self->_update_c_position($&, \$line, \$column); + + $name = $1; + $name =~ s/\s//g; + } elsif(/^$/) { + $name = ""; + } else { + return 0; + } + last finished; } # $output->write("$type: $name: '$_'\n");

1 0

Francois Gouget : winapi: Modify parse_c_typedef() to get rid of the $finished variable.
by Alexandre Julliard 09 Jul '09

09 Jul '09

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