July 2014 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Forward InternetGetCookieW to InternetGetCookieExW, not the other way around.
by Alexandre Julliard 03 Jul '14

03 Jul '14

Module: wine Branch: master Commit: 69c4115c10242c965edfffab86a5937e78005f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c4115c10242c965edfffab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 3 16:31:23 2014 +0200 wininet: Forward InternetGetCookieW to InternetGetCookieExW, not the other way around. --- dlls/wininet/cookie.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 9d7c98a..b48cc04 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -649,7 +649,7 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD } /*********************************************************************** - * InternetGetCookieW (WININET.@) + * InternetGetCookieExW (WININET.@) * * Retrieve cookie from the specified url * @@ -661,14 +661,17 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD * FALSE on failure * */ -BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, - LPWSTR lpCookieData, LPDWORD lpdwSize) +BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, + LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; DWORD res; BOOL ret; - TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize); + TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); + + if (flags) + FIXME("flags 0x%08x not supported\n", flags); if (!lpszUrl) { @@ -689,6 +692,17 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return res == ERROR_SUCCESS; } +/*********************************************************************** + * InternetGetCookieW (WININET.@) + * + * Retrieve cookie for the specified URL. + */ +BOOL WINAPI InternetGetCookieW(const WCHAR *url, const WCHAR *name, WCHAR *data, DWORD *size) +{ + TRACE("(%s, %s, %s, %p)\n", debugstr_w(url), debugstr_w(name), debugstr_w(data), size); + + return InternetGetCookieExW(url, name, data, size, 0, NULL); +} /*********************************************************************** * InternetGetCookieExA (WININET.@) @@ -1089,27 +1103,6 @@ DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCW } /*********************************************************************** - * InternetGetCookieExW (WININET.@) - * - * Retrieve cookie for the specified URL. - * - * RETURNS - * TRUE on success - * FALSE on failure - * - */ -BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - TRACE("(%s, %s, %s, %p, 0x%08x, %p)\n", - debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetGetCookieW(pchURL, pchCookieName, pchCookieData, pcchCookieData); -} - -/*********************************************************************** * InternetClearAllPerSiteCookieDecisions (WININET.@) * * Clears all per-site decisions about cookies.

1 0

Jacek Caban : wininet.h: Added missing INTERNET_COOKIE_* flags.
by Alexandre Julliard 03 Jul '14

03 Jul '14

Module: wine Branch: master Commit: 50ccf65fe6c7cfa81d20d17dead787eabc2c6db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ccf65fe6c7cfa81d20d17de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 3 16:46:11 2014 +0200 wininet.h: Added missing INTERNET_COOKIE_* flags. --- include/wininet.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 331055c..a1c332b 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1321,6 +1321,8 @@ BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,ULONG *,ULONG *,ULONG); #define INTERNET_COOKIE_IS_RESTRICTED 0x00000200 #define INTERNET_COOKIE_IE6 0x00000400 #define INTERNET_COOKIE_IS_LEGACY 0x00000800 +#define INTERNET_COOKIE_NON_SCRIPT 0x00001000 +#define INTERNET_COOKIE_HTTPONLY 0x00002000 BOOLAPI InternetGetCookieExA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); BOOLAPI InternetGetCookieExW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID);

1 0

Jactry Zeng : riched20: Initialize ed->reOle in ME_MakeEditor().
by Alexandre Julliard 03 Jul '14

03 Jul '14

Module: wine Branch: master Commit: 10e6a665fdd9f964679c977504d6cdfdef7f448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e6a665fdd9f964679c97750… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Jul 4 00:03:14 2014 +0800 riched20: Initialize ed->reOle in ME_MakeEditor(). --- dlls/riched20/editor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 06d8690..f0d6590 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2744,6 +2744,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; + ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost,

1 0

Gediminas Jakutis : d3dx9: Add adjacency generation for D3DXCreateSphere() .
by Alexandre Julliard 03 Jul '14

03 Jul '14

Module: wine Branch: master Commit: dc115a2c917f9fa2b951292795e5717703755c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc115a2c917f9fa2b95129279… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Jul 3 01:42:11 2014 +0300 d3dx9: Add adjacency generation for D3DXCreateSphere(). --- dlls/d3dx9_36/mesh.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 1a2b020..3b3784b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4693,12 +4693,6 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U return D3DERR_INVALIDCALL; } - if (adjacency) - { - FIXME("Case of adjacency != NULL not implemented.\n"); - return E_NOTIMPL; - } - number_of_vertices = 2 + slices * (stacks-1); number_of_faces = 2 * slices + (stacks - 2) * (2 * slices); @@ -4836,6 +4830,24 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U free_sincos_table(&phi); sphere->lpVtbl->UnlockIndexBuffer(sphere); sphere->lpVtbl->UnlockVertexBuffer(sphere); + + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency))) + { + sphere->lpVtbl->Release(sphere); + return hr; + } + + if (FAILED(hr = sphere->lpVtbl->GenerateAdjacency(sphere, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency)))) + { + (*adjacency)->lpVtbl->Release(*adjacency); + sphere->lpVtbl->Release(sphere); + return hr; + } + } + *mesh = sphere; return D3D_OK;

1 0

Bruno Jesus : ws2_32: Only declare IPX support if the required definitions are found.
by Alexandre Julliard 03 Jul '14

03 Jul '14

Module: wine Branch: master Commit: 543314d449ad0de1e5e3703f8091e5c594e922db URL: http://source.winehq.org/git/wine.git/?a=commit;h=543314d449ad0de1e5e3703f8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jul 3 01:01:53 2014 -0300 ws2_32: Only declare IPX support if the required definitions are found. --- dlls/ws2_32/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1d0ce5..0e738f1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -100,7 +100,6 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -109,6 +108,8 @@ # include <linux/types.h> # endif # include <linux/ipx.h> +#endif +#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif

1 0

Jacek Caban : iphlpapi: Protect res_init call with critical section.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: ef1342bae711aa798f5fa6e5cb9260237395b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1342bae711aa798f5fa6e5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 1 17:00:36 2014 +0200 iphlpapi: Protect res_init call with critical section. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c55048..70a063b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1068,10 +1068,21 @@ static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sock #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ + +static CRITICAL_SECTION res_init_cs; +static CRITICAL_SECTION_DEBUG res_init_cs_debug = { + 0, 0, &res_init_cs, + { &res_init_cs_debug.ProcessLocksList, &res_init_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": res_init_cs") } +}; +static CRITICAL_SECTION res_init_cs = { &res_init_cs_debug, -1, 0, 0, 0, 0 }; + static void initialise_resolver(void) { + EnterCriticalSection(&res_init_cs); if ((_res.options & RES_INIT) == 0) res_init(); + LeaveCriticalSection(&res_init_cs); } static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )

1 0

Andrew Eikum : winecoreaudio.drv: Use AUHAL API instead of AudioQueue.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 46928d381ee4dcf95a0ac409be52729407f4eaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=46928d381ee4dcf95a0ac409b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 1 14:53:45 2014 -0500 winecoreaudio.drv: Use AUHAL API instead of AudioQueue. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1181 +++++++++++++++++++------------------ 1 file changed, 603 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46928d381ee4dcf95a0ac…

1 0

Sebastian Lackner : wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind).
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 8fd44a3d2b7438fbf1e7fcfa7482147999ff4851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd44a3d2b7438fbf1e7fcfa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 2 01:23:40 2014 +0200 wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind). --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b5e6a73..bb53a03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3589,12 +3589,12 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); - for (i=0; i<len; i++) + for (i = 0; i < len / sizeof(WCHAR); i++) { if (headers[i] == '\n') headers[i] = 0; } - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + memcpy(lpBuffer, headers, len); } *lpdwBufferLength = len - sizeof(WCHAR); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4e8ea5b..a8b55fd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,6 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; + WCHAR wbuffer[4000]; DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,6 +650,37 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(wbuffer)-sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length); + length /= sizeof(WCHAR); + /* show that the function writes data past the length returned */ + ok(wbuffer[length-2], "Expected any header character, got 0x0000\n"); + ok(!wbuffer[length-1], "Expected 0x0000, got %04X\n", wbuffer[length-1]); + ok(!wbuffer[length], "Expected 0x0000, got %04X\n", wbuffer[length]); + ok(wbuffer[length+1] == 0x7777 || broken(wbuffer[length+1] != 0x7777), + "Expected 0x7777, got %04X\n", wbuffer[length+1]); + + length2 = length*sizeof(WCHAR); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = (length+1)*sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(!wbuffer[length2], "Expected 0x0000, got %04X\n", wbuffer[length2]); + ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError());

1 0

Jacek Caban : urlmon: Don' t decode percent-encoded characters in file URLs with implicit scheme.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: e656914fbf4cdb774c8db8dc9ebf631693a1fdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e656914fbf4cdb774c8db8dc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:22:50 2014 +0200 urlmon: Don't decode percent-encoded characters in file URLs with implicit scheme. --- dlls/urlmon/uri.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2fe0113..1f18bc6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2838,7 +2838,7 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%test -> file:///c:/test%25test */ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, - WCHAR *ret_path) { + BOOL is_implicit_scheme, WCHAR *ret_path) { const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = scheme_type == URL_SCHEME_FILE; const BOOL is_res = scheme_type == URL_SCHEME_RES; @@ -2904,7 +2904,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || - (is_file && (is_unreserved(val) || is_reserved(val) || + (is_file && !is_implicit_scheme && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { if(ret_path) ret_path[len] = val; @@ -2929,7 +2929,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + if(!is_file || !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Escape the forbidden character. */ if(ret_path) pct_encode_val(*ptr, ret_path+len); @@ -3122,7 +3122,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!computeOnly) uri->path_start = uri->canon_len; uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, - flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + flags, data->has_implicit_scheme, computeOnly ? NULL : uri->canon_uri+uri->canon_len); uri->canon_len += uri->path_len; if(!computeOnly && !uri->path_len) uri->path_start = -1; @@ -3889,8 +3889,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return S_OK; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, NULL); canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); if(!canon_path_a) @@ -3901,8 +3901,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return E_OUTOFMEMORY; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, canon_path_b); *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a);

1 0

Jacek Caban : urlmon.idl: Added missing Uri_CREATE_* flags.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 1b5a12618408e42b7062aede0bf31abe3dbffa93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5a12618408e42b7062aede0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:28:01 2014 +0200 urlmon.idl: Added missing Uri_CREATE_* flags. --- include/urlmon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ccba5b..a9b665c 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1848,6 +1848,8 @@ cpp_quote("#define Uri_CREATE_NO_PRE_PROCESS_HTML_URI 0x1000") cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") +cpp_quote("#define Uri_CREATE_NORMALIZE_INTL_CHARACTERS 0x00010000") +cpp_quote("#define Uri_CREATE_CANONICALIZE_ABSOLUTE 0x00020000") cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002")

1 0