November 2011 - Wine-Commits

Huw Davies : gdi32: Return valid anti-alias format bitmaps if the glyph is a monochrome bitmap .
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 6c9c9107d4b542c7cd1c3ecf9bce53106d0419af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9c9107d4b542c7cd1c3ecf9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 16 11:20:51 2011 +0000 gdi32: Return valid anti-alias format bitmaps if the glyph is a monochrome bitmap. --- dlls/gdi32/freetype.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ec7785..5fb8cda 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5289,9 +5289,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } if(ft_face->glyph->format != ft_glyph_format_outline && - (format == GGO_NATIVE || format == GGO_BEZIER || - format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || - format == GGO_GRAY8_BITMAP)) + (format == GGO_NATIVE || format == GGO_BEZIER)) { TRACE("loaded a bitmap\n"); return GDI_ERROR; @@ -5369,7 +5367,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, memset( buf, 0, needed ); while(h--) { for(x = 0; x < pitch && x < ft_face->glyph->bitmap.width; x++) - if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = 0xff; + if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = max_level; src += ft_face->glyph->bitmap.pitch; dst += pitch; }

1 0

Huw Davies : gdi32: Add a helper to retrieve the octant bias.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 666f83bc0f82c4d8bae2f30f7a6dee8f2d4cf584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666f83bc0f82c4d8bae2f30f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 16 11:20:53 2011 +0000 gdi32: Add a helper to retrieve the octant bias. --- dlls/gdi32/dibdrv/objects.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3de6cb9..c0dd7d2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -308,6 +308,12 @@ static inline DWORD get_octant_mask(int dx, int dy) return 1 << (get_octant_number(dx, dy) - 1); } +static inline int get_bias( DWORD mask ) +{ + /* Octants 3, 5, 6 and 8 take a bias */ + return (mask & 0xb4) ? 1 : 0; +} + static void solid_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y) { RECT rect; @@ -653,8 +659,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) params.dx = abs(dx); params.dy = abs(dy); params.octant = get_octant_mask(dx, dy); - /* Octants 3, 5, 6 and 8 take a bias */ - params.bias = (params.octant & 0xb4) ? 1 : 0; + params.bias = get_bias(params.octant); for(i = 0; i < clip->numRects; i++) { @@ -926,8 +931,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) params.dx = abs(dx); params.dy = abs(dy); params.octant = get_octant_mask(dx, dy); - /* Octants 3, 5, 6 and 8 take a bias */ - params.bias = (params.octant & 0xb4) ? 1 : 0; + params.bias = get_bias(params.octant); for(i = 0; i < clip->numRects; i++) {

1 0

Piotr Caban : msvcrt: Don't use fputc in flsbuf implementation.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 764b85511c72ab9e4b4ab456c98e0e71b4aa4009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764b85511c72ab9e4b4ab456c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 12:50:50 2011 +0100 msvcrt: Don't use fputc in flsbuf implementation. --- dlls/msvcrt/file.c | 74 +++++++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0ead68a..1334ec6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3062,37 +3062,6 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, return 0; } -/* MSVCRT_fputc calls MSVCRT__flsbuf which calls MSVCRT_fputc */ -int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file); - -/********************************************************************* - * fputc (MSVCRT.@) - */ -int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) -{ - int res; - - MSVCRT__lock_file(file); - if(file->_cnt>0) { - *file->_ptr++=c; - file->_cnt--; - if (c == '\n') - { - res = msvcrt_flush_buffer(file); - MSVCRT__unlock_file(file); - return res ? res : c; - } - else { - MSVCRT__unlock_file(file); - return c & 0xff; - } - } else { - res = MSVCRT__flsbuf(c, file); - MSVCRT__unlock_file(file); - return res; - } -} - /********************************************************************* * _flsbuf (MSVCRT.@) */ @@ -3109,10 +3078,17 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) return MSVCRT_EOF; } if(file->_bufsiz) { - int res=msvcrt_flush_buffer(file); - if(!res) - res = MSVCRT_fputc(c, file); - return res; + int res = 0; + + if(file->_cnt == 0) + res = msvcrt_flush_buffer(file); + if(!res) { + *file->_ptr++ = c; + file->_cnt--; + res = msvcrt_flush_buffer(file); + } + + return res ? res : c&0xff; } else { unsigned char cc=c; int len; @@ -3127,6 +3103,34 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) } /********************************************************************* + * fputc (MSVCRT.@) + */ +int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) +{ + int res; + + MSVCRT__lock_file(file); + if(file->_cnt>0) { + *file->_ptr++=c; + file->_cnt--; + if (c == '\n') + { + res = msvcrt_flush_buffer(file); + MSVCRT__unlock_file(file); + return res ? res : c; + } + else { + MSVCRT__unlock_file(file); + return c & 0xff; + } + } else { + res = MSVCRT__flsbuf(c, file); + MSVCRT__unlock_file(file); + return res; + } +} + +/********************************************************************* * _fputchar (MSVCRT.@) */ int CDECL MSVCRT__fputchar(int c)

1 0

Huw Davies : msxml3: Re-initialise the variant so that VariantChangeType doesn' t free the user string.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 8f9c39d2a8a3666efb86d400d9f5f9c464f3ab2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9c39d2a8a3666efb86d400d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 16 13:18:49 2011 +0000 msxml3: Re-initialise the variant so that VariantChangeType doesn't free the user string. --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 32cfc2c..2385d18 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -706,6 +706,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->user = V_BSTR(&str); + VariantInit(&str); hr = VariantChangeType(&str, &password, 0, VT_BSTR); if (hr == S_OK) This->password = V_BSTR(&str);

1 0

Nikolay Sivov : msxml3: Fix get_namespaceURI().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 12bb4a471fc0ec01108d19e649dd097382fc9913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bb4a471fc0ec01108d19e64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:28:51 2011 +0300 msxml3: Fix get_namespaceURI(). --- dlls/msxml3/node.c | 9 +++------ dlls/msxml3/tests/domdoc.c | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 923a0c2..1df7331 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1054,18 +1054,15 @@ HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **no HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) { - xmlNsPtr *ns; + xmlNsPtr ns = This->node->ns; if(!namespaceURI) return E_INVALIDARG; *namespaceURI = NULL; - if ((ns = xmlGetNsList(This->node->doc, This->node))) - { - if (ns[0]->href) *namespaceURI = bstr_from_xmlChar( ns[0]->href ); - xmlFree(ns); - } + if (ns && ns->href) + *namespaceURI = bstr_from_xmlChar(ns->href); TRACE("uri: %s\n", debugstr_w(*namespaceURI)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bad088f..699382f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8712,10 +8712,8 @@ static void test_get_prefix(void) str = (void*)0xdeadbeef; hr = IXMLDOMElement_get_namespaceURI(element, &str); -todo_wine { EXPECT_HR(hr, S_FALSE); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); -} IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Nikolay Sivov : msxml3: Convert test stream to single byte string.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: f291933177d68c7e118d282499f2be726ada1d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f291933177d68c7e118d28249… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:32:42 2011 +0300 msxml3: Convert test stream to single byte string. --- dlls/msxml3/tests/domdoc.c | 154 +++++++++++++++++--------------------------- 1 files changed, 59 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f291933177d68c7e118d2…

1 0

Hans Leidekker : winhttp: Implement WinHttpGetIEProxyConfigForCurrentUser.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: f6c46dd0743def8e015bc0390924ab1980206805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c46dd0743def8e015bc0390… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 09:42:17 2011 +0100 winhttp: Implement WinHttpGetIEProxyConfigForCurrentUser. --- dlls/winhttp/session.c | 109 ++++++++++++++++++++++++++++++++--------- dlls/winhttp/tests/winhttp.c | 26 ++++++++++ 2 files changed, 111 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c187079..42ef85b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1234,15 +1234,18 @@ static const WCHAR Connections[] = { 'C','o','n','n','e','c','t','i','o','n','s',0 }; static const WCHAR WinHttpSettings[] = { 'W','i','n','H','t','t','p','S','e','t','t','i','n','g','s',0 }; -static const DWORD WINHTTPSETTINGS_MAGIC = 0x18; -static const DWORD WINHTTP_PROXY_TYPE_DIRECT = 1; -static const DWORD WINHTTP_PROXY_TYPE_PROXY = 2; - -struct winhttp_settings_header +static const DWORD WINHTTP_SETTINGS_MAGIC = 0x18; +static const DWORD WININET_SETTINGS_MAGIC = 0x46; +static const DWORD PROXY_TYPE_DIRECT = 1; +static const DWORD PROXY_TYPE_PROXY = 2; +static const DWORD PROXY_USE_PAC_SCRIPT = 4; +static const DWORD PROXY_AUTODETECT_SETTINGS = 8; + +struct connection_settings_header { DWORD magic; DWORD unknown; /* always zero? */ - DWORD flags; /* one of WINHTTP_PROXY_TYPE_* */ + DWORD flags; /* one or more of PROXY_* */ }; static inline void copy_char_to_wchar_sz(const BYTE *src, DWORD len, WCHAR *dst) @@ -1273,22 +1276,22 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) l = RegQueryValueExW( key, WinHttpSettings, NULL, &type, NULL, &size ); if (!l && type == REG_BINARY && - size >= sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD)) + size >= sizeof(struct connection_settings_header) + 2 * sizeof(DWORD)) { BYTE *buf = heap_alloc( size ); if (buf) { - struct winhttp_settings_header *hdr = - (struct winhttp_settings_header *)buf; + struct connection_settings_header *hdr = + (struct connection_settings_header *)buf; DWORD *len = (DWORD *)(hdr + 1); l = RegQueryValueExW( key, WinHttpSettings, NULL, NULL, buf, &size ); - if (!l && hdr->magic == WINHTTPSETTINGS_MAGIC && + if (!l && hdr->magic == WINHTTP_SETTINGS_MAGIC && hdr->unknown == 0) { - if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) + if (hdr->flags & PROXY_TYPE_PROXY) { BOOL sane = FALSE; LPWSTR proxy = NULL; @@ -1394,6 +1397,13 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) */ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *config ) { + static const WCHAR settingsW[] = + {'D','e','f','a','u','l','t','C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; + HKEY hkey = NULL; + struct connection_settings_header *hdr = NULL; + DWORD type, offset, len, size = 0; + BOOL ret = FALSE; + TRACE("%p\n", config); if (!config) @@ -1401,16 +1411,67 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } + memset( config, 0, sizeof(*config) ); + config->fAutoDetect = TRUE; - /* FIXME: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ + if (RegOpenKeyExW( HKEY_CURRENT_USER, Connections, 0, KEY_READ, &hkey ) || + RegQueryValueExW( hkey, settingsW, NULL, &type, NULL, &size ) || + type != REG_BINARY || size < sizeof(struct connection_settings_header)) + { + ret = TRUE; + goto done; + } + if (!(hdr = heap_alloc( size ))) goto done; + if (RegQueryValueExW( hkey, settingsW, NULL, &type, (BYTE *)hdr, &size ) || + hdr->magic != WININET_SETTINGS_MAGIC) + { + ret = TRUE; + goto done; + } - FIXME("returning no proxy used\n"); - config->fAutoDetect = FALSE; - config->lpszAutoConfigUrl = NULL; - config->lpszProxy = NULL; - config->lpszProxyBypass = NULL; + config->fAutoDetect = (hdr->flags & PROXY_AUTODETECT_SETTINGS) != 0; + offset = sizeof(*hdr); + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && hdr->flags & PROXY_TYPE_PROXY) + { + if (!(config->lpszProxy = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszProxy ); + } + offset += len; + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && (hdr->flags & PROXY_TYPE_PROXY)) + { + if (!(config->lpszProxyBypass = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszProxyBypass ); + } + offset += len; + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && (hdr->flags & PROXY_USE_PAC_SCRIPT)) + { + if (!(config->lpszAutoConfigUrl = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszAutoConfigUrl ); + } + ret = TRUE; - return TRUE; +done: + RegCloseKey( hkey ); + heap_free( hdr ); + if (!ret) + { + heap_free( config->lpszAutoConfigUrl ); + config->lpszAutoConfigUrl = NULL; + heap_free( config->lpszProxy ); + config->lpszProxy = NULL; + heap_free( config->lpszProxyBypass ); + config->lpszProxyBypass = NULL; + } + return ret; } /*********************************************************************** @@ -1478,7 +1539,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) KEY_WRITE, NULL, &key, NULL ); if (!l) { - DWORD size = sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD); + DWORD size = sizeof(struct connection_settings_header) + 2 * sizeof(DWORD); BYTE *buf; if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) @@ -1490,17 +1551,17 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) buf = heap_alloc( size ); if (buf) { - struct winhttp_settings_header *hdr = - (struct winhttp_settings_header *)buf; + struct connection_settings_header *hdr = + (struct connection_settings_header *)buf; DWORD *len = (DWORD *)(hdr + 1); - hdr->magic = WINHTTPSETTINGS_MAGIC; + hdr->magic = WINHTTP_SETTINGS_MAGIC; hdr->unknown = 0; if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) { BYTE *dst; - hdr->flags = WINHTTP_PROXY_TYPE_PROXY; + hdr->flags = PROXY_TYPE_PROXY; *len++ = strlenW( info->lpszProxy ); for (dst = (BYTE *)len, src = info->lpszProxy; *src; src++, dst++) @@ -1518,7 +1579,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } else { - hdr->flags = WINHTTP_PROXY_TYPE_DIRECT; + hdr->flags = PROXY_TYPE_DIRECT; *len++ = 0; *len++ = 0; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f481a82..5e4892c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2556,6 +2556,31 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) } } +static void test_WinHttpGetIEProxyConfigForCurrentUser(void) +{ + BOOL ret; + DWORD error; + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG cfg; + + memset( &cfg, 0, sizeof(cfg) ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetIEProxyConfigForCurrentUser( NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); + ok( ret, "expected success\n" ); + trace("%d\n", cfg.fAutoDetect); + trace("%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxy)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); + GlobalFree( cfg.lpszAutoConfigUrl ); + GlobalFree( cfg.lpszProxy ); + GlobalFree( cfg.lpszProxyBypass ); +} + START_TEST (winhttp) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -2579,6 +2604,7 @@ START_TEST (winhttp) test_credentials(); test_IWinHttpRequest(); test_WinHttpDetectAutoProxyConfigUrl(); + test_WinHttpGetIEProxyConfigForCurrentUser(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532;

1 0

Jacek Caban : urlmon: Get rid of create_todo_* from uri_equality struct.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 11835771501dee5d16ed1ccc77332deb25fb47eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=11835771501dee5d16ed1ccc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 12:51:04 2011 +0100 urlmon: Get rid of create_todo_* from uri_equality struct. --- dlls/urlmon/tests/uri.c | 173 ++++++++++++++++++++--------------------------- 1 files changed, 74 insertions(+), 99 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 327b9a2..478a5f0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4418,91 +4418,89 @@ static const invalid_uri invalid_uri_tests[] = { typedef struct _uri_equality { const char* a; DWORD create_flags_a; - BOOL create_todo_a; const char* b; DWORD create_flags_b; - BOOL create_todo_b; BOOL equal; BOOL todo; } uri_equality; static const uri_equality equality_tests[] = { { - "HTTP://www.winehq.org/test dir/./",0,FALSE, - "http://www.winehq.org/test dir/../test dir/",0,FALSE, - TRUE, FALSE + "HTTP://www.winehq.org/test dir/./",0, + "http://www.winehq.org/test dir/../test dir/",0, + TRUE }, { /* http://www.winehq.org/test%20dir */ - "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0,FALSE, - "http://www.winehq.org/test dir",0,FALSE, - TRUE, FALSE + "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0, + "http://www.winehq.org/test dir",0, + TRUE }, { - "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME,FALSE, - "file:///c:/test.mp3",0,FALSE, - TRUE, FALSE + "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + "file:///c:/test.mp3",0, + TRUE }, { - "ftp://ftp.winehq.org/",0,FALSE, - "ftp://ftp.winehq.org",0,FALSE, - TRUE, FALSE + "ftp://ftp.winehq.org/",0, + "ftp://ftp.winehq.org",0, + TRUE }, { - "ftp://ftp.winehq.org/test/test2/../../testB/",0,FALSE, - "ftp://ftp.winehq.org/t%45stB/",0,FALSE, - FALSE, FALSE + "ftp://ftp.winehq.org/test/test2/../../testB/",0, + "ftp://ftp.winehq.org/t%45stB/",0, + FALSE }, { - "http://google.com/TEST",0,FALSE, - "http://google.com/test",0,FALSE, - FALSE, FALSE + "http://google.com/TEST",0, + "http://google.com/test",0, + FALSE }, { - "http://GOOGLE.com/",0,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://GOOGLE.com/",0, + "http://google.com/",0, + TRUE }, /* Performs case insensitive compare of host names (for known scheme types). */ { - "ftp://GOOGLE.com/",Uri_CREATE_NO_CANONICALIZE,FALSE, - "ftp://google.com/",0,FALSE, - TRUE, FALSE + "ftp://GOOGLE.com/",Uri_CREATE_NO_CANONICALIZE, + "ftp://google.com/",0, + TRUE }, { - "zip://GOOGLE.com/",0,FALSE, - "zip://google.com/",0,FALSE, - FALSE, FALSE + "zip://GOOGLE.com/",0, + "zip://google.com/",0, + FALSE }, { - "file:///c:/TEST/TeST/",0,FALSE, - "file:///c:/test/test/",0,FALSE, - TRUE, FALSE + "file:///c:/TEST/TeST/",0, + "file:///c:/test/test/",0, + TRUE }, { - "file:///server/TEST",0,FALSE, - "file:///SERVER/TEST",0,FALSE, - TRUE, FALSE + "file:///server/TEST",0, + "file:///SERVER/TEST",0, + TRUE }, { - "http://google.com",Uri_CREATE_NO_CANONICALIZE,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://google.com",Uri_CREATE_NO_CANONICALIZE, + "http://google.com/",0, + TRUE }, { - "ftp://google.com:21/",0,FALSE, - "ftp://google.com/",0,FALSE, - TRUE, FALSE + "ftp://google.com:21/",0, + "ftp://google.com/",0, + TRUE }, { - "http://google.com:80/",Uri_CREATE_NO_CANONICALIZE,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://google.com:80/",Uri_CREATE_NO_CANONICALIZE, + "http://google.com/",0, + TRUE }, { - "http://google.com:70/",0,FALSE, - "http://google.com:71/",0,FALSE, - FALSE, FALSE + "http://google.com:70/",0, + "http://google.com:71/",0, + FALSE } }; @@ -7625,27 +7623,28 @@ static void test_IUri_HasProperty(void) { static void test_IUri_IsEqual(void) { IUri *uriA, *uriB; - HRESULT hrA, hrB; + BOOL equal; + HRESULT hres; DWORD i; uriA = uriB = NULL; /* Make sure IsEqual handles invalid args correctly. */ - hrA = pCreateUri(http_urlW, 0, 0, &uriA); - hrB = pCreateUri(http_urlW, 0, 0, &uriB); - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrB, S_OK); - if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { - BOOL equal = -1; - hrA = IUri_IsEqual(uriA, NULL, &equal); - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); - ok(equal == FALSE, "Error: Expected equal to be FALSE, but was %d instead.\n", equal); - - hrA = IUri_IsEqual(uriA, uriB, NULL); - ok(hrA == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, E_POINTER); - } - if(uriA) IUri_Release(uriA); - if(uriB) IUri_Release(uriB); + hres = pCreateUri(http_urlW, 0, 0, &uriA); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + hres = pCreateUri(http_urlW, 0, 0, &uriB); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + + equal = -1; + hres = IUri_IsEqual(uriA, NULL, &equal); + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + ok(!equal, "Error: Expected equal to be FALSE, but was %d instead.\n", equal); + + hres = IUri_IsEqual(uriA, uriB, NULL); + ok(hres == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, E_POINTER); + + IUri_Release(uriA); + IUri_Release(uriB); for(i = 0; i < sizeof(equality_tests)/sizeof(equality_tests[0]); ++i) { uri_equality test = equality_tests[i]; @@ -7656,44 +7655,20 @@ static void test_IUri_IsEqual(void) { uriA_W = a2w(test.a); uriB_W = a2w(test.b); - hrA = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA); - if(test.create_todo_a) { - todo_wine { - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", - hrA, S_OK, i); - } - } else { - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", - hrA, S_OK, i); - } - - hrB = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB); - if(test.create_todo_b) { - todo_wine { - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", - hrB, S_OK, i); - } - } else { - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", - hrB, S_OK, i); - } + hres = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", hres, S_OK, i); - if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { - BOOL equal = -1; + hres = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", hres, S_OK, i); - hrA = IUri_IsEqual(uriA, uriB, &equal); - if(test.todo) { - todo_wine { - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", - hrA, S_OK, i); - } - todo_wine { - ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); - } - } else { - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hrA, S_OK, i); - ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); - } + equal = -1; + hres = IUri_IsEqual(uriA, uriB, &equal); + if(test.todo) todo_wine { + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); + } else { + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); } if(uriA) IUri_Release(uriA); if(uriB) IUri_Release(uriB);

1 0

Henri Verbeet : wined3d: Pass a wined3d_color struct to wined3d_device_clear().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: e0a0d611af86e3320dd305c7af0abe14065cd8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a0d611af86e3320dd305c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:28 2011 +0100 wined3d: Pass a wined3d_color struct to wined3d_device_clear(). --- dlls/d3d8/device.c | 15 +++++++++++---- dlls/d3d9/device.c | 16 +++++++++++----- dlls/ddraw/device.c | 21 +++++++++++---------- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/swapchain.c | 4 +++- include/wine/wined3d.h | 4 +--- 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ead518..4ba3bbd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1200,17 +1200,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(IDirect3DD return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_Clear(IDirect3DDevice8 *iface, DWORD Count, - const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) +static HRESULT WINAPI IDirect3DDevice8Impl_Clear(IDirect3DDevice8 *iface, DWORD rect_count, + const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", - iface, Count, pRects, Flags, Color, Z, Stencil); + iface, rect_count, rects, flags, color, z, stencil); wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4e8eee1..9dea7fb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1218,18 +1218,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(IDirect3DD return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_Clear(IDirect3DDevice9Ex *iface, DWORD Count, - const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) +static HRESULT WINAPI IDirect3DDevice9Impl_Clear(IDirect3DDevice9Ex *iface, DWORD rect_count, + const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", - iface, Count, pRects, Flags, Color, Z, Stencil); + iface, rect_count, rects, flags, color, z, stencil); - /* Note: D3DRECT is compatible with WINED3DRECT */ wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c4de3b..ecff7fa 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5065,23 +5065,24 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *ifa * For details, see IWineD3DDevice::Clear * *****************************************************************************/ -static HRESULT -IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, - DWORD Count, - D3DRECT *Rects, - DWORD Flags, - D3DCOLOR Color, - D3DVALUE Z, - DWORD Stencil) +static HRESULT IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, DWORD count, + D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) { + const struct wined3d_color c = + { + ((color >> 16) & 0xff) / 255.0f, + ((color >> 8) & 0xff) / 255.0f, + (color & 0xff) / 255.0f, + ((color >> 24) & 0xff) / 255.0f, + }; IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", - iface, Count, Rects, Flags, Color, Z, Stencil); + iface, count, rects, flags, color, z, stencil); wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, Count, (RECT *)Rects, Flags, Color, Z, Stencil); + hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb51b39..177f41a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1199,6 +1199,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters) { + static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; @@ -1345,7 +1346,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Clear the screen */ wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET | (present_parameters->EnableAutoDepthStencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - 0x00, 1.0f, 0); + &black, 1.0f, 0); device->d3d_initialized = TRUE; @@ -4025,13 +4026,12 @@ HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, - const RECT *rects, DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) + const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct wined3d_color c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; RECT draw_rect; - TRACE("device %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", - device, rect_count, rects, flags, color, depth, stencil); + TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", + device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { @@ -4057,7 +4057,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, rect_count, rects, - &draw_rect, flags, &c, depth, stencil); + &draw_rect, flags, color, depth, stencil); } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d04d9c1..321d8ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -591,10 +591,12 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ if (FALSE && swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { + static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; + TRACE("Clearing the color buffer with cyan color\n"); wined3d_device_clear(swapchain->device, 0, NULL, - WINED3DCLEAR_TARGET, 0xff00ffff, 1.0f, 0); + WINED3DCLEAR_TARGET, &cyan, 1.0f, 0); } if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c1dbaa3..4224c6c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -65,8 +65,6 @@ #define WINEDDERR_NOCLIPLIST MAKE_WINED3DHRESULT(205) #define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) -typedef DWORD WINED3DCOLOR; - typedef enum _WINED3DLIGHTTYPE { WINED3DLIGHT_POINT = 1, @@ -2168,7 +2166,7 @@ HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *devic HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, - WINED3DCOLOR color, float z, DWORD stencil); + const struct wined3d_color *color, float z, DWORD stencil); void __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color); HRESULT __cdecl wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface,

1 0

Francois Gouget : rpcrt4: The offset to the complex pointer' s description is signed.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 97ba7aa521c30867ca09906e8e40f0036a28349a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ba7aa521c30867ca09906e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 23:57:44 2011 +0100 rpcrt4: The offset to the complex pointer's description is signed. --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 5eb699e..fdde3a4 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -156,7 +156,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = sizeof(void *); break; } - size = calc_arg_size(pStubMsg, &pFormat[2] + *(WORD *)&pFormat[2]); + size = calc_arg_size(pStubMsg, &pFormat[2] + *(const SHORT*)&pFormat[2]); break; case RPC_FC_STRUCT: case RPC_FC_PSTRUCT:

1 0