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

Stefan Dösinger : wined3d: Only use 4 component specular colors if GL allows it.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 8a6553da149694f9a188d2b28b46318d37add3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6553da149694f9a188d2b28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 10 11:28:49 2009 +0200 wined3d: Only use 4 component specular colors if GL allows it. --- dlls/wined3d/directx.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 36 ++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f5a750..1ba7ca5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -612,6 +612,33 @@ static BOOL match_dx10_capable(const WineD3D_GL_Info *gl_info, const char *gl_re return gl_info->max_glsl_varyings > 44; } +/* A GL context is provided by the caller */ +static BOOL match_allows_spec_alpha(const WineD3D_GL_Info *gl_info, const char *gl_renderer) +{ + GLenum error; + DWORD data[16]; + + if(!GL_SUPPORT(EXT_SECONDARY_COLOR)) return FALSE; + + ENTER_GL(); + while(glGetError()); + GL_EXTCALL(glSecondaryColorPointerEXT)(4, GL_UNSIGNED_BYTE, 4, data); + error = glGetError(); + LEAVE_GL(); + + if(error == GL_NO_ERROR) + { + TRACE("GL Implementation accepts 4 component specular color pointers\n"); + return TRUE; + } + else + { + TRACE("GL implementation does not accept 4 component specular colors, error %s\n", + debug_glerror(error)); + return FALSE; + } +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->vs_arb_constantsF); @@ -721,6 +748,11 @@ static void quirk_clip_varying(WineD3D_GL_Info *gl_info) gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; } +static void quirk_allows_specular_alpha(WineD3D_GL_Info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA; +} + struct driver_quirk { BOOL (*match)(const WineD3D_GL_Info *gl_info, const char *gl_renderer); @@ -770,6 +802,21 @@ struct driver_quirk quirk_table[] = match_dx10_capable, quirk_clip_varying, "Reserved varying for gl_ClipPos" + }, + { + /* GL_EXT_secondary_color does not allow 4 component secondary colors, but most + * GL implementations accept it. The Mac GL is the only implementation known to + * reject it. + * + * If we can pass 4 component specular colors, do it, because (a) we don't have + * to screw around with the data, and (b) the D3D fixed function vertex pipeline + * passes specular alpha to the pixel shader if any is used. Otherwise the + * specular alpha is used to pass the fog coordinate, which we pass to opengl + * via GL_EXT_fog_coord. + */ + match_allows_spec_alpha, + quirk_allows_specular_alpha, + "Allow specular alpha quirk" } }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2158d0b..9f77b5b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4199,15 +4199,45 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const struct wine VTRACE(("glSecondaryColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n", e->stride, e->data)); if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + GLenum type = e->format_desc->gl_vtx_type; + GLint format = e->format_desc->gl_vtx_format; + if (curVBO != e->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, e->buffer_object)); checkGLcall("glBindBufferARB"); curVBO = e->buffer_object; } - GL_EXTCALL(glSecondaryColorPointerEXT)(e->format_desc->gl_vtx_format, e->format_desc->gl_vtx_type, - e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); - checkGLcall("glSecondaryColorPointerEXT(4, GL_UNSIGNED_BYTE, ...)"); + + if(format != 4 || (GLINFO_LOCATION.quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) + { + /* Usually specular colors only allow 3 components, since they have no alpha. In D3D, the specular alpha + * contains the fog coordinate, which is passed to GL with GL_EXT_fog_coord. However, the fixed function + * vertex pipeline can pass the specular alpha through, and pixel shaders can read it. So it GL accepts + * 4 component secondary colors use it + */ + GL_EXTCALL(glSecondaryColorPointerEXT)(format, type, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(format, type, ...)"); + } + else + { + switch(type) + { + case GL_UNSIGNED_BYTE: + GL_EXTCALL(glSecondaryColorPointerEXT)(3, GL_UNSIGNED_BYTE, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, ...)"); + break; + + default: + FIXME("Add 4 component specular color pointers for type %x\n", type); + /* Make sure that the right color component is dropped */ + GL_EXTCALL(glSecondaryColorPointerEXT)(3, type, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(3, type, ...)"); + } + } glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b80c35c..60c363c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -47,6 +47,7 @@ #define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 #define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 #define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 +#define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 /* Texture format fixups */

1 0

Stefan Dösinger : wined3d: Drop the color0 mov optimization if the src is overwritten.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 17769497ebebb91bf925f51e685adbb47d27ae3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17769497ebebb91bf925f51e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 9 22:24:27 2009 +0200 wined3d: Drop the color0 mov optimization if the src is overwritten. --- dlls/wined3d/baseshader.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 411665e..0c2ede1 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -632,9 +632,12 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 reg_maps->texcoord_mask[dst_param.reg.idx] |= dst_param.write_mask; } - if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)This; + + if(dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to * COLOROUT 0. If we know this in advance, the ARB shader backend can skip * the mov and perform the sRGB write correction from the source register. @@ -642,13 +645,20 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 * However, if the mov is only partial, we can't do this, and if the write * comes from an instruction other than MOV it is hard to do as well. If * COLOROUT 0 is overwritten partially later, the marker is dropped again. */ - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)This; - ps->color0_mov = FALSE; - if (ins.handler_idx == WINED3DSIH_MOV) + ps->color0_mov = FALSE; + if (ins.handler_idx == WINED3DSIH_MOV) + { + /* Used later when the source register is read. */ + color0_mov = TRUE; + } + } + /* Also drop the MOV marker if the source register is overwritten prior to the shader + * end + */ + else if(dst_param.reg.type == WINED3DSPR_TEMP && dst_param.reg.idx == ps->color0_reg) { - /* Used later when the source register is read. */ - color0_mov = TRUE; + ps->color0_mov = FALSE; } }

1 0

Aurimas Fišeras : kernel32/nls: Add Lithuanian winerr translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 73d9ffbdb49736ea73d7ce988288a6df5472f554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d9ffbdb49736ea73d7ce988… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 12:37:05 2009 +0300 kernel32/nls: Add Lithuanian winerr translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/winerr_lth.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3738 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73d9ffbdb49736ea73d7c…

1 0

Frédéric Delanoy : cryptui: Fix UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 04f5c9153ad4654b56f71acbed7558f2ccd7ee71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f5c9153ad4654b56f71acbe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 13:15:05 2009 +0200 cryptui: Fix UI display. --- dlls/cryptui/cryptui_En.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 957fe98..5aee197 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -285,16 +285,16 @@ CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", -1, 115,103,195,8 END -IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -325,7 +325,7 @@ BEGIN PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -381,9 +381,9 @@ CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", @@ -394,8 +394,8 @@ IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,23 - LTEXT "Do you wish to export the private key?", -1, 21,24,195,15 + LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,25 + LTEXT "Do you wish to export the private key?", -1, 21,27,195,10 AUTORADIOBUTTON "&Yes, export the private key", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "N&o, do not export the private key", @@ -447,7 +447,7 @@ BEGIN PUSHBUTTON "B&rowse...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN

1 0

Alexandre Julliard : wmc: Add support for utf-8 codepage.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 52f81c12dbcdef3ccc8f0f1365d1ea21994168a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f81c12dbcdef3ccc8f0f136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 13:03:09 2009 +0200 wmc: Add support for utf-8 codepage. --- tools/wmc/mcl.c | 8 +++++--- tools/wmc/mcy.y | 6 +++--- tools/wmc/write.c | 20 ++++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index be01691..7be41d5 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -155,7 +155,7 @@ void set_codepage(int cp) { codepage = cp; codepage_def = find_codepage(codepage); - if(!codepage_def) + if(!codepage_def && codepage != CP_UTF8) xyyerror("Codepage %d not found; cannot process\n", codepage); } @@ -200,8 +200,10 @@ try_again: xyyerror(err_fatalread); else if(!cptr) return 0; - assert(codepage_def != NULL); - n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + if (codepage_def) + n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + else + n = wine_utf8_mbstowcs(0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 2887df5..5de67c9 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -251,12 +251,12 @@ cmaps : cmap ; cmap : clan '=' tNUMBER ':' tNUMBER { - static const char err_nocp[] = "Codepage %d not builtin; cannot convert"; + static const char err_nocp[] = "Codepage %d not builtin; cannot convert\n"; if(find_cpxlat($1)) xyyerror("Codepage translation already defined for language 0x%x\n", $1); - if($3 && !find_codepage($3)) + if($3 && $3 != CP_UTF8 && !find_codepage($3)) xyyerror(err_nocp, $3); - if($5 && !find_codepage($5)) + if($5 && $5 != CP_UTF8 && !find_codepage($5)) xyyerror(err_nocp, $5); add_cpxlat($1, $3, $5); } diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 7df2424..22858b8 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -100,11 +100,17 @@ static char *dup_u2c(int cp, const WCHAR *uc) int len; char *cptr; const union cptable *cpdef = find_codepage(cp); - if(!cpdef) - internal_error(__FILE__, __LINE__, "Codepage %d not found (vanished?)\n", cp); - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + + if(cpdef) + len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + else + len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); cptr = xmalloc(len); - if((len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL)) < 0) + if (cpdef) + len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL); + else + len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, cptr, len); + if (len < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; } @@ -385,8 +391,10 @@ static char *make_string(WCHAR *uc, int len, int codepage) int mlen; const union cptable *cpdef = find_codepage(codepage); - assert(cpdef != NULL); - mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + if (cpdef) + mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + else + mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); cc = tmp = xmalloc(mlen); if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i);

1 0

Stefan Dösinger : wined3d: Check the correct constant limit.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 2bfdff198c54218147cbf9532c68c9140b543909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfdff198c54218147cbf9532… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 10 09:30:14 2009 +0200 wined3d: Check the correct constant limit. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e48d5e3..6f7a1f0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4492,7 +4492,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if(GL_LIMITS(vshader_constantsF) >= 32) + else if(GL_LIMITS(pshader_constantsF) >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0);

1 0

Alexandre Julliard : dbghelp: Grow all arrays by doubling the size.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 75792a3e6994e124a777b8825ef9b2916e7fe333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75792a3e6994e124a777b8825… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 14:46:55 2009 +0200 dbghelp: Grow all arrays by doubling the size. --- dlls/dbghelp/coff.c | 20 ++++++++++++------ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/minidump.c | 28 ++++++++++++++++++++----- dlls/dbghelp/module.c | 2 + dlls/dbghelp/msc.c | 11 +++++++-- dlls/dbghelp/source.c | 9 ++++++- dlls/dbghelp/stabs.c | 43 ++++++++++++++++++++++++--------------- dlls/dbghelp/symbol.c | 13 ++++++++++- 8 files changed, 90 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75792a3e6994e124a777b…

1 0

Juan Lang : wininet: Support IPv6 in GetAddress.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: cd0c18be6c54a4e599b1f1a0c43472189154d29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0c18be6c54a4e599b1f1a0c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:51:21 2009 -0700 wininet: Support IPv6 in GetAddress. --- dlls/wininet/utility.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index e2eee46..0812af5 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -178,14 +178,23 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, #ifdef HAVE_GETADDRINFO memset( &hints, 0, sizeof(struct addrinfo) ); + /* Prefer IPv4 to IPv6 addresses, since some servers do not listen on + * their IPv6 addresses even though they have IPv6 addresses in the DNS. + */ hints.ai_family = AF_INET; ret = getaddrinfo( name, NULL, &hints, &res ); HeapFree( GetProcessHeap(), 0, name ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); - return FALSE; + TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(lpszServerName), gai_strerror(ret)); + hints.ai_family = AF_INET6; + ret = getaddrinfo( name, NULL, &hints, &res ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); + return FALSE; + } } if (*sa_len < res->ai_addrlen) { @@ -201,6 +210,9 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, case AF_INET: ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); break; + case AF_INET6: + ((struct sockaddr_in6 *)psa)->sin6_port = htons(nServerPort); + break; } freeaddrinfo( res );

1 0

Juan Lang : wininet: Fail in FTP if the resolved name is not an IPv4 address.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 78b813236a72f1190b52ef324f6582791e595898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b813236a72f1190b52ef324… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:45:48 2009 -0700 wininet: Fail in FTP if the resolved name is not an IPv4 address. --- dlls/wininet/ftp.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6d41ac5..dce18bb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2450,6 +2450,12 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, (LPWSTR) lpszServerName, strlenW(lpszServerName)); + if (socketAddr.sin_family != AF_INET) + { + WARN("unsupported address family %d\n", socketAddr.sin_family); + INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); + goto lerror; + } nsocket = socket(AF_INET,SOCK_STREAM,0); if (nsocket == -1) {

1 0

Roderick Colenbrander : winex11: Get rid of depth conversion fixme.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: cce1c44afa6e0d2efe1d145e7c39206ffef66c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce1c44afa6e0d2efe1d145e7… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jul 9 22:01:47 2009 +0200 winex11: Get rid of depth conversion fixme. --- dlls/winex11.drv/xrandr.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4884e1f..c313bab 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -178,16 +178,11 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) short rate; unsigned int i; int j; - DWORD dwBpp = screen_bpp; wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); sc = pXRRGetScreenInfo (gdi_display, root); size = pXRRConfigCurrentConfiguration (sc, &rot); - if (dwBpp != dd_modes[mode].dwBPP) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP); - } mode = mode%real_xrandr_modes_count; TRACE("Changing Resolution to %dx%d @%d Hz\n",

1 0