September 2008 - Wine-Commits

Alexandre Julliard : rpcrt4/tests: Fix a couple of test failures on Windows .
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: da95db8d5b21161ea21faaab8b4b630fb23e1702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da95db8d5b21161ea21faaab8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 14:32:30 2008 +0200 rpcrt4/tests: Fix a couple of test failures on Windows. --- dlls/rpcrt4/tests/rpc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 9f2684e..763d387 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -384,7 +384,9 @@ static void test_towers(void) ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); - ok(!strcmp(address, "0.0.0.0"), "address was \"%s\" instead of \"0.0.0.0\"\n", address); + ok(!strcmp(address, "0.0.0.0") || + broken(!strcmp(address, "255.255.255.255")), + "address was \"%s\" instead of \"0.0.0.0\"\n", address); I_RpcFree(address); I_RpcFree(tower); @@ -665,6 +667,7 @@ static void test_I_RpcExceptionFilter(void) ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", exception, EXCEPTION_CONTINUE_SEARCH, retval); break; + case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: trace("I_RpcExceptionFilter(0x%x) returned %d\n", exception, retval);

1 0

Alexandre Julliard : kernel32/tests: Fix the ResumeThread on win9x.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: c9f84aa9f925ca6ac6c5ef809b6370c8942f1280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f84aa9f925ca6ac6c5ef809… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 14:10:35 2008 +0200 kernel32/tests: Fix the ResumeThread on win9x. --- dlls/kernel32/tests/thread.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 697f34b..ff9dad2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -478,7 +478,9 @@ static VOID test_CreateThread_suspended(void) ok(suspend_count == -1, "SuspendThread returned %d, expected -1\n", suspend_count); suspend_count = ResumeThread(thread); - ok(suspend_count == 0, "ResumeThread returned %d, expected 0\n", suspend_count); + ok(suspend_count == 0 || + broken(suspend_count == -1), /* win9x */ + "ResumeThread returned %d, expected 0\n", suspend_count); ok(CloseHandle(thread)!=0,"CloseHandle failed\n"); }

1 0

Alexandre Julliard : ntdll/tests: Fix the async I/O test on Vista.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: a543896382ec6c90687aed5ce1a908d2052dad24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a543896382ec6c90687aed5ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 14:18:46 2008 +0200 ntdll/tests: Fix the async I/O test on Vista. --- dlls/ntdll/tests/file.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b58b1a7..e4f1d0a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -377,7 +377,9 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); + ok( status == STATUS_SUCCESS || + status == STATUS_PENDING, /* vista */ + "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -391,13 +393,25 @@ static void read_file_test(void) iosb.Information = 0xdeadbeef; offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( !is_signaled( event ), "event is signaled\n" ); - ok( !apc_count, "apc was called\n" ); - SleepEx( 1, TRUE ); /* alertable sleep */ - ok( !apc_count, "apc was called\n" ); + if (status == STATUS_PENDING) /* vista */ + { + ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc was not called\n" ); + } + else + { + ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); + ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); + ok( !is_signaled( event ), "event is signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( !apc_count, "apc was called\n" ); + } CloseHandle( handle ); /* now a non-overlapped file */ @@ -407,7 +421,9 @@ static void read_file_test(void) iosb.Information = 0xdeadbeef; offset.QuadPart = 0; pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); + ok( status == STATUS_END_OF_FILE || + status == STATUS_PENDING, /* vista */ + "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" );

1 0

Alexandre Julliard : kernel32/tests: Fix the BindIoCompletionCallback test on Vista.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 33c5d44d495a620568c798d36381541ec9f0a40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c5d44d495a620568c798d36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 14:07:54 2008 +0200 kernel32/tests: Fix the BindIoCompletionCallback test on Vista. --- dlls/kernel32/tests/sync.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index b685259..40ee4bb 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -512,16 +512,6 @@ static void test_iocp_callback(void) ret = DeleteFileA(filename); ok( ret, "DeleteFileA: error %d\n", GetLastError()); - hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); - ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); - retb = p_BindIoCompletionCallback(hFile, NULL, 0); - ok(retb == TRUE, "BindIoCompletionCallback failed with a NULL callback(first time set)\n"); - ret = CloseHandle(hFile); - ok( ret, "CloseHandle: error %d\n", GetLastError()); - ret = DeleteFileA(filename); - ok( ret, "DeleteFileA: error %d\n", GetLastError()); - /* win2k3 requires the Flags parameter to be zero */ SetLastError(0xdeadbeef); hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, @@ -540,7 +530,9 @@ static void test_iocp_callback(void) retb = p_BindIoCompletionCallback(NULL, iocp_callback, 0); ok(retb == FALSE, "BindIoCompletionCallback succeeded on a NULL file\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "Last error is %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* vista */ + "Last error is %d\n", GetLastError()); } static void CALLBACK timer_queue_cb1(PVOID p, BOOLEAN timedOut)

1 0

Alexandre Julliard : kernel32/tests: Fix the async I/ O test to handle errors properly.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: f0bf098e163c0ce027acb3d8b843f88a8a4d8f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bf098e163c0ce027acb3d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 13:49:16 2008 +0200 kernel32/tests: Fix the async I/O test to handle errors properly. --- dlls/kernel32/tests/file.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 94bc975..722e892 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1612,18 +1612,22 @@ static void test_async_file_errors(void) szFile[0] = '\0'; GetWindowsDirectoryA(szFile, sizeof(szFile)/sizeof(szFile[0])-1-strlen("\\win.ini")); strcat(szFile, "\\win.ini"); - hFile = CreateFileA(szFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED, NULL); - ok(hFile != NULL, "CreateFileA(%s ...) failed\n", szFile); + hFile = CreateFileA(szFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA(%s ...) failed\n", szFile); while (TRUE) { BOOL res; + DWORD count; while (WaitForSingleObjectEx(hSem, INFINITE, TRUE) == WAIT_IO_COMPLETION) ; res = ReadFileEx(hFile, lpBuffer, 4096, &ovl, FileIOComplete); /*printf("Offset = %ld, result = %s\n", ovl.Offset, res ? "TRUE" : "FALSE");*/ if (!res) break; - S(U(ovl)).Offset += 4096; + if (!GetOverlappedResult(hFile, &ovl, &count, FALSE)) + break; + S(U(ovl)).Offset += count; /* i/o completion routine only called if ReadFileEx returned success. * we only care about violations of this rule so undo what should have * been done */

1 0

Hans Leidekker : winhttp: Redirects are always GET requests.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 0451643e02b97480c3d0a23a3b05ac46159d553c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0451643e02b97480c3d0a23a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 11 11:49:56 2008 +0200 winhttp: Redirects are always GET requests. --- dlls/winhttp/request.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c5a7ae7..6ff2fec 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1118,6 +1118,9 @@ static BOOL handle_redirect( request_t *request ) } } + /* redirects are always GET requests */ + heap_free( request->verb ); + request->verb = NULL; ret = TRUE; end:

1 0

Hans Leidekker : winhttp: Handle relative redirects.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 28ae1d4f0dc55c59532c33a3d3d3443f23195c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ae1d4f0dc55c59532c33a3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 11 11:49:29 2008 +0200 winhttp: Handle relative redirects. Spotted by Jeremy White. --- dlls/winhttp/request.c | 77 ++++++++++++++++++++++++++++------------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f377087..c5a7ae7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1063,44 +1063,59 @@ static BOOL handle_redirect( request_t *request ) uc.dwStructSize = sizeof(uc); uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = ~0UL; - if (!(ret = WinHttpCrackUrl( location, size / sizeof(WCHAR), 0, &uc ))) goto end; - - if (uc.nScheme == INTERNET_SCHEME_HTTP && request->hdr.flags & WINHTTP_FLAG_SECURE) + if (!WinHttpCrackUrl( location, size / sizeof(WCHAR), 0, &uc )) /* assume relative redirect */ { - TRACE("redirect from secure page to non-secure page\n"); - request->hdr.flags &= ~WINHTTP_FLAG_SECURE; + WCHAR *path, *p; + + len = strlenW( location ) + 1; + if (location[0] != '/') len++; + if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; + + if (location[0] != '/') *p++ = '/'; + strcpyW( p, location ); + + heap_free( request->path ); + request->path = path; } - else if (uc.nScheme == INTERNET_SCHEME_HTTPS && !(request->hdr.flags & WINHTTP_FLAG_SECURE)) + else { - TRACE("redirect from non-secure page to secure page\n"); - request->hdr.flags |= WINHTTP_FLAG_SECURE; - } + if (uc.nScheme == INTERNET_SCHEME_HTTP && request->hdr.flags & WINHTTP_FLAG_SECURE) + { + TRACE("redirect from secure page to non-secure page\n"); + request->hdr.flags &= ~WINHTTP_FLAG_SECURE; + } + else if (uc.nScheme == INTERNET_SCHEME_HTTPS && !(request->hdr.flags & WINHTTP_FLAG_SECURE)) + { + TRACE("redirect from non-secure page to secure page\n"); + request->hdr.flags |= WINHTTP_FLAG_SECURE; + } - len = uc.dwHostNameLength; - if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - memcpy( hostname, uc.lpszHostName, len * sizeof(WCHAR) ); - hostname[len] = 0; + len = uc.dwHostNameLength; + if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + memcpy( hostname, uc.lpszHostName, len * sizeof(WCHAR) ); + hostname[len] = 0; - port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); - if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) - { - heap_free( connect->servername ); - connect->servername = hostname; - connect->serverport = connect->hostport = port; + port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); + if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) + { + heap_free( connect->servername ); + connect->servername = hostname; + connect->serverport = connect->hostport = port; - netconn_close( &request->netconn ); - if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; - } - if (!(ret = add_host_header( request, hostname, port, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; - if (!(ret = open_connection( request ))) goto end; + netconn_close( &request->netconn ); + if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; + } + if (!(ret = add_host_header( request, hostname, port, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; + if (!(ret = open_connection( request ))) goto end; - heap_free( request->path ); - request->path = NULL; - if (uc.lpszUrlPath) - { - len = uc.dwUrlPathLength + uc.dwExtraInfoLength; - if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( request->path, uc.lpszUrlPath ); + heap_free( request->path ); + request->path = NULL; + if (uc.lpszUrlPath) + { + len = uc.dwUrlPathLength + uc.dwExtraInfoLength; + if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( request->path, uc.lpszUrlPath ); + } } ret = TRUE;

1 0

Hans Leidekker : cryptui: Add a stub implementation of CryptUIDlgViewCertificateW.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 1f3e3b848bfdb55e2a643348c63d634b2150a16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3e3b848bfdb55e2a643348c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 11 11:47:14 2008 +0200 cryptui: Add a stub implementation of CryptUIDlgViewCertificateW. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index b023ed2..ad5cb4b 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -14,7 +14,7 @@ 14 stub CryptUIDlgViewCertificateA 15 stub CryptUIDlgViewCertificatePropertiesA 16 stub CryptUIDlgViewCertificatePropertiesW -17 stub CryptUIDlgViewCertificateW +17 stdcall CryptUIDlgViewCertificateW(ptr ptr) 18 stub CryptUIDlgViewContext 19 stub CryptUIDlgViewSignerInfoA 20 stub CryptUIDlgViewSignerInfoW diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 8784915..4bf456a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -55,3 +55,11 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) FIXME("(%p): stub\n", pCryptUICertMgr); return FALSE; } + +BOOL WINAPI CryptUIDlgViewCertificateW(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, + BOOL *pfPropertiesChanged) +{ + FIXME("(%p, %p): stub\n", pCertViewInfo, pfPropertiesChanged); + if (pfPropertiesChanged) *pfPropertiesChanged = FALSE; + return TRUE; +}

1 0

Alistair Leslie-Hughes : mshtml: Implement get/put margin.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 433027a3773e0c6e87ca517bd74a70d2c4461bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=433027a3773e0c6e87ca517bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 11 09:46:32 2008 +1000 mshtml: Implement get/put margin. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b4c48d4..669df72 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -63,6 +63,8 @@ static const WCHAR attrFontStyle[] = {'f','o','n','t','-','s','t','y','l','e',0}; static const WCHAR attrFontWeight[] = {'f','o','n','t','-','w','e','i','g','h','t',0}; +static const WCHAR attrMargin[] = + {'m','a','r','g','i','n',0}; static const WCHAR attrMarginLeft[] = {'m','a','r','g','i','n','-','l','e','f','t',0}; static const WCHAR attrMarginRight[] = @@ -848,15 +850,19 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_put_margin(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrMargin, v, 0); } static HRESULT WINAPI HTMLStyle_get_margin(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrMargin, p); } static HRESULT WINAPI HTMLStyle_get_marginLeft(IHTMLStyle *iface, VARIANT *p)

1 0

Alistair Leslie-Hughes : hlink: Mark Get/ Set AdditionalParams as Unimplemented.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 522b515b544ae8d366a37fff916b2afa33523f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522b515b544ae8d366a37fff9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 11 11:19:23 2008 +1000 hlink: Mark Get/Set AdditionalParams as Unimplemented. --- dlls/hlink/link.c | 4 ++-- dlls/hlink/tests/hlink.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index ff34556..20841f8 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -441,14 +441,14 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, LPCWSTR pwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; } static HRESULT WINAPI IHlink_fnGetAdditionalParams(IHlink* iface, LPWSTR* ppwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 9e4c5a3..89b7c7a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -158,6 +158,13 @@ static void test_reference(void) ok(r == S_OK, "failed\n"); ok(str == NULL, "string should be null\n"); + /* Unimplented functions checks */ + r = IHlink_GetAdditionalParams(lnk, NULL); + ok(r == E_NOTIMPL, "failed\n"); + + r = IHlink_SetAdditionalParams(lnk, NULL); + ok(r == E_NOTIMPL, "failed\n"); + IHlink_Release(lnk); }

1 0