Module: wine
Branch: refs/heads/master
Commit: 0fd184773a90a44ae5fd8dd493646ac9d6796e0e
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fd184773a90a44ae5fd8dd…
Author: Robert Shearman <rob(a)codeweavers.com>
Date: Mon May 22 22:17:53 2006 +0100
ole32: Release the outer unknown in the proxybuffer test.
Release the outer unknown in the proxybuffer test to show that the
last release of the outer unknown doesn't free the proxy buffer.
---
dlls/ole32/tests/marshal.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index dffff9d..8ecbe42 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -1400,13 +1400,18 @@ static void test_proxybuffer(REFIID riid
ok_ole_success(hr, IPSFactoryBuffer_CreateProxy);
ok(lpvtbl != NULL, "IPSFactoryBuffer_CreateProxy succeeded, but returned a NULL vtable!\n");
+ /* release our reference to the outer unknown object - the PS factory
+ * buffer will have AddRef's it in the CreateProxy call */
+ refs = IUnknown_Release((IUnknown *)pUnkOuter);
+ ok(refs == 1, "Ref count of outer unknown should have been 1 instead of %ld\n", refs);
+
refs = IPSFactoryBuffer_Release(psfb);
#if 0 /* not reliable on native. maybe it leaks references! */
ok(refs == 0, "Ref-count leak of %ld on IPSFactoryBuffer\n", refs);
#endif
refs = IUnknown_Release((IUnknown *)lpvtbl);
- ok(refs == 1, "Ref-count leak of %ld on IRpcProxyBuffer\n", refs-1);
+ ok(refs == 0, "Ref-count leak of %ld on IRpcProxyBuffer\n", refs);
refs = IRpcProxyBuffer_Release(proxy);
ok(refs == 0, "Ref-count leak of %ld on IRpcProxyBuffer\n", refs);
Module: wine
Branch: refs/heads/master
Commit: d4245634ca3230b0b8f93a6fa0a85c8f165f90e6
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4245634ca3230b0b8f93a6…
Author: Robert Shearman <rob(a)codeweavers.com>
Date: Mon May 22 12:02:23 2006 +0100
wininet: Fix a failing test.
---
dlls/wininet/tests/url.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 364364a..60ed7e9 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -320,12 +320,12 @@ static void InternetCrackUrlW_test(void)
comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]);
r = InternetCrackUrlW(url2, 0, 0, &comp);
- ok( r, "InternetCrackUrl failed, error %lx\n",GetLastError());
- ok(!comp.dwSchemeLength,".dwSchemeLength should be 0, but is %ld\n", comp.dwSchemeLength);
- ok(!comp.dwHostNameLength,".dwHostNameLength should be 0, but is %ld\n", comp.dwHostNameLength);
- ok(!comp.dwUserNameLength,".dwUserNameLength should be 0, but is %ld\n", comp.dwUserNameLength);
- ok(!comp.dwPasswordLength,".dwPasswordLength should be 0, but is %ld\n", comp.dwPasswordLength);
- ok(!comp.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %ld\n", comp.dwExtraInfoLength);
+ todo_wine {
+ ok(!r, "InternetCrackUrl should have failed\n");
+ ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME,
+ "InternetCrackUrl should have failed with error ERROR_INTERNET_UNRECOGNIZED_SCHEME instead of error %ld\n",
+ GetLastError());
+ }
}
static void fill_url_components(LPURL_COMPONENTS lpUrlComponents)
Module: wine
Branch: refs/heads/master
Commit: dd362a62a1ae5e6fa0f66032d6a4fe7704ea0555
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd362a62a1ae5e6fa0f6603…
Author: Robert Shearman <rob(a)codeweavers.com>
Date: Mon May 22 12:02:04 2006 +0100
rpcrt4: Fix copying too much data from the buffer by not taking into account the fact that auth_pad_len has been included in the fragment length.
---
dlls/rpcrt4/rpc_message.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c
index e19735d..ccf33fa 100644
--- a/dlls/rpcrt4/rpc_message.c
+++ b/dlls/rpcrt4/rpc_message.c
@@ -304,7 +304,7 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon
if (hdr_size == Header->common.frag_len)
goto write;
- memcpy(pkt + hdr_size, buffer_pos, Header->common.frag_len - hdr_size - alen);
+ memcpy(pkt + hdr_size, buffer_pos, Header->common.frag_len - hdr_size - auth_pad_len - alen);
/* add the authorization info */
if (Connection->AuthInfo && AuthLength)