November 2013 - Wine-commits

Nikolay Sivov : msctf: COM interface cleanup.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: fc245339b0941074bdeae7dab038ec0bc31fa40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc245339b0941074bdeae7dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 12:21:51 2013 +0400 msctf: COM interface cleanup. --- dlls/msctf/compartmentmgr.c | 136 ++++++++++-------- dlls/msctf/context.c | 187 +++++++++++++------------ dlls/msctf/displayattributemgr.c | 2 +- dlls/msctf/documentmgr.c | 10 +- dlls/msctf/inputprocessor.c | 148 +++++++++++--------- dlls/msctf/langbarmgr.c | 2 +- dlls/msctf/range.c | 4 +- dlls/msctf/threadmgr.c | 279 +++++++++++++++++++------------------- 8 files changed, 401 insertions(+), 367 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc245339b0941074bdeae…

1 0

Nikolay Sivov : msctf: Pass QueryInterface arguments properly to main interface method.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 58f06cf9723a82f5c698cbee66e44f79ad6fe19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f06cf9723a82f5c698cbee6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 12:22:17 2013 +0400 msctf: Pass QueryInterface arguments properly to main interface method. --- dlls/msctf/compartmentmgr.c | 4 ++-- dlls/msctf/context.c | 12 ++++++------ dlls/msctf/documentmgr.c | 2 +- dlls/msctf/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 10a6428..eaf072f 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -134,7 +134,7 @@ static HRESULT WINAPI CompartmentMgr_QueryInterface(ITfCompartmentMgr *iface, RE { CompartmentMgr *This = impl_from_ITfCompartmentMgr(iface); if (This->pUnkOuter) - return IUnknown_QueryInterface(This->pUnkOuter, iid, *ppvOut); + return IUnknown_QueryInterface(This->pUnkOuter, iid, ppvOut); else { *ppvOut = NULL; @@ -574,7 +574,7 @@ static const ITfCompartmentVtbl CompartmentVtbl = static HRESULT WINAPI CompartmentSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { Compartment *This = impl_from_ITfSource(iface); - return ITfCompartment_QueryInterface(&This->ITfCompartment_iface, iid, *ppvOut); + return ITfCompartment_QueryInterface(&This->ITfCompartment_iface, iid, ppvOut); } static ULONG WINAPI CompartmentSource_AddRef(ITfSource *iface) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6f96e1a..13898f5 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -590,7 +590,7 @@ static const ITfContextVtbl ContextVtbl = static HRESULT WINAPI ContextSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfSource(iface); - return ITfContext_QueryInterface(&This->ITfContext_iface, iid, *ppvOut); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); } static ULONG WINAPI ContextSource_AddRef(ITfSource *iface) @@ -676,7 +676,7 @@ static const ITfSourceVtbl ContextSourceVtbl = static HRESULT WINAPI InsertAtSelection_QueryInterface(ITfInsertAtSelection *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfInsertAtSelection(iface); - return ITfContext_QueryInterface(&This->ITfContext_iface, iid, *ppvOut); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); } static ULONG WINAPI InsertAtSelection_AddRef(ITfInsertAtSelection *iface) @@ -751,19 +751,19 @@ static const ITfInsertAtSelectionVtbl InsertAtSelectionVtbl = static HRESULT WINAPI SourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfSourceSingle(iface); - return Context_QueryInterface((ITfContext *)This, iid, *ppvOut); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); } static ULONG WINAPI SourceSingle_AddRef(ITfSourceSingle *iface) { Context *This = impl_from_ITfSourceSingle(iface); - return Context_AddRef((ITfContext *)This); + return ITfContext_AddRef(&This->ITfContext_iface); } static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface) { Context *This = impl_from_ITfSourceSingle(iface); - return Context_Release((ITfContext *)This); + return ITfContext_Release(&This->ITfContext_iface); } static HRESULT WINAPI SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, @@ -897,7 +897,7 @@ static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface, if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACPSink)) { - *ppvOut = This; + *ppvOut = &This->ITextStoreACPSink_iface; } if (*ppvOut) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index f3cc12b..fadbb06 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -280,7 +280,7 @@ static const ITfDocumentMgrVtbl DocumentMgr_DocumentMgrVtbl = static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { DocumentMgr *This = impl_from_ITfSource(iface); - return ITfDocumentMgr_QueryInterface(&This->ITfDocumentMgr_iface, iid, *ppvOut); + return ITfDocumentMgr_QueryInterface(&This->ITfDocumentMgr_iface, iid, ppvOut); } static ULONG WINAPI Source_AddRef(ITfSource *iface) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 5ef8fe0..ad8a9b8 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -691,7 +691,7 @@ static const ITfInputProcessorProfilesVtbl InputProcessorProfilesVtbl = static HRESULT WINAPI IPPSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { InputProcessorProfiles *This = impl_from_ITfSource(iface); - return ITfInputProcessorProfiles_QueryInterface(&This->ITfInputProcessorProfiles_iface, iid, *ppvOut); + return ITfInputProcessorProfiles_QueryInterface(&This->ITfInputProcessorProfiles_iface, iid, ppvOut); } static ULONG WINAPI IPPSource_AddRef(ITfSource *iface) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 1d62ac7..960548c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -605,7 +605,7 @@ static const ITfThreadMgrVtbl ThreadMgrVtbl = static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfSource(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI Source_AddRef(ITfSource *iface) @@ -694,7 +694,7 @@ static const ITfSourceVtbl ThreadMgrSourceVtbl = static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface) @@ -986,7 +986,7 @@ static const ITfKeystrokeMgrVtbl KeystrokeMgrVtbl = static HRESULT WINAPI MessagePump_QueryInterface(ITfMessagePump *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfMessagePump(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI MessagePump_AddRef(ITfMessagePump *iface) @@ -1059,7 +1059,7 @@ static const ITfMessagePumpVtbl MessagePumpVtbl = static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfClientId(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI ClientId_AddRef(ITfClientId *iface) @@ -1105,7 +1105,7 @@ static const ITfClientIdVtbl ClientIdVtbl = static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) @@ -1225,7 +1225,7 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSinkVtbl = static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfSourceSingle(iface); - return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, *ppvOut); + return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut); } static ULONG WINAPI ThreadMgrSourceSingle_AddRef(ITfSourceSingle *iface)

1 0

Piotr Caban : wininet/tests: Fix urlcache tests on IE10.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 69b8c97c1d1cc1b13cdbe7a9f7a07ee382bdb775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b8c97c1d1cc1b13cdbe7a9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 18 09:58:13 2013 +0100 wininet/tests: Fix urlcache tests on IE10. --- dlls/wininet/tests/urlcache.c | 59 +++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index b89682d..e093d4b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -43,6 +43,7 @@ static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); static char filenameA[MAX_PATH + 1]; static char filenameA1[MAX_PATH + 1]; static BOOL old_ie = FALSE; +static BOOL ie10_cache = FALSE; static void check_cache_entry_infoA(const char *returnedfrom, INTERNET_CACHE_ENTRY_INFOA *lpCacheEntryInfo) { @@ -133,9 +134,9 @@ static void test_GetUrlCacheEntryInfoExA(void) SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoExA(test_url, NULL, NULL, NULL, NULL, NULL, 0x200 /*GET_INSTALLED_ENTRY*/); - ok(!ret, "GetUrlCacheEntryInfoEx succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetUrlCacheEntryInfoEx should have set last error to ERROR_FILE_NOT_FOUND instead of %d\n", GetLastError()); + ok(ret == ie10_cache, "GetUrlCacheEntryInfoEx returned %x\n", ret); + if (!ret) ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetUrlCacheEntryInfoEx should have set last error to ERROR_FILE_NOT_FOUND instead of %d\n", GetLastError()); /* Unicode version of function seems to ignore 0x200 flag */ ret = GetUrlCacheEntryInfoExW(test_urlW, NULL, NULL, NULL, NULL, NULL, 0x200 /*GET_INSTALLED_ENTRY*/); @@ -216,16 +217,16 @@ static void test_IsUrlCacheEntryExpiredA(void) * is NULL. */ ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL); - ok(ret, "expected TRUE\n"); + ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft); - ok(ret, "expected TRUE\n"); + ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d, "expected time to be unchanged, got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL); - ok(ret, "expected TRUE\n"); + ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); /* The return value should indicate whether the URL is expired, * and the filetime indicates the last modified time, but a cache entry @@ -308,7 +309,7 @@ static void test_IsUrlCacheEntryExpiredA(void) ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft); - ok(ret, "expected TRUE\n"); + ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(!ft.dwLowDateTime && !ft.dwHighDateTime, "expected time (0,0), got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); @@ -469,7 +470,7 @@ static void test_urlcacheA(void) SetLastError(0xdeadbeef); ret = RetrieveUrlCacheEntryFileA(test_url1, NULL, &cbCacheEntryInfo, 0); ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); - ok(GetLastError() == ERROR_INVALID_DATA, + ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_DATA instead of %d\n", GetLastError()); if (pUnlockUrlCacheEntryFileA) @@ -661,16 +662,16 @@ static void test_urlcacheA(void) ret = CommitUrlCacheEntryA(test_url, NULL, filetime_zero, filetime_zero, STICKY_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), "html", NULL); - ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ie10_cache, "CommitUrlCacheEntryA returned %x\n", ret); + if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = CommitUrlCacheEntryA(test_url, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), "html", NULL); - ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ie10_cache, "CommitUrlCacheEntryA returned %x\n", ret); + if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ret = CreateUrlCacheEntryA(test_url, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); @@ -757,9 +758,8 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600, - "expected dwExemptDelta 8600, got %d\n", - U(*lpCacheEntryInfo).dwExemptDelta); + ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600 || (ie10_cache && U(*lpCacheEntryInfo).dwExemptDelta == 86400), + "expected dwExemptDelta 8600, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); @@ -862,11 +862,24 @@ static void test_urlcacheW(void) return; } + if(ie10_cache) { + if(!MultiByteToWideChar(CP_ACP, 0, urls[6].encoded_url, -1, + urls[6].url, sizeof(urls[6].url)/sizeof(WCHAR))) + urls[6].url[0] = 0; + + trace("converted url in test 6: %s\n", wine_dbgstr_w(urls[6].url)); + } + for(i=0; i<sizeof(urls)/sizeof(*urls); i++) { INTERNET_CACHE_ENTRY_INFOA *entry_infoA; INTERNET_CACHE_ENTRY_INFOW *entry_infoW; DWORD size; + if(!urls[i].url[0]) { + win_skip("No UTF16 version of url (%d)\n", i); + continue; + } + SetLastError(0xdeadbeef); ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); if(urls[i].err != 0) { @@ -948,10 +961,13 @@ static void test_urlcacheW(void) } if(!urls[i].extension[0]) { - ok(!entry_infoW->lpszFileExtension, "entry_infoW->lpszFileExtension != NULL\n"); + ok(!entry_infoW->lpszFileExtension || (ie10_cache && !entry_infoW->lpszFileExtension[0]), + "%d) entry_infoW->lpszFileExtension = %s\n", + i, wine_dbgstr_w(entry_infoW->lpszFileExtension)); }else { MultiByteToWideChar(CP_ACP, 0, entry_infoA->lpszFileExtension, -1, bufW, MAX_PATH); - ok(!lstrcmpW(entry_infoW->lpszFileExtension, bufW), + ok(!lstrcmpW(entry_infoW->lpszFileExtension, bufW) || + (ie10_cache && !lstrcmpW(entry_infoW->lpszFileExtension, urls[i].extension)), "%d) entry_infoW->lpszFileExtension = %s, expected %s\n", i, wine_dbgstr_w(entry_infoW->lpszFileExtension), wine_dbgstr_w(bufW)); } @@ -1030,6 +1046,11 @@ START_TEST(urlcache) if(!GetProcAddress(hdll, "InternetGetSecurityInfoByURL")) /* < IE7 */ old_ie = TRUE; + if(GetProcAddress(hdll, "CreateUrlCacheEntryExW")) { + trace("Running tests on IE10 or newer\n"); + ie10_cache = TRUE; + } + pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA();

1 0

Henri Verbeet : wined3d: Create a proper texture for the software cursor.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 505951e32d16280998359f6ee57e6a88aa5e102f URL: http://source.winehq.org/git/wine.git/?a=commit;h=505951e32d16280998359f6ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:16 2013 +0100 wined3d: Create a proper texture for the software cursor. --- dlls/wined3d/device.c | 136 +++++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 60 ++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 93 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=505951e32d16280998359…

1 0

Henri Verbeet : wined3d: Avoid calling wined3d_surface_set_mem() in surface_cleanup().
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 941fe99eaf66bd2446a9c8434da6dad1765e4335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941fe99eaf66bd2446a9c8434… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:17 2013 +0100 wined3d: Avoid calling wined3d_surface_set_mem() in surface_cleanup(). Calling wined3d_surface_set_mem() might cause the surface container to be accessed, for example when invalidating resource locations. This would become a problem once we assume surfaces always have a container, and is pointless anyway because the surface is being destroyed. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e30d6b4..a5d9118 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -96,7 +96,8 @@ static void surface_cleanup(struct wined3d_surface *surface) } if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL, 0); + surface->resource.allocatedMemory = NULL; + if (surface->overlay_dest) list_remove(&surface->overlay_entry);

1 0

Henri Verbeet : wined3d: Surfaces always have a container in draw_textured_quad().
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 96fbf9fed385c4a3e6e4f29ccae272570e90c647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fbf9fed385c4a3e6e4f29cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:18 2013 +0100 wined3d: Surfaces always have a container in draw_textured_quad(). --- dlls/wined3d/surface.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a5d9118..bc97ac7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -333,6 +333,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture *texture = src_surface->container; struct blt_info info; surface_get_blt_info(src_surface->texture_target, src_rect, src_surface->pow2Width, src_surface->pow2Height, &info); @@ -376,14 +377,10 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 /* We changed the filtering settings on the texture. Inform the * container about this to get the filters reset properly next draw. */ - if (src_surface->container) - { - struct wined3d_texture *texture = src_surface->container; - texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; - texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; - texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; - texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; - } + texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3D_TEXF_POINT; + texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; + texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; + texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; } /* Works correctly only for <= 4 bpp formats. */

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_bind() .
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 32fb4e45eb8e04db1ed3cb52c08e73636e6c3155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fb4e45eb8e04db1ed3cb52c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:19 2013 +0100 wined3d: Surfaces always have a container in surface_bind(). --- dlls/wined3d/surface.c | 44 ++++---------------------------------------- 1 files changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc97ac7..9780a31 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -604,48 +604,12 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) /* Context activation is done by the caller. */ static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; + struct wined3d_texture *texture = surface->container; - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_bind(texture, context, srgb); - } - else - { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (surface->texture_level) - { - ERR("Standalone surface %p is non-zero texture level %u.\n", - surface, surface->texture_level); - } - - if (srgb) - ERR("Trying to bind standalone surface %p as sRGB.\n", surface); + TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - if (!surface->texture_name) - { - gl_info->gl_ops.gl.p_glGenTextures(1, &surface->texture_name); - checkGLcall("glGenTextures"); - - TRACE("Surface %p given name %u.\n", surface, surface->texture_name); - - context_bind_texture(context, surface->texture_target, surface->texture_name); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - } - else - { - context_bind_texture(context, surface->texture_target, surface->texture_name); - } - } + TRACE("Passing to container (%p).\n", texture); + texture->texture_ops->texture_bind(texture, context, srgb); } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_unload ().
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 743900faaac32f0912bbde280c50c1aba5980427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743900faaac32f0912bbde280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:20 2013 +0100 wined3d: Surfaces always have a container in surface_unload(). --- dlls/wined3d/surface.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9780a31..7718186 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1498,15 +1498,6 @@ static void surface_unload(struct wined3d_resource *resource) list_init(&surface->renderbuffers); surface->current_renderbuffer = NULL; - /* If we're in a texture, the texture name belongs to the texture. - * Otherwise, destroy it. */ - if (!surface->container) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name); - surface->texture_name = 0; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name_srgb); - surface->texture_name_srgb = 0; - } if (surface->rb_multisample) { gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample);

1 0

André Hentschel : quartz/tests: Don' t use DebugInfo of critical sections in tests.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 29d08186c9fc0432368a5ada9ad9d8fdff464a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d08186c9fc0432368a5ada9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 17 20:11:07 2013 +0100 quartz/tests: Don't use DebugInfo of critical sections in tests. --- dlls/quartz/tests/filtergraph.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7a6dd5a..6938e67 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1094,7 +1094,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl; pTestFilter->refCount = 1; InitializeCriticalSection(&pTestFilter->csFilter); - pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter"); pTestFilter->state = State_Stopped; ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO)); @@ -1149,7 +1148,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi } } CoTaskMemFree(pTestFilter->ppPins); - pTestFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTestFilter->csFilter); CoTaskMemFree(pTestFilter); @@ -1213,7 +1211,6 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); CoTaskMemFree(This);

1 0

Alexandre Julliard : makefiles: Generate rules from makedep for running tests.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: a6fd273a90280d4f24945ff83a5b3f61b6c7f72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fd273a90280d4f24945ff83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 11:57:14 2013 +0100 makefiles: Generate rules from makedep for running tests. --- Make.rules.in | 10 +--------- Makefile.in | 2 +- configure | 4 +--- configure.ac | 4 +--- tools/makedep.c | 35 ++++++++++++++++++++++++++--------- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ed2d8cf..630e598 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -32,10 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules -.SUFFIXES: .ok .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp - -.c.ok: - $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ +.SUFFIXES: .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .sfd.ttf: $(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@ @@ -106,11 +103,6 @@ $(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in $(WINETEST_RES): $(TESTMODULE_STRIPPED) echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@ -testclean:: - $(RM) *.ok - -.PHONY: check test testclean - # Rules for man pages MANPAGES = $(MANPAGE) $(EXTRA_MANPAGES) diff --git a/Makefile.in b/Makefile.in index d54fc21..045d708 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ uninstall:: __uninstall__ # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include -.PHONY: test crosstest __tooldeps__ __builddeps__ +.PHONY: check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/configure b/configure index 3942d45..a66ba62 100755 --- a/configure +++ b/configure @@ -16161,9 +16161,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) -check test: \$(C_SRCS:.c=.ok) - -.PHONY: check test crosstest +.PHONY: check test testclean crosstest " if test -n "$CROSSTARGET" diff --git a/configure.ac b/configure.ac index 106377e..35accb2 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,9 +2647,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) -check test: \$(C_SRCS:.c=.ok) - -.PHONY: check test crosstest +.PHONY: check test testclean crosstest ") if test -n "$CROSSTARGET" then diff --git a/tools/makedep.c b/tools/makedep.c index 3b441be..cd0b573 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1149,6 +1149,7 @@ static void output_sources(void) struct incl_file *source; struct strarray clean_files; int i, column, po_srcs = 0, mc_srcs = 0; + int is_test = find_src_file( "testlist.o" ) != NULL; strarray_init( &clean_files ); @@ -1247,12 +1248,12 @@ static void output_sources(void) } else { - struct object_extension *ext; - LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) + struct object_extension *obj_ext; + LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) { - strarray_add( &clean_files, strmake( "%s.%s", obj, ext->extension )); - output( "%s.%s: %s\n", obj, ext->extension, source->filename ); - if (strstr( ext->extension, "cross" )) + strarray_add( &clean_files, strmake( "%s.%s", obj, obj_ext->extension )); + output( "%s.%s: %s\n", obj, obj_ext->extension, source->filename ); + if (strstr( obj_ext->extension, "cross" )) output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); else output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); @@ -1263,8 +1264,13 @@ static void output_sources(void) output( "%s.cross.o: %s\n", obj, source->filename ); output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); } - LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) - column += output( "%s.%s ", obj, ext->extension ); + if (is_test && !strcmp( ext, "c" ) && !is_generated_idl( source )) + { + output( "%s.ok:\n", obj ); + output( "\t$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@\n", obj ); + } + LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) + column += output( "%s.%s ", obj, obj_ext->extension ); if (source->flags & FLAG_C_IMPLIB) column += output( "%s.cross.o", obj ); column += output( ":" ); } @@ -1313,13 +1319,24 @@ static void output_sources(void) strarray_add( &clean_files, "dlldata.c" ); } - if (find_src_file( "testlist.o" )) + if (is_test) { output( "testlist.c: $(MAKECTESTS) Makefile.in\n" ); column = output( "\t$(MAKECTESTS) -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) - output_filename( source->filename, &column ); + output_filename( source->name, &column ); + output( "\n" ); + column = output( "check test:" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) + output_filename( replace_extension( source->name, 2, ".ok" ), &column ); + output( "\n" ); + output( "clean testclean::\n" ); + column = output( "\t$(RM)" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) + output_filename( replace_extension( source->name, 2, ".ok" ), &column ); output( "\n" ); strarray_add( &clean_files, "testlist.c" ); }

1 0