wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Juan Lang : ws2_32/tests: Test SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: d06b1d599d344762909c65d5be7cbddb75dd30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06b1d599d344762909c65d5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 17:21:33 2010 -0700 ws2_32/tests: Test SIO_ROUTING_INTERFACE_QUERY. --- dlls/ws2_32/tests/sock.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87403c6..abe0934 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4274,6 +4274,73 @@ static void test_getpeername(void) closesocket(sock); } +static void test_sioRoutingInterfaceQuery(void) +{ + int ret; + SOCKET sock; + SOCKADDR_IN sin = { 0 }, sout = { 0 }; + DWORD bytesReturned; + + sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + if (sock == INVALID_SOCKET) + { + skip("Socket creation failed with %d\n", WSAGetLastError()); + return; + } + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, + NULL, NULL); + todo_wine + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "expected WSAEFAULT, got %d\n", WSAGetLastError()); + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), + NULL, 0, NULL, NULL, NULL); + todo_wine + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "expected WSAEFAULT, got %d\n", WSAGetLastError()); + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), + NULL, 0, &bytesReturned, NULL, NULL); + todo_wine + ok(ret == SOCKET_ERROR && + (WSAGetLastError() == WSAEFAULT /* Win98 */ || + WSAGetLastError() == WSAEINVAL /* NT4 */|| + WSAGetLastError() == WSAEAFNOSUPPORT), + "expected WSAEFAULT or WSAEINVAL or WSAEAFNOSUPPORT, got %d\n", + WSAGetLastError()); + sin.sin_family = AF_INET; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), + NULL, 0, &bytesReturned, NULL, NULL); + todo_wine + ok(ret == SOCKET_ERROR && + (WSAGetLastError() == WSAEFAULT /* Win98 */ || + WSAGetLastError() == WSAEINVAL), + "expected WSAEFAULT or WSAEINVAL, got %d\n", WSAGetLastError()); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), + NULL, 0, &bytesReturned, NULL, NULL); + todo_wine + ok(ret == SOCKET_ERROR && + (WSAGetLastError() == WSAEINVAL /* NT4 */ || + WSAGetLastError() == WSAEFAULT), + "expected WSAEINVAL or WSAEFAULT, got %d\n", WSAGetLastError()); + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), + &sout, sizeof(sout), &bytesReturned, NULL, NULL); + todo_wine + ok(!ret || broken(WSAGetLastError() == WSAEINVAL /* NT4 */), + "WSAIoctl failed: %d\n", WSAGetLastError()); + if (!ret) + { + ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", + sout.sin_family); + if (sout.sin_family == AF_INET) + ok(sout.sin_addr.s_addr == htonl(INADDR_LOOPBACK), + "expected %08x, got %08x\n", htonl(INADDR_LOOPBACK), + htonl(sout.sin_addr.s_addr)); + } + closesocket(sock); +} + + /**************** Main program ***************/ START_TEST( sock ) @@ -4331,6 +4398,8 @@ START_TEST( sock ) test_AcceptEx(); test_ConnectEx(); + test_sioRoutingInterfaceQuery(); + /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Aric Stewart : mciqtz32: Do not allow MCIQTZ_mciUpdate to interrupt a playing video.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: dc4d607062134fc32fb7f3e433b60e2c306a8f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4d607062134fc32fb7f3e43… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 27 13:29:39 2010 -0500 mciqtz32: Do not allow MCIQTZ_mciUpdate to interrupt a playing video. --- dlls/mciqtz32/mciqtz.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index fef27e7..aca7bf4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -822,6 +822,9 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS LONG visible = OATRUE; res = MCIERR_INTERNAL; + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (state == State_Running) + return MCIERR_UNSUPPORTED_FUNCTION; /* If in stopped state, nothing has been drawn to screen * moving to pause, which is needed for the old dib renderer, will result * in a single frame drawn, so hide the window here */

1 0

Aric Stewart : quartz: Improve video window sizing on first sample.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: e2b3a7f479463f9bf51263910a6d997318946c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b3a7f479463f9bf51263910… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 27 11:11:22 2010 -0500 quartz: Improve video window sizing on first sample. Preserve sizes set by the application and defer erasing as it is not needed and can cause deadlock between threads with child video windows. --- dlls/quartz/videorenderer.c | 47 +++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index d3ccede..9469427 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -298,23 +298,36 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, if (!This->init) { - DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); - - if (!This->WindowPos.right || !This->WindowPos.bottom) - This->WindowPos = This->SourceRect; - - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); - - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); - SetWindowPos(This->hWnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE); - - GetClientRect(This->hWnd, &This->DestRect); + if (!This->WindowPos.right || !This->WindowPos.top) + { + DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); + DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); + + if (!This->WindowPos.right) + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } + if (!This->WindowPos.bottom) + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } + + AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); + + GetClientRect(This->hWnd, &This->DestRect); + } + else + This->DestRect = This->WindowPos; This->init = TRUE; }

1 0

Mike Kaplinskiy : ws2_32: Implement SO_UPDATE_ACCEPT_CONTEXT.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: f138a5724d5be3c6e6da88c7dd350c6c1a02ad28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f138a5724d5be3c6e6da88c7d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Sep 27 22:59:58 2010 -0400 ws2_32: Implement SO_UPDATE_ACCEPT_CONTEXT. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a4380aa..b01b623 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3941,6 +3941,12 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal\n"); return 0; + /* After a AcceptEx call succeeds, the socket can't be used with half of the + * normal winsock functions on windows. We don't have that problem. */ + case WS_SO_UPDATE_ACCEPT_CONTEXT: + TRACE("Ignoring SO_UPDATE_ACCEPT_CONTEXT, since our sockets are normal\n"); + return 0; + /* SO_OPENTYPE does not require a valid socket handle. */ case WS_SO_OPENTYPE: if (!optlen || optlen < sizeof(int) || !optval)

1 0

Jacek Caban : mshtml: Added nsIURI::GetUserPass implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 008c0597c8f5e430f35130480fa021496b927e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008c0597c8f5e430f35130480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:26:21 2010 +0200 mshtml: Added nsIURI::GetUserPass implementation. --- dlls/mshtml/nsio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 64c5696..df8f148 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1759,8 +1759,7 @@ static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass) if(This->nsuri) return nsIURI_GetUserPass(This->nsuri, aUserPass); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_USER_INFO, aUserPass); } static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPass)

1 0

Jacek Caban : mshtml: Added nsIURI::GetHostPort implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 9bb0ecceb5af6144fc7ef8195ca8e9f8ef303b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb0ecceb5af6144fc7ef8195… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:26:01 2010 +0200 mshtml: Added nsIURI::GetHostPort implementation. --- dlls/mshtml/nsio.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bc377cf..64c5696 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1837,14 +1837,38 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort) { nsWineURI *This = NSURI_THIS(iface); + const WCHAR *ptr; + char *vala; + BSTR val; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aHostPort); if(This->nsuri) return nsIURI_GetHostPort(This->nsuri, aHostPort); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetAuthority(This->uri, &val); + if(FAILED(hres)) { + WARN("GetAuthority failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + ptr = strchrW(val, '@'); + if(!ptr) + ptr = val; + + vala = heap_strdupWtoA(ptr); + SysFreeString(val); + if(!vala) + return NS_ERROR_OUT_OF_MEMORY; + + TRACE("ret %s\n", debugstr_a(vala)); + nsACString_SetData(aHostPort, vala); + heap_free(vala); + return NS_OK; } static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPort)

1 0

Jacek Caban : mshtml: Added nsIURI::GetPort implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: cb85bad7a931e10e035653df57234e99b2cd27b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb85bad7a931e10e035653df5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:25:40 2010 +0200 mshtml: Added nsIURI::GetPort implementation. --- dlls/mshtml/nsio.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 019c612..bc377cf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1892,14 +1892,25 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) { nsWineURI *This = NSURI_THIS(iface); + DWORD port; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aPort); if(This->nsuri) return nsIURI_GetPort(This->nsuri, aPort); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetPort(This->uri, &port); + if(FAILED(hres)) { + WARN("GetPort failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + *aPort = port ? port : -1; + return NS_OK; } static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort)

1 0

Jacek Caban : mshtml: Added nsIURI:: GetHost implementation based on IUri API.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 3a00f739b1a5b7c8591ad2a57f98019f0ecabf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a00f739b1a5b7c8591ad2a57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:25:24 2010 +0200 mshtml: Added nsIURI::GetHost implementation based on IUri API. --- dlls/mshtml/nsio.c | 124 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4b9af43..019c612 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -64,6 +64,7 @@ struct nsWineURI { windowref_t *window_ref; nsChannelBSC *channel_bsc; LPWSTR wine_url; + IUri *uri; BOOL is_doc_uri; BOOL use_wine_url; }; @@ -1538,6 +1539,55 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_GetCanceled }; +static BOOL ensure_uri(nsWineURI *This) +{ + if(!This->uri) { + HRESULT hres; + + hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return FALSE; + } + } + + return TRUE; +} + +static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *ret) +{ + char *vala; + BSTR val; + HRESULT hres; + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetPropertyBSTR(This->uri, prop, &val, 0); + if(FAILED(hres)) { + WARN("GetPropertyBSTR failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + vala = heap_strdupWtoA(val); + SysFreeString(val); + if(!vala) + return NS_ERROR_OUT_OF_MEMORY; + + TRACE("ret %s\n", debugstr_a(vala)); + nsACString_SetData(ret, vala); + heap_free(vala); + return NS_OK; +} + +static void invalidate_uri(nsWineURI *This) +{ + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } +} + #define NSURI_THIS(iface) DEFINE_THIS(nsWineURI, IURL, iface) static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, void **result) @@ -1595,6 +1645,8 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) nsIURL_Release(This->nsurl); if(This->nsuri) nsIURI_Release(This->nsuri); + if(This->uri) + IUri_Release(This->uri); heap_free(This->wine_url); heap_free(This); } @@ -1630,8 +1682,10 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) TRACE("(%p)->(%p)\n", This, debugstr_nsacstr(aSpec)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetSpec(This->nsuri, aSpec); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1687,8 +1741,10 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aScheme)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetScheme(This->nsuri, aScheme); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1713,8 +1769,10 @@ static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUserPass)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetUserPass(This->nsuri, aUserPass); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1739,8 +1797,10 @@ static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUserna TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUsername)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetUsername(This->nsuri, aUsername); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1765,8 +1825,10 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPassword)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetPassword(This->nsuri, aPassword); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1791,8 +1853,10 @@ static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPo TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHostPort)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetHostPort(This->nsuri, aHostPort); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1807,8 +1871,7 @@ static nsresult NSAPI nsURI_GetHost(nsIURL *iface, nsACString *aHost) if(This->nsuri) return nsIURI_GetHost(This->nsuri, aHost); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_HOST, aHost); } static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) @@ -1817,8 +1880,10 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHost)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetHost(This->nsuri, aHost); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1843,8 +1908,10 @@ static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort) TRACE("(%p)->(%d)\n", This, aPort); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetPort(This->nsuri, aPort); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1870,6 +1937,8 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPath)); + invalidate_uri(This); + nsACString_GetData(aPath, &path); if(This->wine_url) { WCHAR new_url[INTERNET_MAX_URL_LENGTH]; @@ -1964,6 +2033,11 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) set_wine_url(wine_uri, This->wine_url); + if(This->uri) { + IUri_AddRef(This->uri); + wine_uri->uri = This->uri; + } + *_retval = NSURI(wine_uri); return NS_OK; } @@ -2069,8 +2143,10 @@ static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFilePath(This->nsurl, aFilePath); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2095,8 +2171,10 @@ static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aParam)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetParam(This->nsurl, aParam); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2154,6 +2232,8 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aQuery)); + invalidate_uri(This); + if(This->nsurl) nsIURL_SetQuery(This->nsurl, aQuery); @@ -2217,8 +2297,10 @@ static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetRef(This->nsurl, aRef); + } nsACString_GetData(aRef, &refa); if(!*refa) @@ -2247,8 +2329,10 @@ static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirec TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aDirectory)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetDirectory(This->nsurl, aDirectory); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2273,8 +2357,10 @@ static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileNa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileName(This->nsurl, aFileName); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2299,8 +2385,10 @@ static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFi TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileBaseName(This->nsurl, aFileBaseName); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2325,8 +2413,10 @@ static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aF TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileExtension(This->nsurl, aFileExtension); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED;

1 0

Jacek Caban : mshtml: Renamed uri to nsuri.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 725aab4fa92cd5c8ef4e6f77777f569dc75d9ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725aab4fa92cd5c8ef4e6f777… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:24:57 2010 +0200 mshtml: Renamed uri to nsuri. --- dlls/mshtml/nsio.c | 122 ++++++++++++++++++++++++++-------------------------- 1 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=725aab4fa92cd5c8ef4e6…

1 0

Hwang YunSong : ipconfig: Update Korean resource.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 9a83c075993317dd55e5ee049b67b22159a2a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a83c075993317dd55e5ee049… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 28 16:35:24 2010 +0900 ipconfig: Update Korean resource. --- programs/ipconfig/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Ko.rc b/programs/ipconfig/Ko.rc index dae65d4..2997ce5 100644 --- a/programs/ipconfig/Ko.rc +++ b/programs/ipconfig/Ko.rc @@ -47,4 +47,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP 가능" STRING_YES, "예" STRING_NO, "아니오" + STRING_DEFAULT_GATEWAY, "기본 게이트웨이" }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
86
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 September 2010