August 2017 - Wine-Commits - list.winehq.org

Rosanne DiMesio : Fix submitTime field
by Jeremy Newman Aug. 28, 2017

Aug. 28, 2017

Module: appdb Branch: master Commit: 0888cc3467295c03ac169d6e0304656a334ad482 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0888cc3467295c03ac169d6e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Aug 28 07:41:50 2017 -0500 Fix submitTime field Supersedes 136700, which was incompatible with mySQL 5.5. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 49cfa69..7f05db2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -103,7 +103,7 @@ class testData{ $this->shWorkarounds, $this->sTestedRating, $this->sComments, - "NOW()", + date("Y-m-d H:i:s"), $_SESSION['current']->iUserId, $this->sState, $this->sGpuMfr,

1 0

Rosanne DiMesio : Fix submitTime field
by Jeremy Newman Aug. 28, 2017

Aug. 28, 2017

Module: appdb Branch: master Commit: c2d2c7ad817828cafcf6e967b451fbdf009f268d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c2d2c7ad817828cafcf6e967… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 25 10:24:23 2017 -0500 Fix submitTime field Fixes a regression created by 4a1506322966340d3ad42151ffa31f551e7e9f4c where the submitTime field was not being filled in on new test reports. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 7 +++---- tables/alter.sql | 4 ++++ tables/testResults.sql | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/testData.php b/include/testData.php index 49cfa69..98f1c09 100644 --- a/include/testData.php +++ b/include/testData.php @@ -84,11 +84,11 @@ class testData{ "testedRelease, staging, installs, runs,". "usedWorkaround, workarounds,". "testedRating, comments,". - "submitTime, submitterId, state,". + "submitterId, state,". "gpuMfr, graphicsDriver)". "VALUES('?', '?', '?', '?', '?', '?', '?',". "'?', '?', '?', '?', '?',". - "'?', '?', '?', '?', '?', '?', '?')", + "'?', '?', '?', '?', '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, @@ -102,8 +102,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, - "NOW()", + $this->sComments, $_SESSION['current']->iUserId, $this->sState, $this->sGpuMfr, diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..8aa4423 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,6 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ +ALTER TABLE `testResults` CHANGE `submitTime` `submitTime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP; + +/* to fix the incorrect entries*/ +UPDATE testResults SET submitTime = testedDate WHERE submitTime = '0000-00-00 00:00:00' diff --git a/tables/testResults.sql b/tables/testResults.sql index 511c115..be80b9d 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -21,7 +21,7 @@ create table testResults ( workarounds text default NULL, testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text, - submitTime datetime NOT NULL, + submitTime datetime NOT NULL default CURRENT_TIMESTAMP, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', gpuMfr enum('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') default NULL,

1 0

Andrew Eikum : gdiplus: Don' t call PlayEnhMetaFileRecord for records handled by gdiplus.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 7860d11e6cd93d8a1c463be79f783385dcda45eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7860d11e6cd93d8a1c463be79… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 25 08:10:38 2017 -0500 gdiplus: Don't call PlayEnhMetaFileRecord for records handled by gdiplus. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0bd3033..6260cb3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1423,8 +1423,6 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, /* regular EMF record */ if (metafile->playback_dc) { - ENHMETARECORD *record; - switch (recordType) { case EMR_SETMAPMODE: @@ -1469,24 +1467,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return Ok; } default: - break; - } + { + ENHMETARECORD *record = heap_alloc_zero(dataSize + 8); - record = heap_alloc_zero(dataSize + 8); + if (record) + { + record->iType = recordType; + record->nSize = dataSize + 8; + memcpy(record->dParm, data, dataSize); - if (record) - { - record->iType = recordType; - record->nSize = dataSize + 8; - memcpy(record->dParm, data, dataSize); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, + record, metafile->handle_count) == 0) + ERR("PlayEnhMetaFileRecord failed\n"); - PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, - record, metafile->handle_count); + heap_free(record); + } + else + return OutOfMemory; - heap_free(record); + break; + } } - else - return OutOfMemory; } } else

1 0

Hans Leidekker : webservices: Create a new HTTP request for each message.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: c94ccee16af71d8cfcfa157fc804e4998eb5a71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94ccee16af71d8cfcfa157fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 25 11:51:40 2017 +0200 webservices: Create a new HTTP request for each message. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 49 +++++++++++++++++++++++++--------------------- dlls/webservices/msg.c | 14 ++++++++----- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 09cfd80..3451bea 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -113,6 +113,8 @@ struct channel HINTERNET session; HINTERNET connect; HINTERNET request; + WCHAR *path; + DWORD flags; } http; struct { @@ -169,6 +171,9 @@ static void reset_channel( struct channel *channel ) channel->u.http.connect = NULL; WinHttpCloseHandle( channel->u.http.session ); channel->u.http.session = NULL; + heap_free( channel->u.http.path ); + channel->u.http.path = NULL; + channel->u.http.flags = 0; break; case WS_TCP_CHANNEL_BINDING: @@ -587,34 +592,29 @@ static HRESULT connect_channel_http( struct channel *channel ) { static const WCHAR agentW[] = {'M','S','-','W','e','b','S','e','r','v','i','c','e','s','/','1','.','0',0}; - static const WCHAR postW[] = - {'P','O','S','T',0}; - HINTERNET ses = NULL, con = NULL, req = NULL; - WCHAR *path; + HINTERNET ses = NULL, con = NULL; URL_COMPONENTS uc; - DWORD flags = 0; HRESULT hr; - if (channel->u.http.request) return S_OK; + if (channel->u.http.connect) return S_OK; if ((hr = parse_http_url( channel->addr.url.chars, channel->addr.url.length, &uc )) != S_OK) return hr; - if (!uc.dwExtraInfoLength) path = uc.lpszUrlPath; - else if (!(path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) + if (!(channel->u.http.path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; } else { - strcpyW( path, uc.lpszUrlPath ); - strcatW( path, uc.lpszExtraInfo ); + strcpyW( channel->u.http.path, uc.lpszUrlPath ); + if (uc.dwExtraInfoLength) strcatW( channel->u.http.path, uc.lpszExtraInfo ); } switch (uc.nScheme) { case INTERNET_SCHEME_HTTP: break; case INTERNET_SCHEME_HTTPS: - flags |= WINHTTP_FLAG_SECURE; + channel->u.http.flags |= WINHTTP_FLAG_SECURE; break; default: @@ -632,29 +632,19 @@ static HRESULT connect_channel_http( struct channel *channel ) hr = HRESULT_FROM_WIN32( GetLastError() ); goto done; } - if (!(req = WinHttpOpenRequest( con, postW, path, NULL, NULL, NULL, flags ))) - { - hr = HRESULT_FROM_WIN32( GetLastError() ); - goto done; - } - - if ((hr = message_insert_http_headers( channel->msg, req )) != S_OK) goto done; channel->u.http.session = ses; channel->u.http.connect = con; - channel->u.http.request = req; done: if (hr != S_OK) { - WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); } heap_free( uc.lpszHostName ); heap_free( uc.lpszUrlPath ); heap_free( uc.lpszExtraInfo ); - if (path != uc.lpszUrlPath) heap_free( path ); return hr; } @@ -762,7 +752,7 @@ static HRESULT write_message( WS_MESSAGE *handle, WS_XML_WRITER *writer, const W return WsWriteEnvelopeEnd( handle, NULL ); } -static HRESULT send_message_http( HANDLE request, BYTE *data, ULONG len ) +static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) { if (!WinHttpSendRequest( request, NULL, 0, data, len, len, 0 )) return HRESULT_FROM_WIN32( GetLastError() ); @@ -984,6 +974,14 @@ static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG l return send_bytes( channel->u.tcp.socket, data, len ); } +static HRESULT open_http_request( struct channel *channel, HINTERNET *req ) +{ + static const WCHAR postW[] = {'P','O','S','T',0}; + if ((*req = WinHttpOpenRequest( channel->u.http.connect, postW, channel->u.http.path, + NULL, NULL, NULL, channel->u.http.flags ))) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); +} + static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) { WS_XML_WRITER *writer; @@ -999,6 +997,13 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: + if (channel->u.http.request) + { + WinHttpCloseHandle( channel->u.http.request ); + channel->u.http.request = NULL; + } + if ((hr = open_http_request( channel, &channel->u.http.request )) != S_OK) return hr; + if ((hr = message_insert_http_headers( msg, channel->u.http.request )) != S_OK) return hr; return send_message_http( channel->u.http.request, buf.bytes, buf.length ); case WS_TCP_CHANNEL_BINDING: diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 02cb22b..d6f0144 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1610,9 +1610,13 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na static WCHAR *build_http_header( const WCHAR *name, const WCHAR *value, ULONG *ret_len ) { - static const WCHAR fmtW[] = {'%','s',':',' ','%','s',0}; - WCHAR *ret = heap_alloc( (strlenW(name) + strlenW(value) + 3) * sizeof(WCHAR) ); - if (ret) *ret_len = sprintfW( ret, fmtW, name, value ); + int len_name = strlenW( name ), len_value = strlenW( value ); + WCHAR *ret = heap_alloc( (len_name + len_value) * sizeof(WCHAR) ); + + if (!ret) return NULL; + memcpy( ret, name, len_name * sizeof(WCHAR) ); + memcpy( ret + len_name, value, len_value * sizeof(WCHAR) ); + *ret_len = len_name + len_value; return ret; } @@ -1625,7 +1629,7 @@ static inline HRESULT insert_http_header( HINTERNET req, const WCHAR *header, UL HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { static const WCHAR contenttypeW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ',0}; static const WCHAR soapxmlW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','s','o','a','p','+','x','m','l',0}; static const WCHAR textxmlW[] = @@ -1675,7 +1679,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { case WS_ENVELOPE_VERSION_SOAP_1_1: { - static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',0}; + static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',':',' ',0}; if (!(len = msg->action.length)) break;

1 0

Hans Leidekker : webservices: Set cache control headers.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: c51b41f905ab750d6eadca1f7dc73ec3238fccce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51b41f905ab750d6eadca1f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 25 11:51:41 2017 +0200 webservices: Set cache control headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 3451bea..5db6f1d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -610,6 +610,7 @@ static HRESULT connect_channel_http( struct channel *channel ) if (uc.dwExtraInfoLength) strcatW( channel->u.http.path, uc.lpszExtraInfo ); } + channel->u.http.flags = WINHTTP_FLAG_REFRESH; switch (uc.nScheme) { case INTERNET_SCHEME_HTTP: break;

1 0

Andrew Eikum : gdi32: Update metafile world transform immediately in winnt mode.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 083e61fddf90ade32a119d5b6bf84d27adefc589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083e61fddf90ade32a119d5b6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 25 08:10:44 2017 -0500 gdi32: Update metafile world transform immediately in winnt mode. The Chrome browser print function implements their own handling for EMR_MODIFYWORLDTRANSFORM which calls ModifyWorldTransform on the HDC directly without ever calling PlayEnhMetaFileRecord. In Wine, this transformation would get discarded when the callback function returned, causing the page to be printed at the wrong scale. Tests show that the transform is updated immediately during PlayEnhMetaFileRecord. In addition, a modified transform persists between callbacks until PlayEnhMetaFileRecord is called on a relevant type of callback, at which point the transform is reverted before playing back the record. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 41 ++++++- dlls/gdi32/tests/metafile.c | 253 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 289 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=083e61fddf90ade32a119…

1 0

Alistair Leslie-Hughes : wininet: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 43deec95f6b2bb05b3156c570473429ddfdfb7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43deec95f6b2bb05b3156c570… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 25 08:24:39 2017 +0000 wininet: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7db5eab..c7b5f9e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3420,8 +3420,8 @@ HANDLE WINAPI FindFirstUrlCacheEntryExA( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3439,8 +3439,8 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3716,8 +3716,8 @@ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved) */ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(0x%08x%08x, 0x%08x, %p) stub\n", - (ULONG)(GroupId >> 32), (ULONG)GroupId, dwFlags, lpReserved); + FIXME("(0x%s, 0x%08x, %p) stub\n", + wine_dbgstr_longlong(GroupId), dwFlags, lpReserved); return FALSE; } @@ -3739,8 +3739,8 @@ BOOL WINAPI SetUrlCacheEntryGroupA(LPCSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_a(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_a(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3754,8 +3754,8 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_w(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_w(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3785,8 +3785,8 @@ BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3795,8 +3795,8 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3804,16 +3804,16 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } BOOL WINAPI SetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; }

1 0

Alexandre Julliard : gdi32/tests: Add a test case for DIB color painting.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 103f2646d56e9d7e3e94bb3b24c1bc9e622e609c URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f2646d56e9d7e3e94bb3b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:23:19 2017 +0200 gdi32/tests: Add a test case for DIB color painting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4e5b4d0..23d376d 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "8eb1f99d21a84153e88e7958707049d517ab7641", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", + "fd5b4569f2a1e42b2804c5baf93d95c9963cf608", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", "d08f2c4e2b30131450328ed6be0efb9966a890de", "e462052a03dbe4ec3814db7700e166d00d4d686f", @@ -201,6 +202,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "8eb1f99d21a84153e88e7958707049d517ab7641", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", + "fd5b4569f2a1e42b2804c5baf93d95c9963cf608", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", "d08f2c4e2b30131450328ed6be0efb9966a890de", "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", @@ -272,6 +274,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "c272d1e0342e6089a0182dc42b37e47889116a9b", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", + "9098b3ef02debe1924ad5a1bc4d24ade9d91ae7f", "849d4abf4b690128a5f70e9b8ac78f20c437de06", "88a51deb333457af423e1a1a4e3dd4ef8ca4e8c5", "87f57a31253a38dbf3dc3070473328fa04b68a48", @@ -343,6 +346,7 @@ static const char *sha1_graphics_r10g10b10[] = "7735098af7535d8c57266190a13f92d8869e8529", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", + "5d0e4959415b18f0c5589e03d03605e553309138", "4782df8e24127e66a434b4e839adebf2dbb223fb", "c31bed2e92265aab0b690fb5092e2f6e533a0554", "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", @@ -414,6 +418,7 @@ static const char *sha1_graphics_r6g6b6[] = "4b41865829b50b2e29beda51b055bd1f908a649c", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", + "65b7b585ffa3bfaa9ce1561a343e450b6ba409db", "2b3e87e0b705b03c7c08f403409ab82cce095ba1", "3ded1c18712c1d102e327d0699be43675f881e89", "aecb242c31f31a90f071b6455ea7d808d4ea22e3", @@ -485,6 +490,7 @@ static const char *sha1_graphics_24[] = "bf55d4bdb26ae0f358bd67ef01932563519aab98", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", + "5ef5da5582a1a57272efaa98b109c0eb20f8ea03", "099c688a920f606655b485e8f0a433dc811bc976", "8a6c0e9f060653365ae76294e1ec53741c89c27d", "354b92008a8409c62d0fa1dff1532c5943aa37a2", @@ -555,6 +561,7 @@ static const char *sha1_graphics_r5g5b5[] = "ace2c60bd76b11a002bee852686e8783f102eba1", "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", + "60357eaacc998d34891ce084904fd27d1fcde958", "904f1d82159bcf5485f323bd12b859dc5e83f8eb", "bf63c5db6b057e67a4444c1a0b3a6e5b99a45363", "295ec16530126046790fb734e99f86f5b3b74ed8", @@ -625,6 +632,7 @@ static const char *sha1_graphics_r4g4b4[] = "a80f3df0aea1e1b30d9833039157bca658218f48", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", + "facf052602b422d2cbe29f9ab3bb8e2f599f57f3", "f373a5f37b82e7523c64c08eb509b6191e49b173", "a966cb01ea9b1d962094717e483092d3baab6626", "7587a9c87cab1eca827807f351bb67ca184d1ac5", @@ -695,6 +703,7 @@ static const char *sha1_graphics_8_color[] = "65b2c868790806be7ab4aaa6114d445c42a31f98", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", + "d215ad3e5efef008ebe672dcc66478d06935e5cb", "52e7c2f8b01592898c13f1e7633881e350244209", "4907fd0fdbf375a2dcca573208a49efa2e15c9d6", "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", @@ -766,6 +775,7 @@ static const char *sha1_graphics_8_grayscale[] = "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", "5eb00252664ec39e61359adb1dade4906a87a248", + "7ae54b25bbead496af7886dadd8530be5f53e85c", "ee7b9b292ea9fb559ef5ebf6a2a5586d38c7f854", "5b4a11854e508a579b1cda121841442367716930", "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", @@ -836,6 +846,7 @@ static const char *sha1_graphics_8[] = "95060f3dc9e6d01ada42f09a871b69f0699cb77c", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", + "b7ffe12eec77bde401bbe17df0de5ea7f37e3323", "0025a440866a404523a8a20e79a8891e45a2ff56", "7833e6cb62b4e4459d3e7ceba2cc6eb18c4b5d59", "bd28d77cd85b20a2384d6b25082cfd884bba683e", @@ -906,6 +917,7 @@ static const char *sha1_graphics_4[] = "09438163dcbede3890a0e6d8e614c97a06759380", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", + "aa3b12616cfce8ddd8aa71e390c0be5013f870f3", "ccf8d11b1e81895e9781f17c227c821228d8714b", "33a86f99eb8472088a1d63a1c63539bd5cea1c7f", "28a6b9f7927e99e53cf46f0333d29168cb10e920", @@ -976,6 +988,7 @@ static const char *sha1_graphics_4_grayscale[] = "f8d2f196ba8a16f54acb934e61a759ab7d3f2f05", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", + "020b00eab7dcf12ea1a58441d44b85ebc9c026e8", "06a6a224be0f5cdc51ac4704f9f57fc1f3813d6f", "d5335e66fdbd61a350f010986fa9b47655f1517f", "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", @@ -1048,6 +1061,7 @@ static const char *sha1_graphics_1[] = "58273e1fbf961ff2c772d57160d60170e258d3fe", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", + "ca711c69165e1fa5be72993b9a7870ef6d485249", "44a28536466dc895feb824b23dfd4a47c6948af8", "6bea3a3b5bde2e8038bfee86bb332205167571f4", "781d8c5cbc28591fd48fce06f984c502fdc6b363", @@ -1118,6 +1132,7 @@ static const RECT graphics_bounds[] = { 0, 0, 16, 16 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, + { 0, 0, 512, 512 }, { 0, 10, 511, 306 }, { 0, 0, 512, 336 }, { 1, 1, 300, 512 }, @@ -2412,6 +2427,19 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) compare_hash_broken_todo(hdc, bmi, bits, "stretchdibits", dib_is_8bpp_gray ? 1 : 0, dib_is_8bpp_gray ); /* Solid colors */ + + for (i = 0; i < 16; i++) + { + for (j = 0; j < 16; j++) + { + solid_patblt( hdc, 16 * j, 16 * i, 16, 16, RGB( i*16+j, i*16+j, i*16+j )); + solid_patblt( hdc, 16 * j, 256 + 16 * i, 16, 16, RGB( 3*(i*16+j), i*16+j, i*16+j )); + solid_patblt( hdc, 256 + 16 * j, 16 * i, 16, 16, RGB( i*16+j, 3*(i*16+j), i*16+j )); + solid_patblt( hdc, 256 + 16 * j, 256 + 16 * i, 16, 16, RGB( i*16+j, i*16+j, 3*(i*16+j) )); + } + } + compare_hash(hdc, bmi, bits, "color fills"); + for (i = 0; i < 256; i++) { solid_patblt( hdc, i * 2, 10, 1, 1, DIBINDEX(i) );

1 0

Alistair Leslie-Hughes : ntdll: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: cb13ee3bf1f90195bf1e5050d54d28fcebb2e61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb13ee3bf1f90195bf1e5050d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 25 08:24:48 2017 +0000 ntdll: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tape.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 09803d4..9050584 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -405,9 +405,9 @@ static NTSTATUS TAPE_SetPosition( int fd, const TAPE_SET_POSITION *data ) #ifdef HAVE_SYS_MTIO_H struct mtop cmd; - TRACE( "fd: %d method: 0x%08x partition: 0x%08x offset: 0x%x%08x immediate: 0x%02x\n", - fd, data->Method, data->Partition, (DWORD)(data->Offset.QuadPart >> 32), - (DWORD)data->Offset.QuadPart, data->Immediate ); + TRACE( "fd: %d method: 0x%08x partition: 0x%08x offset: 0x%s immediate: 0x%02x\n", + fd, data->Method, data->Partition, wine_dbgstr_longlong(data->Offset.QuadPart), + data->Immediate ); if (sizeof(cmd.mt_count) < sizeof(data->Offset.QuadPart) && (int)data->Offset.QuadPart != data->Offset.QuadPart)

1 0

Alexandre Julliard : gdi32: Always dither brush when painting to a 1-bpp device.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 80ae5c968e78f80f96c6542934ac86d772270633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ae5c968e78f80f96c654293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:29:14 2017 +0200 gdi32: Always dither brush when painting to a 1-bpp device. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/tests/dib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 8e55d1a..a36e03f 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1933,7 +1933,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * BITMAPINFO *info = (BITMAPINFO *)buffer; RGBQUAD color_table[2]; dib_info pattern; - BOOL dither = (brush->dib.bit_count == 1); + BOOL dither = (brush->dib.bit_count == 1) || (pdev->dib.bit_count == 1); if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 23d376d..4017845 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1753,7 +1753,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) y += 25; } } - compare_hash_broken_todo(hdc, bmi, bits, "top-down 8888 dib brush patblt", 0, dib_is_1bpp); + compare_hash(hdc, bmi, bits, "top-down 8888 dib brush patblt"); SelectObject(hdc, orig_brush); DeleteObject(dib_brush);

1 0