wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Alexandre Julliard : Import of upstream bugzilla release 4.0.8.
by Alexandre Julliard 19 Sep '12

19 Sep '12

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: bugzilla Branch: master Commit: 480ff98127eb5a268b7d1fb17bc543856aaafed5 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=480ff98127eb5a268b7d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 23:46:06 2012 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.0.8.
by Alexandre Julliard 19 Sep '12

19 Sep '12

1 0

Piotr Caban : wininet: Don' t delete files that were modified after adding to cache.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: e3a2e3a1c992477d61d643a92093e722f4876838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a2e3a1c992477d61d643a92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 19 15:30:25 2012 +0200 wininet: Don't delete files that were modified after adding to cache. --- dlls/wininet/urlcache.c | 62 +++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 34 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3a028b5..379288a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -127,8 +127,8 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wLastSyncTime; /* last sync time in dos format */ DWORD dwHitRate; /* see INTERNET_CACHE_ENTRY_INFO::dwHitRate */ DWORD dwUseCount; /* see INTERNET_CACHE_ENTRY_INFO::dwUseCount */ - WORD wUnknownDate; /* usually same as wLastSyncDate */ - WORD wUnknownTime; /* usually same as wLastSyncTime */ + WORD LastWriteDate; + WORD LastWriteTime; DWORD dwUnknown7; /* usually zero */ DWORD dwUnknown8; /* usually zero */ /* packing to dword align start of next field */ @@ -960,15 +960,29 @@ static BOOL URLCache_LocalFileNameToPathA( return FALSE; } +/* Just like FileTimeToDosDateTime, except that it also maps the special + * case of a filetime of (0,0) to a DOS date/time of (0,0). + */ +static void URLCache_FileTimeToDosDateTime(const FILETIME *ft, WORD *fatdate, + WORD *fattime) +{ + if (!ft->dwLowDateTime && !ft->dwHighDateTime) + *fatdate = *fattime = 0; + else + FileTimeToDosDateTime(ft, fatdate, fattime); +} + /*********************************************************************** * URLCache_DeleteFile (Internal) */ static DWORD URLCache_DeleteFile(const URLCACHECONTAINER *container, URLCACHE_HEADER *header, URL_CACHEFILE_ENTRY *url_entry) { + WIN32_FILE_ATTRIBUTE_DATA attr; WCHAR path[MAX_PATH]; LONG path_size = sizeof(path); DWORD err; + WORD date, time; if(!url_entry->dwOffsetLocalName) goto succ; @@ -978,6 +992,12 @@ static DWORD URLCache_DeleteFile(const URLCACHECONTAINER *container, url_entry->CacheDir, path, &path_size)) goto succ; + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &attr)) + goto succ; + URLCache_FileTimeToDosDateTime(&attr.ftLastWriteTime, &date, &time); + if(date != url_entry->LastWriteDate || time != url_entry->LastWriteTime) + goto succ; + err = (DeleteFileW(path) ? ERROR_SUCCESS : GetLastError()); if(err == ERROR_ACCESS_DENIED || err == ERROR_SHARING_VIOLATION) return err; @@ -1203,18 +1223,6 @@ static DWORD URLCache_CopyEntry( return ERROR_SUCCESS; } -/* Just like FileTimeToDosDateTime, except that it also maps the special - * case of a filetime of (0,0) to a DOS date/time of (0,0). - */ -static void URLCache_FileTimeToDosDateTime(const FILETIME *ft, WORD *fatdate, - WORD *fattime) -{ - if (!ft->dwLowDateTime && !ft->dwHighDateTime) - *fatdate = *fattime = 0; - else - FileTimeToDosDateTime(ft, fatdate, fattime); -} - /*********************************************************************** * URLCache_SetEntryInfo (Internal) * @@ -2741,6 +2749,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwOffsetFileExtension = 0; + WIN32_FILE_ATTRIBUTE_DATA file_attr; LARGE_INTEGER file_size; BYTE cDirectory = 0; char achFile[MAX_PATH]; @@ -2768,28 +2777,14 @@ static BOOL CommitUrlCacheEntryInternal( if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); - file_size.QuadPart = 0; + memset(&file_attr, 0, sizeof(file_attr)); if (lpszLocalFileName) { - HANDLE hFile; - - hFile = CreateFileW(lpszLocalFileName, FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - { - ERR("couldn't open file %s (error is %d)\n", debugstr_w(lpszLocalFileName), GetLastError()); + if(!GetFileAttributesExW(lpszLocalFileName, GetFileExInfoStandard, &file_attr)) return FALSE; - } - - /* Get file size */ - if (!GetFileSizeEx(hFile, &file_size)) - { - ERR("couldn't get file size (error is %d)\n", GetLastError()); - CloseHandle(hFile); - return FALSE; - } - - CloseHandle(hFile); } + file_size.u.LowPart = file_attr.nFileSizeLow; + file_size.u.HighPart = file_attr.nFileSizeHigh; error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) @@ -2931,8 +2926,7 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->LastModifiedTime = LastModifiedTime; URLCache_FileTimeToDosDateTime(&pUrlEntry->LastAccessTime, &pUrlEntry->wLastSyncDate, &pUrlEntry->wLastSyncTime); URLCache_FileTimeToDosDateTime(&ExpireTime, &pUrlEntry->wExpiredDate, &pUrlEntry->wExpiredTime); - pUrlEntry->wUnknownDate = pUrlEntry->wLastSyncDate; - pUrlEntry->wUnknownTime = pUrlEntry->wLastSyncTime; + URLCache_FileTimeToDosDateTime(&file_attr.ftLastWriteTime, &pUrlEntry->LastWriteDate, &pUrlEntry->LastWriteTime); /*** Unknowns ***/ pUrlEntry->dwUnknown1 = 0;

1 0

Piotr Caban : wininet: Added support for leaked urlcache entries handling.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: b7010348cfc53674913733b72033ee16a6868f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7010348cfc53674913733b72… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 19 15:30:03 2012 +0200 wininet: Added support for leaked urlcache entries handling. --- dlls/wininet/urlcache.c | 170 ++++++++++++++++++++++++++++++----------------- 1 files changed, 109 insertions(+), 61 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 04ecd80..3a028b5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -82,6 +82,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 + #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') #define REDR_SIGNATURE DWORD_SIG('R','E','D','R') @@ -752,44 +754,6 @@ static BOOL URLCacheContainer_UnlockIndex(URLCACHECONTAINER * pContainer, LPURLC return UnmapViewOfFile(pHeader); } -/*********************************************************************** - * URLCacheContainer_CleanIndex (Internal) - * - * This function is meant to make place in index file by removing old - * entries and resizing the file. - * - * CAUTION: file view may get mapped to new memory - * TODO: implement entries cleaning - * - * RETURNS - * ERROR_SUCCESS when new memory is available - * error code otherwise - */ -static DWORD URLCacheContainer_CleanIndex(URLCACHECONTAINER *container, URLCACHE_HEADER **file_view) -{ - URLCACHE_HEADER *header = *file_view; - DWORD ret; - - FIXME("(%s %s) semi-stub\n", debugstr_w(container->cache_prefix), debugstr_w(container->path)); - - if(header->dwFileSize >= ALLOCATION_TABLE_SIZE*8*BLOCKSIZE + ENTRY_START_OFFSET) { - WARN("index file has maximal size\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } - - URLCacheContainer_CloseIndex(container); - ret = URLCacheContainer_OpenIndex(container, header->dwIndexCapacityInBlocks*2); - if(ret != ERROR_SUCCESS) - return ret; - header = MapViewOfFile(container->hMapping, FILE_MAP_WRITE, 0, 0, 0); - if(!header) - return GetLastError(); - - UnmapViewOfFile(*file_view); - *file_view = header; - return ERROR_SUCCESS; -} - #ifndef CHAR_BIT #define CHAR_BIT (8 * sizeof(CHAR)) #endif @@ -996,6 +960,107 @@ static BOOL URLCache_LocalFileNameToPathA( return FALSE; } +/*********************************************************************** + * URLCache_DeleteFile (Internal) + */ +static DWORD URLCache_DeleteFile(const URLCACHECONTAINER *container, + URLCACHE_HEADER *header, URL_CACHEFILE_ENTRY *url_entry) +{ + WCHAR path[MAX_PATH]; + LONG path_size = sizeof(path); + DWORD err; + + if(!url_entry->dwOffsetLocalName) + goto succ; + + if(!URLCache_LocalFileNameToPathW(container, header, + (LPCSTR)url_entry+url_entry->dwOffsetLocalName, + url_entry->CacheDir, path, &path_size)) + goto succ; + + err = (DeleteFileW(path) ? ERROR_SUCCESS : GetLastError()); + if(err == ERROR_ACCESS_DENIED || err == ERROR_SHARING_VIOLATION) + return err; + +succ: + if (url_entry->CacheDir < header->DirectoryCount) + { + if (header->directory_data[url_entry->CacheDir].dwNumFiles) + header->directory_data[url_entry->CacheDir].dwNumFiles--; + } + if (url_entry->CacheEntryType & STICKY_CACHE_ENTRY) + { + if (url_entry->size.QuadPart < header->ExemptUsage.QuadPart) + header->ExemptUsage.QuadPart -= url_entry->size.QuadPart; + else + header->ExemptUsage.QuadPart = 0; + } + else + { + if (url_entry->size.QuadPart < header->CacheUsage.QuadPart) + header->CacheUsage.QuadPart -= url_entry->size.QuadPart; + else + header->CacheUsage.QuadPart = 0; + } + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * URLCacheContainer_CleanIndex (Internal) + * + * This function is meant to make place in index file by removing leaked + * files entries and resizing the file. + * + * CAUTION: file view may get mapped to new memory + * + * RETURNS + * ERROR_SUCCESS when new memory is available + * error code otherwise + */ +static DWORD URLCacheContainer_CleanIndex(URLCACHECONTAINER *container, URLCACHE_HEADER **file_view) +{ + URLCACHE_HEADER *header = *file_view; + DWORD ret; + DWORD *leak_off; + BOOL freed = FALSE; + + TRACE("(%s %s)\n", debugstr_w(container->cache_prefix), debugstr_w(container->path)); + + leak_off = &(*file_view)->options[CACHE_HEADER_DATA_ROOT_LEAK_OFFSET]; + while(*leak_off) { + URL_CACHEFILE_ENTRY *url_entry = (URL_CACHEFILE_ENTRY*)((LPBYTE)(*file_view) + *leak_off); + + if(SUCCEEDED(URLCache_DeleteFile(container, *file_view, url_entry))) { + *leak_off = url_entry->dwExemptDelta; + URLCache_DeleteEntry(*file_view, &url_entry->CacheFileEntry); + freed = TRUE; + }else { + leak_off = &url_entry->dwExemptDelta; + } + } + + if(freed) + return ERROR_SUCCESS; + + if(header->dwFileSize >= ALLOCATION_TABLE_SIZE*8*BLOCKSIZE + ENTRY_START_OFFSET) { + WARN("index file has maximal size\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + URLCacheContainer_CloseIndex(container); + ret = URLCacheContainer_OpenIndex(container, header->dwIndexCapacityInBlocks*2); + if(ret != ERROR_SUCCESS) + return ret; + header = MapViewOfFile(container->hMapping, FILE_MAP_WRITE, 0, 0, 0); + if(!header) + return GetLastError(); + + UnmapViewOfFile(*file_view); + *file_view = header; + return ERROR_SUCCESS; +} + /* Just like DosDateTimeToFileTime, except that it also maps the special * case of a DOS date/time of (0,0) to a filetime of (0,0). */ @@ -2218,8 +2283,6 @@ static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, { CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; - WCHAR path[MAX_PATH]; - LONG path_size = sizeof(path); pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) @@ -2239,33 +2302,18 @@ static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, return FALSE; } - if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + if(!URLCache_DeleteFile(pContainer, pHeader, pUrlEntry)) { - if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) - pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; - } - if (pUrlEntry->CacheEntryType & STICKY_CACHE_ENTRY) - { - if (pUrlEntry->size.QuadPart < pHeader->ExemptUsage.QuadPart) - pHeader->ExemptUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->ExemptUsage.QuadPart = 0; + URLCache_DeleteEntry(pHeader, pEntry); } else { - if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) - pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; - else - pHeader->CacheUsage.QuadPart = 0; - } - - if (pUrlEntry->dwOffsetLocalName && URLCache_LocalFileNameToPathW(pContainer, pHeader, - (LPCSTR)pUrlEntry+pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, path, &path_size)) - { - DeleteFileW(path); + /* Add entry to leaked files list */ + pUrlEntry->CacheFileEntry.dwSignature = LEAK_SIGNATURE; + pUrlEntry->dwExemptDelta = pHeader->options[CACHE_HEADER_DATA_ROOT_LEAK_OFFSET]; + pHeader->options[CACHE_HEADER_DATA_ROOT_LEAK_OFFSET] = pHashEntry->dwOffsetEntry; } - URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); return TRUE; }

1 0

Piotr Caban : wininet: Define more fields in urlcache header structure.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: dba38b1ab437e42f3cd50146a92d19872c83db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba38b1ab437e42f3cd50146a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 19 15:29:44 2012 +0200 wininet: Define more fields in urlcache header structure. --- dlls/wininet/urlcache.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 04ffd90..04ecd80 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -62,6 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define ENTRY_START_OFFSET 0x4000 #define DIR_LENGTH 8 +#define MAX_DIR_NO 0x20 #define BLOCKSIZE 128 #define HASHTABLE_SIZE 448 #define HASHTABLE_NUM_ENTRIES 64 /* this needs to be power of 2, that divides HASHTABLE_SIZE */ @@ -167,8 +168,10 @@ typedef struct _URLCACHE_HEADER ULARGE_INTEGER CacheLimit; ULARGE_INTEGER CacheUsage; ULARGE_INTEGER ExemptUsage; - DWORD DirectoryCount; /* number of directory_data's */ - DIRECTORY_DATA directory_data[1]; /* first directory entry */ + DWORD DirectoryCount; + DIRECTORY_DATA directory_data[MAX_DIR_NO]; + DWORD options[0x21]; + BYTE allocation_table[ALLOCATION_TABLE_SIZE]; } URLCACHE_HEADER, *LPURLCACHE_HEADER; typedef const URLCACHE_HEADER *LPCURLCACHE_HEADER; @@ -850,7 +853,6 @@ static inline void URLCache_Allocation_BlockAllocate(BYTE * AllocationTable, DWO */ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry) { - LPBYTE AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; DWORD dwBlockNumber; DWORD dwFreeCounter; for (dwBlockNumber = 0; dwBlockNumber < pHeader->dwIndexCapacityInBlocks; dwBlockNumber++) @@ -858,7 +860,7 @@ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBloc for (dwFreeCounter = 0; dwFreeCounter < dwBlocksNeeded && dwFreeCounter + dwBlockNumber < pHeader->dwIndexCapacityInBlocks && - URLCache_Allocation_BlockIsFree(AllocationTable, dwBlockNumber + dwFreeCounter); + URLCache_Allocation_BlockIsFree(pHeader->allocation_table, dwBlockNumber + dwFreeCounter); dwFreeCounter++) TRACE("Found free block at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); @@ -867,7 +869,7 @@ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBloc DWORD index; TRACE("Found free blocks starting at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); for (index = 0; index < dwBlocksNeeded; index++) - URLCache_Allocation_BlockAllocate(AllocationTable, dwBlockNumber + index); + URLCache_Allocation_BlockAllocate(pHeader->allocation_table, dwBlockNumber + index); *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); for (index = 0; index < dwBlocksNeeded * BLOCKSIZE / sizeof(DWORD); index++) ((DWORD*)*ppEntry)[index] = 0xdeadbeef; @@ -893,12 +895,11 @@ static BOOL URLCache_DeleteEntry(LPURLCACHE_HEADER pHeader, CACHEFILE_ENTRY * pE { DWORD dwStartBlock; DWORD dwBlock; - BYTE * AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; /* update allocation table */ dwStartBlock = ((DWORD)((BYTE *)pEntry - (BYTE *)pHeader) - ENTRY_START_OFFSET) / BLOCKSIZE; for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) - URLCache_Allocation_BlockFree(AllocationTable, dwBlock); + URLCache_Allocation_BlockFree(pHeader->allocation_table, dwBlock); return TRUE; }

1 0

Jacek Caban : mshtml: Fixed NULL event_obj handling in fire_event_obj.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: f833ac752e975f0040e2bcfa96180c2528982725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f833ac752e975f0040e2bcfa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 15:30:25 2012 +0200 mshtml: Fixed NULL event_obj handling in fire_event_obj. --- dlls/mshtml/htmlevent.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 12ff2ff..eeb4070 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1042,7 +1042,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e window = doc->window; prev_event = window->event; - window->event = &event_obj->IHTMLEventObj_iface; + window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target;

1 0

Jacek Caban : oleaut32: Properly handle TKIND_ALIAS when looking for iface GUID.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 2f7afbebd1e7944b0374ba2438baa52741936809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7afbebd1e7944b0374ba243… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:22:38 2012 +0200 oleaut32: Properly handle TKIND_ALIAS when looking for iface GUID. --- dlls/oleaut32/typelib.c | 60 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index abde61b..602181c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6022,6 +6022,42 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, return hr; } +static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *guid) +{ + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + + hres = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetTypeAttr(tinfo2, &tattr); + if(FAILED(hres)) { + ITypeInfo_Release(tinfo2); + return hres; + } + + switch(tattr->typekind) { + case TKIND_ALIAS: + hres = get_iface_guid(tinfo2, &tattr->tdescAlias, guid); + break; + + case TKIND_INTERFACE: + case TKIND_DISPATCH: + *guid = tattr->guid; + break; + + default: + ERR("Unexpected typekind %d\n", tattr->typekind); + hres = E_UNEXPECTED; + } + + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return hres; +} + /*********************************************************************** * DispCallFunc (OLEAUT32.@) * @@ -6515,30 +6551,18 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } if((tdesc->vt == VT_USERDEFINED || (tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED)) - && (V_VT(prgpvarg[i]) == VT_DISPATCH || V_VT(prgpvarg[i]) == VT_UNKNOWN)) { - const TYPEDESC *userdefined_tdesc = tdesc; + && (V_VT(prgpvarg[i]) == VT_DISPATCH || V_VT(prgpvarg[i]) == VT_UNKNOWN) + && V_UNKNOWN(prgpvarg[i])) { IUnknown *userdefined_iface; - ITypeInfo *tinfo2; - TYPEATTR *tattr; - - if(tdesc->vt == VT_PTR) - userdefined_tdesc = tdesc->u.lptdesc; + GUID guid; - hres = ITypeInfo2_GetRefTypeInfo(iface, userdefined_tdesc->u.hreftype, &tinfo2); + hres = get_iface_guid((ITypeInfo*)iface, tdesc->vt == VT_PTR ? tdesc->u.lptdesc : tdesc, &guid); if(FAILED(hres)) break; - hres = ITypeInfo_GetTypeAttr(tinfo2, &tattr); - if(FAILED(hres)) { - ITypeInfo_Release(tinfo2); - return hres; - } - - hres = IUnknown_QueryInterface(V_UNKNOWN(prgpvarg[i]), &tattr->guid, (void**)&userdefined_iface); - ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); - ITypeInfo_Release(tinfo2); + hres = IUnknown_QueryInterface(V_UNKNOWN(prgpvarg[i]), &guid, (void**)&userdefined_iface); if(FAILED(hres)) { - ERR("argument does not support %s interface\n", debugstr_guid(&tattr->guid)); + ERR("argument does not support %s interface\n", debugstr_guid(&guid)); break; }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the XEmbed event handler.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 5f8e41233b5cfb7f646d580fb7515175186b2ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8e41233b5cfb7f646d580fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:14:00 2012 +0200 winex11: Add window data structure locking to the XEmbed event handler. --- dlls/winex11.drv/event.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 2a4fda7..9012cae 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1566,7 +1566,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) */ static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); if (!data) return; @@ -1581,6 +1581,7 @@ static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) hwnd, event->window, event->data.l[1], event->data.l[2] ); break; } + release_win_data( data ); }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the GravityNotify event handler.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 220f1af06493e0c4623c2195435d993be275b3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220f1af06493e0c4623c21954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:13:51 2012 +0200 winex11: Add window data structure locking to the GravityNotify event handler. --- dlls/winex11.drv/event.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 744bc40..2a4fda7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1100,10 +1100,16 @@ done: static void X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) { XGravityEvent *event = &xev->xgravity; - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - RECT rect; + struct x11drv_win_data *data = get_win_data( hwnd ); + RECT rect, window_rect; - if (!data || data->whole_window) return; /* only handle this for foreign windows */ + if (!data) return; + + if (data->whole_window) /* only handle this for foreign windows */ + { + release_win_data( data ); + return; + } rect.left = event->x; rect.top = event->y; @@ -1115,8 +1121,10 @@ static void X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) event->x, event->y ); X11DRV_X_to_window_rect( data, &rect ); + window_rect = data->window_rect; + release_win_data( data ); - if (data->window_rect.left != rect.left || data ->window_rect.top != rect.top) + if (window_rect.left != rect.left || window_rect.top != rect.top) SetWindowPos( hwnd, 0, rect.left, rect.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
83
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 September 2012