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

Hans Leidekker : msi: Build the key path from the display name if the component is an assembly.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 888a19c02c1c719faba704c00ab24ac11b0dd7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a19c02c1c719faba704c00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:46 2011 +0100 msi: Build the key path from the display name if the component is an assembly. --- dlls/msi/action.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f58aaf2..7567f5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3252,7 +3252,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) squash_guid(comp->ComponentId,squished_cc); msi_free(comp->FullKeypath); - comp->FullKeypath = resolve_keypath( package, comp ); + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + + comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (comp->FullKeypath) + { + strcpyW( comp->FullKeypath, prefixW ); + strcatW( comp->FullKeypath, comp->assembly->display_name ); + } + } + else comp->FullKeypath = resolve_keypath( package, comp ); ACTION_RefCountComponent( package, comp );

1 0

Hans Leidekker : msi: Also register components without a key path.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: e292eb121ddc9da71e758bc41096fa497101e813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292eb121ddc9da71e758bc41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:29 2011 +0100 msi: Also register components without a key path. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a003f5e..f58aaf2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3266,15 +3266,10 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (comp->ActionRequest == INSTALLSTATE_LOCAL || comp->ActionRequest == INSTALLSTATE_SOURCE) { - if (!comp->FullKeypath) - continue; - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); else - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, &hkey, TRUE); if (rc != ERROR_SUCCESS) continue;

1 0

Henri Verbeet : d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: ab8a9f27f925e47cb39959ad4a3e84c7752d26f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8a9f27f925e47cb39959ad4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:08 2011 +0100 d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE. --- dlls/d3d9/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1dd6895..e008b31 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, /* This method is only allowed with surfaces that are render targets, or * offscreen plain surfaces in D3DPOOL_DEFAULT. */ - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) { wined3d_mutex_unlock(); WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");

1 0

Henri Verbeet : wined3d: Store all the resource desc information in struct wined3d_resource.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: ac9c592ca9c0bac6479f9a8beef4030815b738c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9c592ca9c0bac6479f9a8be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:07 2011 +0100 wined3d: Store all the resource desc information in struct wined3d_resource. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/basetexture.c | 5 +- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 44 ++++++------ dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/resource.c | 17 +++-- dlls/wined3d/state.c | 6 +- dlls/wined3d/surface.c | 140 +++++++++++++++++++------------------ dlls/wined3d/surface_base.c | 136 +++++++++++++++++++----------------- dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 16 ++-- dlls/wined3d/swapchain_gdi.c | 4 +- dlls/wined3d/volume.c | 34 ++++----- dlls/wined3d/wined3d_private.h | 40 ++++------- 15 files changed, 235 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9c592ca9c0bac6479f9…

1 0

Thomas Mullaly : mshtml/tests: Fixed memory leak and made Vtbl's const.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: a33df48f36c0b34343d3c369de724dac0fceb943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33df48f36c0b34343d3c369d… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Mar 8 23:27:16 2011 -0500 mshtml/tests: Fixed memory leak and made Vtbl's const. --- dlls/mshtml/tests/events.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bdb8460..a670532 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1197,7 +1197,7 @@ static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember return S_OK; } -static IDispatchExVtbl timeoutFuncVtbl = { +static const IDispatchExVtbl timeoutFuncVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -1231,7 +1231,7 @@ static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, return S_OK; } -static IDispatchExVtbl div_onclick_dispVtbl = { +static const IDispatchExVtbl div_onclick_dispVtbl = { Dispatch_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -2208,7 +2208,7 @@ static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *ifac return E_NOTIMPL; } -static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_QueryInterface, PropertyNotifySink_AddRef, PropertyNotifySink_Release, @@ -2410,6 +2410,7 @@ static void test_empty_document(void) ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); + IHTMLDocument2_Release(doc); } START_TEST(events)

1 0

Juan Lang : wininet: Store headers in url cache entries.
by Alexandre Julliard March 9, 2011

March 9, 2011

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

Henri Verbeet : wined3d: Merge the various resource desc structures.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 756fdb7c5affaef02d058c388e15fe1ce183ee38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756fdb7c5affaef02d058c388… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:05 2011 +0100 wined3d: Merge the various resource desc structures. --- dlls/d3d8/buffer.c | 16 +++++++------- dlls/d3d8/cubetexture.c | 24 ++++++++++---------- dlls/d3d8/device.c | 19 ++++++++-------- dlls/d3d8/surface.c | 25 +++++++++++---------- dlls/d3d8/texture.c | 27 +++++++++++------------ dlls/d3d8/volume.c | 24 ++++++++++---------- dlls/d3d8/volumetexture.c | 27 ++++++++++++----------- dlls/d3d9/buffer.c | 16 +++++++------- dlls/d3d9/cubetexture.c | 26 ++++++++++++---------- dlls/d3d9/device.c | 17 +++++--------- dlls/d3d9/surface.c | 25 +++++++++++---------- dlls/d3d9/texture.c | 27 ++++++++++++----------- dlls/d3d9/volume.c | 23 ++++++++++--------- dlls/d3d9/volumetexture.c | 25 +++++++++++---------- dlls/ddraw/ddraw.c | 28 +++++------------------- dlls/ddraw/device.c | 12 +++++----- dlls/ddraw/surface.c | 2 +- dlls/ddraw/vertexbuffer.c | 12 +++++----- dlls/wined3d/buffer.c | 16 +++++++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface_base.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 20 +++++++++-------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 45 +++++++++++---------------------------- 27 files changed, 223 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756fdb7c5affaef02d058…

1 0

Juan Lang : wininet: Implement FindNextUrlCacheEntryW.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: c4d628cb023b856629cda61f6bbb353bd6200ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d628cb023b856629cda61f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 11:22:43 2011 -0800 wininet: Implement FindNextUrlCacheEntryW. --- dlls/wininet/urlcache.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 100a103..431288f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3304,19 +3304,15 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, return pEntryHandle; } -/*********************************************************************** - * FindNextUrlCacheEntryA (WININET.@) - */ -BOOL WINAPI FindNextUrlCacheEntryA( +static BOOL FindNextUrlCacheEntryInternal( HANDLE hEnumHandle, LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, - LPDWORD lpdwNextCacheEntryInfoBufferSize) + LPDWORD lpdwNextCacheEntryInfoBufferSize, + BOOL unicode) { URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; URLCACHECONTAINER * pContainer; - TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -3354,8 +3350,10 @@ BOOL WINAPI FindNextUrlCacheEntryA( continue; pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); error = URLCache_CopyEntry( pContainer, @@ -3363,14 +3361,15 @@ BOOL WINAPI FindNextUrlCacheEntryA( lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* not UNICODE */); + unicode); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + TRACE("Local File Name: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */ @@ -3388,6 +3387,20 @@ BOOL WINAPI FindNextUrlCacheEntryA( } /*********************************************************************** + * FindNextUrlCacheEntryA (WININET.@) + */ +BOOL WINAPI FindNextUrlCacheEntryA( + HANDLE hEnumHandle, + LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + LPDWORD lpdwNextCacheEntryInfoBufferSize) +{ + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, FALSE /* not UNICODE */); +} + +/*********************************************************************** * FindNextUrlCacheEntryW (WININET.@) */ BOOL WINAPI FindNextUrlCacheEntryW( @@ -3396,9 +3409,11 @@ BOOL WINAPI FindNextUrlCacheEntryW( LPDWORD lpdwNextCacheEntryInfoBufferSize ) { - FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, + (LPINTERNET_CACHE_ENTRY_INFOA)lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, TRUE /* UNICODE */); } /***********************************************************************

1 0

Juan Lang : wininet: Implement RetrieveUrlCacheEntryStreamW.
by Alexandre Julliard March 9, 2011

March 9, 2011

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

Juan Lang : wininet: Account for disk space usage when deleting url cache entries.
by Alexandre Julliard March 9, 2011

March 9, 2011

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