December 2008 - Wine-commits

Christian Costa : d3dxof: Move X files parsing into a separate file.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: eb4eda275727a0b9027f09d8542f0ce6f1819a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4eda275727a0b9027f09d85… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 31 12:27:24 2008 +0100 d3dxof: Move X files parsing into a separate file. --- dlls/d3dxof/Makefile.in | 1 + dlls/d3dxof/d3dxof.c | 1252 +---------------------------------------- dlls/d3dxof/d3dxof_private.h | 8 + dlls/d3dxof/parsing.c | 1290 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1300 insertions(+), 1251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb4eda275727a0b9027f0…

1 0

Paul TBBle Hampson : winhttp/tests: Add tests for WinHttpCrackUrl port number handling.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: f093f9e8d551da5f5451405910d3416d7bd99801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f093f9e8d551da5f545140591… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Wed Dec 31 17:24:25 2008 +1100 winhttp/tests: Add tests for WinHttpCrackUrl port number handling. --- dlls/winhttp/tests/url.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index ef48b04..9e5d759 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -59,6 +59,14 @@ static const WCHAR url8[] = static const WCHAR url9[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; +static const WCHAR url10[] = + {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', + '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; +static const WCHAR url11[] = + {'h','t','t','p','s',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', + '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; + + static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -82,6 +90,13 @@ static const WCHAR url_k9[] = static const WCHAR url_k10[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','/','p','o','s','t',';','a',0}; +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void fill_url_components( URL_COMPONENTS *uc ) { uc->dwStructSize = sizeof(URL_COMPONENTS); @@ -297,6 +312,7 @@ static void reset_url_components( URL_COMPONENTS *uc ) uc->dwStructSize = sizeof(URL_COMPONENTS); uc->dwSchemeLength = ~0UL; uc->dwHostNameLength = ~0UL; + uc->nPort = 0; uc->dwUserNameLength = ~0UL; uc->dwPasswordLength = ~0UL; uc->dwUrlPathLength = ~0UL; @@ -328,6 +344,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwPasswordLength = 20; uc.lpszHostName = host; uc.dwHostNameLength = 20; + uc.nPort = 0; uc.lpszUrlPath = path; uc.dwUrlPathLength = 40; uc.lpszExtraInfo = extra; @@ -344,6 +361,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 8, "unexpected password length\n" ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); + todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path\n" ); ok( uc.dwUrlPathLength == 11, "unexpected path length\n" ); ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info\n" ); @@ -374,6 +392,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 8, "unexpected password length\n" ); ok( uc.lpszHostName == url_k1 + 25, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); + todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k1 + 39, "unexpected path\n" ); ok( uc.dwUrlPathLength == 11, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k1 + 50, "unexpected extra info\n" ); @@ -392,6 +411,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 0, "unexpected password length\n" ); ok( uc.lpszHostName == url_k2 + 7, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); + todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k2 + 21, "unexpected path\n" ); ok( uc.dwUrlPathLength == 0, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k2 + 21, "unexpected extra info\n" ); @@ -410,6 +430,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 0, "unexpected password length\n" ); ok( uc.lpszHostName == url_k3 + 8, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); + todo_wine ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k3 + 22, "unexpected path\n" ); ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k3 + 27, "unexpected extra info\n" ); @@ -483,6 +504,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwPasswordLength = 20; uc.lpszHostName = host; uc.dwHostNameLength = 20; + uc.nPort = 0; uc.lpszUrlPath = path; uc.dwUrlPathLength = 40; uc.lpszExtraInfo = extra; @@ -495,6 +517,46 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 32, "unexpected path length\n" ); ok( !memcmp( uc.lpszExtraInfo, escape + 21, 12 * sizeof(WCHAR) ), "unexpected extra info\n" ); ok( uc.dwExtraInfoLength == 12, "unexpected extra info length\n" ); + + /* Urls with specified port numbers */ + /* decoding with buffers */ + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszUserName = user; + uc.dwUserNameLength = 20; + uc.lpszPassword = pass; + uc.dwPasswordLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.nPort = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = extra; + uc.dwExtraInfoLength = 20; + path[0] = 0; + + ret = WinHttpCrackUrl( url7, 0, 0, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + todo_wine ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", debugstr_w(uc.lpszHostName) ); + todo_wine ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); + todo_wine ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); + + /* decoding without buffers */ + reset_url_components( &uc ); + ret = WinHttpCrackUrl( url9, 0, 0, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + ok( uc.nPort == 0, "unexpected port: %u\n", uc.nPort ); + + reset_url_components( &uc ); + ret = WinHttpCrackUrl( url10, 0, 0, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + + reset_url_components( &uc ); + ret = WinHttpCrackUrl( url11, 0, 0, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + todo_wine ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); + } START_TEST(url)

1 0

Paul TBBle Hampson : winhttp: Correctly parse specified ports in WinHttpCrackUrl.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 4876375ab8d099e8936ee7119d39657fb29d5f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4876375ab8d099e8936ee7119… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Wed Dec 31 17:35:53 2008 +1100 winhttp: Correctly parse specified ports in WinHttpCrackUrl. --- dlls/winhttp/tests/url.c | 18 +++++++++--------- dlls/winhttp/url.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 9e5d759..2a04208 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -361,7 +361,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 8, "unexpected password length\n" ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); - todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path\n" ); ok( uc.dwUrlPathLength == 11, "unexpected path length\n" ); ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info\n" ); @@ -392,7 +392,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 8, "unexpected password length\n" ); ok( uc.lpszHostName == url_k1 + 25, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); - todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k1 + 39, "unexpected path\n" ); ok( uc.dwUrlPathLength == 11, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k1 + 50, "unexpected extra info\n" ); @@ -411,7 +411,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 0, "unexpected password length\n" ); ok( uc.lpszHostName == url_k2 + 7, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); - todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k2 + 21, "unexpected path\n" ); ok( uc.dwUrlPathLength == 0, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k2 + 21, "unexpected extra info\n" ); @@ -430,7 +430,7 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwPasswordLength == 0, "unexpected password length\n" ); ok( uc.lpszHostName == url_k3 + 8, "unexpected hostname\n" ); ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); - todo_wine ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); ok( uc.lpszUrlPath == url_k3 + 22, "unexpected path\n" ); ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url_k3 + 27, "unexpected extra info\n" ); @@ -537,9 +537,9 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url7, 0, 0, &uc ); ok( ret, "WinHttpCrackUrl failed\n" ); - todo_wine ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", debugstr_w(uc.lpszHostName) ); - todo_wine ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); - todo_wine ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); + ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", debugstr_w(uc.lpszHostName) ); + ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); + ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); /* decoding without buffers */ reset_url_components( &uc ); @@ -550,12 +550,12 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url10, 0, 0, &uc ); ok( ret, "WinHttpCrackUrl failed\n" ); - todo_wine ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url11, 0, 0, &uc ); ok( ret, "WinHttpCrackUrl failed\n" ); - todo_wine ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); + ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); } diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index f8c1972..9ed04cf 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -149,7 +149,18 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN } if ((q = memchrW( p, '/', len - (p - url) ))) { - if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags ))) goto exit; + if ((r = memchrW( p, ':', q - p ))) + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags ))) goto exit; + r++; + uc->nPort = atoiW( r ); + } + else + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags ))) goto exit; + if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } if ((r = memchrW( q, '?', len - (q - url) ))) { @@ -164,16 +175,28 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN } else { - if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags ))) goto exit; + if ((r = memchrW( p, ':', len - (p - url) ))) + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags ))) goto exit; + r++; + uc->nPort = atoiW( r ); + } + else + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags ))) goto exit; + if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags ))) goto exit; if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags ))) goto exit; } ret = TRUE; - TRACE("scheme(%s) host(%s) path(%s) extra(%s)\n", + TRACE("scheme(%s) host(%s) port(%d) path(%s) extra(%s)\n", debugstr_wn( uc->lpszScheme, uc->dwSchemeLength ), debugstr_wn( uc->lpszHostName, uc->dwHostNameLength ), + uc->nPort, debugstr_wn( uc->lpszUrlPath, uc->dwUrlPathLength ), debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength ));

1 0

Paul TBBle Hampson : winhttp: Don't try and call a null callback.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 04b8ec07a6e9c5888bc306939eaffdfa549580e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b8ec07a6e9c5888bc306939… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Wed Dec 31 18:59:02 2008 +1100 winhttp: Don't try and call a null callback. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index db4ce03..11c4b4f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -47,7 +47,7 @@ void send_callback( object_header_t *hdr, DWORD status, LPVOID info, DWORD bufle { TRACE("%p, 0x%08x, %p, %u\n", hdr, status, info, buflen); - if (hdr->notify_mask & status) hdr->callback( hdr->handle, hdr->context, status, info, buflen ); + if (hdr->callback && (hdr->notify_mask & status)) hdr->callback( hdr->handle, hdr->context, status, info, buflen ); } /***********************************************************************

1 0

Byeongsik Jeon : winex11.drv: Add the basic antialias type decision code.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 3807ca733d27e2c7a6b3afa521ad09078a7bee03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3807ca733d27e2c7a6b3afa52… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Dec 31 11:43:42 2008 +0900 winex11.drv: Add the basic antialias type decision code. --- dlls/winex11.drv/xrender.c | 68 +++++++++++++++++++++++++++++++++++--------- include/wingdi.h | 2 + 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 01c9560..596d9f0 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -451,14 +451,45 @@ static BOOL get_gasp_flags(X11DRV_PDEVICE *physDev, WORD *flags) return TRUE; } +static AA_Type get_antialias_type( X11DRV_PDEVICE *physDev, BOOL subpixel, BOOL hinter) +{ + AA_Type ret; + WORD flags; + UINT font_smoothing_type, font_smoothing_orientation; + + if (X11DRV_XRender_Installed && subpixel && + SystemParametersInfoW( SPI_GETFONTSMOOTHINGTYPE, 0, &font_smoothing_type, 0) && + font_smoothing_type == FE_FONTSMOOTHINGCLEARTYPE) + { + if ( SystemParametersInfoW( SPI_GETFONTSMOOTHINGORIENTATION, 0, + &font_smoothing_orientation, 0) && + font_smoothing_orientation == FE_FONTSMOOTHINGORIENTATIONBGR) + { + ret = AA_BGR; + } + else + ret = AA_RGB; + /*FIXME + If the monitor is in portrait mode, ClearType is disabled in the MS Windows (MSDN). + But, Wine's subpixel rendering can support the portrait mode. + */ + } + else if (!hinter || !get_gasp_flags(physDev, &flags) || flags & GASP_DOGRAY) + ret = AA_Grey; + else + ret = AA_None; + + return ret; +} + static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) { int ret; int format; gsCacheEntry *entry; - WORD flags; static int hinter = -1; static int subpixel = -1; + BOOL font_smoothing; if((ret = LookupEntry(plfsz)) != -1) return ret; @@ -479,19 +510,28 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) subpixel = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; } - /* FIXME: Use the following registry information - [HKEY_CURRENT_USER\Control Panel\Desktop] - "FontSmoothing"="2" ; 0=>Off, 2=>On - "FontSmoothingType"=dword:00000002 ; 1=>Standard, 2=>Cleartype - "FontSmoothingOrientation"=dword:00000001 ; 0=>BGR, 1=>RGB - "FontSmoothingGamma"=dword:00000578 - */ - if ( subpixel && X11DRV_XRender_Installed) - entry->aa_default = AA_RGB; - else if(!hinter || !get_gasp_flags(physDev, &flags) || flags & GASP_DOGRAY) - entry->aa_default = AA_Grey; - else - entry->aa_default = AA_None; + switch (plfsz->lf.lfQuality) + { + case ANTIALIASED_QUALITY: + entry->aa_default = get_antialias_type( physDev, FALSE, hinter ); + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + entry->aa_default = get_antialias_type( physDev, subpixel, hinter ); + break; + case DEFAULT_QUALITY: + case DRAFT_QUALITY: + case PROOF_QUALITY: + default: + if ( SystemParametersInfoW( SPI_GETFONTSMOOTHING, 0, &font_smoothing, 0) && + font_smoothing) + { + entry->aa_default = get_antialias_type( physDev, subpixel, hinter ); + } + else + entry->aa_default = AA_None; + break; + } } else entry->aa_default = AA_None; diff --git a/include/wingdi.h b/include/wingdi.h index 5841103..96a0d20 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -771,6 +771,8 @@ typedef struct tagXFORM #define PROOF_QUALITY 2 #define NONANTIALIASED_QUALITY 3 #define ANTIALIASED_QUALITY 4 +#define CLEARTYPE_QUALITY 5 +#define CLEARTYPE_NATURAL_QUALITY 6 /* lfPitchAndFamily pitch values */ #define DEFAULT_PITCH 0x00

1 0

Rob Shearman : widl: Remove duplicate pointer handling code in get_struct_type.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 36c03f6a940bacfc92202e846fa9e34b901eb1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c03f6a940bacfc92202e846… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 30 18:49:48 2008 +0000 widl: Remove duplicate pointer handling code in get_struct_type. Only make the structure complex if there is an interface pointer, not if there is a pointer to a union or complex struct since these are handled perfectly well by the pointer marshalling code. Fix the detection of structures with ref-pointers or pointers in 64-bit code. --- tools/widl/typegen.c | 23 ++++------------------- 1 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index daabbd6..8852ca0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -142,25 +142,6 @@ static int get_struct_type(const type_t *type) if (is_user_type(t)) return RPC_FC_BOGUS_STRUCT; - if (is_ptr(t)) - { - do - t = t->ref; - while (is_ptr(t)); - - switch (get_struct_type(t)) - { - case RPC_FC_IP: - case RPC_FC_ENCAPSULATED_UNION: - case RPC_FC_NON_ENCAPSULATED_UNION: - case RPC_FC_BOGUS_STRUCT: - return RPC_FC_BOGUS_STRUCT; - } - - has_pointer = 1; - continue; - } - if (field->type->declarray) { if (is_string_type(field->attrs, field->type)) @@ -222,6 +203,10 @@ static int get_struct_type(const type_t *type) case RPC_FC_OP: if (pointer_size != 4) return RPC_FC_BOGUS_STRUCT; + /* pointers to interfaces aren't really pointers and have to be + * marshalled specially so they make the structure complex */ + if (t->ref->type == RPC_FC_IP) + return RPC_FC_BOGUS_STRUCT; has_pointer = 1; break;

1 0

Jeff Zaroyko : iphlpapi/tests: Fix a failing test.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 33479b898a0cf2aa5f53873a8153776fba730e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33479b898a0cf2aa5f53873a8… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Dec 31 00:09:03 2008 +1100 iphlpapi/tests: Fix a failing test. --- dlls/iphlpapi/tests/iphlpapi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 27393b8..23f85ec 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -322,7 +322,8 @@ static void testGetIpNetTable(void) PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIpNetTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, + ok(apiReturn == NO_ERROR || + apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); HeapFree(GetProcessHeap(), 0, buf);

1 0

Paul TBBle Hampson : winhttp: Fix resolution-failure TRACE in netconn_resolve to use input WCHAR* rather than already-freed CHAR* .
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 83ea32ea02ed652a8a6f001ae7c7a3b9a249d9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ea32ea02ed652a8a6f001ae… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Wed Dec 31 02:37:47 2008 +1100 winhttp: Fix resolution-failure TRACE in netconn_resolve to use input WCHAR* rather than already-freed CHAR*. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index e9e12f7..2e37b1c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -586,7 +586,7 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * heap_free( hostname ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_a(hostname), gai_strerror(ret)); + TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); return FALSE; } memset( sa, 0, sizeof(struct sockaddr_in) ); @@ -602,7 +602,7 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * heap_free( hostname ); if (!he) { - TRACE("failed to get address of %s (%d)\n", debugstr_a(hostname), h_errno); + TRACE("failed to get address of %s (%d)\n", debugstr_w(hostnameW), h_errno); LeaveCriticalSection( &cs_gethostbyname ); return FALSE; }

1 0

Rob Shearman : widl: Don' t add NULL pointer checks in generated code for user types.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: c6e7609b01858a46507ef9995bcffe00cd2d4c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e7609b01858a46507ef9995… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 30 18:48:43 2008 +0000 widl: Don't add NULL pointer checks in generated code for user types. --- tools/widl/proxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 7bb6acd..5d4d2af 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -161,6 +161,9 @@ int cant_be_null(const var_t *v) if (is_aliaschain_attr(type, ATTR_CONTEXTHANDLE)) return 0; + if (is_user_type(type)) + return 0; + if (! attrs && type) { attrs = type->attrs;

1 0

Andrew Riedi : winex11.drv: Calculate the cursor bitmap offsets in a way consistent with user32.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: cdf88e9c2900a791883cbd08a697f3513db5e537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf88e9c2900a791883cbd08a… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Dec 24 14:35:39 2008 -0800 winex11.drv: Calculate the cursor bitmap offsets in a way consistent with user32. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b79f149..728a8cd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -436,10 +436,10 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) unsigned char tmp; BOOL alpha_zero = TRUE; - and_width_bytes = ptr->nWidth / 8; - xor_width_bytes = and_width_bytes * ptr->bBitsPerPixel; + and_width_bytes = 2 * ((ptr->nWidth+15) / 16); + xor_width_bytes = ptr->nWidthBytes; - and_size = ptr->nWidth * ptr->nHeight / 8; + and_size = ptr->nHeight * and_width_bytes; and_ptr = and_bits = (unsigned char *)(ptr + 1); xor_ptr = xor_bits = and_ptr + and_size;

1 0