September 2012 - Wine-commits

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: 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: 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

Henri Verbeet : d3d10core: Replace a FIXME with a TRACE in d3d10_device_CreateSamplerState().
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 843db2c3643000cab3fc2f9a3167a8c130fb6112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843db2c3643000cab3fc2f9a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:55 2012 +0200 d3d10core: Replace a FIXME with a TRACE in d3d10_device_CreateSamplerState(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1e54db2..b6c29f4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1091,7 +1091,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i struct d3d10_sampler_state *object; HRESULT hr; - FIXME("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Henri Verbeet : d3d10: Use debugstr_a() on variable names in parse_fx10_object().
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: b0795aafd33aa0e1f4493bc682cb8ec04c8eb79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0795aafd33aa0e1f4493bc68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:56 2012 +0200 d3d10: Use debugstr_a() on variable names in parse_fx10_object(). --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d1337b..e2a4744 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1297,7 +1297,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOO_PARSED_OBJECT: /* This is a local object, we've parsed in parse_fx10_local_object. */ - TRACE("Shader = %s.\n", data + offset); + TRACE("Variable name %s.\n", debugstr_a(data + offset)); o->data = e->lpVtbl->GetVariableByName(e, data + offset); hr = S_OK; @@ -1308,7 +1308,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr data_ptr = data + offset; read_dword(&data_ptr, &offset); read_dword(&data_ptr, &o->index); - TRACE("Shader = %s[%u].\n", data + offset, o->index); + TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), o->index); o->data = e->lpVtbl->GetVariableByName(e, data + offset); hr = S_OK;

1 0

Henri Verbeet : wined3d: wined3d_device_set_sampler_state() never fails.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 0d96be2c201e514007327133783b03536c7b8798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d96be2c201e5140073271337… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:57 2012 +0200 wined3d: wined3d_device_set_sampler_state() never fails. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 16 +++++++--------- dlls/wined3d/device.c | 10 ++++------ include/wine/wined3d.h | 2 +- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f6f0501..2b7e7c0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1812,7 +1812,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value); @@ -1826,7 +1826,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - hr = wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); else hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fcdfc6f..ea90e1a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1809,15 +1809,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev DWORD sampler, D3DSAMPLERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, sampler %u, state %#x, value %#x.\n", iface, sampler, state, value); wined3d_mutex_lock(); - hr = wined3d_device_set_sampler_state(device->wined3d_device, sampler, state, value); + wined3d_device_set_sampler_state(device->wined3d_device, sampler, state, value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWORD *pass_count) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 996fca8..908efa3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2509,7 +2509,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE state, DWORD value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); @@ -2552,7 +2552,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); break; } @@ -2597,7 +2597,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER, tex_mip); - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER, tex_min); break; } @@ -2607,11 +2607,11 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, 0, WINED3D_SAMP_ADDRESS_V, value); /* Drop through */ case D3DRENDERSTATE_TEXTUREADDRESSU: - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U, value); break; case D3DRENDERSTATE_TEXTUREADDRESSV: - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V, value); break; @@ -2630,7 +2630,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_ZBIAS: wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); - hr = D3D_OK; break; default: @@ -2643,7 +2642,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, } wined3d_device_set_render_state(device->wined3d_device, state, value); - hr = D3D_OK; break; } wined3d_mutex_unlock(); @@ -4728,7 +4726,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); @@ -4806,7 +4804,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8bb403..596206c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2325,7 +2325,7 @@ DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, return device->stateBlock->state.render_states[state]; } -HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, +void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { DWORD old_value; @@ -2340,7 +2340,7 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, / sizeof(*device->stateBlock->state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + return; /* Windows accepts overflowing this array ... we do not. */ } old_value = device->stateBlock->state.sampler_states[sampler_idx][state]; @@ -2351,18 +2351,16 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (old_value == value) { TRACE("Application is setting the old value over, nothing to do.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4d10fd6..57b6a1b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2223,7 +2223,7 @@ void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport); -HRESULT __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, +void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); HRESULT __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);

1 0

Henri Verbeet : wined3d: wined3d_device_get_sampler_state() never fails.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 62670c7ba530ee894f8c1d8f58e3e5405d77b8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62670c7ba530ee894f8c1d8f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:58 2012 +0200 wined3d: wined3d_device_get_sampler_state() never fails. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 29 ++++++++--------------------- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2b7e7c0..5e21a38 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1785,7 +1785,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); @@ -1799,7 +1799,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - hr = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); else hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ea90e1a..2662f4e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1794,15 +1794,14 @@ static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, DWORD sampler, D3DSAMPLERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, sampler %u, state %#x, value %p.\n", iface, sampler, state, value); wined3d_mutex_lock(); - hr = wined3d_device_get_sampler_state(device->wined3d_device, sampler, state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, sampler, state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 908efa3..20b2510 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2217,7 +2217,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -2231,8 +2231,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, { enum wined3d_texture_filter_type tex_mag; - hr = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, &tex_mag); - + tex_mag = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER); switch (tex_mag) { case WINED3D_TEXF_POINT: @@ -2253,16 +2252,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, enum wined3d_texture_filter_type tex_min; enum wined3d_texture_filter_type tex_mip; - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIN_FILTER, &tex_min); - if (FAILED(hr)) - { - wined3d_mutex_unlock(); - return hr; - } - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIP_FILTER, &tex_mip); - + tex_min = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER); + tex_mip = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER); switch (tex_min) { case WINED3D_TEXF_POINT: @@ -2311,12 +2302,10 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREADDRESS: case D3DRENDERSTATE_TEXTUREADDRESSU: - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_U, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U); break; case D3DRENDERSTATE_TEXTUREADDRESSV: - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_V, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V); break; case D3DRENDERSTATE_BORDERCOLOR: @@ -2332,7 +2321,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_ZBIAS: *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); - hr = D3D_OK; break; default: @@ -2344,7 +2332,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, break; } *value = wined3d_device_get_render_state(device->wined3d_device, state); - hr = D3D_OK; } wined3d_mutex_unlock(); @@ -4584,8 +4571,8 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; const struct tss_lookup *l; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -4605,7 +4592,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, if (l->sampler_state) { - hr = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); switch (state) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 596206c..69518b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2363,11 +2363,11 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); } -HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD *value) +DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, + UINT sampler_idx, enum wined3d_sampler_state state) { - TRACE("device %p, sampler_idx %u, state %s, value %p.\n", - device, sampler_idx, debug_d3dsamplerstate(state), value); + TRACE("device %p, sampler_idx %u, state %s.\n", + device, sampler_idx, debug_d3dsamplerstate(state)); if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); @@ -2376,13 +2376,10 @@ HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *devi / sizeof(*device->stateBlock->state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + return 0; /* Windows accepts overflowing this array ... we do not. */ } - *value = device->stateBlock->state.sampler_states[sampler_idx][state]; - TRACE("Returning %#x.\n", *value); - - return WINED3D_OK; + return device->stateBlock->state.sampler_states[sampler_idx][state]; } HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7aea714..c50dd29 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -77,7 +77,7 @@ @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_render_target(ptr long ptr) -@ cdecl wined3d_device_get_sampler_state(ptr long long ptr) +@ cdecl wined3d_device_get_sampler_state(ptr long long) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 57b6a1b..b44cc42 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2145,8 +2145,8 @@ HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *de DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); -HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, + UINT sampler_idx, enum wined3d_sampler_state state); HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Implement version checks for geometry shaders.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: fb989f1d1eb092f3273a206964f01376b93bc398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb989f1d1eb092f3273a20696… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:59 2012 +0200 wined3d: Implement version checks for geometry shaders. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++--------------- dlls/wined3d/device.c | 11 ++++++----- dlls/wined3d/directx.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++------------------- dlls/wined3d/shader.c | 20 ++++++++++++-------- dlls/wined3d/wined3d_private.h | 18 ++++++++++-------- 6 files changed, 63 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb989f1d1eb092f3273a2…

1 0