November 2011 - Wine-commits

Matteo Bruni : wined3d: Make a copy of gl_info for later context_destroy_gl_resources() usage.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 1fd18d768845ab8ec965a57c5a8783aba1cc0c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd18d768845ab8ec965a57c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 14:21:08 2011 +0100 wined3d: Make a copy of gl_info for later context_destroy_gl_resources() usage. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 355dccf..9b0ae05 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1027,6 +1027,7 @@ BOOL context_set_current(struct wined3d_context *ctx) { TRACE("Switching away from destroyed context %p.\n", old); context_destroy_gl_resources(old); + HeapFree(GetProcessHeap(), 0, (void *)old->gl_info); HeapFree(GetProcessHeap(), 0, old); } else @@ -1603,6 +1604,11 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont } else { + /* Make a copy of gl_info for context_destroy_gl_resources use, the one + in wined3d_adapter may go away in the meantime */ + struct wined3d_gl_info *gl_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*gl_info)); + *gl_info = *context->gl_info; + context->gl_info = gl_info; context->destroyed = 1; destroy = FALSE; }

1 0

Matteo Bruni : wined3d: Disable WINED3DFMT_B8G8R8_UNORM.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 151cf2696bd96095dcc4962de3b58c821c75399f URL: http://source.winehq.org/git/wine.git/?a=commit;h=151cf2696bd96095dcc4962de… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 15:16:56 2011 +0100 wined3d: Disable WINED3DFMT_B8G8R8_UNORM. --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ad79276..8846576 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3406,7 +3406,9 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const /***** * supported: RGB(A) formats */ - case WINED3DFMT_B8G8R8_UNORM: /* Enable for dx7, blacklisted for 8 and 9 above */ + case WINED3DFMT_B8G8R8_UNORM: + TRACE_(d3d_caps)("[FAILED] - Not enumerated on Windows\n"); + return FALSE; case WINED3DFMT_B8G8R8A8_UNORM: case WINED3DFMT_B8G8R8X8_UNORM: case WINED3DFMT_B5G6R5_UNORM: @@ -3677,6 +3679,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, switch (check_format->id) { case WINED3DFMT_B8G8R8_UNORM: + TRACE_(d3d_caps)("[FAILED] - Not enumerated on Windows\n"); + return FALSE; case WINED3DFMT_B8G8R8A8_UNORM: case WINED3DFMT_B8G8R8X8_UNORM: case WINED3DFMT_B5G6R5_UNORM:

1 0

Matteo Bruni : d3d8: Remove D3DFMT_R8G8B8 special handling.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 77fa1a5c67527f46cd3d76fb2260bfa84ca2a757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fa1a5c67527f46cd3d76fb2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 15:16:57 2011 +0100 d3d8: Remove D3DFMT_R8G8B8 special handling. --- dlls/d3d8/directx.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7618c0a..b40895e 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -229,14 +229,6 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat(LPDIRECT3D8 iface, UINT A TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); - if(CheckFormat == D3DFMT_R8G8B8) - { - /* See comment in dlls/d3d9/directx.c, IDirect3D9Impl_CheckDeviceFormat for details */ - WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n"); - return D3DERR_NOTAVAILABLE; - } - - switch(RType) { case D3DRTYPE_VERTEXBUFFER: case D3DRTYPE_INDEXBUFFER:

1 0

Matteo Bruni : d3d9: Remove D3DFMT_R8G8B8 special handling.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 276216360e91ab8b987fc23d5a63cf16cd2eea27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276216360e91ab8b987fc23d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 15:16:58 2011 +0100 d3d9: Remove D3DFMT_R8G8B8 special handling. --- dlls/d3d9/directx.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b356d13..1770239 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -238,18 +238,6 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(IDirect3D9Ex *iface, UINT TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); - /* This format is nothing special and it is supported perfectly. - * However, ati and nvidia driver on windows do not mark this format as - * supported (tested with the dxCapsViewer) and pretending to - * support this format uncovers a bug in Battlefield 1942 (fonts are missing) - * So do the same as Windows drivers and pretend not to support it on dx8 and 9 - */ - if(CheckFormat == D3DFMT_R8G8B8) - { - WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n"); - return D3DERR_NOTAVAILABLE; - } - switch(RType) { case D3DRTYPE_VERTEXBUFFER: case D3DRTYPE_INDEXBUFFER:

1 0

Piotr Caban : msvcrt: Don't hold FILE critical section in some functions.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: e4ac347075b1cb35a3ba3317ce7abbbd34ce2b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ac347075b1cb35a3ba3317c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 15:25:42 2011 +0100 msvcrt: Don't hold FILE critical section in some functions. --- dlls/msvcrt/file.c | 39 ++++++--------------------------------- 1 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 07fed45..0ead68a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1348,15 +1348,8 @@ __int64 CDECL MSVCRT__filelengthi64(int fd) */ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) { - int ret; - TRACE(":FILE* (%p) fd (%d)\n",file,file->_file); - - MSVCRT__lock_file(file); - ret = file->_file; - MSVCRT__unlock_file(file); - - return ret; + return file->_file; } /********************************************************************* @@ -2631,13 +2624,7 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) */ int CDECL MSVCRT_feof(MSVCRT_FILE* file) { - int ret; - - MSVCRT__lock_file(file); - ret = file->_flag & MSVCRT__IOEOF; - MSVCRT__unlock_file(file); - - return ret; + return file->_flag & MSVCRT__IOEOF; } /********************************************************************* @@ -2645,13 +2632,7 @@ int CDECL MSVCRT_feof(MSVCRT_FILE* file) */ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) { - int ret; - - MSVCRT__lock_file(file); - ret = file->_flag & MSVCRT__IOERR; - MSVCRT__unlock_file(file); - - return ret; + return file->_flag & MSVCRT__IOERR; } /********************************************************************* @@ -3117,25 +3098,20 @@ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) */ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { - MSVCRT__lock_file(file); - /* Flush output buffer */ if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { msvcrt_alloc_buffer(file); } if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { + if(file->_flag & MSVCRT__IORW) file->_flag |= MSVCRT__IOWRT; - } else { - MSVCRT__unlock_file(file); + else return MSVCRT_EOF; - } } if(file->_bufsiz) { int res=msvcrt_flush_buffer(file); if(!res) res = MSVCRT_fputc(c, file); - MSVCRT__unlock_file(file); return res; } else { unsigned char cc=c; @@ -3143,12 +3119,9 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) /* set _cnt to 0 for unbuffered FILEs */ file->_cnt = 0; len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) { - MSVCRT__unlock_file(file); + if (len == 1) return c & 0xff; - } file->_flag |= MSVCRT__IOERR; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } }

1 0

Andrew Eikum : dsound: Don't specify period size for the IAudioClient.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: c59ecdcefb2b4e16182e9c2090db11fc00640ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59ecdcefb2b4e16182e9c209… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 15 08:48:30 2011 -0600 dsound: Don't specify period size for the IAudioClient. We don't actually care what period size gets used (in fact, docs say the parameter is entirely ignored in Shared mode). --- dlls/dsound/primary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c170358..3b61562 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -119,7 +119,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) hres = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - prebuf_rt, 50000, device->pwfx, NULL); + prebuf_rt, 0, device->pwfx, NULL); if(FAILED(hres)){ IAudioClient_Release(device->client); device->client = NULL;

1 0

Jacek Caban : urlmon: Fixed protocol tests on IE9.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9c464ca3cbff96e0f4339c2cb4ae2678c1f0b6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c464ca3cbff96e0f4339c2cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 19:20:54 2011 +0100 urlmon: Fixed protocol tests on IE9. --- dlls/urlmon/bindprot.c | 1 + dlls/urlmon/tests/protocol.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index cfb5cec..7c2aca6 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -203,6 +203,7 @@ static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_fi return hres; } + /* NOTE: IE9 calls it on the new protocol_sink. It doesn't make sense to is seems to be a bug there. */ IInternetProtocolSink_ReportProgress(old_sink, BINDSTATUS_LOADINGMIMEHANDLER, NULL); IInternetProtocolSink_Release(old_sink); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 52da99b..87be3fe 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -112,7 +112,6 @@ DEFINE_EXPECT(UnlockRequest); DEFINE_EXPECT(Abort); DEFINE_EXPECT(MimeFilter_CreateInstance); DEFINE_EXPECT(MimeFilter_Start); -DEFINE_EXPECT(MimeFilter_ReportProgress); DEFINE_EXPECT(MimeFilter_ReportData); DEFINE_EXPECT(MimeFilter_ReportResult); DEFINE_EXPECT(MimeFilter_Terminate); @@ -1043,7 +1042,20 @@ static HRESULT WINAPI MimeProtocolSink_Switch(IInternetProtocolSink *iface, PROT static HRESULT WINAPI MimeProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - CHECK_EXPECT(MimeFilter_ReportProgress); + switch(ulStatusCode) { + case BINDSTATUS_LOADINGMIMEHANDLER: + /* + * IE9 for some reason (bug?) calls this on mime handler's protocol sink instead of the + * main protocol sink. We check ReportProgress_LOADINGMIMEHANDLER both here and in + * ProtocolSink_ReportProgress to workaround it. + */ + CHECK_EXPECT(ReportProgress_LOADINGMIMEHANDLER); + ok(!szStatusText, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + break; + default: + ok(0, "Unexpected status code %d\n", ulStatusCode); + } + return S_OK; } @@ -1742,6 +1754,7 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocolEx *iface, if(pr == 200) { if(!mimefilter_test) SET_EXPECT(Read); /* checked in BINDSTATUS_MIMETYPEAVAILABLE or ReportData */ + SET_EXPECT(GetBindInfo); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); } if(pr >= 200) @@ -1759,6 +1772,7 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocolEx *iface, if(!short_read && pr < 200) CHECK_CALLED(Read); if(pr == 200) { + CLEAR_CALLED(GetBindInfo); /* IE9 */ CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); } }else { @@ -1816,6 +1830,7 @@ static HRESULT WINAPI ProtocolEmul_Read(IInternetProtocolEx *iface, void *pv, prot_state = 4; if(short_read) { SET_EXPECT(Read2); /* checked in BINDSTATUS_MIMETYPEAVAILABLE */ + SET_EXPECT(GetBindInfo); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); } if(mimefilter_test) @@ -1827,8 +1842,10 @@ static HRESULT WINAPI ProtocolEmul_Read(IInternetProtocolEx *iface, void *pv, BSCF_LASTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION, 0, 0); read_report_data--; ok(hres == S_OK, "ReportData failed: %08x\n", hres); - if(short_read) + if(short_read) { + CLEAR_CALLED(GetBindInfo); /* IE9 */ CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + } if(mimefilter_test) CHECK_CALLED(MimeFilter_ReportData); else if(direct_read)

1 0

Jacek Caban : mshtml: Split setting window URI from set_current_mon.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: bc701d59652ccefca78fd67a8255829f570af95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc701d59652ccefca78fd67a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:12 2011 +0100 mshtml: Split setting window URI from set_current_mon. --- dlls/mshtml/persist.c | 51 ++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 3107e92..ad7f4a6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -70,9 +70,31 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } +static void set_current_uri(HTMLWindow *window, IUri *uri) +{ + if(window->uri) { + IUri_Release(window->uri); + window->uri = NULL; + } + + if(window->url) { + SysFreeString(window->url); + window->url = NULL; + } + + if(!uri) + return; + + IUri_AddRef(uri); + window->uri = uri; + + IUri_GetDisplayUri(uri, &window->url); +} + void set_current_mon(HTMLWindow *This, IMoniker *mon) { IUriContainer *uri_container; + IUri *uri = NULL; HRESULT hres; if(This->mon) { @@ -80,15 +102,6 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) This->mon = NULL; } - if(This->uri) { - IUri_Release(This->uri); - This->uri = NULL; - } - - if(This->url) { - SysFreeString(This->url); - This->url = NULL; - } if(!mon) return; @@ -98,23 +111,26 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); if(SUCCEEDED(hres)) { - hres = IUriContainer_GetIUri(uri_container, &This->uri); + hres = IUriContainer_GetIUri(uri_container, &uri); IUriContainer_Release(uri_container); if(hres != S_OK) { WARN("GetIUri failed: %08x\n", hres); - This->uri = NULL; + uri = NULL; } } - if(!This->uri) { + if(!uri) { WCHAR *url; hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); if(SUCCEEDED(hres)) { - hres = CreateUri(url, 0, 0, &This->uri); + hres = CreateUri(url, 0, 0, &uri); if(FAILED(hres)) { WARN("CrateUri failed: %08x\n", hres); + set_current_uri(This, NULL); This->url = SysAllocString(url); + CoTaskMemFree(url); + return; } CoTaskMemFree(url); }else { @@ -122,12 +138,9 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) } } - if(!This->url && This->uri) { - hres = IUri_GetDisplayUri(This->uri, &This->url); - if(FAILED(hres)) - WARN("GetDisplayUri failed: %08x\n", hres); - } - + set_current_uri(This, uri); + if(uri) + IUri_Release(uri); set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); }

1 0

Jacek Caban : mshtml: Properly implement nsIURI::CloneIgnoreRef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9751e3c65f2ba87f52879d8095d395cb71b5f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9751e3c65f2ba87f52879d809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:12 2011 +0100 mshtml: Properly implement nsIURI::CloneIgnoreRef. --- dlls/mshtml/nsio.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7b6bb78..547f258 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -86,6 +86,33 @@ static BOOL ensure_uri(nsWineURI *This) return TRUE; } +static IUri *get_uri_nofrag(IUri *uri) +{ + IUriBuilder *uri_builder; + IUri *ret; + BOOL b; + HRESULT hres; + + hres = IUri_HasProperty(uri, Uri_PROPERTY_FRAGMENT, &b); + if(SUCCEEDED(hres) && !b) { + IUri_AddRef(uri); + return uri; + } + + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NULL; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &ret); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NULL; + + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2232,13 +2259,6 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return NS_OK; } -static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p)\n", This, _retval); - return nsIURL_Clone(&This->nsIURL_iface, _retval); -} - static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePath, nsACString *_retval) { @@ -2314,6 +2334,33 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *wine_uri; + IUri *uri; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, _retval); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + uri = get_uri_nofrag(This->uri); + if(!uri) + return NS_ERROR_FAILURE; + + nsres = create_nsuri(uri, NULL, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + IUri_Release(uri); + if(NS_FAILED(nsres)) { + WARN("create_nsuri failed: %08x\n", nsres); + return nsres; + } + + *_retval = (nsIURI*)&wine_uri->nsIURL_iface; + return NS_OK; +} + static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIURL *iface, nsACString *aSpecIgnoringRef) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Jacek Caban : mshtml: Properly implement nsIURI::EqualsExceptRef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 7b5125ac02e309dc4ee8f97b2190ae33c68ca42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5125ac02e309dc4ee8f97b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:22 2011 +0100 mshtml: Properly implement nsIURI::EqualsExceptRef. --- dlls/mshtml/nsio.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 547f258..b39453e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,6 +113,25 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } +static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +{ + IUri *uri_nofrag1, *uri_nofrag2; + BOOL ret = FALSE; + + uri_nofrag1 = get_uri_nofrag(uri1); + if(!uri_nofrag1) + return FALSE; + + uri_nofrag2 = get_uri_nofrag(uri2); + if(uri_nofrag2) { + IUri_IsEqual(uri_nofrag1, uri_nofrag2, &ret); + IUri_Release(uri_nofrag2); + } + + IUri_Release(uri_nofrag1); + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2200,13 +2219,6 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval return nsres; } -static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p %p)\n", This, other, _retval); - return nsIURL_Equals(&This->nsIURL_iface, other, _retval); -} - static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface); @@ -2334,6 +2346,32 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *other_obj; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, other, _retval); + + nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&other_obj); + if(NS_FAILED(nsres)) { + TRACE("Could not get nsWineURI interface\n"); + *_retval = FALSE; + return NS_OK; + } + + if(ensure_uri(This) && ensure_uri(other_obj)) { + *_retval = compare_ignoring_frag(This->uri, other_obj->uri); + nsres = NS_OK; + }else { + nsres = NS_ERROR_UNEXPECTED; + } + + nsIURI_Release(&other_obj->nsIURL_iface); + return nsres; +} + static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) { nsWineURI *This = impl_from_nsIURL(iface);

1 0