April 2012 - Wine-commits - list.winehq.org

Stefan Leichter : atl80: Add stub for AtlCreateRegistrar.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 7bffd907908a18a16b34d16245c817ec0d605d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bffd907908a18a16b34d1624… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: Add stub for AtlCreateRegistrar. --- dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.c | 31 +++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index d144f83..c310fdb 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,3 +1,5 @@ MODULE = atl80.dll +C_SRCS = atl80.c + @MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c new file mode 100644 index 0000000..ab1a5ab --- /dev/null +++ b/dlls/atl80/atl80.c @@ -0,0 +1,31 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "atliface.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl80); + +HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) +{ + FIXME("(%p) stub\n", ppReg); + return E_NOTIMPL; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index d2b0cff..7035991 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -48,7 +48,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stub AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA 64 stub AltCallTermFunc

1 0

Morten Rønne : wininet/tests: Fixed text errors in tests.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: fb81502a504145ae2e6831afaea3957612606fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb81502a504145ae2e6831afa… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sat Mar 31 12:38:32 2012 +0200 wininet/tests: Fixed text errors in tests. --- dlls/wininet/tests/urlcache.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index ed42395..c37e791 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -87,7 +87,7 @@ static void test_find_url_cache_entriesA(void) if (!ret) break; } - ok(found, "committed url cache entry not found during enumeration\n"); + ok(found, "Committed url cache entry not found during enumeration\n"); ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); @@ -494,7 +494,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -647,7 +647,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -657,7 +657,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) @@ -679,7 +679,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -689,7 +689,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); U(*lpCacheEntryInfo).dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo,

1 0

Morten Rønne : wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: e0f93874c832f38a34b5d80a0c6f1d9da9746be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f93874c832f38a34b5d80a0… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sun Mar 25 18:45:33 2012 +0200 wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType. --- dlls/wininet/tests/urlcache.c | 80 ++++++++++++++++++++++++++++++++++------- include/wininet.h | 1 + 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c37e791..3b4627c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -347,6 +347,7 @@ static void test_urlcacheA(void) HANDLE hFile; BYTE zero_byte = 0; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo2; DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; @@ -361,7 +362,7 @@ static void test_urlcacheA(void) create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -381,9 +382,11 @@ static void test_urlcacheA(void) lpCacheEntryInfo->CacheEntryType); ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); - HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - /* A subsequent commit with a different time/type doesn't change the type */ + /* Make sure there is a notable change in timestamps */ + Sleep(1000); + + /* A subsequent commit with a different time/type doesn't change most of the entry */ GetSystemTimeAsFileTime(&now); ret = CommitUrlCacheEntry(TEST_URL1, NULL, now, now, NORMAL_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), NULL, NULL); @@ -393,26 +396,41 @@ static void test_urlcacheA(void) ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); - ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo, &cbCacheEntryInfo); + lpCacheEntryInfo2 = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ todo_wine - ok(memcmp(&lpCacheEntryInfo->ExpireTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); todo_wine - ok(memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || - broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), + ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || + broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", - lpCacheEntryInfo->CacheEntryType); + lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ todo_wine - ok(lpCacheEntryInfo->dwHeaderInfoSize == 19, - "expected headers size 19, got %d\n", - lpCacheEntryInfo->dwHeaderInfoSize); + ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, + "expected headers size 19, got %d\n", + lpCacheEntryInfo2->dwHeaderInfoSize); + /* Hit rate gets incremented by 1 */ + todo_wine + ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, + "HitRate not incremented by one on commit\n"); + /* Last access time should be updated */ + todo_wine + ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && + lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), + "Last accessed time was not updated by commit\n"); + /* File extension should be unset */ + todo_wine + ok(lpCacheEntryInfo2->lpszFileExtension == NULL, + "Fileextension isn't unset: %s\n", + lpCacheEntryInfo2->lpszFileExtension); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo2); ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); @@ -560,6 +578,18 @@ static void test_urlcacheA(void) "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); check_file_exists(filenameA); } + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + todo_wine + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + todo_wine + ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, + "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", + lpCacheEntryInfo->CacheEntryType); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pUnlockUrlCacheEntryFileA) { check_file_exists(filenameA); @@ -637,6 +667,7 @@ static void test_urlcacheA(void) ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); @@ -705,7 +736,30 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + + /* Recommit of Url entry keeps dwExemptDelta */ + U(*lpCacheEntryInfo).dwExemptDelta = 8600; + ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, + CACHE_ENTRY_EXEMPT_DELTA_FC); + ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA1, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntry(TEST_URL, filenameA1, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(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); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL); diff --git a/include/wininet.h b/include/wininet.h index 6db41ca..530a693 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1496,6 +1496,7 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 +#define DELETED_CACHE_ENTRY 0x00400000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define SPARSE_CACHE_ENTRY 0x00010000

1 0

Jacek Caban : mshtml: Remove old channel from load group in nsIAsyncVerifyRedirectCallback:: AsyncOnChannelRedirect.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 5fad02d0f16ce74ddc98af5eedb09d8be52435b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fad02d0f16ce74ddc98af5ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:26 2012 +0200 mshtml: Remove old channel from load group in nsIAsyncVerifyRedirectCallback::AsyncOnChannelRedirect. --- dlls/mshtml/navigate.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1255121..2c6d826 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1200,17 +1200,16 @@ static nsrefcnt NSAPI nsAsyncVerifyRedirectCallback_Release(nsIAsyncVerifyRedire static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAsyncVerifyRedirectCallback *iface, nsresult result) { nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); + nsChannel *old_nschannel; + nsresult nsres; TRACE("(%p)->(%08x)\n", This, result); - if(This->bsc->nschannel) - nsIHttpChannel_Release(&This->bsc->nschannel->nsIHttpChannel_iface); + old_nschannel = This->bsc->nschannel; nsIChannel_AddRef(&This->nschannel->nsIHttpChannel_iface); This->bsc->nschannel = This->nschannel; if(This->nschannel->load_group) { - nsresult nsres; - nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL); if(NS_FAILED(nsres)) @@ -1228,6 +1227,14 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs } } + if(old_nschannel) { + nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, + (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + nsIHttpChannel_Release(&old_nschannel->nsIHttpChannel_iface); + } + return NS_OK; } @@ -1480,6 +1487,8 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) hres = create_redirect_nschannel(new_url, This->nschannel, &new_channel); if(SUCCEEDED(hres)) { + TRACE("%p %p->%p\n", This, This->nschannel, new_channel); + hres = create_redirect_callback(new_channel, This, &callback); nsIChannel_Release(&new_channel->nsIHttpChannel_iface); }

1 0

Jacek Caban : mshtml: Added support for IDispatch-only ActiveX objects.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8791ce15e9e6d327d3f0c1185aaa9aed67ce592d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8791ce15e9e6d327d3f0c1185… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:42 2012 +0200 mshtml: Added support for IDispatch-only ActiveX objects. --- dlls/mshtml/pluginhost.c | 47 ++++++++++++++++++++++--------------------- dlls/mshtml/tests/activex.c | 46 +++++++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9309310..f059670 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -185,9 +185,9 @@ static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; + IOleObject *ole_obj = NULL; IOleCommandTarget *cmdtrg; IViewObjectEx *view_obj; - IOleObject *ole_obj; IDispatchEx *dispex; IDispatch *disp; RECT rect; @@ -223,29 +223,28 @@ static void activate_plugin(PluginHost *host) IQuickActivate_Release(quick_activate); if(FAILED(hres)) FIXME("QuickActivate failed: %08x\n", hres); - - load_plugin(host); }else { DWORD status = 0; hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); - if(FAILED(hres)) { - FIXME("Plugin does not support IOleObject\n"); - return; - } - - hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); - TRACE("GetMiscStatus returned %08x %x\n", hres, status); + if(SUCCEEDED(hres)) { + hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); + TRACE("GetMiscStatus returned %08x %x\n", hres, status); - hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); - IOleObject_Release(ole_obj); - if(FAILED(hres)) { - FIXME("SetClientSite failed: %08x\n", hres); - return; + hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); + IOleObject_Release(ole_obj); + if(FAILED(hres)) { + FIXME("SetClientSite failed: %08x\n", hres); + return; + } + }else { + TRACE("Plugin does not support IOleObject\n"); } + } - load_plugin(host); + load_plugin(host); + if(ole_obj) { hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IViewObjectEx, (void**)&view_obj); if(SUCCEEDED(hres)) { DWORD view_status = 0; @@ -288,11 +287,13 @@ static void activate_plugin(PluginHost *host) return; } - get_pos_rect(host, &rect); - hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); - IOleObject_Release(ole_obj); - if(FAILED(hres)) - WARN("DoVerb failed: %08x\n", hres); + if(ole_obj) { + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); + } if(host->ip_object) { HWND hwnd; @@ -390,7 +391,7 @@ HRESULT get_plugin_dispid(HTMLPluginContainer *plugin_container, WCHAR *name, DI }else if(plugin_container->props_len == plugin_container->props_size) { DISPID *new_props; - new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2); + new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2*sizeof(DISPID)); if(!new_props) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 0972392..feb178e 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -95,11 +95,13 @@ DEFINE_EXPECT(wrapped_func); enum { TEST_FLASH, - TEST_NOQUICKACT + TEST_NOQUICKACT, + TEST_DISPONLY }; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; +static BOOL no_quickact; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -1204,24 +1206,24 @@ static void init_wrapped_iface(void) static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { - *ppv = &OleControl; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleControl; }else if(IsEqualGUID(riid, &IID_IQuickActivate)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &QuickActivate; + *ppv = no_quickact ? NULL : &QuickActivate; }else if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &PersistPropertyBag; + *ppv = no_quickact ? NULL : &PersistPropertyBag; }else if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = &Dispatch; }else if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) || IsEqualGUID(riid, &IID_IViewObjectEx)) { - *ppv = &ViewObjectEx; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &ViewObjectEx; }else if(IsEqualGUID(riid, &IID_IOleObject)) { - *ppv = &OleObject; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleObject; }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { CHECK_EXPECT(QI_ITestActiveX); *ppv = &wrapped_iface; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { - *ppv = &OleInPlaceObjectWindowless; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleInPlaceObjectWindowless; }else { trace("QI %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -2081,11 +2083,18 @@ static void release_doc(IHTMLDocument2 *doc) } } +static void init_test(int behavior) +{ + plugin_behavior = behavior; + + no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; +} + static void test_flash_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_FLASH; + init_test(TEST_FLASH); /* * We pump messages until both document is loaded and plugin instance is created. @@ -2147,7 +2156,7 @@ static void test_noquickact_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_NOQUICKACT; + init_test(TEST_NOQUICKACT); SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); @@ -2188,6 +2197,23 @@ static void test_noquickact_ax(void) CHECK_CALLED(SetClientSite_NULL); } +static void test_nooleobj_ax(void) +{ + IHTMLDocument2 *doc; + + init_test(TEST_DISPONLY); + + SET_EXPECT(CreateInstance); + SET_EXPECT(Invoke_READYSTATE); + + doc = create_doc(object_ax_str, &called_CreateInstance); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Invoke_READYSTATE); + + release_doc(doc); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProc(hwnd, msg, wParam, lParam); @@ -2305,6 +2331,8 @@ START_TEST(activex) test_flash_ax(); trace("Testing plugin without IQuickActivate iface...\n"); test_noquickact_ax(); + trace("Testing plugin with IDispatch iface only...\n"); + test_nooleobj_ax(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0

Jacek Caban : mshtml: Detach also internal listeners in detach_events.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 039a9a5aad9ddc265a848b354dd021addb7ff9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039a9a5aad9ddc265a848b354… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:53 2012 +0200 mshtml: Detach also internal listeners in detach_events. --- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmlevent.c | 15 ++++++++------- dlls/mshtml/nsevents.c | 45 +++++++++++++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3cbfe8d..1d483d4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2046,8 +2046,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_events(This); if(This->body_event_target) release_event_target(This->body_event_target); - if(This->nsevent_listener) - release_nsevents(This); if(This->catmgr) ICatInformation_Release(This->catmgr); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cfba560..0950c5e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1191,15 +1191,16 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve void detach_events(HTMLDocumentNode *doc) { - int i; - - if(!doc->event_vector) - return; + if(doc->event_vector) { + int i; - for(i=0; i < EVENTID_LAST; i++) { - if(doc->event_vector[i]) - detach_nsevent(doc, event_info[i].name); + for(i=0; i < EVENTID_LAST; i++) { + if(doc->event_vector[i]) + detach_nsevent(doc, event_info[i].name); + } } + + release_nsevents(doc); } diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d4cdc10..542b8c7 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -37,6 +37,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const PRUnichar blurW[] = {'b','l','u','r',0}; +static const PRUnichar focusW[] = {'f','o','c','u','s',0}; +static const PRUnichar keypressW[] = {'k','e','y','p','r','e','s','s',0}; +static const PRUnichar loadW[] = {'l','o','a','d',0}; + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; @@ -363,7 +368,7 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ nsIDOMEventTarget_Release(target); } -void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventListener *listener, cpp_bool is_capture) { nsIDOMEventTarget *target; nsAString type_str; @@ -380,22 +385,35 @@ void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, - &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, TRUE); + &listener->nsIDOMEventListener_iface, is_capture); nsAString_Finish(&type_str); nsIDOMEventTarget_Release(target); if(NS_FAILED(nsres)) ERR("RemoveEventTarget failed: %08x\n", nsres); } +void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +{ + detach_nslistener(doc, type, &doc->nsevent_listener->htmlevent_listener, TRUE); +} + void release_nsevents(HTMLDocumentNode *doc) { + nsDocumentEventListener *listener = doc->nsevent_listener; + TRACE("%p %p\n", doc, doc->nsevent_listener); - if(doc->nsevent_listener) { - doc->nsevent_listener->doc = NULL; - release_listener(doc->nsevent_listener); - doc->nsevent_listener = NULL; - } + if(!listener) + return; + + detach_nslistener(doc, blurW, &listener->blur_listener, TRUE); + detach_nslistener(doc, focusW, &listener->focus_listener, TRUE); + detach_nslistener(doc, keypressW, &listener->keypress_listener, FALSE); + detach_nslistener(doc, loadW, &listener->load_listener, TRUE); + + listener->doc = NULL; + release_listener(listener); + doc->nsevent_listener = NULL; } void init_nsevents(HTMLDocumentNode *doc) @@ -404,11 +422,6 @@ void init_nsevents(HTMLDocumentNode *doc) nsIDOMEventTarget *target; nsresult nsres; - static const PRUnichar wsz_blur[] = {'b','l','u','r',0}; - static const PRUnichar wsz_focus[] = {'f','o','c','u','s',0}; - static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; - static const PRUnichar wsz_load[] = {'l','o','a','d',0}; - listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) return; @@ -432,10 +445,10 @@ void init_nsevents(HTMLDocumentNode *doc) return; } - init_event(target, wsz_blur, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, wsz_focus, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, wsz_keypress, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); - init_event(target, wsz_load, &listener->load_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, keypressW, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, loadW, &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); }

1 0

Alexandre Julliard : msvcrt: Use macros to define exception type info structures.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 04ccf4f1004446512adf97e9be8931a632db1cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ccf4f1004446512adf97e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:47:06 2012 +0200 msvcrt: Use macros to define exception type info structures. --- dlls/msvcrt/cpp.c | 114 +++++++++++++++-------------------------------------- 1 files changed, 32 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 6f5f0a5..9564ff3 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -746,94 +746,44 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#define DEFINE_EXCEPTION_TYPE_INFO(name, base_classes, cl1, cl2) \ +static const cxx_type_info name ## _cxx_type_info = \ +{ \ + 0, \ + &name ## _type_info, \ + { 0, -1, 0 }, \ + sizeof(name), \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## name ## _copy_ctor) \ +}; \ +\ +static const cxx_type_info_table name ## _type_info_table = \ +{ \ + base_classes+1, \ + { \ + &name ## _cxx_type_info, \ + cl2, \ + cl1 \ + } \ +}; \ +\ +const cxx_exception_type name ## _exception_type = \ +{ \ + 0, \ + (void *)THISCALL(MSVCRT_ ## name ## _dtor), \ + NULL, \ + &name ## _type_info_table \ +} + DEFINE_RTTI_DATA( type_info, 0, NULL, NULL, ".?AVtype_info@@" ); DEFINE_RTTI_DATA( exception, 0, NULL, NULL, ".?AVexception@@" ); DEFINE_RTTI_DATA( bad_typeid, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_typeid@@" ); DEFINE_RTTI_DATA( bad_cast, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_cast@@" ); DEFINE_RTTI_DATA( __non_rtti_object, 2, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ); -static const cxx_type_info exception_cxx_type_info = -{ - 0, - &exception_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_exception_copy_ctor) -}; - -static const cxx_type_info bad_typeid_cxx_type_info = -{ - 0, - &bad_typeid_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_typeid_copy_ctor) -}; - -static const cxx_type_info bad_cast_cxx_type_info = -{ - 0, - &bad_cast_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_cast_copy_ctor) -}; - -static const cxx_type_info __non_rtti_object_cxx_type_info = -{ - 0, - &__non_rtti_object_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT___non_rtti_object_copy_ctor) -}; - -/* - * Exception RTTI for cpp objects - */ -static const cxx_type_info_table bad_cast_type_info_table = -{ - 3, - { - &__non_rtti_object_cxx_type_info, - &bad_typeid_cxx_type_info, - &exception_cxx_type_info - } -}; - -static const cxx_exception_type bad_cast_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_cast_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_type_info_table bad_typeid_type_info_table = -{ - 2, - { - &bad_cast_cxx_type_info, - &exception_cxx_type_info, - NULL - } -}; - -static const cxx_exception_type bad_typeid_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_typeid_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_exception_type __non_rtti_object_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT___non_rtti_object_dtor), - NULL, - &bad_typeid_type_info_table -}; +DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ); /******************************************************************

1 0

Andrew Eikum : winealsa.drv: Prefix device names with direction indication.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: ea231aba407dcb90ba463ba3114be8e84617e8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea231aba407dcb90ba463ba31… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 4 13:15:33 2012 -0500 winealsa.drv: Prefix device names with direction indication. --- dlls/winealsa.drv/mmdevdrv.c | 79 ++++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 25 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a3ac27b..c99186b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -339,11 +339,60 @@ static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) return TRUE; } +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const char *chunk2) +{ + WCHAR *ret; + const WCHAR *prefix; + DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len; + + static const WCHAR dashW[] = {' ','-',' ',0}; + static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + + if(flow == eRender){ + prefix = outW; + prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + len_wchars += prefix_len; + }else{ + prefix = inW; + prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + len_wchars += prefix_len; + } + if(chunk1){ + chunk1_len = strlenW(chunk1); + len_wchars += chunk1_len; + } + if(chunk1 && chunk2) + len_wchars += dashW_len; + if(chunk2) + len_wchars += MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, NULL, 0) - 1; + len_wchars += 1; /* NULL byte */ + + ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); + + memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); + copied += prefix_len; + if(chunk1){ + memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); + copied += chunk1_len; + } + if(chunk1 && chunk2){ + memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); + copied += dashW_len; + } + if(chunk2){ + MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, ret + copied, len_wchars - copied); + }else + ret[copied] = 0; + + return ret; +} + static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids, GUID *guids, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { - static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; @@ -377,8 +426,6 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, continue; if(ids && guids){ - DWORD len, cardlen; - devname = snd_pcm_info_get_name(info); if(!devname){ WARN("Unable to get device name for card %d, device %d\n", card, @@ -386,21 +433,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, continue; } - cardlen = lstrlenW(cardnameW); - len = MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, NULL, 0); - len += lstrlenW(dashW); - len += cardlen; - ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!ids[*num]){ - HeapFree(GetProcessHeap(), 0, info); - return E_OUTOFMEMORY; - } - memcpy(ids[*num], cardnameW, cardlen * sizeof(WCHAR)); - memcpy(ids[*num] + cardlen, dashW, lstrlenW(dashW) * sizeof(WCHAR)); - cardlen += lstrlenW(dashW); - MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, ids[*num] + cardlen, - len - cardlen); - + ids[*num] = construct_device_id(flow, cardnameW, devname); get_device_guid(flow, devnode, &guids[*num]); } @@ -423,7 +456,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; HKEY key; WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type, len; + DWORD size = sizeof(reg_devices), type; const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ @@ -445,10 +478,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids if(alsa_try_open(devname, stream)){ if(ids && guids){ - len = lstrlenW(p) + 1; - ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(ids[*num], p, len * sizeof(WCHAR)); - + ids[*num] = construct_device_id(flow, p, NULL); get_device_guid(flow, devname, &guids[*num]); } ++*num; @@ -474,8 +504,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, if(alsa_try_open(defname, stream)){ if(ids && guids){ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - memcpy(*ids, defaultW, sizeof(defaultW)); + *ids = construct_device_id(flow, defaultW, NULL); get_device_guid(flow, defname, guids); } ++*num;

1 0

Andrew Eikum : wineoss.drv: Prefix device names with direction indication.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 81ca5d09b6b4f488c57bc958009bd89981119385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ca5d09b6b4f488c57bc9580… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 4 13:16:09 2012 -0500 wineoss.drv: Prefix device names with direction indication. --- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d8e6468..70ea416 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -458,6 +458,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, oss_sysinfo sysinfo; static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); mixer_fd = open("/dev/mixer", O_RDONLY, 0); @@ -536,7 +539,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len; + size_t len, prefix_len; + const WCHAR *prefix; dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); @@ -547,6 +551,15 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, (*guids)[*num] = dev_item->guid; len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); + if(flow == eRender){ + prefix = outW; + prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + len += prefix_len; + }else{ + prefix = inW; + prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + len += prefix_len; + } (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if(!(*ids)[*num]){ @@ -558,8 +571,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, close(mixer_fd); return E_OUTOFMEMORY; } + memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num], len); + (*ids)[*num] + prefix_len, len - prefix_len); list_add_tail(&g_devices, &dev_item->entry);

1 0

Henri Verbeet : wined3d: Properly determine the viewport size for front buffer blits in SetupForBlit ().
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: baff64a27aa18dd76b17017b4977dc22aa3ebad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baff64a27aa18dd76b17017b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:20 2012 +0200 wined3d: Properly determine the viewport size for front buffer blits in SetupForBlit(). --- dlls/wined3d/context.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7d16d3c..bba4112 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1638,6 +1638,26 @@ static void set_blit_dimension(UINT width, UINT height) checkGLcall("glViewport"); } +static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) +{ + const struct wined3d_surface *rt = context->current_rt; + + if (rt->container.type == WINED3D_CONTAINER_SWAPCHAIN + && rt->container.u.swapchain->front_buffer == rt) + { + RECT window_size; + + GetClientRect(context->win_handle, &window_size); + size->cx = window_size.right - window_size.left; + size->cy = window_size.bottom - window_size.top; + + return; + } + + size->cx = rt->resource.width; + size->cy = rt->resource.height; +} + /***************************************************************************** * SetupForBlit * @@ -1659,21 +1679,24 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con { int i; const struct wined3d_gl_info *gl_info = context->gl_info; - UINT width = context->current_rt->resource.width; - UINT height = context->current_rt->resource.height; DWORD sampler; + SIZE rt_size; TRACE("Setting up context %p for blitting\n", context); - if(context->last_was_blit) { - if(context->blit_w != width || context->blit_h != height) { + + context_get_rt_size(context, &rt_size); + + if (context->last_was_blit) + { + if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + { ENTER_GL(); - set_blit_dimension(width, height); + set_blit_dimension(rt_size.cx, rt_size.cy); LEAVE_GL(); - context->blit_w = width; context->blit_h = height; - /* No need to dirtify here, the states are still dirtified because they weren't - * applied since the last SetupForBlit call. Otherwise last_was_blit would not - * be set - */ + context->blit_w = rt_size.cx; + context->blit_h = rt_size.cy; + /* No need to dirtify here, the states are still dirtified because + * they weren't applied since the last SetupForBlit() call. */ } TRACE("Context is already set up for blitting, nothing to do\n"); return; @@ -1839,12 +1862,13 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); - set_blit_dimension(width, height); + set_blit_dimension(rt_size.cx, rt_size.cy); device->frag_pipe->enable_extension(FALSE); LEAVE_GL(); - context->blit_w = width; context->blit_h = height; + context->blit_w = rt_size.cx; + context->blit_h = rt_size.cy; context_invalidate_state(context, STATE_VIEWPORT); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); }

1 0