September 2010 - Wine-commits

Gerald Pfeifer : winedbg: Fix the check for GCC version number around db_printf format checking.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 0991954c7f917ec652ad895e48e3234639255c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991954c7f917ec652ad895e4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 11:22:37 2010 +0200 winedbg: Fix the check for GCC version number around db_printf format checking. --- programs/winedbg/db_disasm64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 7cf1394..fe6a538 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -32,7 +32,7 @@ #include <stdio.h> #include "debugger.h" -#if defined(__GNUC__) && (GCC_VERSION >= 30000) +#if defined(__GNUC__) && (__GNUC__ >= 3) static int (*db_printf)(const char* format, ...) __attribute__((format (printf,1,2))); #else static int (*db_printf)(const char* format, ...);

1 0

Gerald Pfeifer : setupx.dll16: Fix error handling in VCP_VirtnodeCreate.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 7c27f9cbac03231807cace32f9e52a741c7ee17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c27f9cbac03231807cace32f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 15:41:43 2010 +0200 setupx.dll16: Fix error handling in VCP_VirtnodeCreate. --- dlls/setupx.dll16/virtcopy.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index b80a5be..3fb94ec 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -211,7 +211,6 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC { HANDLE heap; LPVIRTNODE lpvn; - RETERR16 cbres; while (vn_last < vn_num) { @@ -248,9 +247,9 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC lpvn->vhstrDstFinalName = 0xffff; /* FIXME: what is this ? */ - cbres = VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef); + VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef); lpvn->fl |= VFNL_CREATED; - cbres = VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef); + VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef); return OK; }

1 0

Gerald Pfeifer : setupx.dll16: Simplify VcpClose16 a bit.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: ae0a15477cf7abfd7df99564395b8399fadb500b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0a15477cf7abfd7df995643… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 00:17:21 2010 +0200 setupx.dll16: Simplify VcpClose16 a bit. --- dlls/setupx.dll16/virtcopy.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 3fb94ec..299041f 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -484,7 +484,6 @@ static RETERR16 VCP_CopyFiles(void) RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) { RETERR16 res = OK; - WORD cbres = VCPN_PROCEED; TRACE("(%04x, '%s')\n", fl, lpszBackupDest); @@ -495,7 +494,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) memset(&vcp_status, 0, sizeof(VCPSTATUS)); /* yes, vcp_status.cbSize is 0 ! */ TRACE("#2\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef); TRACE("#3\n"); res = VCP_CheckPaths(); @@ -505,7 +504,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) VCP_CopyFiles(); TRACE("#5\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); TRACE("#6\n"); VCP_Proc = NULL; VCP_opened = FALSE;

1 0

Gerald Pfeifer : user32: Fix error handling in BITMAP_Load.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 824ab969ff1c5e0e3706d37855f4652244e295d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824ab969ff1c5e0e3706d3785… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 16:10:39 2010 +0200 user32: Fix error handling in BITMAP_Load. --- dlls/user32/cursoricon.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 938f0dd..acae302 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -366,7 +366,7 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) * DIB_GetBitmapInfo * * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 in case of failure. */ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *bpp, DWORD *compr ) @@ -2257,6 +2257,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, memcpy(scaled_info, fix_info, size); bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, &bpp_dummy, &compr_dummy); + if (bm_type == -1) + { + WARN("Invalid bitmap format!\n"); + goto end_close; + } + if(desiredx != 0) new_width = desiredx; else

1 0

André Hentschel : winemaker: Don't use -march options.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: b7efaf8b6d65da512406ed5f3440d7d11a464af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7efaf8b6d65da512406ed5f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 19 20:42:44 2010 +0200 winemaker: Don't use -march options. --- tools/winemaker | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 64cf54b..99e60ba 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -691,19 +691,19 @@ sub source_scan_project_file($$$) # this option is always present and is already specified in the suffix rules } elsif (/^GB$/) { # Blend Optimization - $prj_target_cflags.="-march=pentiumpro -D_M_IX86=500 "; + $prj_target_cflags.="-D_M_IX86=500 "; } elsif (/^G6$/) { # Pentium Pro Optimization - $prj_target_cflags.="-march=pentiumpro -D_M_IX86=600 "; + $prj_target_cflags.="-D_M_IX86=600 "; } elsif (/^G5$/) { # Pentium Optimization - $prj_target_cflags.="-march=pentium -D_M_IX86=500 "; + $prj_target_cflags.="-D_M_IX86=500 "; } elsif (/^G3$/) { # 80386 Optimization - $prj_target_cflags.="-march=i386 -D_M_IX86=300 "; + $prj_target_cflags.="-D_M_IX86=300 "; } elsif (/^G4$/) { # 80486 Optimization - $prj_target_cflags.="-march=i486 -D_M_IX86=400 "; + $prj_target_cflags.="-D_M_IX86=400 "; } elsif (/^Yc/) { # Create Precompiled Header } elsif (/^Yu/) {

1 0

Gerald Pfeifer : configure: Improve formatting of error when X development files are not found.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 5805d8b4f64fb72a137365ed82f8ed383acd2e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5805d8b4f64fb72a137365ed8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 21:10:13 2010 +0200 configure: Improve formatting of error when X development files are not found. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b9927b1..dcca4e6 100755 --- a/configure +++ b/configure @@ -9031,8 +9031,8 @@ if test "x$XLIB" = "x"; then : case "x$with_x" in xno) ;; *) as_fn_error $? "X ${notice_platform}development files not found. Wine will be built -without X support, which probably isn't what you want. You will need to install -${notice_platform}development packages of Xlib/Xfree86 at the very least. +without X support, which probably isn't what you want. You will need +to install ${notice_platform}development packages of Xlib/Xfree86 at the very least. Use the --without-x option if you really want this." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 559f674..e3220ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1088,8 +1088,8 @@ else enable_glu32=${enable_glu32:-no} fi WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built -without X support, which probably isn't what you want. You will need to install -${notice_platform}development packages of Xlib/Xfree86 at the very least.]) +without X support, which probably isn't what you want. You will need +to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) dnl **** Check for libxml2 ****

1 0

Paul Vriens : urlmon/tests: Fix test failures on Win9x/ WinMe by using more A-functions.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 6704cd804fece0d88e605459421e616c04a05369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6704cd804fece0d88e6054594… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 19 15:01:42 2010 +0200 urlmon/tests: Fix test failures on Win9x/WinMe by using more A-functions. --- dlls/urlmon/tests/url.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index bf5e9fe..e25db0b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -176,7 +176,7 @@ static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; static const WCHAR dwl_htmlW[] = {'d','w','l','.','h','t','m','l',0}; -static const WCHAR test_txtW[] = {'t','e','s','t','.','t','x','t',0}; +static const CHAR test_txtA[] = "test.txt"; static const WCHAR emptyW[] = {0}; static BOOL stopped_binding = FALSE, stopped_obj_binding = FALSE, emulate_protocol = FALSE, @@ -2831,11 +2831,11 @@ static void create_file(void) static void create_cache_file(void) { - char buf[6500]; + char buf[6500], curdir[MAX_PATH]; HANDLE file; DWORD size; - file = CreateFileW(test_txtW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA(test_txtA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) @@ -2845,9 +2845,12 @@ static void create_cache_file(void) WriteFile(file, buf, sizeof(buf), &size, NULL); CloseHandle(file); - size = GetCurrentDirectoryW(MAX_PATH, cache_file_name); - cache_file_name[size] = '\\'; - memcpy(cache_file_name+size+1, test_txtW, sizeof(test_txtW)); + memset(curdir, 0, sizeof(curdir)); + GetCurrentDirectoryA(MAX_PATH, curdir); + lstrcatA(curdir, "\\"); + lstrcatA(curdir, test_txtA); + + MultiByteToWideChar(CP_ACP, 0, curdir, -1, cache_file_name, MAX_PATH); } static void test_ReportResult(HRESULT exhres) @@ -3114,7 +3117,7 @@ START_TEST(url) } DeleteFileA(wszIndexHtmlA); - DeleteFileW(test_txtW); + DeleteFileA(test_txtA); CloseHandle(complete_event); CloseHandle(complete_event2); CoUninitialize();

1 0

Thomas Mullaly : urlmon/tests: Added more tests for IUriBuilder' s CreateUri functions.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 2e1f85486022015573c027f829fbcbf5da1a2dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1f85486022015573c027f82… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Sep 17 17:17:11 2010 -0400 urlmon/tests: Added more tests for IUriBuilder's CreateUri functions. --- dlls/urlmon/tests/uri.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e39c410..442c38c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7932,6 +7932,37 @@ static void test_IUriBuilder_IUriProperty(void) { } if(test) IUri_Release(test); + /* Doesn't return the same IUri, if the flag combination is different then the one that created + * the base IUri. + */ + test = NULL; + hr = IUriBuilder_CreateUri(builder, Uri_CREATE_ALLOW_RELATIVE, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(test != uri, "Error: Wasn't expecting 'test' to be 'uri'\n"); + } + } + if(test) IUri_Release(test); + + /* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE + * explicitly set (because it's a default flags). + */ + test = NULL; + hr = IUriBuilder_CreateUri(builder, Uri_CREATE_CANONICALIZE, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + ok(test == uri, "Error: Expected 'test' to be %p, but was %p instead.\n", uri, test); + } + if(test) IUri_Release(test); + test = NULL; hr = IUriBuilder_CreateUriSimple(builder, 0, 0, &test); todo_wine { @@ -7958,6 +7989,37 @@ static void test_IUriBuilder_IUriProperty(void) { ok(test == uri, "Error: Expected test to be %p, but was %p instead.\n", uri, test); } if(test) IUri_Release(test); + + /* Doesn't return the same IUri, if the flag combination is different then the one that created + * the base IUri. + */ + test = NULL; + hr = IUriBuilder_CreateUriWithFlags(builder, Uri_CREATE_ALLOW_RELATIVE, 0, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(test != uri, "Error: Wasn't expecting 'test' to be 'uri'\n"); + } + } + if(test) IUri_Release(test); + + /* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE + * explicitly set (because it's a default flags). + */ + test = NULL; + hr = IUriBuilder_CreateUriWithFlags(builder, Uri_CREATE_CANONICALIZE, 0, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + ok(test == uri, "Error: Expected 'test' to be %p, but was %p instead.\n", uri, test); + } + if(test) IUri_Release(test); } if(uri) IUri_Release(uri); }

1 0

Thomas Mullaly : urlmon: IUriBuilder_CreateUri* functions return base IUri if there were no changes .
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 947e4ec56737cffc9ad322afa728b159aa41288a URL: http://source.winehq.org/git/wine.git/?a=commit;h=947e4ec56737cffc9ad322afa… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Sep 17 16:54:39 2010 -0400 urlmon: IUriBuilder_CreateUri* functions return base IUri if there were no changes. --- dlls/urlmon/tests/uri.c | 182 +++++++++++++++++++++++++++++++++++------------ dlls/urlmon/uri.c | 126 ++++++++++++++++++++++----------- 2 files changed, 222 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=947e4ec56737cffc9ad32…

1 0

Thomas Mullaly : urlmon: Implemented validation of scheme component of a IUriBuilder.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: f2a1737e35e7fd46c5a960360bb475d71b1989f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a1737e35e7fd46c5a960360… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 18 15:19:55 2010 -0400 urlmon: Implemented validation of scheme component of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 19 +++++++++++++ dlls/urlmon/uri.c | 69 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9ef36aa..6830832 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5085,6 +5085,25 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { NULL,0,S_OK,FALSE, + { + {TRUE,"/test/test/",NULL,Uri_PROPERTY_PATH,S_OK,FALSE}, + {TRUE,"#Fr<|>g",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"ht%xxtp",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e4a7401..bab021b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,6 +26,8 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff +#define ALLOW_NULL_TERM_SCHEME 0x1 + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; @@ -1148,7 +1150,7 @@ static BOOL check_ipv4address(const WCHAR **ptr, BOOL strict) { * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. * NOTE: Windows accepts a number as the first character of a scheme. */ -static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { +static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data, DWORD extras) { const WCHAR *start = *ptr; data->scheme = NULL; @@ -1172,7 +1174,7 @@ static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { return FALSE; /* Schemes must end with a ':' */ - if(**ptr != ':') { + if(**ptr != ':' && !((extras & ALLOW_NULL_TERM_SCHEME) && !**ptr)) { *ptr = start; return FALSE; } @@ -1225,7 +1227,7 @@ static BOOL parse_scheme_type(parse_data *data) { * * Returns TRUE if it was able to successfully parse the information. */ -static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { static const WCHAR fileW[] = {'f','i','l','e',0}; static const WCHAR wildcardW[] = {'*',0}; @@ -1245,7 +1247,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { ptr, data, flags); return FALSE; } - } else if(!parse_scheme_name(ptr, data)) { + } else if(!parse_scheme_name(ptr, data, extras)) { /* No Scheme was found, this means it could be: * a) an implicit Wildcard scheme * b) a relative URI @@ -2091,7 +2093,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { TRACE("(%p %x): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri)); - if(!parse_scheme(pptr, data, flags)) + if(!parse_scheme(pptr, data, flags, 0)) return FALSE; if(!parse_hierpart(pptr, data, flags)) @@ -3407,9 +3409,58 @@ static void reset_builder(UriBuilder *builder) { builder->modified_props = 0; } +static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->scheme) { + ptr = builder->scheme; + expected_len = builder->scheme_len; + } else if(builder->uri && builder->uri->scheme_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->scheme_start; + expected_len = builder->uri->scheme_len; + } else { + static const WCHAR nullW[] = {0}; + ptr = nullW; + expected_len = 0; + } + + pptr = &ptr; + if(parse_scheme(pptr, data, flags, ALLOW_NULL_TERM_SCHEME) && + data->scheme_len == expected_len) { + if(data->scheme) + TRACE("(%p %p %x): Found valid scheme component %s.\n", builder, data, flags, + debugstr_wn(data->scheme, data->scheme_len)); + } else { + TRACE("(%p %p %x): Invalid scheme component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + + return S_OK; +} + +static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { + HRESULT hr; + + memset(data, 0, sizeof(parse_data)); + + TRACE("(%p %p %x): Beginning to validate builder components.\n", builder, data, flags); + + hr = validate_scheme_name(builder, data, flags); + if(FAILED(hr)) + return hr; + + return E_NOTIMPL; +} + static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, DWORD use_orig_flags, DWORD encoding_mask) { + HRESULT hr; + parse_data data; + if(!uri) return E_POINTER; @@ -3438,7 +3489,13 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return S_OK; } - return E_NOTIMPL; + hr = validate_components(builder, &data, create_flags); + if(FAILED(hr)) { + *uri = NULL; + return hr; + } + + return S_OK; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)

1 0