November 2013 - Wine-Commits

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

Nov. 18, 2013

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: Avoid calling wined3d_surface_set_mem() in surface_cleanup().
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

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: Create a proper texture for the software cursor.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

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

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

Nov. 18, 2013

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

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

Nov. 18, 2013

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

Nikolay Sivov : msctf: COM interface cleanup.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

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 : scrrun: Implement BuildPath method.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 70bb23a9acc6abb73005dc221c65c9c682a2d868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bb23a9acc6abb73005dc221… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 11:49:53 2013 +0400 scrrun: Implement BuildPath method. --- dlls/scrrun/filesystem.c | 57 ++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2750108..ee89b76 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1073,11 +1073,62 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * } static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, - BSTR Name, BSTR *pbstrResult) + BSTR Name, BSTR *Result) { - FIXME("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), pbstrResult); + BSTR ret; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + ret[path_len] = 0; + strcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + static const WCHAR bsW[] = {'\\',0}; + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + strcpyW(ret, Path); + if (Path[path_len-1] != ':') + strcatW(ret, bsW); + strcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + strcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6016049..630de1b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -651,6 +651,94 @@ static void test_CopyFolder(void) SysFreeString(bsrc); } +static BSTR bstr_from_str(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +struct buildpath_test +{ + const char *path; + const char *name; + const char *result; +}; + +static struct buildpath_test buildpath_data[] = +{ + { "C:\\path", "..\\name.tmp", "C:\\path\\..\\name.tmp" }, + { "C:\\path", "\\name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path", "name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path\\", "name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path", "\\\\name.tmp", "C:\\path\\\\name.tmp" }, + { "C:\\path\\", "\\name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path\\", "\\\\name.tmp", "C:\\path\\\\name.tmp" }, + { "C:\\path\\\\", "\\\\name.tmp", "C:\\path\\\\\\name.tmp" }, + { "C:\\\\", "\\name.tmp", "C:\\\\name.tmp" }, + { "C:", "name.tmp", "C:name.tmp" }, + { "C:", "\\\\name.tmp", "C:\\\\name.tmp" }, + { NULL } +}; + +static void test_BuildPath(void) +{ + struct buildpath_test *ptr = buildpath_data; + BSTR ret, path; + HRESULT hr; + int i = 0; + + hr = IFileSystem3_BuildPath(fs3, NULL, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = (BSTR)0xdeadbeef; + hr = IFileSystem3_BuildPath(fs3, NULL, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*ret == 0, "got %p\n", ret); + SysFreeString(ret); + + ret = (BSTR)0xdeadbeef; + path = bstr_from_str("path"); + hr = IFileSystem3_BuildPath(fs3, path, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(path); + + ret = (BSTR)0xdeadbeef; + path = bstr_from_str("path"); + hr = IFileSystem3_BuildPath(fs3, NULL, path, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(path); + + while (ptr->path) + { + BSTR name, result; + + ret = NULL; + path = bstr_from_str(ptr->path); + name = bstr_from_str(ptr->name); + result = bstr_from_str(ptr->result); + hr = IFileSystem3_BuildPath(fs3, path, name, &ret); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + if (hr == S_OK) + { + ok(!lstrcmpW(ret, result), "%d: got wrong path %s, expected %s\n", i, wine_dbgstr_w(ret), + wine_dbgstr_w(result)); + SysFreeString(ret); + } + SysFreeString(path); + SysFreeString(name); + SysFreeString(result); + + i++; + ptr++; + } +} + START_TEST(filesystem) { HRESULT hr; @@ -674,6 +762,7 @@ START_TEST(filesystem) test_GetAbsolutePathName(); test_GetFile(); test_CopyFolder(); + test_BuildPath(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : kernel32/tests: Fix IdnToNameprepUnicode tests.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 18f7f637b01e5b0ea0a27ce398aefbf851cf1304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f7f637b01e5b0ea0a27ce39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 16 16:31:13 2013 +0100 kernel32/tests: Fix IdnToNameprepUnicode tests. --- dlls/kernel32/tests/locale.c | 55 ++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 60dea78..62e9f01 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3107,6 +3107,7 @@ static void test_IdnToNameprepUnicode(void) DWORD in_len; const WCHAR in[64]; DWORD ret; + DWORD broken_ret; const WCHAR out[64]; DWORD flags; DWORD err; @@ -3114,77 +3115,77 @@ static void test_IdnToNameprepUnicode(void) } test_data[] = { { 5, {'t','e','s','t',0}, - 5, {'t','e','s','t',0}, + 5, 5, {'t','e','s','t',0}, 0, 0xdeadbeef }, { 3, {'a',0xe111,'b'}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 4, {'t',0,'e',0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 1, {'T',0}, - 1, {'T',0}, + 1, 1, {'T',0}, 0, 0xdeadbeef }, { 1, {0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 6, {' ','-','/','[',']',0}, - 6, {' ','-','/','[',']',0}, + 6, 6, {' ','-','/','[',']',0}, 0, 0xdeadbeef }, { 3, {'a','-','a'}, - 3, {'a','-','a'}, + 3, 3, {'a','-','a'}, IDN_USE_STD3_ASCII_RULES, 0xdeadbeef }, { 3, {'a','a','-'}, - 0, {0}, + 0, 0, {0}, IDN_USE_STD3_ASCII_RULES, ERROR_INVALID_NAME }, { /* FoldString is not working as expected when MAP_FOLDCZONE is specified (composition+compatibility) */ 10, {'T',0xdf,0x130,0x143,0x37a,0x6a,0x30c,' ',0xaa,0}, - 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, + 12, 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, 0, 0xdeadbeef, TRUE }, { 11, {'t',0xad,0x34f,0x1806,0x180b,0x180c,0x180d,0x200b,0x200c,0x200d,0}, - 2, {'t',0}, + 2, 0, {'t',0}, 0, 0xdeadbeef }, { /* Another example of incorrectly working FoldString (composition) */ 2, {0x3b0, 0}, - 2, {0x3b0, 0}, + 2, 2, {0x3b0, 0}, 0, 0xdeadbeef, TRUE }, { 2, {0x221, 0}, - 0, {0}, + 0, 2, {0}, 0, ERROR_NO_UNICODE_TRANSLATION }, { 2, {0x221, 0}, - 2, {0x221, 0}, + 2, 2, {0x221, 0}, IDN_ALLOW_UNASSIGNED, 0xdeadbeef }, { 5, {'a','.','.','a',0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 3, {'a','.',0}, - 3, {'a','.',0}, + 3, 3, {'a','.',0}, 0, 0xdeadbeef }, }; @@ -3253,15 +3254,23 @@ static void test_IdnToNameprepUnicode(void) ret = pIdnToNameprepUnicode(test_data[i].flags, test_data[i].in, test_data[i].in_len, buf, sizeof(buf)/sizeof(WCHAR)); err = GetLastError(); - if(!test_data[i].todo) { - ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); - ok(err == test_data[i].err, "%d) err = %d\n", i, err); - ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), - "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); - }else { - todo_wine ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), - "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + + if (!test_data[i].todo) + { + ok(ret == test_data[i].ret || + broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); } + else + { + todo_wine ok(ret == test_data[i].ret || + broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); + } + if(ret != test_data[i].ret) + continue; + + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); } }

1 0

Jacek Caban : msxml3: Compile tests with __WINESRC__ defined.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 66677e616f41cbebdcdfedeff1d064b6a11a8f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66677e616f41cbebdcdfedeff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 16:07:21 2013 +0100 msxml3: Compile tests with __WINESRC__ defined. --- dlls/msxml3/tests/Makefile.in | 1 - dlls/msxml3/tests/domdoc.c | 9 +++++---- dlls/msxml3/tests/saxreader.c | 10 ++++++---- dlls/msxml3/tests/schema.c | 1 + dlls/msxml3/tests/xmldoc.c | 8 ++++---- dlls/msxml3/tests/xmlview.c | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 38d20f1..345d454 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msxml3.dll IMPORTS = oleaut32 ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ domdoc.c \ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8e17885..1621470 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -30,6 +30,7 @@ #include "windows.h" +#include "xmldom.h" #include "msxml2.h" #include "msxml2did.h" #include "ole2.h" @@ -1068,7 +1069,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf) else { r = IXMLDOMNode_get_parentNode(node, &new_node); - wsprintf(buf, "%d", get_node_position(node)); + sprintf(buf, "%d", get_node_position(node)); buf += strlen(buf); } @@ -6039,7 +6040,7 @@ static void test_save(void) ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); CloseHandle(hfile); - DeleteFile("test.xml"); + DeleteFileA("test.xml"); /* save to path VT_BSTR | VT_BYREF */ filename = _bstr_("test.xml"); @@ -6060,7 +6061,7 @@ static void test_save(void) ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); CloseHandle(hfile); - DeleteFile("test.xml"); + DeleteFileA("test.xml"); } /* save to stream */ @@ -6679,7 +6680,7 @@ static void test_TransformWithLoadingLocalFile(void) IXMLDOMDocument_Release(doc); IXMLDOMDocument_Release(xsl); - DeleteFile(lpPathBuffer); + DeleteFileA(lpPathBuffer); free_bstrs(); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index f3a6bbd..e1bcf5e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3497,15 +3497,17 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem if (table->type & StartElement) { - hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), table->attr); + hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), table->uri ? strlen(table->uri) : 0, + _bstr_(table->local_name), table->local_name ? strlen(table->local_name) : 0, _bstr_(table->qname), + table->qname ? strlen(table->qname) : 0, table->attr); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); } if (table->type & EndElement) { - hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname)); + hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), table->uri ? strlen(table->uri) : 0, + _bstr_(table->local_name), table->local_name ? strlen(table->local_name) : 0, _bstr_(table->qname), + table->qname ? strlen(table->qname) : 0); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index fe6e6b6..ac3fead 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -27,6 +27,7 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#undef CLSID_DOMDocument #include "msxml2did.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 701b1bb..4130ea4 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -38,8 +38,8 @@ static void create_xml_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); static const char data[] = "<?xml version=\"1.0\" ?>\n" @@ -61,8 +61,8 @@ static void create_stream_on_file(IStream **stream, LPCSTR path) HRESULT hr; DWORD file_size, read; - hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); file_size = GetFileSize(hfile, NULL); diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 82577bf..3e3bd29 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -242,9 +242,9 @@ static void test_Load(void) IBindCtx_Release(bctx); IMoniker_Release(mon); - while(!loaded && GetMessage(&msg, NULL, 0, 0)) { + while(!loaded && GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } hres = IHTMLDocument2_get_body(html_doc, &elem);

1 0

Jacek Caban : msxml3: Return NULL instead of empty string in IXMLElement:: get_tagName.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: fe0f945769ca3e6204baa8089bdb205c75aa02ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0f945769ca3e6204baa8089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 16:06:51 2013 +0100 msxml3: Return NULL instead of empty string in IXMLElement::get_tagName. --- dlls/msxml3/tests/xmldoc.c | 2 +- dlls/msxml3/xmlelem.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 7bf5062..701b1bb 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -893,7 +893,7 @@ static void test_xmlelem(void) hr = IXMLElement_get_tagName(element, &str); EXPECT_HR(hr, S_OK); - ok(lstrlenW(str) == 0, "Expected empty tag name\n"); + ok(!str, "Expected empty tag name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); parent = (IXMLElement *)0xdeadbeef; diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 679e159..a932397 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -189,8 +189,12 @@ static HRESULT WINAPI xmlelem_get_tagName(IXMLElement *iface, BSTR *p) if (!p) return E_INVALIDARG; - *p = bstr_from_xmlChar(This->node->name); - CharUpperBuffW(*p, SysStringLen(*p)); + if (*This->node->name) { + *p = bstr_from_xmlChar(This->node->name); + CharUpperBuffW(*p, SysStringLen(*p)); + }else { + *p = NULL; + } TRACE("returning %s\n", debugstr_w(*p));

1 0