February 2007 - Wine-commits

Paul Vriens : wininet/ftp.c: Add another test.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 2ba1cdad6991f0e45547760671eb882cdd0ab100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba1cdad6991f0e4554776067… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 12 10:03:25 2007 +0100 wininet/ftp.c: Add another test. --- dlls/wininet/tests/ftp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 0e566b1..f0c59ba 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -42,6 +42,19 @@ #include "wine/test.h" +static void test_getfile_no_open(void) +{ + BOOL bRet; + + /* Invalid internet handle, the others are valid parameters */ + SetLastError(0xdeadbeef); + bRet = FtpGetFileA(NULL, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_INTERNET_NOT_INITIALIZED, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); +} + static void test_connect(void) { HINTERNET hInternet, hFtp; @@ -727,6 +740,15 @@ static void test_renamefile(void) START_TEST(ftp) { + /* The first call should always be a proper InternetOpen, if not + * several calls will return ERROR_INTERNET_NOT_INITIALIZED when + * all parameters are correct but no session handle is given. Whereas + * the same call will return ERROR_INVALID_HANDLE if an InternetOpen + * is done before. + * The following test will show that behaviour, where the tests inside + * the other sub-tests will show the other situation. + */ + test_getfile_no_open(); test_connect(); test_createdir(); test_deletefile();

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: d20833fc5297acc4c4d6d144ed20345d82792c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20833fc5297acc4c4d6d144e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Feb 10 17:33:17 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 17 ++++++++++++++--- dlls/wininet/tests/ftp.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6a0275c..56fade1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1667,12 +1667,24 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt BOOL r = FALSE; lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if (!lpszSrc || !lpszDest) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -1693,8 +1705,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index f389816..0e566b1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -666,7 +666,6 @@ static void test_renamefile(void) SetLastError(0xdeadbeef); bRet = FtpRenameFileA(NULL , "should_be_non_existing_deadbeef", "new"); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -685,7 +684,6 @@ static void test_renamefile(void) SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , NULL, "new"); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -693,7 +691,6 @@ static void test_renamefile(void) SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", NULL); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 6c050487568edee76621a908c24077f262156a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c050487568edee76621a908c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Feb 9 21:17:27 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 17 ++++++++++++++--- dlls/wininet/tests/ftp.c | 2 -- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1d9224b..a9f7166 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1384,12 +1384,24 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt BOOL r = FALSE; lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if (!lpszFileName) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -1409,8 +1421,7 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index d5a4a6f..50ef6cc 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -167,7 +167,6 @@ static void test_deletefile(void) SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(NULL, "non_existent_file_deadbeef"); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -186,7 +185,6 @@ static void test_deletefile(void) SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(hFtp, NULL); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 54c80612ac4814d7eff21ea052d33bb3341e5cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c80612ac4814d7eff21ea05… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Feb 10 17:23:15 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 17 ++++++++++++++--- dlls/wininet/tests/ftp.c | 2 -- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index a9f7166..6a0275c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1523,12 +1523,24 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE BOOL r = FALSE; lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if (!lpszDirectory) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -1548,8 +1560,7 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNE } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 50ef6cc..f389816 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -597,7 +597,6 @@ static void test_removedir(void) SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(NULL, "should_be_non_existing_deadbeef_dir"); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -616,7 +615,6 @@ static void test_removedir(void) SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, NULL); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Jacek Caban : mshtml: Handle resource protocol like chrome protocol.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 31bbe886f018e11dd137a83f7d5c32c5b408ea79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bbe886f018e11dd137a83f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 17:37:37 2007 +0100 mshtml: Handle resource protocol like chrome protocol. --- dlls/mshtml/nsio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2edc431..7e8e7f2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1721,6 +1721,7 @@ static nsresult NSAPI nsIOService_NewURI const char *base_uri = NULL; static const char szChrome[] = "chrome:"; + static const char szResource[] = "resource:"; nsACString_Init(&base_uri_str, NULL); @@ -1734,7 +1735,8 @@ static nsresult NSAPI nsIOService_NewURI nsACString_Finish(&base_uri_str); - if(!strncmp(spec, szChrome, sizeof(szChrome)-1)) + if(!strncmp(spec, szChrome, sizeof(szChrome)-1) + || !strncmp(spec, szResource, sizeof(szResource)-1)) aBaseURI = NULL; }

1 0

Jacek Caban : mshtml: Call SetWineURL in Clone.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 9750893eff32dc961d17bd3dd0f46b3bb0755963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9750893eff32dc961d17bd3dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 17:36:58 2007 +0100 mshtml: Call SetWineURL in Clone. --- dlls/mshtml/nsio.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 973adcf..2edc431 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1440,6 +1440,7 @@ static nsresult NSAPI nsURI_Clone(nsIWin if(This->uri) { nsIURI *uri; + nsIWineURI *wine_uri; nsresult nsres; nsres = nsIURI_Clone(This->uri, &uri); @@ -1448,7 +1449,11 @@ static nsresult NSAPI nsURI_Clone(nsIWin return nsres; } - return create_uri(uri, This->container, (nsIWineURI**)_retval); + nsres = create_uri(uri, This->container, &wine_uri); + *_retval = (nsIURI*)wine_uri; + if(NS_SUCCEEDED(nsres)) + return nsIWineURI_SetWineURL(wine_uri, This->wine_url); + return nsres; } FIXME("default action not implemented\n");

1 0

Jacek Caban : mshtml: Move AddRequest call to OnStartBinding.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 48b445b80d218248d5e586bcf32aa11829053e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b445b80d218248d5e586bcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 9 20:20:43 2007 +0100 mshtml: Move AddRequest call to OnStartBinding. --- dlls/mshtml/navigate.c | 8 ++++++++ dlls/mshtml/nsio.c | 18 +----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3706f2f..a665ff0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -267,6 +267,14 @@ static HRESULT WINAPI BindStatusCallback IBinding_AddRef(pbind); This->binding = pbind; + if(This->nschannel && This->nschannel->load_group) { + nsresult nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + + if(NS_FAILED(nsres)) + ERR("AddRequest failed:%08x\n", nsres); + } + return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b075b7b..1d1ec90 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -634,16 +634,8 @@ static nsresult NSAPI nsChannel_AsyncOpe nsIWebBrowserChrome_Release(NSWBCHROME(container)); - if(do_load_from_moniker_hack(This)) { - if(This->load_group) { - nsres = nsILoadGroup_AddRequest(This->load_group, - (nsIRequest*)NSCHANNEL(This), NULL); - - if(NS_FAILED(nsres)) - ERR("AddRequest failed:%08x\n", nsres); - } + if(do_load_from_moniker_hack(This)) return WINE_NS_LOAD_FROM_MONIKER; - } }else if(container->doc) { BOOL cont = before_async_open(This, container); nsIWebBrowserChrome_Release(NSWBCHROME(container)); @@ -726,14 +718,6 @@ static nsresult NSAPI nsChannel_AsyncOpe bscallback->nscontext = aContext; } - if(This->load_group) { - nsres = nsILoadGroup_AddRequest(This->load_group, - (nsIRequest*)NSCHANNEL(This), NULL); - - if(NS_FAILED(nsres)) - ERR("AddRequest failed:%08x\n", nsres); - } - start_binding(bscallback); IBindStatusCallback_Release(STATUSCLB(bscallback));

1 0

Jacek Caban : mshtml: Start binding asynchronously.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 124cb44903805f5cb38d1f58d6ed38123262518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=124cb44903805f5cb38d1f58d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 17:36:13 2007 +0100 mshtml: Start binding asynchronously. --- dlls/mshtml/mshtml_private.h | 5 ++++- dlls/mshtml/nsio.c | 11 +++++++++-- dlls/mshtml/task.c | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d23a967..ca5527b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -386,9 +386,12 @@ typedef struct task_t { enum { TASK_SETDOWNLOADSTATE, TASK_PARSECOMPLETE, - TASK_SETPROGRESS + TASK_SETPROGRESS, + TASK_START_BINDING } task_id; + BSCallback *bscallback; + struct task_t *next; } task_t; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1d1ec90..973adcf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -605,6 +605,7 @@ static nsresult NSAPI nsChannel_AsyncOpe PRBool is_doc_uri; LPCWSTR wine_url; nsresult nsres; + task_t *task; HRESULT hres; TRACE("(%p)->(%p %p)\n", This, aListener, aContext); @@ -718,8 +719,14 @@ static nsresult NSAPI nsChannel_AsyncOpe bscallback->nscontext = aContext; } - start_binding(bscallback); - IBindStatusCallback_Release(STATUSCLB(bscallback)); + task = mshtml_alloc(sizeof(task_t)); + + task->doc = bscallback->doc; + task->task_id = TASK_START_BINDING; + task->next = NULL; + task->bscallback = bscallback; + + push_task(task); return NS_OK; } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 84108d1..f6030f1 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -217,6 +217,12 @@ static void set_progress(HTMLDocument *d } } +static void task_start_binding(BSCallback *bscallback) +{ + start_binding(bscallback); + IBindStatusCallback_Release(STATUSCLB(bscallback)); +} + static void process_task(task_t *task) { switch(task->task_id) { @@ -226,6 +232,8 @@ static void process_task(task_t *task) return set_parsecomplete(task->doc); case TASK_SETPROGRESS: return set_progress(task->doc); + case TASK_START_BINDING: + return task_start_binding(task->bscallback); default: ERR("Wrong task_id %d\n", task->task_id); }

1 0

Alexandre Julliard : mshtml: Don't test the contents of an output parameter .
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: fe57f04a448001ce9d50049d94c105cc91d065d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe57f04a448001ce9d50049d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 13:41:35 2007 +0100 mshtml: Don't test the contents of an output parameter. --- dlls/mshtml/tests/htmldoc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 33deb5e..afaa56f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -575,7 +575,6 @@ static HRESULT WINAPI Moniker_GetDisplay /* ok(pbc != NULL, "pbc == NULL\n"); */ ok(pmkToLeft == NULL, "pmkToLeft=%p\n", pmkToLeft); ok(ppszDisplayName != NULL, "ppszDisplayName == NULL\n"); - ok(*ppszDisplayName == NULL, "*ppszDisplayName=%p\n", *ppszDisplayName); *ppszDisplayName = CoTaskMemAlloc(sizeof(winetest_test)); memcpy(*ppszDisplayName, winetest_test, sizeof(winetest_test));

1 0

Jacek Caban : mshtml: Remove no longer used [Get|Set]Moniker functions.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 2e53ac9d8e38a77bc8da79d393a36a32e40fcd52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e53ac9d8e38a77bc8da79d39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 9 20:19:56 2007 +0100 mshtml: Remove no longer used [Get|Set]Moniker functions. --- dlls/mshtml/nsiface.idl | 2 - dlls/mshtml/nsio.c | 58 ----------------------------------------------- 2 files changed, 0 insertions(+), 60 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index a93c957..09b4793 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1529,8 +1529,6 @@ interface nsIWineURI : nsIURI nsresult GetNSContainer(NSContainer **aNSContainer); nsresult SetNSContainer(NSContainer *aNSContainer); - nsresult GetMoniker(IMoniker **aMoniker); - nsresult SetMoniker(IMoniker *aMoniker); nsresult GetIsDocumentURI(PRBool *aIsDocumentURI); nsresult SetIsDocumentURI(PRBool aIsDocumentURI); nsresult GetWineURL(LPCWSTR *aURL); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2cd226c..b075b7b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -55,7 +55,6 @@ typedef struct { nsIURI *uri; NSContainer *container; - IMoniker *mon; LPWSTR wine_url; PRBool is_doc_uri; } nsURI; @@ -1153,8 +1152,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIW nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); if(This->uri) nsIURI_Release(This->uri); - if(This->mon) - IMoniker_Release(This->mon); mshtml_free(This->wine_url); mshtml_free(This); } @@ -1553,58 +1550,6 @@ static nsresult NSAPI nsURI_SetNSContain return NS_OK; } -static nsresult NSAPI nsURI_GetMoniker(nsIWineURI *iface, IMoniker **aMoniker) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aMoniker); - - if(This->mon) - IMoniker_AddRef(This->mon); - *aMoniker = This->mon; - - return NS_OK; -} - -static nsresult NSAPI nsURI_SetMoniker(nsIWineURI *iface, IMoniker *aMoniker) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aMoniker); - - if(This->mon) { - WARN("Moniker already set: %p\n", This->container); - IMoniker_Release(This->mon); - - mshtml_free(This->wine_url); - This->wine_url = NULL; - } - - if(aMoniker) { - LPWSTR url = NULL; - HRESULT hres; - - hres = IMoniker_GetDisplayName(aMoniker, NULL, NULL, &url); - if(SUCCEEDED(hres)) { - DWORD len; - - len = strlenW(url)+1; - This->wine_url = mshtml_alloc(len*sizeof(WCHAR)); - memcpy(This->wine_url, url, len*sizeof(WCHAR)); - CoTaskMemFree(url); - - TRACE("wine_url %s\n", debugstr_w(This->wine_url)); - }else { - ERR("GetDisplayName failed: %08x\n", hres); - } - - IMoniker_AddRef(aMoniker); - } - This->mon = aMoniker; - - return NS_OK; -} - static nsresult NSAPI nsURI_GetIsDocumentURI(nsIWineURI *iface, PRBool *aIsDocumentURI) { nsURI *This = NSURI_THIS(iface); @@ -1688,8 +1633,6 @@ static const nsIWineURIVtbl nsWineURIVtb nsURI_GetOriginCharset, nsURI_GetNSContainer, nsURI_SetNSContainer, - nsURI_GetMoniker, - nsURI_SetMoniker, nsURI_GetIsDocumentURI, nsURI_SetIsDocumentURI, nsURI_GetWineURL, @@ -1704,7 +1647,6 @@ static nsresult create_uri(nsIURI *uri, ret->ref = 1; ret->uri = uri; ret->container = container; - ret->mon = NULL; ret->wine_url = NULL; ret->is_doc_uri = FALSE;

1 0