wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Alexandre Julliard : wininet/tests: Update test data location to test. winehq.org/tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ac6a5a6355cc5ad1c9efa393835300d224a85cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a5a6355cc5ad1c9efa3938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:43:19 2011 +0100 wininet/tests: Update test data location to test.winehq.org/tests. --- dlls/wininet/tests/http.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 95a5779..980a809 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define TEST_URL "http://test.winehq.org/hello.html" +#define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; @@ -121,10 +121,10 @@ typedef struct { static const test_data_t test_data[] = { { - "http://test.winehq.org/testredirect", - "http://test.winehq.org/hello.html", + "http://test.winehq.org/tests/redirect", + "http://test.winehq.org/tests/hello.html", "test.winehq.org", - "/testredirect", + "/tests/redirect", "", TESTF_REDIRECT }, @@ -629,7 +629,7 @@ static void InternetReadFile_chunked_test(void) if (hic == 0x0) goto abort; trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testchunked", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -748,7 +748,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -1150,7 +1150,7 @@ static void test_http_cache(void) INTERNET_SERVICE_HTTP, 0, 0); ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); - request = HttpOpenRequestA(connect, NULL, "/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); + request = HttpOpenRequestA(connect, NULL, "/tests/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { skip( "Network unreachable, skipping test\n" ); @@ -1165,7 +1165,7 @@ static void test_http_cache(void) size = sizeof(url); ret = InternetQueryOptionA(request, INTERNET_OPTION_URL, url, &size); ok(ret, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(url, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", url); + ok(!strcmp(url, "http://test.winehq.org/tests/hello.html"), "Wrong URL %s\n", url); size = sizeof(file_name); ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); @@ -2913,7 +2913,7 @@ static void test_user_agent_header(void) con = InternetConnect(ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequest(con, "GET", "/tests/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); size = sizeof(buffer);

1 0

André Hentschel : advapi32/tests: Add some skips.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: e2a3b4b4e59d519d07be925c057aa3e82ff1a8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a3b4b4e59d519d07be925c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 13 15:32:59 2011 +0100 advapi32/tests: Add some skips. --- dlls/advapi32/tests/registry.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2809559..91164bd 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2064,8 +2064,13 @@ static void test_classesroot(void) delete_key( hkey ); RegCloseKey( hkey ); } - if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, - KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a user class\n"); + return; + } /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2075,7 +2080,7 @@ static void test_classesroot(void) "test key not found in hkcr: %d\n", res); if (res) { - trace( "HKCR key merging not supported\n" ); + skip("HKCR key merging not supported\n"); delete_key( hkey ); RegCloseKey( hkey ); return;

1 0

André Hentschel : ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 42d3bd713d9575a393a1a7d909d72a56d1e5f10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d3bd713d9575a393a1a7d90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 22:27:32 2011 +0100 ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE. --- dlls/ws2_32/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1993419..9469d30 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3483,6 +3483,10 @@ INT WINAPI WSAIoctl(SOCKET s, HeapFree(GetProcessHeap(), 0, ipAddrTable); return 0; } + case WS_SIO_SET_COMPATIBILITY_MODE: + TRACE("WS_SIO_SET_COMPATIBILITY_MODE ignored\n"); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break;

1 0

André Hentschel : kernel32/tests: Fix a test for real hardware.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 27ae573806cc541a63288884f29483905da80c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae573806cc541a63288884f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 13:41:47 2011 +0100 kernel32/tests: Fix a test for real hardware. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index fab01dc..25b55ac 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -865,7 +865,7 @@ static VOID test_thread_processor(void) } error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); - ok(error==0, "SetThreadIdealProcessor returned an incorrect value\n"); + ok(error!=-1, "SetThreadIdealProcessor failed\n"); } }

1 0

André Hentschel : ntoskrnl.exe: Add more mutex stubs.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: bd456a926cbfb1dbe1ff003e7f7805ab45a9a522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd456a926cbfb1dbe1ff003e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 13:40:31 2011 +0100 ntoskrnl.exe: Add more mutex stubs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 27c5f7a..a697751 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1099,6 +1099,27 @@ void WINAPI KeInitializeMutex(PRKMUTEX Mutex, ULONG Level) } + /*********************************************************************** + * KeWaitForMutexObject (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForMutexObject(PRKMUTEX Mutex, KWAIT_REASON WaitReason, KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, PLARGE_INTEGER Timeout) +{ + FIXME( "stub: %p, %d, %d, %d, %p\n", Mutex, WaitReason, WaitMode, Alertable, Timeout ); + return STATUS_NOT_IMPLEMENTED; +} + + + /*********************************************************************** + * KeReleaseMutex (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReleaseMutex(PRKMUTEX Mutex, BOOLEAN Wait) +{ + FIXME( "stub: %p, %d\n", Mutex, Wait ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * KeInitializeSemaphore (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6d645ad..ed0059e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,7 +587,7 @@ @ stub KeRegisterBugCheckReasonCallback @ stub KeReleaseInterruptSpinLock @ stub KeReleaseMutant -@ stub KeReleaseMutex +@ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @@ -628,7 +628,7 @@ @ stub KeUpdateSystemTime @ stub KeUserModeCallback @ stub KeWaitForMultipleObjects -@ stub KeWaitForMutexObject +@ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError

1 0

Marcus Meissner : quartz: Removed const from const REFIID (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 82cd229cc2143b5111dc136e9e29c1e4fd84bc0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cd229cc2143b5111dc136e9… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:32:52 2011 +0100 quartz: Removed const from const REFIID (Coverity). --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d472145..f172d87 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1534,7 +1534,7 @@ static DSoundRenderImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (DSoundRenderImpl*)((char*)iface - offsetof(DSoundRenderImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { DSoundRenderImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d458144..6093713 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1357,7 +1357,7 @@ static AsyncReader *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (AsyncReader*)((char*)iface - offsetof(AsyncReader, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { AsyncReader *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index cdc7621..f4486c4 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -478,7 +478,7 @@ static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { NullRendererImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 86b9f2a..cf6fc2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -2202,7 +2202,7 @@ static VideoRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (VideoRendererImpl*)((char*)iface - offsetof(VideoRendererImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); }

1 0

Marcus Meissner : mshtml: Removed duplicate const (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 63b05794a7c64b1f1a3db67695ecd4ab3a287880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b05794a7c64b1f1a3db6769… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:28:42 2011 +0100 mshtml: Removed duplicate const (Coverity). --- dlls/mshtml/tests/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 241342b..486acce 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -101,7 +101,7 @@ static const char object_ax_str[] = "</object>" "</body></html>"; -static const REFIID pluginhost_iids[] = { +static REFIID pluginhost_iids[] = { &IID_IOleClientSite, &IID_IAdviseSink, &IID_IAdviseSinkEx,

1 0

Jacek Caban : mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement:: get_src.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0ef8f70e114fcba6845b8b3cab25fdc405efc297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef8f70e114fcba6845b8b3ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:07:09 2011 +0100 mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement::get_src. --- dlls/mshtml/htmlimg.c | 22 ++++++++++++++++------ dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 1008f87..1fb0e83 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -287,21 +287,31 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) const PRUnichar *src; nsAString src_str; nsresult nsres; - HRESULT hres; + HRESULT hres = S_OK; + + static const WCHAR blockedW[] = {'B','L','O','C','K','E','D',':',':',0}; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&src_str, NULL); nsres = nsIDOMHTMLImageElement_GetSrc(This->nsimg, &src_str); - if(NS_FAILED(nsres)) { + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&src_str, &src); + + if(!strncmpiW(src, blockedW, sizeof(blockedW)/sizeof(WCHAR)-1)) { + TRACE("returning BLOCKED::\n"); + *p = SysAllocString(blockedW); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + hres = nsuri_to_url(src, TRUE, p); + } + }else { ERR("GetSrc failed: %08x\n", nsres); - return E_FAIL; + hres = E_FAIL; } - nsAString_GetData(&src_str, &src); - hres = nsuri_to_url(src, TRUE, p); nsAString_Finish(&src_str); - return hres; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ec6c7e8..64e0cf2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2161,8 +2161,8 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ok(l == l2, "unexpected left %d, expected %d\n", l2, l); } -#define test_img_src(i,s) _test_img_src(__LINE__,i,s) -static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) +#define test_img_src(a,b,c) _test_img_src(__LINE__,a,b,c) +static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc, const char *broken_src) { IHTMLImgElement *img = _get_img_iface(line, unk); BSTR src; @@ -2171,7 +2171,8 @@ static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) hres = IHTMLImgElement_get_src(img, &src); IHTMLImgElement_Release(img); ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); - ok_(__FILE__,line) (!strcmp_wa(src, exsrc), "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); + ok_(__FILE__,line) (!strcmp_wa(src, exsrc) || (broken_src && broken(!strcmp_wa(src, broken_src))), + "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); SysFreeString(src); } @@ -2187,8 +2188,6 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) IHTMLImgElement_Release(img); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); - - _test_img_src(line, unk, src); } #define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) @@ -6574,8 +6573,9 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "imgid", TRUE); if(elem) { - test_img_src((IUnknown*)elem, ""); + test_img_src((IUnknown*)elem, "", NULL); test_img_set_src((IUnknown*)elem, "about:blank"); + test_img_src((IUnknown*)elem, "about:blank", NULL); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); @@ -6852,6 +6852,31 @@ static void test_attr(IHTMLElement *elem) IHTMLDOMAttribute_Release(attr); } +static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) +{ + IHTMLElement *elem; + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKED::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKE::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "blocke::http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "BLOCKED:http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "blocked:http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "blocked::http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6913,6 +6938,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_attr(div); test_style_filters(div); + test_blocked(doc, div); IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml: Reimplement nsIURI::SetScheme on top of IUri.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: cdb7bc451b942be8e783c29ca9113af774e4088b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7bc451b942be8e783c29ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:06:37 2011 +0100 mshtml: Reimplement nsIURI::SetScheme on top of IUri. --- dlls/mshtml/nsio.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 327b191..016356d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1725,16 +1725,27 @@ static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) { nsWineURI *This = impl_from_nsIURL(iface); + const char *schemea; + WCHAR *scheme; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aScheme)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetScheme(This->nsuri, aScheme); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aScheme, &schemea); + scheme = heap_strdupAtoW(schemea); + if(!scheme) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetSchemeName(This->uri_builder, scheme); + heap_free(scheme); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass)

1 0

Alexandre Julliard : configure: Improve check for security framework and don' t warn about gnutls in that case.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 45db3481f4d9ef7290eab9c2d29e5e3904cd16ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=45db3481f4d9ef7290eab9c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 14:25:45 2011 +0100 configure: Improve check for security framework and don't warn about gnutls in that case. --- configure | 12 ++++++++---- configure.ac | 6 +++++- dlls/crypt32/rootstore.c | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3651711..8790041 100755 --- a/configure +++ b/configure @@ -657,12 +657,12 @@ QUICKTIMELIB LIBOPENCL FRAMEWORK_OPENAL COREAUDIO +SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS APPLICATIONSERVICESLIB IOKITLIB COREFOUNDATIONLIB -SECURITYLIB DLLWRAP DLLTOOL LDD @@ -6519,9 +6519,7 @@ fi LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" - SECURITYLIB="-framework Security -framework CoreFoundation" - - COREFOUNDATIONLIB="-framework CoreFoundation" + COREFOUNDATIONLIB="-framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation" @@ -6534,6 +6532,12 @@ fi DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + SECURITYLIB="-framework Security -framework CoreFoundation" + + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/configure.ac b/configure.ac index 8314579..b16b9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -703,7 +703,6 @@ case $host_os in STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" dnl declare needed frameworks - AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") @@ -713,6 +712,11 @@ case $host_os in dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation") fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 506497a..c6f106e 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -40,7 +40,7 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #endif @@ -746,7 +746,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) DWORD i; BOOL ret = FALSE; -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H OSStatus status; CFArrayRef rootCerts;

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011