March 2011 - Wine-Commits - list.winehq.org

Juan Lang : wininet: Default to 10 minutes expiration for cache entries.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: ab16c75c48a79786a7adeb4dd93dc3135faaeb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab16c75c48a79786a7adeb4dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:07 2011 -0800 wininet: Default to 10 minutes expiration for cache entries. --- dlls/wininet/http.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 85484bf..3254a25 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3757,6 +3757,7 @@ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) static void HTTP_ProcessExpires(http_request_t *request) { + BOOL expirationFound = FALSE; int headerIndex; headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); @@ -3766,7 +3767,20 @@ static void HTTP_ProcessExpires(http_request_t *request) FILETIME ft; if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + { + expirationFound = TRUE; request->expires = ft; + } + } + if (!expirationFound) + { + ULARGE_INTEGER ft; + + /* With no known age, default to 10 minutes until expiration. */ + GetSystemTimeAsFileTime((FILETIME *)&ft); + ft.QuadPart += 10 * 60 * 10000000; + request->expires.dwLowDateTime = ft.u.LowPart; + request->expires.dwHighDateTime = ft.u.HighPart; } }

1 0

Juan Lang : wininet: Default to 10 minutes expiration for cache entries.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: 2d323430cbaa2ed9e58220694ca23068b3fd8821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d323430cbaa2ed9e58220694… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:07 2011 -0800 wininet: Default to 10 minutes expiration for cache entries. --- dlls/wininet/http.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3254a25..649bd17 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -56,6 +56,7 @@ #include "winbase.h" #include "wininet.h" #include "winerror.h" +#include "winternl.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG #define NO_SHLWAPI_STRFCNS @@ -3774,13 +3775,13 @@ static void HTTP_ProcessExpires(http_request_t *request) } if (!expirationFound) { - ULARGE_INTEGER ft; + LARGE_INTEGER t; /* With no known age, default to 10 minutes until expiration. */ - GetSystemTimeAsFileTime((FILETIME *)&ft); - ft.QuadPart += 10 * 60 * 10000000; - request->expires.dwLowDateTime = ft.u.LowPart; - request->expires.dwHighDateTime = ft.u.HighPart; + NtQuerySystemTime( &t ); + t.QuadPart += 10 * 60 * (ULONGLONG)10000000; + request->expires.dwLowDateTime = t.u.LowPart; + request->expires.dwHighDateTime = t.u.HighPart; } }

1 0

Juan Lang : wininet: Support the Cache-Control max-age directive for setting url cache entry expiration .
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: 488c2d0c36bc4e0579f6aa54eb645fdf565b24fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=488c2d0c36bc4e0579f6aa54e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:47 2011 -0800 wininet: Support the Cache-Control max-age directive for setting url cache entry expiration. --- dlls/wininet/http.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 649bd17..8787ba2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3761,16 +3761,74 @@ static void HTTP_ProcessExpires(http_request_t *request) BOOL expirationFound = FALSE; int headerIndex; - headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + /* Look for a Cache-Control header with a max-age directive, as it takes + * precedence over the Expires header. + */ + headerIndex = HTTP_GetCustomHeaderIndex(request, szCache_Control, 0, FALSE); if (headerIndex != -1) { - LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; - FILETIME ft; + LPHTTPHEADERW ccHeader = &request->custHeaders[headerIndex]; + LPWSTR ptr; - if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + for (ptr = ccHeader->lpszValue; ptr && *ptr; ) { - expirationFound = TRUE; - request->expires = ft; + LPWSTR comma = strchrW(ptr, ','), end, equal; + + if (comma) + end = comma; + else + end = ptr + strlenW(ptr); + for (equal = end - 1; equal > ptr && *equal != '='; equal--) + ; + if (*equal == '=') + { + static const WCHAR max_age[] = { + 'm','a','x','-','a','g','e',0 }; + + if (!strncmpiW(ptr, max_age, equal - ptr - 1)) + { + LPWSTR nextPtr; + unsigned long age; + + age = strtoulW(equal + 1, &nextPtr, 10); + if (nextPtr > equal + 1) + { + LARGE_INTEGER ft; + + NtQuerySystemTime( &ft ); + /* Age is in seconds, FILETIME resolution is in + * 100 nanosecond intervals. + */ + ft.QuadPart += age * (ULONGLONG)1000000; + request->expires.dwLowDateTime = ft.u.LowPart; + request->expires.dwHighDateTime = ft.u.HighPart; + expirationFound = TRUE; + } + } + } + if (comma) + { + ptr = comma + 1; + while (isspaceW(*ptr)) + ptr++; + } + else + ptr = NULL; + } + } + if (!expirationFound) + { + headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + if (headerIndex != -1) + { + LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; + FILETIME ft; + + if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + { + expirationFound = TRUE; + request->expires = ft; + } } } if (!expirationFound)

1 0

Juan Lang : include: Add some missing definitions.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: e71a23505846b51224fd799f717b0eec6cfb6a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71a23505846b51224fd799f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:25:55 2011 -0800 include: Add some missing definitions. --- include/winineti.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/winineti.h b/include/winineti.h index f1eb880..6419204 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -84,6 +84,26 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW DECL_WINELIB_TYPE_AW(INTERNET_CACHE_CONFIG_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_CONFIG_INFO) +typedef enum { + WININET_SYNC_MODE_NEVER = 0, + WININET_SYNC_MODE_ON_EXPIRY, + WININET_SYNC_MODE_ONCE_PER_SESSION, + WININET_SYNC_MODE_ALWAYS, + WININET_SYNC_MODE_AUTOMATIC, + WININET_SYNC_MODE_DEFAULT = WININET_SYNC_MODE_AUTOMATIC +} WININET_SYNC_MODE; + +/* Flags for GetUrlCacheConfigInfoA/W and SetUrlCacheConfigInfoA/W */ +#define CACHE_CONFIG_FORCE_CLEANUP_FC 0x00000020 +#define CACHE_CONFIG_DISK_CACHE_PATHS_FC 0x00000040 +#define CACHE_CONFIG_SYNC_MODE_FC 0x00000080 +#define CACHE_CONFIG_CONTENT_PATHS_FC 0x00000100 +#define CACHE_CONFIG_COOKIES_PATHS_FC 0x00000200 +#define CACHE_CONFIG_HISTORY_PATHS_FC 0x00000400 +#define CACHE_CONFIG_QUOTA_FC 0x00000800 +#define CACHE_CONFIG_USER_MODE_FC 0x00001000 +#define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 +#define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 #ifdef __cplusplus extern "C" {

1 0

Juan Lang : wininet: Store entries in url cache with valid expiration date.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: 0b5ea6f970bdaaeab5a2b177d9d681aa22e42094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5ea6f970bdaaeab5a2b177d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 11:20:11 2011 -0800 wininet: Store entries in url cache with valid expiration date. --- dlls/wininet/http.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0467860..85484bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1577,7 +1577,7 @@ static void HTTPREQ_Destroy(object_header_t *hdr) memset(&ft, 0, sizeof(FILETIME)); if(HTTP_GetRequestURL(request, url)) { - CommitUrlCacheEntryW(url, request->cacheFile, ft, ft, + CommitUrlCacheEntryW(url, request->cacheFile, request->expires, ft, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); } } @@ -3577,6 +3577,199 @@ static void HTTP_InsertCookies(http_request_t *request) HeapFree(GetProcessHeap(), 0, lpszUrl); } +static WORD HTTP_ParseDay(LPCWSTR day) +{ + static const WCHAR sun[] = { 's','u','n',0 }; + static const WCHAR mon[] = { 'm','o','n',0 }; + static const WCHAR tue[] = { 't','u','e',0 }; + static const WCHAR wed[] = { 'w','e','d',0 }; + static const WCHAR thu[] = { 't','h','u',0 }; + static const WCHAR fri[] = { 'f','r','i',0 }; + static const WCHAR sat[] = { 's','a','t',0 }; + + if (!strcmpiW(day, sun)) return 0; + if (!strcmpiW(day, mon)) return 1; + if (!strcmpiW(day, tue)) return 2; + if (!strcmpiW(day, wed)) return 3; + if (!strcmpiW(day, thu)) return 4; + if (!strcmpiW(day, fri)) return 5; + if (!strcmpiW(day, sat)) return 6; + /* Invalid */ + return 7; +} + +static WORD HTTP_ParseMonth(LPCWSTR month) +{ + static const WCHAR jan[] = { 'j','a','n',0 }; + static const WCHAR feb[] = { 'f','e','b',0 }; + static const WCHAR mar[] = { 'm','a','r',0 }; + static const WCHAR apr[] = { 'a','p','r',0 }; + static const WCHAR may[] = { 'm','a','y',0 }; + static const WCHAR jun[] = { 'j','u','n',0 }; + static const WCHAR jul[] = { 'j','u','l',0 }; + static const WCHAR aug[] = { 'a','u','g',0 }; + static const WCHAR sep[] = { 's','e','p',0 }; + static const WCHAR oct[] = { 'o','c','t',0 }; + static const WCHAR nov[] = { 'n','o','v',0 }; + static const WCHAR dec[] = { 'd','e','c',0 }; + + if (!strcmpiW(month, jan)) return 1; + if (!strcmpiW(month, feb)) return 2; + if (!strcmpiW(month, mar)) return 3; + if (!strcmpiW(month, apr)) return 4; + if (!strcmpiW(month, may)) return 5; + if (!strcmpiW(month, jun)) return 6; + if (!strcmpiW(month, jul)) return 7; + if (!strcmpiW(month, aug)) return 8; + if (!strcmpiW(month, sep)) return 9; + if (!strcmpiW(month, oct)) return 10; + if (!strcmpiW(month, nov)) return 11; + if (!strcmpiW(month, dec)) return 12; + /* Invalid */ + return 0; +} + +/* FIXME: only accepts dates in RFC 1123 format, which is the only correct + * format for HTTP, but which may not be the only format actually seen in the + * wild. http://www.hackcraft.net/web/datetime/ suggests at least RFC 850 + * dates and dates as formatted by asctime() should be accepted as well. + */ +static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) +{ + static const WCHAR gmt[]= { 'G','M','T',0 }; + WCHAR *ptr, *nextPtr, day[4], month[4], *monthPtr; + unsigned long num; + SYSTEMTIME st; + + ptr = strchrW(value, ','); + if (!ptr) + { + ERR("unexpected date format %s\n", debugstr_w(value)); + return FALSE; + } + if (ptr - value != 3) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[3] = 0; + st.wDayOfWeek = HTTP_ParseDay(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + ptr++; + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || !num || num > 31) + { + ERR("unexpected day %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wDay = (WORD)num; + + while (isspaceW(*ptr)) + ptr++; + + for (monthPtr = month; !isspace(*ptr) && + monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + monthPtr++, ptr++) + *monthPtr = *ptr; + *monthPtr = 0; + st.wMonth = HTTP_ParseMonth(month); + if (!st.wMonth || st.wMonth > 12) + { + ERR("unexpected month %s\n", debugstr_w(month)); + return FALSE; + } + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || num < 1601 || num > 30827) + { + ERR("unexpected year %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wYear = (WORD)num; + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || *nextPtr != ':') + { + ERR("unexpected time format %s\n", debugstr_w(ptr)); + return FALSE; + } + if (num > 23) + { + ERR("unexpected hour in time format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr = nextPtr + 1; + st.wHour = (WORD)num; + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || *nextPtr != ':') + { + ERR("unexpected time format %s\n", debugstr_w(ptr)); + return FALSE; + } + if (num > 59) + { + ERR("unexpected minute in time format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr = nextPtr + 1; + st.wMinute = (WORD)num; + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr) + { + ERR("unexpected time format %s\n", debugstr_w(ptr)); + return FALSE; + } + if (num > 59) + { + ERR("unexpected second in time format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr = nextPtr + 1; + st.wSecond = (WORD)num; + + while (isspaceW(*ptr)) + ptr++; + + if (strcmpW(ptr, gmt)) + { + ERR("unexpected time zone %s\n", debugstr_w(ptr)); + return FALSE; + } + return SystemTimeToFileTime(&st, ft); +} + +static void HTTP_ProcessExpires(http_request_t *request) +{ + int headerIndex; + + headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + if (headerIndex != -1) + { + LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; + FILETIME ft; + + if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + request->expires = ft; + } +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -3755,6 +3948,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, sizeof(DWORD)); HTTP_ProcessCookies(request); + HTTP_ProcessExpires(request); if (!set_content_length( request )) HTTP_FinishedReading(request); @@ -3942,6 +4136,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ /* process cookies here. Is this right? */ HTTP_ProcessCookies(request); + HTTP_ProcessExpires(request); if (!set_content_length( request )) HTTP_FinishedReading(request); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1d89045..40fa696 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -276,6 +276,7 @@ typedef struct DWORD nCustHeaders; HANDLE hCacheFile; LPWSTR cacheFile; + FILETIME expires; struct HttpAuthInfo *authInfo; struct HttpAuthInfo *proxyAuthInfo;

1 0

Alexandre Julliard : winex11: Always reference clipboard formats by atom instead of name.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: 57921fec3ac4fa1e5b36bccc467b7219926f7b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57921fec3ac4fa1e5b36bccc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 21:37:35 2011 +0100 winex11: Always reference clipboard formats by atom instead of name. --- dlls/winex11.drv/clipboard.c | 164 ++++++++++++------------------------------ 1 files changed, 46 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57921fec3ac4fa1e5b36b…

1 0

Alexandre Julliard : winex11: Convert the clipboard data list to a standard Wine list.
by Alexandre Julliard March 4, 2011

March 4, 2011

Module: wine Branch: master Commit: bfa753ba55a95415febbf4b03ccec99321cc3ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa753ba55a95415febbf4b03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 20:25:01 2011 +0100 winex11: Convert the clipboard data list to a standard Wine list. --- dlls/winex11.drv/clipboard.c | 103 ++++++++++-------------------------------- 1 files changed, 24 insertions(+), 79 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3610af7..37d1f3f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -79,6 +79,7 @@ #include "windef.h" #include "winbase.h" #include "x11drv.h" +#include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/server.h" @@ -121,13 +122,12 @@ typedef struct tagWINE_CLIPFORMAT { } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; typedef struct tagWINE_CLIPDATA { + struct list entry; UINT wFormatID; HANDLE hData; UINT wFlags; UINT drvData; LPWINE_CLIPFORMAT lpFormat; - struct tagWINE_CLIPDATA *PrevData; - struct tagWINE_CLIPDATA *NextData; } WINE_CLIPDATA, *LPWINE_CLIPDATA; #define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ @@ -311,7 +311,7 @@ static const struct /* * Cached clipboard data. */ -static LPWINE_CLIPDATA ClipData = NULL; +static struct list data_list = LIST_INIT( data_list ); static UINT ClipDataCount = 0; /* @@ -487,24 +487,12 @@ static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT curre */ static LPWINE_CLIPDATA X11DRV_CLIPBOARD_LookupData(DWORD wID) { - LPWINE_CLIPDATA lpData = ClipData; + WINE_CLIPDATA *data; - if (lpData) - { - do - { - if (lpData->wFormatID == wID) - break; - - lpData = lpData->NextData; - } - while(lpData != ClipData); - - if (lpData->wFormatID != wID) - lpData = NULL; - } + LIST_FOR_EACH_ENTRY( data, &data_list, WINE_CLIPDATA, entry ) + if (data->wFormatID == wID) return data; - return lpData; + return NULL; } @@ -649,23 +637,7 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, D lpData->lpFormat = lpFormat; lpData->drvData = 0; - if (ClipData) - { - LPWINE_CLIPDATA lpPrevData = ClipData->PrevData; - - lpData->PrevData = lpPrevData; - lpData->NextData = ClipData; - - lpPrevData->NextData = lpData; - ClipData->PrevData = lpData; - } - else - { - lpData->NextData = lpData; - lpData->PrevData = lpData; - ClipData = lpData; - } - + list_add_tail( &data_list, &lpData->entry ); ClipDataCount++; } @@ -2734,33 +2706,15 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) */ void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) { - if (ClipData) - { - LPWINE_CLIPDATA lpData, lpStart; - LPWINE_CLIPDATA lpNext = ClipData; - - TRACE(" called with %d entries in cache.\n", ClipDataCount); - - do - { - lpStart = ClipData; - lpData = lpNext; - lpNext = lpData->NextData; - - if (!keepunowned || !(lpData->wFlags & CF_FLAG_UNOWNED)) - { - lpData->PrevData->NextData = lpData->NextData; - lpData->NextData->PrevData = lpData->PrevData; - - if (lpData == ClipData) - ClipData = lpNext != lpData ? lpNext : NULL; - - X11DRV_CLIPBOARD_FreeData(lpData); - HeapFree(GetProcessHeap(), 0, lpData); + WINE_CLIPDATA *data, *next; - ClipDataCount--; - } - } while (lpNext != lpStart); + LIST_FOR_EACH_ENTRY_SAFE( data, next, &data_list, WINE_CLIPDATA, entry ) + { + if (keepunowned && (data->wFlags & CF_FLAG_UNOWNED)) continue; + list_remove( &data->entry ); + X11DRV_CLIPBOARD_FreeData( data ); + HeapFree( GetProcessHeap(), 0, data ); + ClipDataCount--; } TRACE(" %d entries remaining in cache.\n", ClipDataCount); @@ -2820,7 +2774,7 @@ INT CDECL X11DRV_CountClipboardFormats(void) UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) { CLIPBOARDINFO cbinfo; - UINT wNextFormat = 0; + struct list *ptr = NULL; TRACE("(%04X)\n", wFormat); @@ -2828,18 +2782,16 @@ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) if (!wFormat) { - if (ClipData) - wNextFormat = ClipData->wFormatID; + ptr = list_head( &data_list ); } else { LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormat); - - if (lpData && lpData->NextData != ClipData) - wNextFormat = lpData->NextData->wFormatID; + if (lpData) ptr = list_next( &data_list, &lpData->entry ); } - return wNextFormat; + if (!ptr) return 0; + return LIST_ENTRY( ptr, WINE_CLIPDATA, entry )->wFormatID; } @@ -3032,9 +2984,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, */ cTargets = 1; /* Include TARGETS */ - if (!(lpData = ClipData)) return None; + if (!list_head( &data_list )) return None; - do + LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) { lpFormats = ClipFormats; @@ -3046,10 +2998,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, lpFormats = lpFormats->NextFormat; } - - lpData = lpData->NextData; } - while (lpData != ClipData); TRACE(" found %d formats\n", cTargets); @@ -3059,10 +3008,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, return None; i = 0; - lpData = ClipData; targets[i++] = x11drv_atom(TARGETS); - do + LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) { lpFormats = ClipFormats; @@ -3074,10 +3022,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, lpFormats = lpFormats->NextFormat; } - - lpData = lpData->NextData; } - while (lpData != ClipData); wine_tsx11_lock();

1 0

Maarten Lankhorst : gdiplus: Clean up gdip_format_string.
by Alexandre Julliard March 3, 2011

March 3, 2011

Module: wine Branch: master Commit: fe8e08a5d637b7dec927abdcda65e027aa867a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8e08a5d637b7dec927abdcd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 17 11:06:02 2011 +0100 gdiplus: Clean up gdip_format_string. --- dlls/gdiplus/graphics.c | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 026b9a2..65700da 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3984,12 +3984,12 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result); } -typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics, +typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data); -static GpStatus gdip_format_string(GpGraphics *graphics, +static GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, gdip_format_string_callback callback, void *user_data) @@ -4028,7 +4028,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, else halign = StringAlignmentNear; while(sum < length){ - GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, + GetTextExtentExPointW(hdc, stringdup + sum, length - sum, nwidth, &fit, NULL, &size); fitcpy = fit; @@ -4066,7 +4066,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, else lineend = fit; - GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend, + GetTextExtentExPointW(hdc, stringdup + sum, lineend, nwidth, &j, NULL, &size); bounds.Width = size.cx; @@ -4092,7 +4092,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, break; } - stat = callback(graphics, stringdup, sum, lineend, + stat = callback(hdc, stringdup, sum, lineend, font, rect, format, lineno, &bounds, user_data); if (stat != Ok) @@ -4119,7 +4119,7 @@ struct measure_ranges_args { GpRegion **regions; }; -static GpStatus measure_ranges_callback(GpGraphics *graphics, +static GpStatus measure_ranges_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4140,11 +4140,11 @@ static GpStatus measure_ranges_callback(GpGraphics *graphics, range_rect.Y = bounds->Y; range_rect.Height = bounds->Height; - GetTextExtentExPointW(graphics->hdc, string + index, range_start - index, + GetTextExtentExPointW(hdc, string + index, range_start - index, INT_MAX, NULL, NULL, &range_size); range_rect.X = bounds->X + range_size.cx; - GetTextExtentExPointW(graphics->hdc, string + index, range_end - index, + GetTextExtentExPointW(hdc, string + index, range_end - index, INT_MAX, NULL, NULL, &range_size); range_rect.Width = (bounds->X + range_size.cx) - range_rect.X; @@ -4166,7 +4166,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, int i; HFONT oldfont; struct measure_ranges_args args; - HDC temp_hdc=NULL; + HDC hdc, temp_hdc=NULL; TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); @@ -4179,14 +4179,16 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if(!graphics->hdc) { - temp_hdc = graphics->hdc = CreateCompatibleDC(0); + hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } + else + hdc = graphics->hdc; if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); - oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); for (i=0; i<stringFormat->range_count; i++) { @@ -4197,16 +4199,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; - stat = gdip_format_string(graphics, string, length, font, layoutRect, stringFormat, + stat = gdip_format_string(hdc, string, length, font, layoutRect, stringFormat, measure_ranges_callback, &args); - DeleteObject(SelectObject(graphics->hdc, oldfont)); + DeleteObject(SelectObject(hdc, oldfont)); if (temp_hdc) - { - graphics->hdc = NULL; DeleteDC(temp_hdc); - } return stat; } @@ -4217,7 +4216,7 @@ struct measure_string_args { INT *linesfilled; }; -static GpStatus measure_string_callback(GpGraphics *graphics, +static GpStatus measure_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4261,7 +4260,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics->hdc) { - temp_hdc = graphics->hdc = CreateCompatibleDC(0); + temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } @@ -4282,16 +4281,13 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(graphics, string, length, font, rect, format, + gdip_format_string(graphics->hdc ? graphics->hdc : temp_hdc, string, length, font, rect, format, measure_string_callback, &args); DeleteObject(SelectObject(graphics->hdc, oldfont)); if (temp_hdc) - { - graphics->hdc = NULL; DeleteDC(temp_hdc); - } return Ok; } @@ -4302,7 +4298,7 @@ struct draw_string_args { REAL ang_cos, ang_sin; }; -static GpStatus draw_string_callback(GpGraphics *graphics, +static GpStatus draw_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4313,7 +4309,7 @@ static GpStatus draw_string_callback(GpGraphics *graphics, drawcoord.left = drawcoord.right = args->drawbase.x + roundr(args->ang_sin * bounds->Y); drawcoord.top = drawcoord.bottom = args->drawbase.y + roundr(args->ang_cos * bounds->Y); - DrawTextW(graphics->hdc, string + index, length, &drawcoord, args->drawflags); + DrawTextW(hdc, string + index, length, &drawcoord, args->drawflags); return Ok; } @@ -4436,7 +4432,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; } - gdip_format_string(graphics, string, length, font, &scaled_rect, format, + gdip_format_string(graphics->hdc, string, length, font, &scaled_rect, format, draw_string_callback, &args); DeleteObject(rgn);

1 0

Jacek Caban : mshtml: Added support for indexed access to form elements.
by Alexandre Julliard March 3, 2011

March 3, 2011

Module: wine Branch: master Commit: 0af2a117c348bc9e6cf09b50c80713f64805984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af2a117c348bc9e6cf09b50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 3 15:18:26 2011 +0100 mshtml: Added support for indexed access to form elements. --- dlls/mshtml/htmlform.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index d9c2bce..ac6d39c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -534,6 +534,20 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, return E_FAIL; } + if(len > MSHTML_CUSTOM_DISPID_CNT) + len = MSHTML_CUSTOM_DISPID_CNT; + + /* FIXME: Implement in more generic way */ + if('0' <= *name && *name <= '9') { + WCHAR *end_ptr; + + i = strtoulW(name, &end_ptr, 10); + if(!*end_ptr && i < len) { + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + return S_OK; + } + } + nsAString_InitDepend(&nsname, nameW); nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) {

1 0

Maarten Lankhorst : gdiplus: Implement GdipAddPathString.
by Alexandre Julliard March 3, 2011

March 3, 2011

Module: wine Branch: master Commit: b8a1e6c68791ca6e8d583cd2f99d36da498a2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a1e6c68791ca6e8d583cd2f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 17 11:06:43 2011 +0100 gdiplus: Implement GdipAddPathString. --- dlls/gdiplus/gdiplus_private.h | 10 ++ dlls/gdiplus/graphics.c | 7 +-- dlls/gdiplus/graphicspath.c | 179 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 186 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 42e28fa..68998df 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -397,4 +397,14 @@ struct GpRegion{ region_element node; }; +typedef GpStatus (*gdip_format_string_callback)(HDC hdc, + GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + INT lineno, const RectF *bounds, void *user_data); + +GpStatus gdip_format_string(HDC hdc, + GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + gdip_format_string_callback callback, void *user_data); + #endif diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5f226e9..43513c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3989,12 +3989,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result); } -typedef GpStatus (*gdip_format_string_callback)(HDC hdc, - GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *user_data); - -static GpStatus gdip_format_string(HDC hdc, +GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, gdip_format_string_callback callback, void *user_data) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5a68147..992bd7c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -831,16 +831,187 @@ GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, return status; } +static float fromfixedpoint(const FIXED v) +{ + float f = ((float)v.fract) / (1<<(sizeof(v.fract)*8)); + f += v.value; + return f; +} + +struct format_string_args +{ + GpPath *path; + UINT maxY; +}; + +static GpStatus format_string_callback(HDC dc, + GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + INT lineno, const RectF *bounds, void *priv) +{ + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + struct format_string_args *args = priv; + GpPath *path = args->path; + GpStatus status = Ok; + float x = bounds->X; + float y = bounds->Y; + int i; + + for (i = index; i < length; ++i) + { + GLYPHMETRICS gm; + TTPOLYGONHEADER *ph = NULL; + char *start; + DWORD len, ofs = 0; + UINT bb_end; + len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); + if (len == GDI_ERROR) + { + status = GenericError; + break; + } + ph = GdipAlloc(len); + start = (char *)ph; + if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) + { + status = OutOfMemory; + break; + } + GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity); + bb_end = gm.gmBlackBoxY + gm.gmptGlyphOrigin.y; + if (bb_end + y > args->maxY) + args->maxY = bb_end + y; + + ofs = 0; + while (ofs < len) + { + DWORD ofs_start = ofs; + ph = (TTPOLYGONHEADER*)&start[ofs]; + path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart; + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x); + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(ph->pfxStart.y); + TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y); + ofs += sizeof(*ph); + while (ofs - ofs_start < ph->cb) + { + TTPOLYCURVE *curve = (TTPOLYCURVE*)&start[ofs]; + int j; + ofs += sizeof(TTPOLYCURVE) + (curve->cpfx - 1) * sizeof(POINTFX); + + switch (curve->wType) + { + case TT_PRIM_LINE: + for (j = 0; j < curve->cpfx; ++j) + { + path->pathdata.Types[path->pathdata.Count] = PathPointTypeLine; + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x); + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y); + } + break; + case TT_PRIM_CSPLINE: + for (j = 0; j < curve->cpfx; ++j) + { + path->pathdata.Types[path->pathdata.Count] = PathPointTypeBezier; + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x); + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y); + } + break; + default: + ERR("Unhandled type: %u\n", curve->wType); + status = GenericError; + } + } + path->pathdata.Types[path->pathdata.Count - 1] |= PathPointTypeCloseSubpath; + } + path->newfigure = TRUE; + x += gm.gmCellIncX; + y += gm.gmCellIncY; + + GdipFree(ph); + if (status != Ok) + break; + } + + return status; +} + GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format) { - FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); - return NotImplemented; + GpFont *font; + GpStatus status; + HANDLE hfont; + HDC dc; + GpPath *backup; + struct format_string_args args; + int i; + + FIXME("(%p, %s, %d, %p, %d, %f, %p, %p): stub\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format); + if (!path || !string || !family || !emSize || !layoutRect || !format) + return InvalidParameter; + + status = GdipCreateFont(family, emSize, style, UnitPixel, &font); + if (status != Ok) + return status; + + hfont = CreateFontIndirectW(&font->lfw); + if (!hfont) + { + WARN("Failed to create font\n"); + return GenericError; + } + + if ((status = GdipClonePath(path, &backup)) != Ok) + { + DeleteObject(hfont); + return status; + } + + dc = CreateCompatibleDC(0); + SelectObject(dc, hfont); + + args.path = path; + args.maxY = 0; + status = gdip_format_string(dc, string, length, NULL, layoutRect, format, format_string_callback, &args); + + DeleteDC(dc); + DeleteObject(hfont); + + if (status != Ok) /* free backup */ + { + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); + *path = *backup; + GdipFree(backup); + return status; + } + if (format && format->vertalign == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) + { + float inc = layoutRect->Height - args.maxY - layoutRect->Y; + inc /= 2; + for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) + path->pathdata.Points[i].Y += inc; + } else if (format && format->vertalign == StringAlignmentFar) { + float inc = layoutRect->Height - args.maxY - layoutRect->Y; + for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) + path->pathdata.Points[i].Y += inc; + } + GdipDeletePath(backup); + return status; } GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format) { - FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); - return NotImplemented; + if (layoutRect) + { + RectF layoutRectF = { + (REAL)layoutRect->X, + (REAL)layoutRect->Y, + (REAL)layoutRect->Width, + (REAL)layoutRect->Height + }; + return GdipAddPathString(path, string, length, family, style, emSize, &layoutRectF, format); + } + return InvalidParameter; } GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone)

1 0