wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Jacek Caban : winetest: Added data.php for use in http tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: tools Branch: master Commit: a9dba0a918b483816f489189147b76d28787ea8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=a9dba0a918b483816f489189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 19:21:54 2011 +0100 winetest: Added data.php for use in http tests. --- winetest/tests/.htaccess | 2 ++ winetest/tests/data.php | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index b3a256c..f6c2d00 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -1,6 +1,8 @@ Order Allow,Deny Allow From All +SetEnv no-gzip dont-vary + <Files chunked> Allow from All Options ExecCGI diff --git a/winetest/tests/data.php b/winetest/tests/data.php new file mode 100644 index 0000000..3c42734 --- /dev/null +++ b/winetest/tests/data.php @@ -0,0 +1,15 @@ +<?php +header("Cache-Control: no-store"); +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Page for winetest tests purposes</title> +</head> +<body> +<?php +echo str_repeat("test ", 10000); +?> +</body> +</html>

1 0

Alexandre Julliard : winetest: Group all test scripts in a separate directory.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: tools Branch: master Commit: 0a46a5d8504726dde07a3d773d4f7b3cccd69a49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a46a5d8504726dde07a3d77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:25:24 2011 +0100 winetest: Group all test scripts in a separate directory. --- winetest/tests/.htaccess | 8 ++++++++ winetest/tests/chunked | 17 +++++++++++++++++ winetest/tests/hello.html | 4 ++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess new file mode 100644 index 0000000..b3a256c --- /dev/null +++ b/winetest/tests/.htaccess @@ -0,0 +1,8 @@ +Order Allow,Deny +Allow From All + +<Files chunked> + Allow from All + Options ExecCGI + SetHandler cgi-script +</Files> diff --git a/winetest/tests/chunked b/winetest/tests/chunked new file mode 100755 index 0000000..713b172 --- /dev/null +++ b/winetest/tests/chunked @@ -0,0 +1,17 @@ +#!/usr/bin/perl +# +# Generate some data to test chunked transfers +# + +use CGI qw(:standard); + +$| = 1; + +print "Content-type: text/plain\n\n"; + +for (my $i = 0; $i < 10; $i++) +{ + print "Line $i\n"; + select(undef, undef, undef, 0.1); +} +print "Done\n"; diff --git a/winetest/tests/hello.html b/winetest/tests/hello.html new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/hello.html @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>

1 0

Alexandre Julliard : announce: Remove tags/ prefix that newer gitweb doesn' t understand.
by Alexandre Julliard 13 Mar '11

13 Mar '11

Module: website Branch: master Commit: 078958a7b62912998f91e0dc6c6868f955f4bdbb URL: http://source.winehq.org/git/website.git/?a=commit;h=078958a7b62912998f91e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 13 20:08:31 2011 +0100 announce: Remove tags/ prefix that newer gitweb doesn't understand. --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 8f6df00..29b6932 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -14,7 +14,7 @@ global $html, $config; $ver = PAGE_PARAMS; // build tag and announce URL -$tag = ($ver == "latest") ? "master" : "tags/wine-" . urlencode($ver); +$tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; // load announce

1 0

Alistair Leslie-Hughes : msxml3: Ignore XML property ResolveExternals.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: e030b3ce56a520a37f95b19c14c65362ec127ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e030b3ce56a520a37f95b19c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 11 11:32:32 2011 +1100 msxml3: Ignore XML property ResolveExternals. --- dlls/msxml3/domdoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d27ed02..c397fad 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -73,6 +73,7 @@ static const WCHAR PropertyProhibitDTDW[] = {'P','r','o','h','i','b','i','t','D' static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0}; static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; +static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -2952,7 +2953,8 @@ static HRESULT WINAPI domdoc_setProperty( return hr; } else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || - lstrcmpiW(p, PropertyNewParserW) == 0) + lstrcmpiW(p, PropertyNewParserW) == 0 || + lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&var));

1 0

Alexander Scott-Johns : inetcpl.cpl: Add ability to delete Temporary Internet Files.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: f9ef35ea6ae9e24085876c6f2d3c77f80266ef3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ef35ea6ae9e24085876c6f2… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Mar 2 18:38:15 2011 +0000 inetcpl.cpl: Add ability to delete Temporary Internet Files. --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/cpl_De.rc | 5 ++ dlls/inetcpl.cpl/cpl_En.rc | 27 ++++++++++++ dlls/inetcpl.cpl/cpl_Fr.rc | 5 ++ dlls/inetcpl.cpl/cpl_He.rc | 5 ++ dlls/inetcpl.cpl/cpl_It.rc | 5 ++ dlls/inetcpl.cpl/cpl_Ja.rc | 5 ++ dlls/inetcpl.cpl/cpl_Ko.rc | 5 ++ dlls/inetcpl.cpl/cpl_Lt.rc | 5 ++ dlls/inetcpl.cpl/cpl_Nl.rc | 5 ++ dlls/inetcpl.cpl/cpl_Pl.rc | 5 ++ dlls/inetcpl.cpl/cpl_Pt.rc | 7 +++- dlls/inetcpl.cpl/cpl_Ru.rc | 5 ++ dlls/inetcpl.cpl/cpl_Sr.rc | 10 +++++ dlls/inetcpl.cpl/cpl_Sv.rc | 5 ++ dlls/inetcpl.cpl/cpl_Uk.rc | 5 ++ dlls/inetcpl.cpl/general.c | 91 ++++++++++++++++++++++++++++++++++++++++- dlls/inetcpl.cpl/inetcpl.h | 9 ++++ 18 files changed, 201 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ef35ea6ae9e24085876…

1 0

Alexander Scott-Johns : wininet: Partially implement FreeUrlCacheSpaceW.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: fa19e1bdb30087a3e7dbcc2690890c6b6fc74116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa19e1bdb30087a3e7dbcc269… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Mar 2 18:35:27 2011 +0000 wininet: Partially implement FreeUrlCacheSpaceW. --- dlls/wininet/urlcache.c | 99 ++++++++++++++++++++++++++++++++++++++++++----- include/wininet.h | 10 +++++ 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index babf9f7..0c88372 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -48,10 +48,12 @@ #include "wininet.h" #include "winineti.h" #include "winerror.h" -#include "internet.h" #include "winreg.h" #include "shlwapi.h" #include "shlobj.h" +#include "shellapi.h" + +#include "internet.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -1460,28 +1462,105 @@ static BOOL URLCache_EnumHashTableEntries(LPCURLCACHE_HEADER pHeader, const HASH } /*********************************************************************** - * FreeUrlCacheSpaceA (WININET.@) + * URLCache_DeleteCacheDirectory (Internal) + * + * Erase a directory containing an URL cache. + * + * RETURNS + * TRUE success, FALSE failure/aborted. * */ -BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +static BOOL URLCache_DeleteCacheDirectory(LPCWSTR lpszPath) { - FIXME("stub!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD path_len; + WCHAR path[MAX_PATH + 1]; + SHFILEOPSTRUCTW shfos; + int ret; + + path_len = strlenW(lpszPath); + if (path_len >= MAX_PATH) + return FALSE; + strcpyW(path, lpszPath); + path[path_len + 1] = 0; /* double-NUL-terminate path */ + + shfos.hwnd = NULL; + shfos.wFunc = FO_DELETE; + shfos.pFrom = path; + shfos.pTo = NULL; + shfos.fFlags = 0; + shfos.fAnyOperationsAborted = FALSE; + ret = SHFileOperationW(&shfos); + if (ret) + ERR("SHFileOperationW on %s returned %i\n", debugstr_w(path), ret); + return !(ret || shfos.fAnyOperationsAborted); } - /*********************************************************************** +/*********************************************************************** * FreeUrlCacheSpaceW (WININET.@) * + * Frees up some cache. + * + * PARAMETERS + * lpszCachePath [I] Which volume to free up from, or NULL if you don't care. + * dwSize [I] How much space to free up. + * dwSizeType [I] How to interpret dwSize. + * + * RETURNS + * TRUE success. FALSE failure. + * + * IMPLEMENTATION + * This implementation just retrieves the path of the cache directory, and + * deletes its contents from the filesystem. The correct approach would + * probably be to implement and use {FindFirst,FindNext,Delete}UrlCacheGroup(). */ -BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) { - FIXME("stub!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + URLCACHECONTAINER * pContainer; + + if (lpszCachePath != NULL || dwSize != 100 || dwSizeType != FCS_PERCENT_CACHE_SPACE) + { + FIXME("(%s, %x, %x): partial stub!\n", debugstr_w(lpszCachePath), dwSize, dwSizeType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + { + /* The URL cache has prefix L"" (unlike Cookies and History) */ + if (pContainer->cache_prefix[0] == 0) + { + BOOL ret_del; + DWORD ret_open; + WaitForSingleObject(pContainer->hMutex, INFINITE); + + /* unlock, delete, recreate and lock cache */ + URLCacheContainer_CloseIndex(pContainer); + ret_del = URLCache_DeleteCacheDirectory(pContainer->path); + ret_open = URLCacheContainer_OpenIndex(pContainer); + + ReleaseMutex(pContainer->hMutex); + return ret_del && (ret_open == ERROR_SUCCESS); + } + } return FALSE; } /*********************************************************************** + * FreeUrlCacheSpaceA (WININET.@) + * + * See FreeUrlCacheSpaceW. + */ +BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) +{ + BOOL ret = FALSE; + LPWSTR path = heap_strdupAtoW(lpszCachePath); + if (lpszCachePath == NULL || path != NULL) + ret = FreeUrlCacheSpaceW(path, dwSize, dwSizeType); + heap_free(path); + return ret; +} + +/*********************************************************************** * GetUrlCacheEntryInfoExA (WININET.@) * */ diff --git a/include/wininet.h b/include/wininet.h index 0cf453e..ce09821 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1660,6 +1660,16 @@ BOOLAPI DeleteUrlCacheEntryA(LPCSTR); BOOLAPI DeleteUrlCacheEntryW(LPCWSTR); #define DeleteUrlCacheEntry WINELIB_NAME_AW(DeleteUrlCacheEntry) +/* FCS_ flags and FreeUrlCacheSpace are no longer documented */ +#define FCS_PERCENT_CACHE_SPACE 0 /* guessed value */ +#define FCS_PERCENT_DISK_SPACE 1 /* guessed value */ +#define FCS_ABSOLUTE_SIZE 2 /* guessed value */ + +BOOLAPI FreeUrlCacheSpaceA(LPCSTR ,DWORD ,DWORD); +BOOLAPI FreeUrlCacheSpaceW(LPCWSTR ,DWORD ,DWORD); +#define FreeUrlCacheSpace WINELIB_NAME_AW(FreeUrlCacheSpace) + + INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,DWORD_PTR* ,DWORD); INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,DWORD_PTR* ,DWORD); #define InternetDial WINELIB_NAME_AW(InternetDial)

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the color management functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 0c33f1dd8957c19707ddd3a0439b4e8ce8a3cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c33f1dd8957c19707ddd3a04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:33:34 2011 +0100 gdi32: Add null driver entry points for the color management functions. --- dlls/gdi32/dc.c | 8 ++++---- dlls/gdi32/driver.c | 28 ++++++++++++++++++++++++---- dlls/gdi32/icm.c | 51 +++++++++++---------------------------------------- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 98b6bf1..e7da659 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1509,8 +1509,8 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) if( dc ) { - if (dc->funcs->pGetDeviceGammaRamp) - ret = dc->funcs->pGetDeviceGammaRamp(dc->physDev, ptr); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); + ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); release_dc_ptr( dc ); } return ret; @@ -1526,8 +1526,8 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) if( dc ) { - if (dc->funcs->pSetDeviceGammaRamp) - ret = dc->funcs->pSetDeviceGammaRamp(dc->physDev, ptr); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); + ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 61cbfe5..969d660 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -366,6 +366,11 @@ static INT CDECL nulldrv_EndPage( PHYSDEV dev ) return 0; } +static INT CDECL nulldrv_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW func, LPARAM lparam ) +{ + return -1; +} + static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) { @@ -388,6 +393,16 @@ static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) return FALSE; } +static BOOL CDECL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + return FALSE; +} + +static BOOL CDECL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) +{ + return FALSE; +} + static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; @@ -511,6 +526,11 @@ static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) return layout; } +static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + return FALSE; +} + static DWORD CDECL nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags ) { return flags; @@ -667,7 +687,7 @@ const DC_FUNCTIONS null_driver = nulldrv_EndDoc, /* pEndDoc */ nulldrv_EndPage, /* pEndPage */ NULL, /* pEndPath */ - NULL, /* pEnumICMProfiles */ + nulldrv_EnumICMProfiles, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ nulldrv_ExcludeClipRect, /* pExcludeClipRect */ nulldrv_ExtDeviceMode, /* pExtDeviceMode */ @@ -684,8 +704,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetCharWidth */ NULL, /* pGetDIBits */ NULL, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ - NULL, /* pGetICMProfile */ + nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ + nulldrv_GetICMProfile, /* pGetICMProfile */ NULL, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ nulldrv_GetPixelFormat, /* pGetPixelFormat */ @@ -736,7 +756,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ nulldrv_SetLayout, /* pSetLayout */ nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index afbc0ee..d3a345d 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -40,30 +40,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(icm); struct enum_profiles { - BOOL unicode; - union - { - ICMENUMPROCA funcA; - ICMENUMPROCW funcW; - } callback; + ICMENUMPROCA funcA; LPARAM data; }; -INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackA( LPWSTR filename, LPARAM lparam ) { int len, ret = -1; struct enum_profiles *ep = (struct enum_profiles *)lparam; char *filenameA; - if (ep->unicode) - return ep->callback.funcW( filename, ep->data ); - len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); filenameA = HeapAlloc( GetProcessHeap(), 0, len ); if (filenameA) { WideCharToMultiByte( CP_ACP, 0, filename, -1, filenameA, len, NULL, NULL ); - ret = ep->callback.funcA( filenameA, ep->data ); + ret = ep->funcA( filenameA, ep->data ); HeapFree( GetProcessHeap(), 0, filenameA ); } return ret; @@ -74,26 +66,12 @@ INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) */ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) { - DC *dc; - INT ret = -1; - - TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); + struct enum_profiles ep; if (!func) return -1; - if ((dc = get_dc_ptr(hdc))) - { - if (dc->funcs->pEnumICMProfiles) - { - struct enum_profiles ep; - - ep.unicode = FALSE; - ep.callback.funcA = func; - ep.data = lparam; - ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); - } - release_dc_ptr(dc); - } - return ret; + ep.funcA = func; + ep.data = lparam; + return EnumICMProfilesW( hdc, enum_profiles_callbackA, (LPARAM)&ep ); } /*********************************************************************** @@ -109,15 +87,8 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) if (!func) return -1; if ((dc = get_dc_ptr(hdc))) { - if (dc->funcs->pEnumICMProfiles) - { - struct enum_profiles ep; - - ep.unicode = TRUE; - ep.callback.funcW = func; - ep.data = lparam; - ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); - } + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEnumICMProfiles ); + ret = physdev->funcs->pEnumICMProfiles( physdev, func, lparam ); release_dc_ptr(dc); } return ret; @@ -173,8 +144,8 @@ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) if (dc) { - if (dc->funcs->pGetICMProfile) - ret = dc->funcs->pGetICMProfile(dc->physDev, size, filename); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); + ret = physdev->funcs->pGetICMProfile( physdev, size, filename ); release_dc_ptr(dc); } return ret;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the pixel format functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 806d0c4f86db654dc72a28cfd94b98233ef102fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d0c4f86db654dc72a28cfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:26:25 2011 +0100 gdi32: Add null driver entry points for the pixel format functions. --- dlls/gdi32/driver.c | 36 +++++++++++++++++++++--- dlls/gdi32/painting.c | 70 +++++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e1a9897..61cbfe5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -323,6 +323,11 @@ static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo return TRUE; } +static INT CDECL nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) +{ + return 0; +} + static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -334,6 +339,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static INT CDECL nulldrv_DescribePixelFormat( PHYSDEV dev, INT format, + UINT size, PIXELFORMATDESCRIPTOR * descr ) +{ + return 0; +} + static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, WORD cap, LPSTR output, DEVMODEA *devmode ) { @@ -382,6 +393,11 @@ static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) return 0; } +static INT CDECL nulldrv_GetPixelFormat( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) { return TRUE; @@ -505,6 +521,11 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static BOOL CDECL nulldrv_SetPixelFormat( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) +{ + return FALSE; +} + static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) { return mode; @@ -555,6 +576,11 @@ static INT CDECL nulldrv_StartPage( PHYSDEV dev ) return 1; } +static BOOL CDECL nulldrv_SwapBuffers( PHYSDEV dev ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) { return FALSE; @@ -626,7 +652,7 @@ const DC_FUNCTIONS null_driver = nulldrv_ArcTo, /* pArcTo */ NULL, /* pBeginPath */ NULL, /* pBitBlt */ - NULL, /* pChoosePixelFormat */ + nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ NULL, /* pCloseFigure */ NULL, /* pCreateBitmap */ @@ -635,7 +661,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteBitmap */ NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ - NULL, /* pDescribePixelFormat */ + nulldrv_DescribePixelFormat, /* pDescribePixelFormat */ nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ @@ -662,7 +688,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetICMProfile */ NULL, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ - NULL, /* pGetPixelFormat */ + nulldrv_GetPixelFormat, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextMetrics */ @@ -715,7 +741,7 @@ const DC_FUNCTIONS null_driver = nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ nulldrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPixelFormat */ + nulldrv_SetPixelFormat, /* pSetPixelFormat */ nulldrv_SetPolyFillMode, /* pSetPolyFillMode */ nulldrv_SetROP2, /* pSetROP2 */ nulldrv_SetRelAbs, /* pSetRelAbs */ @@ -735,7 +761,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ - NULL, /* pSwapBuffers */ + nulldrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ nulldrv_wglCopyContext, /* pwglCopyContext */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 8c788d5..22cc50c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -545,12 +545,12 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd ) TRACE("(%p,%p)\n",hdc,ppfd); - if (!dc) return 0; - - if (!dc->funcs->pChoosePixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pChoosePixelFormat(dc->physDev,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pChoosePixelFormat ); + ret = physdev->funcs->pChoosePixelFormat( physdev, ppfd ); + release_dc_ptr( dc ); + } return ret; } @@ -576,13 +576,13 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat, TRACE("(%p,%d,%p)\n",hdc,iPixelFormat,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pSetPixelFormat) FIXME(" :stub\n"); - else bRet = dc->funcs->pSetPixelFormat(dc->physDev,iPixelFormat,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetPixelFormat ); + update_dc( dc ); + bRet = physdev->funcs->pSetPixelFormat( physdev, iPixelFormat, ppfd ); + release_dc_ptr( dc ); + } return bRet; } @@ -605,13 +605,13 @@ INT WINAPI GetPixelFormat( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pGetPixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pGetPixelFormat(dc->physDev); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pGetPixelFormat( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -638,19 +638,13 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, TRACE("(%p,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pDescribePixelFormat) + if (dc) { - FIXME(" :stub\n"); - ppfd->nSize = nBytes; - ppfd->nVersion = 1; - ret = 3; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDescribePixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pDescribePixelFormat( physdev, iPixelFormat, nBytes, ppfd ); + release_dc_ptr( dc ); } - else ret = dc->funcs->pDescribePixelFormat(dc->physDev,iPixelFormat,nBytes,ppfd); - - release_dc_ptr( dc ); return ret; } @@ -673,17 +667,13 @@ BOOL WINAPI SwapBuffers( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return TRUE; - - update_dc( dc ); - if (!dc->funcs->pSwapBuffers) + if (dc) { - FIXME(" :stub\n"); - bRet = TRUE; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSwapBuffers ); + update_dc( dc ); + bRet = physdev->funcs->pSwapBuffers( physdev ); + release_dc_ptr( dc ); } - else bRet = dc->funcs->pSwapBuffers(dc->physDev); - - release_dc_ptr( dc ); return bRet; }

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the device printer functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: d1db4c859c53f6e7f9789dd213874faa7312d8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1db4c859c53f6e7f9789dd21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:15:38 2011 +0100 gdi32: Add null driver entry points for the device printer functions. --- dlls/gdi32/driver.c | 48 ++++++++++++++++++++++++++++++++++++------------ dlls/gdi32/gdiobj.c | 5 +++-- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3d5f0e7..e1a9897 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -334,6 +334,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, + WORD cap, LPSTR output, DEVMODEA *devmode ) +{ + return -1; +} + static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -349,11 +355,28 @@ static INT CDECL nulldrv_EndPage( PHYSDEV dev ) return 0; } +static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, + LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) +{ + return -1; +} + +static INT CDECL nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, + INT out_size, void *out_data ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; } +static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) +{ + return FALSE; +} + static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; @@ -613,7 +636,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ - NULL, /* pDeviceCapabilities */ + nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ nulldrv_EndPage, /* pEndPage */ @@ -621,8 +644,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ nulldrv_ExcludeClipRect, /* pExcludeClipRect */ - NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + nulldrv_ExtDeviceMode, /* pExtDeviceMode */ + nulldrv_ExtEscape, /* pExtEscape */ nulldrv_ExtFloodFill, /* pExtFloodFill */ nulldrv_ExtSelectClipRgn, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */ @@ -630,7 +653,7 @@ const DC_FUNCTIONS null_driver = nulldrv_FillRgn, /* pFillRgn */ NULL, /* pFlattenPath */ nulldrv_FrameRgn, /* pFrameRgn */ - NULL, /* pGdiComment */ + nulldrv_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ NULL, /* pGetDIBits */ @@ -887,9 +910,9 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pExtDeviceMode) - ret = dc->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); + ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + lpdmInput, lpszProfile, fwMode ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -941,9 +964,9 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pDeviceCapabilities) - ret = dc->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, - fwCapability, lpszOutput, lpdm ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities ); + ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, + fwCapability, lpszOutput, lpdm ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -1069,10 +1092,11 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, { INT ret = 0; DC * dc = get_dc_ptr( hdc ); + if (dc) { - if (dc->funcs->pExtEscape) - ret = dc->funcs->pExtEscape( dc->physDev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtEscape ); + ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 35b8068..4d84342 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1278,10 +1278,11 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) { DC *dc = get_dc_ptr(hdc); BOOL ret = FALSE; + if(dc) { - if (dc->funcs->pGdiComment) - ret = dc->funcs->pGdiComment( dc->physDev, cbSize, lpData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGdiComment ); + ret = physdev->funcs->pGdiComment( physdev, cbSize, lpData ); release_dc_ptr( dc ); } return ret;

1 0

Alexandre Julliard : gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 8c3766c5e7bf63826a4c4f1064483c9821ee43e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3766c5e7bf63826a4c4f106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:03:41 2011 +0100 gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/enhmfdrv/dc.c | 204 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/graphics.c | 50 ---------- dlls/gdi32/enhmfdrv/mapping.c | 188 ------------------------------------ 4 files changed, 204 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c3766c5e7bf63826a4c4…

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011