September 2010 - Wine-Commits

Alexandre Julliard : user32: Add support for fetching window rectangles relative to various origins.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 7295b6746d64709106c235d02ab109c45e47f397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7295b6746d64709106c235d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 14:31:30 2010 +0200 user32: Add support for fetching window rectangles relative to various origins. --- dlls/user32/win.c | 76 ++++++++++++++++++++++++++++----------- dlls/user32/win.h | 3 +- dlls/user32/winpos.c | 20 ++-------- dlls/winex11.drv/window.c | 5 ++- include/wine/server_protocol.h | 11 +++++- server/protocol.def | 8 ++++ server/request.h | 3 +- server/trace.c | 1 + server/window.c | 33 +++++++++++++++--- 9 files changed, 112 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7295b6746d64709106c23…

1 0

Andrew Nguyen : ipconfig: Permit the "Yes/No" strings to be localized.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 68a1a2678c2540125dc70660e83af79a3839a4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a1a2678c2540125dc70660e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:01:22 2010 -0500 ipconfig: Permit the "Yes/No" strings to be localized. --- programs/ipconfig/En.rc | 2 ++ programs/ipconfig/ipconfig.c | 16 ++++++++++++---- programs/ipconfig/ipconfig.h | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc index 73f112c..6606fe4 100644 --- a/programs/ipconfig/En.rc +++ b/programs/ipconfig/En.rc @@ -42,4 +42,6 @@ STRINGTABLE STRING_DESCRIPTION, "Description" STRING_PHYS_ADDR, "Physical address" STRING_DHCP_ENABLED, "DHCP enabled" + STRING_YES, "Yes" + STRING_NO, "No" } diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index da63acd..84b0ace 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -229,10 +229,18 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) return buf; } +static const WCHAR *boolean_to_string(int value) +{ + static WCHAR msg_buffer[15]; + + LoadStringW(GetModuleHandleW(NULL), value ? STRING_YES : STRING_NO, + msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); + + return msg_buffer; +} + static void print_full_information(void) { - static const WCHAR yesW[] = {'Y','e','s',0}; - static const WCHAR noW[] = {'N','o',0}; static const WCHAR newlineW[] = {'\n',0}; FIXED_INFO *info; @@ -255,7 +263,7 @@ static void print_full_information(void) /* FIXME: Output primary DNS suffix. */ print_field(STRING_NODE_TYPE, nodetype_to_string(info->NodeType)); - print_field(STRING_IP_ROUTING, info->EnableRouting ? yesW : noW); + print_field(STRING_IP_ROUTING, boolean_to_string(info->EnableRouting)); /* FIXME: Output WINS proxy status and DNS suffix search list. */ @@ -285,7 +293,7 @@ static void print_full_information(void) print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); - print_field(STRING_DHCP_ENABLED, (p->Flags & IP_ADAPTER_DHCP_ENABLED) ? yesW : noW); + print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED)); /* FIXME: Output autoconfiguration status. */ diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h index 4f9325b..d209006 100644 --- a/programs/ipconfig/ipconfig.h +++ b/programs/ipconfig/ipconfig.h @@ -38,3 +38,5 @@ #define STRING_DESCRIPTION 115 #define STRING_PHYS_ADDR 116 #define STRING_DHCP_ENABLED 117 +#define STRING_YES 118 +#define STRING_NO 119

1 0

Andrew Nguyen : setupapi: Implement SetupQuerySpaceRequiredOnDriveW.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 3902efc9cb088d8623ff993613d0b091ffe56d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3902efc9cb088d8623ff99361… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:00:39 2010 -0500 setupapi: Implement SetupQuerySpaceRequiredOnDriveW. --- dlls/setupapi/diskspace.c | 50 ++++++++++++++++++++++++++++++++++++++---- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 61e20de..c87d4b6 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -115,20 +115,26 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, } /*********************************************************************** -* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +* SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, - LPCSTR DriveSpec, LONGLONG* SpaceRequired, +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, + LPCWSTR DriveSpec, LONGLONG *SpaceRequired, PVOID Reserved1, UINT Reserved2) { - WCHAR driveW[20]; + WCHAR *driveW; unsigned int i; LPDISKSPACELIST list = DiskSpace; BOOL rc = FALSE; static const WCHAR bkslsh[]= {'\\',0}; - MultiByteToWideChar(CP_ACP,0,DriveSpec,-1,driveW,20); + driveW = HeapAlloc(GetProcessHeap(), 0, lstrlenW(DriveSpec) + 2); + if (!driveW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + lstrcpyW(driveW,DriveSpec); lstrcatW(driveW,bkslsh); TRACE("Looking for drive %s\n",debugstr_w(driveW)); @@ -144,10 +150,44 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, } } + HeapFree(GetProcessHeap(), 0, driveW); + return rc; } /*********************************************************************** +* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +*/ +BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, + LPCSTR DriveSpec, LONGLONG *SpaceRequired, + PVOID Reserved1, UINT Reserved2) +{ + LPWSTR DriveSpecW = NULL; + BOOL ret; + + if (DriveSpec) + { + DWORD len = MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, NULL, 0); + + DriveSpecW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!DriveSpecW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, DriveSpecW, len); + } + + ret = SetupQuerySpaceRequiredOnDriveW(DiskSpace, DriveSpecW, SpaceRequired, + Reserved1, Reserved2); + + HeapFree(GetProcessHeap(), 0, DriveSpecW); + + return ret; +} + +/*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index a3dd4b0..bb96c19 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -482,7 +482,7 @@ @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -@ stub SetupQuerySpaceRequiredOnDriveW +@ stdcall SetupQuerySpaceRequiredOnDriveW(long wstr ptr ptr long) @ stdcall SetupQueueCopyA(long str str str str str str str long) @ stdcall SetupQueueCopyIndirectA(ptr) @ stdcall SetupQueueCopyIndirectW(ptr)

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}SchemeName.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 7f6faca6f6880843217ac39e7d90ea006416bd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6faca6f6880843217ac39e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 16:51:11 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}SchemeName. --- dlls/urlmon/tests/uri.c | 4 ++-- dlls/urlmon/uri.c | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a8b4952..d062df3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4313,7 +4313,7 @@ static const uri_builder_test uri_builder_tests[] = { }, { "http://google.com/",0,S_OK,FALSE, { - {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE} + {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE} }, {TRUE,TRUE,120,S_OK,FALSE}, 0,S_OK,TRUE, @@ -4345,7 +4345,7 @@ static const uri_builder_test uri_builder_tests[] = { }, { "/Test/test dir",Uri_CREATE_ALLOW_RELATIVE,S_OK,FALSE, { - {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE}, + {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE}, {TRUE,"::192.2.3.4",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, {TRUE,NULL,NULL,Uri_PROPERTY_PATH,S_OK,FALSE} }, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ce14446..f15f6aa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -97,6 +97,9 @@ typedef struct { WCHAR *query; DWORD query_len; + + WCHAR *scheme; + DWORD scheme_len; } UriBuilder; typedef struct { @@ -4328,6 +4331,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) heap_free(This->password); heap_free(This->path); heap_free(This->query); + heap_free(This->scheme); heap_free(This); } @@ -4535,19 +4539,11 @@ static HRESULT WINAPI UriBuilder_GetSchemeName(IUriBuilder *iface, DWORD *pcchSc UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); - if(!pcchSchemeName) { - if(ppwzSchemeName) - *ppwzSchemeName = NULL; - return E_POINTER; - } - - if(!ppwzSchemeName) { - *pcchSchemeName = 0; - return E_POINTER; - } - - FIXME("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); - return E_NOTIMPL; + if(!This->uri || This->uri->scheme_start == -1 || This->modified_props & Uri_HAS_SCHEME_NAME) + return get_builder_component(&This->scheme, &This->scheme_len, NULL, 0, ppwzSchemeName, pcchSchemeName); + else + return get_builder_component(&This->scheme, &This->scheme_len, This->uri->canon_uri+This->uri->scheme_start, + This->uri->scheme_len, ppwzSchemeName, pcchSchemeName); } static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUserName, LPCWSTR *ppwzUserName) @@ -4624,8 +4620,9 @@ static HRESULT WINAPI UriBuilder_SetQuery(IUriBuilder *iface, LPCWSTR pwzNewValu static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_SCHEME_NAME); } static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue)

1 0

Piotr Caban : shlwapi: Improved UrlCanonicalize implementation.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 8b7fae35e4f3d8b76cfc6e07ab7684c5e66a8295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7fae35e4f3d8b76cfc6e07a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 5 22:13:05 2010 +0200 shlwapi: Improved UrlCanonicalize implementation. --- dlls/shlwapi/tests/url.c | 2 ++ dlls/shlwapi/url.c | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index adaba9f..532b947 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -114,6 +114,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"http://www.winehq.org/tests/../", 0, S_OK, "http://www.winehq.org/", FALSE}, {"http://www.winehq.org/tests/..?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, {"http://www.winehq.org/tests/../?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, + {"\tht\ttp\t://www\t.w\tineh\t\tq.or\tg\t/\ttests/..\t?\tquer\ty=x\t\t&re\tturn=y\t\t", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, {"http://www.winehq.org/tests/..#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, {"http://www.winehq.org/tests/../#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, {"http://www.winehq.org/tests\\../#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, @@ -143,6 +144,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"c:dir\\file", 0, S_OK, "file:///c:dir/file", FALSE}, {"c:\\tests\\foo bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, + {"c\t:\t\\te\tsts\\fo\to \tbar\t", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, {"res://file", 0, S_OK, "res://file/", FALSE}, {"res://file", URL_FILE_USE_PATHURL, S_OK, "res://file/", FALSE}, {"res:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests/foo bar", FALSE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2f09bc7..4592b7e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -273,7 +273,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, HRESULT hr = S_OK; DWORD EscapeFlags; LPCWSTR wk1, root; - LPWSTR lpszUrlCpy, wk2, mp, mp2; + LPWSTR lpszUrlCpy, url, wk2, mp, mp2; INT state; DWORD nByteLen, nLen, nWkLen; WCHAR slash = '\0'; @@ -295,22 +295,40 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return S_OK; } + /* Remove '\t' characters from URL */ nByteLen = (strlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ + url = HeapAlloc(GetProcessHeap(), 0, nByteLen); + if(!url) + return E_OUTOFMEMORY; + + wk1 = pszUrl; + wk2 = url; + do { + while(*wk1 == '\t') + wk1++; + *wk2++ = *wk1; + } while(*wk1++); + /* Allocate memory for simplified URL (before escaping) */ + nByteLen = (wk2-url)*sizeof(WCHAR); lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen+sizeof(wszFilePrefix)+sizeof(WCHAR)); + if(!lpszUrlCpy) { + HeapFree(GetProcessHeap(), 0, url); + return E_OUTOFMEMORY; + } if ((nByteLen >= sizeof(wszHttp) && - !memcmp(wszHttp, pszUrl, sizeof(wszHttp))) || + !memcmp(wszHttp, url, sizeof(wszHttp))) || (nByteLen >= sizeof(wszFile) && - !memcmp(wszFile, pszUrl, sizeof(wszFile)))) + !memcmp(wszFile, url, sizeof(wszFile)))) slash = '/'; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, pszUrl, sizeof(wszFile))) + && !memcmp(wszFile, url, sizeof(wszFile))) slash = '\\'; - if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, pszUrl, sizeof(wszRes))) { + if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, url, sizeof(wszRes))) { dwFlags &= ~URL_FILE_USE_PATHURL; slash = '\0'; } @@ -326,11 +344,11 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, * 6 have location (found /) save root location */ - wk1 = pszUrl; + wk1 = url; wk2 = lpszUrlCpy; state = 0; - if(pszUrl[1] == ':') { /* Assume path */ + if(url[1] == ':') { /* Assume path */ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); if (dwFlags & URL_FILE_USE_PATHURL) @@ -361,7 +379,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) - && !strncmpW(wszFile, pszUrl, sizeof(wszFile)/sizeof(WCHAR)) + && !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)) && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) @@ -483,6 +501,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, default: FIXME("how did we get here - state=%d\n", state); HeapFree(GetProcessHeap(), 0, lpszUrlCpy); + HeapFree(GetProcessHeap(), 0, url); return E_INVALIDARG; } *wk2 = '\0'; @@ -495,7 +514,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if((dwFlags & URL_UNESCAPE) || ((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, pszUrl, sizeof(wszFile)))) + && !memcmp(wszFile, url, sizeof(wszFile)))) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE | @@ -518,6 +537,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, } HeapFree(GetProcessHeap(), 0, lpszUrlCpy); + HeapFree(GetProcessHeap(), 0, url); if (hr == S_OK) TRACE("result %s\n", debugstr_w(pszCanonicalized));

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Port.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: a4eee688183db9036cf02a973d067a884022d24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4eee688183db9036cf02a973… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 16:34:21 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Port. --- dlls/urlmon/tests/uri.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 21 ++++++-- 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 684a608..6756d99 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4315,7 +4315,7 @@ static const uri_builder_test uri_builder_tests[] = { { {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE} }, - {TRUE,TRUE,120,S_OK,TRUE}, + {TRUE,TRUE,120,S_OK,FALSE}, 0,S_OK,TRUE, 0,S_OK,TRUE, 0,0,0,S_OK,TRUE, @@ -4568,6 +4568,109 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + /* 555 will be returned from GetPort even though FALSE was passed as the hasPort parameter. */ + {TRUE,FALSE,555,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + /* Still returns 80, even though earlier the port was disabled. */ + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + /* Instead of getting "TRUE" back as the "hasPort" parameter in GetPort, + * you'll get 122345 instead. + */ + {TRUE,122345,222,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com:222/",S_OK}, + {"google.com:222",S_OK}, + {"http://google.com:222/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com:222/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {222,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* IUri's created with the IUriBuilder can have ports that exceed USHORT_MAX. */ + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + + {TRUE,TRUE,999999,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com:999999/",S_OK}, + {"google.com:999999",S_OK}, + {"http://google.com:999999/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com:999999/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {999999,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -7516,6 +7619,34 @@ static void test_IUriBuilder_RemoveProperties(void) { } } +static void test_IUriBuilder_Misc(void) { + HRESULT hr; + IUri *uri; + + hr = pCreateUri(http_urlW, 0, 0, &uri); + if(SUCCEEDED(hr)) { + IUriBuilder *builder; + + hr = pCreateIUriBuilder(uri, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + BOOL has = -1; + DWORD port = -1; + + hr = IUriBuilder_GetPort(builder, &has, &port); + ok(hr == S_OK, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + /* 'has' will be set to FALSE, even though uri had a port. */ + ok(has == FALSE, "Error: Expected 'has' to be FALSE, was %d instead.\n", has); + /* Still sets 'port' to 80. */ + ok(port == 80, "Error: Expected the port to be 80, but, was %d instead.\n", port); + } + } + if(builder) IUriBuilder_Release(builder); + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -7591,4 +7722,7 @@ START_TEST(uri) { trace("test IUriBuilder_RemoveProperties...\n"); test_IUriBuilder_RemoveProperties(); + + trace("test IUriBuilder miscellaneous...\n"); + test_IUriBuilder_Misc(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c05c0fa..dbc1747 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -91,6 +91,9 @@ typedef struct { WCHAR *path; DWORD path_len; + + BOOL has_port; + DWORD port; } UriBuilder; typedef struct { @@ -4506,8 +4509,9 @@ static HRESULT WINAPI UriBuilder_GetPort(IUriBuilder *iface, BOOL *pfHasPort, DW return E_POINTER; } - FIXME("(%p)->(%p %p)\n", This, pfHasPort, pdwPort); - return E_NOTIMPL; + *pfHasPort = This->has_port; + *pdwPort = This->port; + return S_OK; } static HRESULT WINAPI UriBuilder_GetQuery(IUriBuilder *iface, DWORD *pcchQuery, LPCWSTR *ppwzQuery) @@ -4605,8 +4609,12 @@ static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%d %d)\n", This, fHasPort, dwNewValue); - return E_NOTIMPL; + TRACE("(%p)->(%d %d)\n", This, fHasPort, dwNewValue); + + This->has_port = fHasPort; + This->port = dwNewValue; + This->modified_props |= Uri_HAS_PORT; + return S_OK; } static HRESULT WINAPI UriBuilder_SetQuery(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -4705,6 +4713,11 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve if((uri = get_uri_obj(pIUri))) { IUri_AddRef(pIUri); ret->uri = uri; + + if(uri->has_port) + /* Windows doesn't set 'has_port' to TRUE in this case. */ + ret->port = uri->port; + } else { heap_free(ret); *ppIUriBuilder = NULL;

1 0

Thomas Mullaly : urlmon: set_builder_component now handles setting the modified property flag.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 23e312e3245faf8123e4f1307f790db93c51e3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e312e3245faf8123e4f1307… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 15:47:01 2010 -0400 urlmon: set_builder_component now handles setting the modified property flag. --- dlls/urlmon/uri.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ef6ba22..c05c0fa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3292,9 +3292,11 @@ static HRESULT get_builder_component(LPWSTR *component, DWORD *component_len, /* Allocates 'component' and copies the string from 'new_value' into 'component'. * If 'prefix' is set and 'new_value' isn't NULL, then it checks if 'new_value' * starts with 'prefix'. If it doesn't then 'prefix' is prepended to 'component'. + * + * If everything is successful, then will set 'success_flag' in 'flags'. */ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LPCWSTR new_value, - WCHAR prefix) + WCHAR prefix, DWORD *flags, DWORD success_flag) { if(*component) heap_free(*component); @@ -3323,6 +3325,7 @@ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LP *component_len = len+pos; } + *flags |= success_flag; return S_OK; } @@ -4571,36 +4574,32 @@ static HRESULT WINAPI UriBuilder_SetFragment(IUriBuilder *iface, LPCWSTR pwzNewV { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_FRAGMENT; - return set_builder_component(&This->fragment, &This->fragment_len, pwzNewValue, '#'); + return set_builder_component(&This->fragment, &This->fragment_len, pwzNewValue, '#', + &This->modified_props, Uri_HAS_FRAGMENT); } static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_HOST; - return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0); + return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_HOST); } static HRESULT WINAPI UriBuilder_SetPassword(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_PASSWORD; - return set_builder_component(&This->password, &This->password_len, pwzNewValue, 0); + return set_builder_component(&This->password, &This->password_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_PASSWORD); } static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_PATH; - return set_builder_component(&This->path, &This->path_len, pwzNewValue, 0); + return set_builder_component(&This->path, &This->path_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_PATH); } static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue)

1 0

Nikolay Sivov : msxml3/domdoc: Implement IXMLDOMNamedNodeMap:: removeQualifiedItem().
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: 0adfd6cf4c4f5b512c10ab2a5f4c77de13a8fa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adfd6cf4c4f5b512c10ab2a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 4 18:41:10 2010 +0400 msxml3/domdoc: Implement IXMLDOMNamedNodeMap::removeQualifiedItem(). --- dlls/msxml3/nodemap.c | 99 +++++++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index f7818f9..78d9d46 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -250,43 +250,8 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlChar *element_name; - xmlAttrPtr attr; - xmlNodePtr node; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - - if ( !name) - return E_INVALIDARG; - - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - element_name = xmlChar_from_wchar( name ); - attr = xmlHasNsProp( node, element_name, NULL ); - heap_free( element_name ); - - if ( !attr ) - { - if( namedItem ) - *namedItem = NULL; - return S_FALSE; - } - - if ( namedItem ) - { - xmlUnlinkNode( (xmlNodePtr) attr ); - xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr ); - *namedItem = create_node( (xmlNodePtr) attr ); - } - else - { - if( xmlRemoveProp( attr ) == -1 ) - ERR("xmlRemoveProp failed\n"); - } - - return S_OK; + return IXMLDOMNamedNodeMap_removeQualifiedItem(iface, name, NULL, namedItem); } static HRESULT WINAPI xmlnodemap_get_item( @@ -394,6 +359,10 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( } attr = xmlHasNsProp(node, name, href); + + heap_free(name); + heap_free(href); + if (!attr) { *qualifiedItem = NULL; @@ -402,9 +371,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( *qualifiedItem = create_node((xmlNodePtr)attr); - heap_free(name); - heap_free(href); - return S_OK; } @@ -415,8 +381,58 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( IXMLDOMNode** qualifiedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); - return E_NOTIMPL; + xmlAttrPtr attr; + xmlNodePtr node; + xmlChar *name; + xmlChar *href; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); + + if (!baseName) return E_INVALIDARG; + + node = xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); + if ( !node ) + return E_FAIL; + + if (namespaceURI && *namespaceURI) + { + href = xmlChar_from_wchar(namespaceURI); + if (!href) return E_OUTOFMEMORY; + } + else + href = NULL; + + name = xmlChar_from_wchar(baseName); + if (!name) + { + heap_free(href); + return E_OUTOFMEMORY; + } + + attr = xmlHasNsProp( node, name, href ); + + heap_free(name); + heap_free(href); + + if ( !attr ) + { + if (qualifiedItem) *qualifiedItem = NULL; + return S_FALSE; + } + + if ( qualifiedItem ) + { + xmlUnlinkNode( (xmlNodePtr) attr ); + xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr ); + *qualifiedItem = create_node( (xmlNodePtr) attr ); + } + else + { + if (xmlRemoveProp(attr) == -1) + ERR("xmlRemoveProp failed\n"); + } + + return S_OK; } static HRESULT WINAPI xmlnodemap_nextNode( @@ -497,7 +513,6 @@ static HRESULT WINAPI support_error_QueryInterface( { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); - return IXMLDOMNamedNodeMap_QueryInterface((IXMLDOMNamedNodeMap*)&This->lpVtbl, riid, ppvObject); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8211aec..ded8175 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2791,7 +2791,7 @@ static void test_removeNamedItem(void) removed_node = (void*)0xdeadbeef; r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node); ok ( r == E_INVALIDARG, "ret %08x\n", r); - ok ( removed_node == (void*)0xdeadbeef, "removed_node == %p\n", removed_node); + ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; str = SysAllocString(szvr); @@ -2801,7 +2801,7 @@ static void test_removeNamedItem(void) removed_node2 = (void*)0xdeadbeef; r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2); ok ( r == S_FALSE, "ret %08x\n", r); - ok ( removed_node2 == NULL, "removed_node == %p\n", removed_node2 ); + ok ( removed_node2 == NULL, "got %p\n", removed_node2 ); r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); ok( r == S_OK, "ret %08x\n", r); @@ -5789,6 +5789,71 @@ static void test_getQualifiedItem(void) free_bstrs(); } +static void test_removeQualifiedItem(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *pr_node, *node; + IXMLDOMNodeList *root_list; + IXMLDOMNamedNodeMap *map; + VARIANT_BOOL b; + BSTR str; + LONG len; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(element, &root_list); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNodeList_Release(root_list); + + hr = IXMLDOMNode_get_attributes(pr_node, &map); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(pr_node); + + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok( hr == S_OK, "ret %08x\n", hr); + ok( len == 3, "length %d\n", len); + + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, &node); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + ok( node == (void*)0xdeadbeef, "got %p\n", node); + + /* out pointer is optional */ + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == S_OK, "ret %08x\n", hr); + + /* already removed */ + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == S_FALSE, "ret %08x\n", hr); + + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("vr"), NULL, &node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(node); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5840,6 +5905,7 @@ START_TEST(domdoc) test_document_IObjectSafety(); test_splitText(); test_getQualifiedItem(); + test_removeQualifiedItem(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3/tests: Add a helper to create document instance, remove useless output.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: e7bfb98e60b9a43dfe0e059537e0ea62f58e2a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bfb98e60b9a43dfe0e05953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 4 18:14:58 2010 +0400 msxml3/tests: Add a helper to create document instance, remove useless output. --- dlls/msxml3/tests/domdoc.c | 298 +++++++++++++++++--------------------------- 1 files changed, 114 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7bfb98e60b9a43dfe0e0…

1 0

Piotr Caban : shlwapi: Improved UrlEscapeW implementation.
by Alexandre Julliard Sept. 7, 2010

Sept. 7, 2010

Module: wine Branch: master Commit: f0bc60324aae58bad51007f2725286545790f9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bc60324aae58bad51007f27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 5 22:13:47 2010 +0200 shlwapi: Improved UrlEscapeW implementation. --- dlls/shlwapi/tests/url.c | 11 +++++++++++ dlls/shlwapi/url.c | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 532b947..d1da88b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -762,10 +762,13 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H static void test_UrlEscape(void) { + static const WCHAR out[] = { 'f','o','o','%','2','0','b','a','r',0 }; + DWORD size = 0; HRESULT ret; unsigned int i; char empty_string[] = ""; + WCHAR overwrite[] = { 'f','o','o',' ','b','a','r',0,0,0 }; if (!pUrlEscapeA) { win_skip("UrlEscapeA noz found\n"); @@ -796,6 +799,14 @@ static void test_UrlEscape(void) ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); + if(pUrlEscapeW) { + size = sizeof(overwrite)/sizeof(WCHAR); + ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == S_OK, "got %x, expected S_OK\n", ret); + ok(size == 9, "got %d, expected 9\n", size); + ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); + } + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4592b7e..c808a2f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1022,8 +1022,8 @@ HRESULT WINAPI UrlEscapeW( DWORD slashes = 0; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; - TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped, - pcchEscaped, dwFlags); + TRACE("(%p(%s) %p %p 0x%08x)\n", pszUrl, debugstr_w(pszUrl), + pszEscaped, pcchEscaped, dwFlags); if(!pszUrl || !pcchEscaped) return E_INVALIDARG; @@ -1034,6 +1034,12 @@ HRESULT WINAPI UrlEscapeW( URL_ESCAPE_PERCENT)) FIXME("Unimplemented flags: %08x\n", dwFlags); + if(pszUrl == pszEscaped) { + dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); + if(!dst) + return E_OUTOFMEMORY; + } + /* fix up flags */ if (dwFlags & URL_ESCAPE_SPACES_ONLY) /* if SPACES_ONLY specified, reset the other controls */ @@ -1150,12 +1156,18 @@ HRESULT WINAPI UrlEscapeW( if(needed < *pcchEscaped) { *dst = '\0'; - ret = S_OK; + if(pszUrl == pszEscaped) + memcpy(pszEscaped, dst-needed, (needed+1)*sizeof(WCHAR)); + + ret = S_OK; } else { needed++; /* add one for the '\0' */ - ret = E_POINTER; + ret = E_POINTER; } *pcchEscaped = needed; + + if(pszUrl == pszEscaped) + HeapFree(GetProcessHeap(), 0, dst); return ret; }

1 0