February 2007 - Wine-Commits

Rob Shearman : include: Fix a typo in the parameter name for IClientSecurity:: QueryBlanket in objidl.idl.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: be160335d2761d573c5e6ce7b54330c941514d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be160335d2761d573c5e6ce7b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 12 13:26:59 2007 +0000 include: Fix a typo in the parameter name for IClientSecurity::QueryBlanket in objidl.idl. --- include/objidl.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 0b1b9fe..b8d8b55 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1960,7 +1960,7 @@ interface IClientSecurity : IUnknown [out] DWORD *pAuthnLevel, [out] DWORD *pImpLevel, [out] void **pAuthInfo, - [out] DWORD *pCapabilites); + [out] DWORD *pCapabilities); HRESULT SetBlanket( [in] IUnknown *pProxy,

1 0

Rob Shearman : include: Add more EOAC_* enumeration values to objidl.idl.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: c3d037c7659355eb255f0537aefa4ac2db1b77c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d037c7659355eb255f0537a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 12 13:28:18 2007 +0000 include: Add more EOAC_* enumeration values to objidl.idl. Also add the SOLE_AUTHENTICATION_INFO and SOLE_AUTHENTICATION_LIST structures which are used by CoInitializeSecurity. --- include/objidl.idl | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index b8d8b55..f7a5b12 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1943,13 +1943,33 @@ interface IClientSecurity : IUnknown typedef SOLE_AUTHENTICATION_SERVICE *PSOLE_AUTHENTICATION_SERVICE; + typedef struct tagSOLE_AUTHENTICATION_INFO { + DWORD dwAuthnSvc; + DWORD dwAuthzSvc; + void *pAuthInfo; + } SOLE_AUTHENTICATION_INFO; + + typedef struct tagSOLE_AUTHENTICATION_LIST { + DWORD cAuthInfo; + SOLE_AUTHENTICATION_INFO *aAuthInfo; + } SOLE_AUTHENTICATION_LIST; + typedef enum tagEOLE_AUTHENTICATION_CAPABILITIES { - EOAC_NONE = 0x0, - EOAC_MUTUAL_AUTH = 0x1, - EOAC_CLOAKING = 0x10, - EOAC_SECURE_REFS = 0x2, - EOAC_ACCESS_CONTROL = 0x4, - EOAC_APPID = 0x8 + EOAC_NONE = 0x0, + EOAC_MUTUAL_AUTH = 0x1, + EOAC_SECURE_REFS = 0x2, /* CoInitializeSecurity only */ + EOAC_ACCESS_CONTROL = 0x4, /* CoInitializeSecurity only */ + EOAC_APPID = 0x8, /* CoInitializeSecurity only */ + EOAC_DYNAMIC = 0x10, /* CoInitializeSecurity only */ + EOAC_STATIC_CLOAKING = 0x20, + EOAC_DYNAMIC_CLOAKING = 0x40, + EOAC_ANY_AUTHORITY = 0x80, + EOAC_MAKE_FULLSIC = 0x100, + EOAC_REQUIRE_FULLSIC = 0x200, /* CoInitializeSecurity only */ + EOAC_AUTO_IMPERSONATE = 0x400, /* CoInitializeSecurity only */ + EOAC_DEFAULT = 0x800, + EOAC_DISABLE_AAA = 0x1000, /* CoInitializeSecurity only */ + EOAC_NO_CUSTOM_MARSHAL = 0x2000, /* CoInitializeSecurity only */ } EOLE_AUTHENTICATION_CAPABILITIES; HRESULT QueryBlanket(

1 0

Rob Shearman : include: Fix a typo in a comment in rpcdce.h.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: f9df13c5b28fdea306ca6d6cd9b428d845bdc458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9df13c5b28fdea306ca6d6cd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 12 13:27:36 2007 +0000 include: Fix a typo in a comment in rpcdce.h. --- include/rpcdce.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index f6b5ab5..3fd4923 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -139,7 +139,7 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_AUTHN_MQ 100 #define RPC_C_AUTHN_DEFAULT 0xffffffff -/* values for RPC_SECURITY_QOS*::ImpersonationLevel */ +/* values for RPC_SECURITY_QOS*::ImpersonationType */ #define RPC_C_IMP_LEVEL_DEFAULT 0 #define RPC_C_IMP_LEVEL_ANONYMOUS 1 #define RPC_C_IMP_LEVEL_IDENTIFY 2

1 0

Francois Gouget : ntdll: Add prototypes to winnt.h for the SList functions.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: 76e258cb53e4bdbe105a2f000b00e20ba57ff72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e258cb53e4bdbe105a2f000… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 15:57:07 2007 +0100 ntdll: Add prototypes to winnt.h for the SList functions. --- dlls/ntdll/rtl.c | 14 +++++++------- include/winnt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 828b4a4..34a05b7 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -927,7 +927,7 @@ PVOID WINAPI RtlDecodePointer( PVOID ptr return (PVOID)(ptrval ^ get_pointer_obfuscator()); } -VOID WINAPI RtlInitializeSListHead(volatile PSLIST_HEADER ListHeader) +VOID WINAPI RtlInitializeSListHead(PSLIST_HEADER ListHeader) { TRACE("(%p)\n", ListHeader); #ifdef _WIN64 @@ -937,7 +937,7 @@ VOID WINAPI RtlInitializeSListHead(volat #endif } -USHORT WINAPI RtlQueryDepthSList(volatile PSLIST_HEADER ListHeader) +WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER ListHeader) { TRACE("(%p)\n", ListHeader); #ifdef _WIN64 @@ -948,7 +948,7 @@ USHORT WINAPI RtlQueryDepthSList(volatil #endif } -PSLIST_ENTRY WINAPI RtlFirstEntrySList(volatile PSLIST_HEADER ListHeader) +PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER* ListHeader) { TRACE("(%p)\n", ListHeader); #ifdef _WIN64 @@ -959,7 +959,7 @@ PSLIST_ENTRY WINAPI RtlFirstEntrySList(v #endif } -PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(volatile PSLIST_HEADER ListHeader) +PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER ListHeader) { SLIST_HEADER oldHeader, newHeader; TRACE("(%p)\n", ListHeader); @@ -981,7 +981,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushS #endif } -PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(volatile PSLIST_HEADER ListHeader, +PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER ListHeader, PSLIST_ENTRY ListEntry) { SLIST_HEADER oldHeader, newHeader; @@ -1004,7 +1004,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEn #endif } -PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(volatile PSLIST_HEADER ListHeader) +PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER ListHeader) { SLIST_HEADER oldHeader, newHeader; PSLIST_ENTRY entry; @@ -1040,7 +1040,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEnt /************************************************************************* * RtlInterlockedPushListSList [NTDLL.@] */ -PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(volatile PSLIST_HEADER ListHeader, +PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER ListHeader, PSLIST_ENTRY FirstEntry, PSLIST_ENTRY LastEntry, ULONG Count) diff --git a/include/winnt.h b/include/winnt.h index ff896c9..7536d8e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -647,6 +647,14 @@ typedef union _SLIST_HEADER { #endif +PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER*); +VOID WINAPI RtlInitializeSListHead(PSLIST_HEADER); +PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER); +PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER); +PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); +WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001

1 0

Francois Gouget : ntdll: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: fff13d275198020116d7cdc2a2c749bee2f5c160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff13d275198020116d7cdc2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 12 15:05:51 2007 +0100 ntdll: Fix compilation on systems that don't support nameless structs. --- dlls/ntdll/rtl.c | 39 ++++++++++++++++++++------------------- include/winnt.h | 4 ++-- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 34a05b7..7dd4003 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <string.h> #include "ntstatus.h" +#define NONAMELESSSTRUCT #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" @@ -944,7 +945,7 @@ WORD WINAPI RtlQueryDepthSList(PSLIST_HE FIXME("stub\n"); return NULL; #else - return ListHeader->Depth; + return ListHeader->s.Depth; #endif } @@ -955,7 +956,7 @@ PSLIST_ENTRY WINAPI RtlFirstEntrySList(c FIXME("stub\n"); return NULL; #else - return ListHeader->Next.Next; + return ListHeader->s.Next.Next; #endif } @@ -967,17 +968,17 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushS FIXME("stub\n"); return NULL; #else - if (ListHeader->Depth == 0) + if (ListHeader->s.Depth == 0) return NULL; newHeader.Alignment = 0; do { oldHeader = *ListHeader; - newHeader.Sequence = ListHeader->Sequence + 1; + newHeader.s.Sequence = ListHeader->s.Sequence + 1; } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, newHeader.Alignment, oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.Next.Next; + return oldHeader.s.Next.Next; #endif } @@ -990,17 +991,17 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEn FIXME("stub\n"); return NULL; #else - newHeader.Next.Next = ListEntry; + newHeader.s.Next.Next = ListEntry; do { oldHeader = *ListHeader; - ListEntry->Next = ListHeader->Next.Next; - newHeader.Depth = ListHeader->Depth + 1; - newHeader.Sequence = ListHeader->Sequence + 1; + ListEntry->Next = ListHeader->s.Next.Next; + newHeader.s.Depth = ListHeader->s.Depth + 1; + newHeader.s.Sequence = ListHeader->s.Sequence + 1; } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, newHeader.Alignment, oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.Next.Next; + return oldHeader.s.Next.Next; #endif } @@ -1016,15 +1017,15 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEnt do { oldHeader = *ListHeader; - entry = ListHeader->Next.Next; + entry = ListHeader->s.Next.Next; if (entry == NULL) return NULL; /* entry could be deleted by another thread */ __TRY { - newHeader.Next.Next = entry->Next; - newHeader.Depth = ListHeader->Depth - 1; - newHeader.Sequence = ListHeader->Sequence + 1; + newHeader.s.Next.Next = entry->Next; + newHeader.s.Depth = ListHeader->s.Depth - 1; + newHeader.s.Sequence = ListHeader->s.Sequence + 1; } __EXCEPT_PAGE_FAULT { @@ -1051,16 +1052,16 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushLi FIXME("stub\n"); return NULL; #else - newHeader.Next.Next = FirstEntry; + newHeader.s.Next.Next = FirstEntry; do { oldHeader = *ListHeader; - newHeader.Depth = ListHeader->Depth + Count; - newHeader.Sequence = ListHeader->Sequence + 1; - LastEntry->Next = ListHeader->Next.Next; + newHeader.s.Depth = ListHeader->s.Depth + Count; + newHeader.s.Sequence = ListHeader->s.Sequence + 1; + LastEntry->Next = ListHeader->s.Next.Next; } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, newHeader.Alignment, oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.Next.Next; + return oldHeader.s.Next.Next; #endif } diff --git a/include/winnt.h b/include/winnt.h index 7536d8e..b86e851 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -609,7 +609,7 @@ typedef union DECLSPEC_ALIGN(16) _SLIST_ struct { ULONGLONG Alignment; ULONGLONG Region; - }; + } DUMMYSTRUCTNAME; struct { ULONGLONG Depth:16; ULONGLONG Sequence:9; @@ -642,7 +642,7 @@ typedef union _SLIST_HEADER { SLIST_ENTRY Next; WORD Depth; WORD Sequence; - }; + } DUMMYSTRUCTNAME; } SLIST_HEADER, *PSLIST_HEADER; #endif

1 0

Jacek Caban : urlmon: Added mk protocol handling test.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: 102ae714c7efdd72af39824ab59cbc1857c0e88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=102ae714c7efdd72af39824ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 16:34:41 2007 +0100 urlmon: Added mk protocol handling test. --- dlls/urlmon/tests/url.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index bac1a7a..5213598 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -82,6 +82,9 @@ static const WCHAR ABOUT_BLANK[] = {'a', static WCHAR INDEX_HTML[MAX_PATH]; static const WCHAR ITS_URL[] = {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR MK_URL[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', + 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; @@ -93,14 +96,16 @@ static const LPCWSTR urls[] = { WINE_ABOUT_URL, ABOUT_BLANK, INDEX_HTML, - ITS_URL + ITS_URL, + MK_URL }; static enum { HTTP_TEST, ABOUT_TEST, FILE_TEST, - ITS_TEST + ITS_TEST, + MK_TEST } test_protocol; static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) @@ -171,7 +176,7 @@ static HRESULT WINAPI Protocol_Start(IIn hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); - if(test_protocol == FILE_TEST) { + if(test_protocol == FILE_TEST || test_protocol == MK_TEST) { ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON), "bindf=%08x\n", bindf); @@ -183,13 +188,23 @@ static HRESULT WINAPI Protocol_Start(IIn ok(!memcmp(&bindinfo, &bi, sizeof(bindinfo)), "wrong bindinfo\n"); - if(test_protocol == FILE_TEST || test_protocol == ITS_TEST) { + switch(test_protocol) { + case MK_TEST: + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_DIRECTBIND, NULL); + ok(hres == S_OK, + "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08x\n", hres); + + case FILE_TEST: + case ITS_TEST: SET_EXPECT(OnProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); ok(hres == S_OK, "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08x\n", hres); CHECK_CALLED(OnProgress_SENDINGREQUEST); + default: + break; } if(test_protocol == FILE_TEST) { @@ -217,7 +232,7 @@ static HRESULT WINAPI Protocol_Start(IIn bscf = BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE; SET_EXPECT(Read); - if(test_protocol != FILE_TEST) + if(test_protocol != FILE_TEST && test_protocol != MK_TEST) SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); SET_EXPECT(OnProgress_ENDDOWNLOADDATA); @@ -229,7 +244,7 @@ static HRESULT WINAPI Protocol_Start(IIn ok(hres == S_OK, "ReportData failed: %08x\n", hres); CHECK_CALLED(Read); - if(test_protocol != FILE_TEST) + if(test_protocol != FILE_TEST && test_protocol != MK_TEST) CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); @@ -819,5 +834,8 @@ START_TEST(url) trace("emulated its test...\n"); test_BindToStorage(ITS_TEST, TRUE); + trace("emulated mk test...\n"); + test_BindToStorage(MK_TEST, TRUE); + test_BindToStorage_fail(); }

1 0

Jacek Caban : urlmon: Added test of handlong its protocol.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: c5280fcc0072d19c370b528acde247f94ee4ffbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5280fcc0072d19c370b528ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 16:33:38 2007 +0100 urlmon: Added test of handlong its protocol. --- dlls/urlmon/tests/url.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index b1cb8f3..bac1a7a 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -80,6 +80,9 @@ static const WCHAR WINE_ABOUT_URL[] = {' 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR ABOUT_BLANK[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static WCHAR INDEX_HTML[MAX_PATH]; +static const WCHAR ITS_URL[] = + {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; @@ -89,13 +92,15 @@ static DWORD read = 0; static const LPCWSTR urls[] = { WINE_ABOUT_URL, ABOUT_BLANK, - INDEX_HTML + INDEX_HTML, + ITS_URL }; static enum { HTTP_TEST, ABOUT_TEST, - FILE_TEST + FILE_TEST, + ITS_TEST } test_protocol; static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) @@ -178,14 +183,16 @@ static HRESULT WINAPI Protocol_Start(IIn ok(!memcmp(&bindinfo, &bi, sizeof(bindinfo)), "wrong bindinfo\n"); - if(test_protocol == FILE_TEST) { + if(test_protocol == FILE_TEST || test_protocol == ITS_TEST) { SET_EXPECT(OnProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); ok(hres == S_OK, "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08x\n", hres); CHECK_CALLED(OnProgress_SENDINGREQUEST); + } + if(test_protocol == FILE_TEST) { hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, &null_char); ok(hres == S_OK, @@ -195,7 +202,7 @@ static HRESULT WINAPI Protocol_Start(IIn hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextHtml); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres); CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); }else { hres = IInternetProtocolSink_ReportProgress(pOIProtSink, @@ -206,6 +213,8 @@ static HRESULT WINAPI Protocol_Start(IIn if(test_protocol == ABOUT_TEST) bscf |= BSCF_DATAFULLYAVAILABLE; + if(test_protocol == ITS_TEST) + bscf = BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE; SET_EXPECT(Read); if(test_protocol != FILE_TEST) @@ -228,6 +237,13 @@ static HRESULT WINAPI Protocol_Start(IIn CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); + if(test_protocol == ITS_TEST) { + SET_EXPECT(Read); + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_BEGINDOWNLOADDATA, NULL); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + CHECK_CALLED(Read); + } + SET_EXPECT(Terminate); hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); ok(hres == S_OK, "ReportResult failed: %08x\n", hres); @@ -286,8 +302,7 @@ static HRESULT WINAPI Protocol_Read(IInt ok(pcbRead != NULL, "pcbRead == NULL\n"); if(pcbRead) { ok(*pcbRead == 0, "*pcbRead=%d, expected 0\n", *pcbRead); - *pcbRead = 13; - read = 13; + read += *pcbRead = sizeof(data)-1; } if(pv) memcpy(pv, data, sizeof(data)); @@ -662,10 +677,10 @@ static void test_BindToStorage(int proto SET_EXPECT(OnProgress_SENDINGREQUEST); SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); - SET_EXPECT(OnDataAvailable); if(test_protocol == HTTP_TEST) SET_EXPECT(OnProgress_DOWNLOADINGDATA); SET_EXPECT(OnProgress_ENDDOWNLOADDATA); + SET_EXPECT(OnDataAvailable); SET_EXPECT(OnStopBinding); } @@ -708,10 +723,10 @@ static void test_BindToStorage(int proto CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); - CHECK_CALLED(OnDataAvailable); if(test_protocol == HTTP_TEST) CHECK_CALLED(OnProgress_DOWNLOADINGDATA); CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); + CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); } @@ -801,5 +816,8 @@ START_TEST(url) set_file_url(); test_BindToStorage(FILE_TEST, TRUE); + trace("emulated its test...\n"); + test_BindToStorage(ITS_TEST, TRUE); + test_BindToStorage_fail(); }

1 0

Jacek Caban : urlmon: Depend on Read result in report_data.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: c37493647281d35559a8cf0f7fcacc8fdaa55126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37493647281d35559a8cf0f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 16:32:44 2007 +0100 urlmon: Depend on Read result in report_data. --- dlls/urlmon/binding.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index cd084b8..bd4a447 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -55,6 +55,7 @@ typedef struct { BYTE buf[1024*8]; DWORD buf_size; BOOL init_buf; + HRESULT hres; } ProtocolStream; typedef enum { @@ -139,14 +140,13 @@ static task_header_t *pop_task(Binding * static void fill_stream_buffer(ProtocolStream *This) { DWORD read = 0; - HRESULT hres; if(sizeof(This->buf) == This->buf_size) return; - hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, - sizeof(This->buf)-This->buf_size, &read); - if(SUCCEEDED(hres)) { + This->hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + sizeof(This->buf)-This->buf_size, &read); + if(SUCCEEDED(This->hres)) { This->buf_size += read; This->init_buf = TRUE; } @@ -389,7 +389,6 @@ static HRESULT WINAPI ProtocolStream_Rea { ProtocolStream *This = STREAM_THIS(iface); DWORD read = 0, pread = 0; - HRESULT hres; TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead); @@ -411,13 +410,13 @@ static HRESULT WINAPI ProtocolStream_Rea return S_OK; } - hres = IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); + This->hres = IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); *pcbRead = read + pread; - if(hres == E_PENDING) + if(This->hres == E_PENDING) return E_PENDING; - else if(FAILED(hres)) - FIXME("Read failed: %08x\n", hres); + else if(FAILED(This->hres)) + FIXME("Read failed: %08x\n", This->hres); return read || pread ? S_OK : S_FALSE; } @@ -533,6 +532,7 @@ static ProtocolStream *create_stream(IIn ret->ref = 1; ret->buf_size = 0; ret->init_buf = FALSE; + ret->hres = S_OK; IInternetProtocol_AddRef(protocol); ret->protocol = protocol; @@ -859,7 +859,7 @@ static void report_data(Binding *This, D BINDSTATUS_BEGINDOWNLOADDATA, This->url); } - if(bscf & BSCF_LASTDATANOTIFICATION) { + if(This->stream->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) { IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); } @@ -874,7 +874,7 @@ static void report_data(Binding *This, D IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, &formatetc, &This->stgmed); - if(bscf & BSCF_LASTDATANOTIFICATION) { + if(This->stream->hres == S_FALSE) { This->download_state = END_DOWNLOAD; IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); }

1 0

Jacek Caban : urlmon: Store download state in Binding object.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: f66b99db83f9a781cf1a384c393e1271ed5092b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66b99db83f9a781cf1a384c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 16:32:03 2007 +0100 urlmon: Store download state in Binding object. --- dlls/urlmon/binding.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 70d08a3..cd084b8 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -57,6 +57,12 @@ typedef struct { BOOL init_buf; } ProtocolStream; +typedef enum { + BEFORE_DOWNLOAD, + DOWNLOADING, + END_DOWNLOAD +} download_state_t; + struct Binding { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -77,6 +83,7 @@ struct Binding { BOOL report_mime; DWORD continue_call; BOOL request_locked; + download_state_t download_state; DWORD apartment_thread; HWND notif_hwnd; @@ -824,6 +831,9 @@ static void report_data(Binding *This, D TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); + if(This->download_state == END_DOWNLOAD) + return; + if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); @@ -841,14 +851,18 @@ static void report_data(Binding *This, D BINDSTATUS_MIMETYPEAVAILABLE, mime); } - if(bscf & BSCF_FIRSTDATANOTIFICATION) { + if(This->download_state == BEFORE_DOWNLOAD) { + fill_stream_buffer(This->stream); + + This->download_state = DOWNLOADING; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); } - if(bscf & BSCF_LASTDATANOTIFICATION) + if(bscf & BSCF_LASTDATANOTIFICATION) { IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); + } if(!This->request_locked) { HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); @@ -860,8 +874,10 @@ static void report_data(Binding *This, D IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, &formatetc, &This->stgmed); - if(bscf & BSCF_LASTDATANOTIFICATION) + if(bscf & BSCF_LASTDATANOTIFICATION) { + This->download_state = END_DOWNLOAD; IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); + } } typedef struct { @@ -1196,6 +1212,7 @@ static HRESULT Binding_Create(LPCWSTR ur ret->report_mime = TRUE; ret->continue_call = 0; ret->request_locked = FALSE; + ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; memset(&ret->bindinfo, 0, sizeof(BINDINFO));

1 0

Alexandre Julliard : rpcrt4: Enter new named pipe connections into the protocol connection list.
by Alexandre Julliard Feb. 12, 2007

Feb. 12, 2007

Module: wine Branch: master Commit: 639ffbfde7a3293b7da1e69294f747af6ee18067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639ffbfde7a3293b7da1e6929… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 14:13:22 2007 +0100 rpcrt4: Enter new named pipe connections into the protocol connection list. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index bf998bb..bd0a797 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -300,7 +300,12 @@ static RPC_STATUS rpcrt4_protseq_ncacn_n strcat(strcpy(pname, prefix), Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); - + + EnterCriticalSection(&protseq->cs); + Connection->Next = protseq->conn; + protseq->conn = Connection; + LeaveCriticalSection(&protseq->cs); + return r; }

1 0