winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
849 discussions
Start a n
N
ew thread
Juan Lang : wininet: Implement RetrieveUrlCacheEntryStreamW.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 9cd7545c00ecb46ebe0a0f9f5d2bc7829374a942 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9cd7545c00ecb46ebe0a0f9f5…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 12:08:38 2011 -0800 wininet: Implement RetrieveUrlCacheEntryStreamW. --- dlls/wininet/urlcache.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6ec08de..100a103 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2868,9 +2868,53 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( IN DWORD dwReserved ) { - FIXME( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, + DWORD size; + int url_len; + /* NOTE: this is not the same as the way that the native + * version allocates 'stream' handles. I did it this way + * as it is much easier and no applications should depend + * on this behaviour. (Native version appears to allocate + * indices into a table) + */ + STREAM_HANDLE * pStream; + HANDLE hFile; + + TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved ); - return NULL; + + if (!RetrieveUrlCacheEntryFileW(lpszUrlName, + lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + dwReserved)) + { + return NULL; + } + + hFile = CreateFileW(lpCacheEntryInfo->lpszLocalFileName, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + /* allocate handle storage space */ + size = sizeof(STREAM_HANDLE); + url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + size += url_len; + pStream = HeapAlloc(GetProcessHeap(), 0, size); + if (!pStream) + { + CloseHandle(hFile); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + pStream->hFile = hFile; + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->lpszUrl, url_len, NULL, NULL); + return pStream; } /***********************************************************************
1
0
0
0
Juan Lang : wininet: Store headers in url cache entries.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 011b26b1c6c229ace4afb65d063563d7c13fa669 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=011b26b1c6c229ace4afb65d0…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:33:40 2011 -0800 wininet: Store headers in url cache entries. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2fb2a2e..a0574bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1576,8 +1576,12 @@ static void HTTPREQ_Destroy(object_header_t *hdr) CloseHandle(request->hCacheFile); if(HTTP_GetRequestURL(request, url)) { + DWORD headersLen; + + headersLen = request->rawHeaders ? strlenW(request->rawHeaders) : 0; CommitUrlCacheEntryW(url, request->cacheFile, request->expires, - request->last_modified, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + request->last_modified, NORMAL_CACHE_ENTRY, + request->rawHeaders, headersLen, NULL, 0); } }
1
0
0
0
Juan Lang : wininet: Set last access time when retrieving a URL cache entry .
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 47970d050464fc711e91a2ce8f46065a2099e836 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=47970d050464fc711e91a2ce8…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:42:08 2011 -0800 wininet: Set last access time when retrieving a URL cache entry. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 639e135..6ec08de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1896,6 +1896,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, @@ -1992,6 +1993,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(
1
0
0
0
Juan Lang : wininet: Account for disk space usage when deleting url cache entries.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: a0397541036f7cedd47cde5bb830e576c5c654b5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a0397541036f7cedd47cde5bb…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:06:10 2011 -0800 wininet: Account for disk space usage when deleting url cache entries. --- dlls/wininet/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e888360..639e135 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2963,6 +2963,10 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry); @@ -3042,6 +3046,10 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry);
1
0
0
0
Juan Lang : wininet: Account for disk space used by cache.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 7c15dc50a246d788c993736f10b60a567ce98afc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7c15dc50a246d788c993736f1…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:04:22 2011 -0800 wininet: Account for disk space used by cache. --- dlls/wininet/urlcache.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f099fa5..e888360 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2628,6 +2628,9 @@ static BOOL CommitUrlCacheEntryInternal( { if (pUrlEntry->CacheDir < pHeader->DirectoryCount) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + pHeader->CacheUsage.QuadPart += file_size.QuadPart; + if (pHeader->CacheUsage.QuadPart > pHeader->CacheLimit.QuadPart) + FIXME("file of size %s bytes fills cache\n", wine_dbgstr_longlong(file_size.QuadPart)); } cleanup:
1
0
0
0
Alexandre Julliard : wininet: Convert file size in cache entry to a large integer.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: d790688afa9487007a255208865caf8aeb6dc52f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d790688afa9487007a2552088…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 12:23:05 2011 +0100 wininet: Convert file size in cache entry to a large integer. --- dlls/wininet/urlcache.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 10b518b..f099fa5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -96,8 +96,7 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wExpiredDate; /* expire date in dos format */ WORD wExpiredTime; /* expire time in dos format */ DWORD dwUnknown1; /* usually zero */ - DWORD dwSizeLow; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow */ - DWORD dwSizeHigh; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeHigh */ + ULARGE_INTEGER size; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow/High */ DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ @@ -959,8 +958,8 @@ static DWORD URLCache_CopyEntry( lpCacheEntryInfo->u.dwExemptDelta = pUrlEntry->dwExemptDelta; lpCacheEntryInfo->dwHeaderInfoSize = pUrlEntry->dwHeaderInfoSize; lpCacheEntryInfo->dwHitRate = pUrlEntry->dwHitRate; - lpCacheEntryInfo->dwSizeHigh = pUrlEntry->dwSizeHigh; - lpCacheEntryInfo->dwSizeLow = pUrlEntry->dwSizeLow; + lpCacheEntryInfo->dwSizeHigh = pUrlEntry->size.u.HighPart; + lpCacheEntryInfo->dwSizeLow = pUrlEntry->size.u.LowPart; lpCacheEntryInfo->dwStructSize = sizeof(*lpCacheEntryInfo); lpCacheEntryInfo->dwUseCount = pUrlEntry->dwUseCount; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, &lpCacheEntryInfo->ExpireTime); @@ -2432,8 +2431,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwOffsetFileExtension = 0; - DWORD dwFileSizeLow = 0; - DWORD dwFileSizeHigh = 0; + LARGE_INTEGER file_size; BYTE cDirectory = 0; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; @@ -2452,7 +2450,8 @@ static BOOL CommitUrlCacheEntryInternal( if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); - + + file_size.QuadPart = 0; if (lpszLocalFileName) { HANDLE hFile; @@ -2465,8 +2464,7 @@ static BOOL CommitUrlCacheEntryInternal( } /* Get file size */ - dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh); - if ((dwFileSizeLow == INVALID_FILE_SIZE) && (GetLastError() != NO_ERROR)) + if (!GetFileSizeEx(hFile, &file_size)) { ERR("couldn't get file size (error is %d)\n", GetLastError()); CloseHandle(hFile); @@ -2595,9 +2593,7 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); - pUrlEntry->dwSizeHigh = 0; - pUrlEntry->dwSizeLow = dwFileSizeLow; - pUrlEntry->dwSizeHigh = dwFileSizeHigh; + pUrlEntry->size.QuadPart = file_size.QuadPart; pUrlEntry->dwUseCount = 0; GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); pUrlEntry->LastModifiedTime = LastModifiedTime;
1
0
0
0
Juan Lang : wininet: Change type of cache limit and usage to large integers .
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: f0cd3de5c1d5d49f45b9594d7211a348f102b69a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f0cd3de5c1d5d49f45b9594d7…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 07:54:19 2011 -0800 wininet: Change type of cache limit and usage to large integers. --- dlls/wininet/urlcache.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ca7f880..10b518b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -154,12 +154,9 @@ typedef struct _URLCACHE_HEADER DWORD dwIndexCapacityInBlocks; DWORD dwBlocksInUse; DWORD dwUnknown1; - DWORD dwCacheLimitLow; - DWORD dwCacheLimitHigh; - DWORD dwCacheUsageLow; - DWORD dwCacheUsageHigh; - DWORD dwExemptUsageLow; - DWORD dwExemptUsageHigh; + ULARGE_INTEGER CacheLimit; + ULARGE_INTEGER CacheUsage; + ULARGE_INTEGER ExemptUsage; DWORD DirectoryCount; /* number of directory_data's */ DIRECTORY_DATA directory_data[1]; /* first directory entry */ } URLCACHE_HEADER, *LPURLCACHE_HEADER; @@ -312,8 +309,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) pHeader->dwFileSize = dwFileSize; pHeader->dwIndexCapacityInBlocks = NEWFILE_NUM_BLOCKS; /* 127MB - taken from default for Windows 2000 */ - pHeader->dwCacheLimitHigh = 0; - pHeader->dwCacheLimitLow = 0x07ff5400; + pHeader->CacheLimit.QuadPart = 0x07ff5400; /* Copied from a Windows 2000 cache index */ pHeader->DirectoryCount = 4; @@ -328,8 +324,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) (BYTE *) &dw, &len) == ERROR_SUCCESS && keytype == REG_DWORD) { - pHeader->dwCacheLimitHigh = (dw >> 22); - pHeader->dwCacheLimitLow = dw << 10; + pHeader->CacheLimit.QuadPart = (ULONGLONG)dw * 1024; } RegCloseKey(key); }
1
0
0
0
Alexandre Julliard : gdi32: Add null driver entry points for the print spooler functions.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 22f920df8e02e911411b8800ab7e1890ce1d7a12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22f920df8e02e911411b8800a…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:36:52 2011 +0100 gdi32: Add null driver entry points for the print spooler functions. --- dlls/gdi32/driver.c | 35 +++++++++++++++++++++++++---- dlls/gdi32/printdrv.c | 58 +++++++++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 114226b..acd8f6e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -312,6 +312,11 @@ done: } +static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -329,6 +334,16 @@ static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, IN return TRUE; } +static INT CDECL nulldrv_EndDoc( PHYSDEV dev ) +{ + return 0; +} + +static INT CDECL nulldrv_EndPage( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; @@ -398,9 +413,19 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) +{ + return 0; +} + +static INT CDECL nulldrv_StartPage( PHYSDEV dev ) +{ + return 1; +} + const DC_FUNCTIONS null_driver = { - NULL, /* pAbortDoc */ + nulldrv_AbortDoc, /* pAbortDoc */ NULL, /* pAbortPath */ NULL, /* pAlphaBlend */ nulldrv_AngleArc, /* pAngleArc */ @@ -420,8 +445,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ - NULL, /* pEndDoc */ - NULL, /* pEndPage */ + nulldrv_EndDoc, /* pEndDoc */ + nulldrv_EndPage, /* pEndPage */ NULL, /* pEndPath */ NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ @@ -510,8 +535,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetWindowExt */ NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ - NULL, /* pStartDoc */ - NULL, /* pStartPage */ + nulldrv_StartDoc, /* pStartDoc */ + nulldrv_StartPage, /* pStartPage */ NULL, /* pStretchBlt */ NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index cc1e61f..3cfdc47 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -69,7 +69,7 @@ DWORD WINAPI GdiInitSpool(void) */ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) { - INT ret = 0; + INT ret; DC *dc = get_dc_ptr( hdc ); TRACE("DocName = %s Output = %s Datatype = %s\n", @@ -78,13 +78,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) + if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + else { - release_dc_ptr( dc ); - return ret; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); + ret = physdev->funcs->pStartDoc( physdev, doc ); } - - if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc ); release_dc_ptr( dc ); return ret; } @@ -140,12 +139,15 @@ INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) */ INT WINAPI EndDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndDoc) ret = dc->funcs->pEndDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndDoc ); + ret = physdev->funcs->pEndDoc( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -156,15 +158,15 @@ INT WINAPI EndDoc(HDC hdc) */ INT WINAPI StartPage(HDC hdc) { - INT ret = 1; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if(dc->funcs->pStartPage) - ret = dc->funcs->pStartPage( dc->physDev ); - else - FIXME("stub\n"); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartPage ); + ret = physdev->funcs->pStartPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -175,12 +177,15 @@ INT WINAPI StartPage(HDC hdc) */ INT WINAPI EndPage(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndPage ); + ret = physdev->funcs->pEndPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -190,12 +195,15 @@ INT WINAPI EndPage(HDC hdc) */ INT WINAPI AbortDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pAbortDoc) ret = dc->funcs->pAbortDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pAbortDoc ); + ret = physdev->funcs->pAbortDoc( physdev ); + release_dc_ptr( dc ); + } return ret; }
1
0
0
0
Alexandre Julliard : gdi32: Add null driver entry points for painting functions that have a fallback implementation .
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 7e3a871497d05e747287f867fcd743190418278d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7e3a871497d05e747287f867f…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:15:59 2011 +0100 gdi32: Add null driver entry points for painting functions that have a fallback implementation. --- dlls/gdi32/driver.c | 18 +- dlls/gdi32/gdi_private.h | 11 ++ dlls/gdi32/painting.c | 436 ++++++++++++++++++++++++---------------------- 3 files changed, 252 insertions(+), 213 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3a871497d05e747287f…
1
0
0
0
Alexandre Julliard : gdi32: Add null driver entry points for a number of simple painting functions.
by Alexandre Julliard
09 Mar '11
09 Mar '11
Module: wine Branch: master Commit: 1f6f82782cd8b214734173f548480f1fc9aeca47 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f6f82782cd8b214734173f54…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 20:30:03 2011 +0100 gdi32: Add null driver entry points for a number of simple painting functions. --- dlls/gdi32/driver.c | 118 ++++++++++++++++++++++++++++++++++++++++++------- dlls/gdi32/painting.c | 100 +++++++++++++++++++++++++++++------------ 2 files changed, 173 insertions(+), 45 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6f82782cd8b21473417…
1
0
0
0
← Newer
1
...
62
63
64
65
66
67
68
...
85
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
Results per page:
10
25
50
100
200