June 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Make connection points container independent.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 88f4fb1f4fe2e25399d21424974f73540fa5fb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f4fb1f4fe2e25399d214249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:50:04 2007 +0200 mshtml: Make connection points container independent. --- dlls/mshtml/conpoint.c | 11 ++++++----- dlls/mshtml/htmldoc.c | 10 ++++++---- dlls/mshtml/mshtml_private.h | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index b19ca16..b5c969c 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -75,13 +75,13 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(This->doc)); + return IConnectionPointContainer_AddRef(This->container); } static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IHTMLDocument2_Release(HTMLDOC(This->doc)); + return IConnectionPointContainer_Release(This->container); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) @@ -107,7 +107,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi if(!ppCPC) return E_POINTER; - *ppCPC = CONPTCONT(&This->doc->cp_container); + *ppCPC = This->container; IConnectionPointContainer_AddRef(*ppCPC); return S_OK; } @@ -184,10 +184,11 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -void ConnectionPoint_Init(ConnectionPoint *cp, HTMLDocument *doc, REFIID riid, ConnectionPoint *prev) +void ConnectionPoint_Init(ConnectionPoint *cp, IConnectionPointContainer *container, + REFIID riid, ConnectionPoint *prev) { cp->lpConnectionPointVtbl = &ConnectionPointVtbl; - cp->doc = doc; + cp->container = container; cp->sinks = NULL; cp->sinks_size = 0; cp->iid = *riid; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b5eee9a..746c67a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1142,10 +1142,12 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) HTMLDocument_Service_Init(ret); HTMLDocument_Hlink_Init(ret); - ConnectionPoint_Init(&ret->cp_propnotif, ret, &IID_IPropertyNotifySink, NULL); - ConnectionPoint_Init(&ret->cp_htmldocevents, ret, &DIID_HTMLDocumentEvents, &ret->cp_propnotif); - ConnectionPoint_Init(&ret->cp_htmldocevents2, ret, &DIID_HTMLDocumentEvents2, - &ret->cp_htmldocevents); + ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), + &IID_IPropertyNotifySink, NULL); + ConnectionPoint_Init(&ret->cp_htmldocevents, CONPTCONT(&ret->cp_container), + &DIID_HTMLDocumentEvents, &ret->cp_propnotif); + ConnectionPoint_Init(&ret->cp_htmldocevents2, CONPTCONT(&ret->cp_container), + &DIID_HTMLDocumentEvents2, &ret->cp_htmldocevents); ConnectionPointContainer_Init(&ret->cp_container, &ret->cp_propnotif, (IUnknown*)HTMLDOC(ret)); ret->nscontainer = NSContainer_Create(ret, NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ecdab3d..244a0e4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -81,7 +81,7 @@ typedef struct { struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; - HTMLDocument *doc; + IConnectionPointContainer *container; union { IUnknown *unk; @@ -346,7 +346,7 @@ void HTMLDocument_Window_Init(HTMLDocument*); void HTMLDocument_Service_Init(HTMLDocument*); void HTMLDocument_Hlink_Init(HTMLDocument*); -void ConnectionPoint_Init(ConnectionPoint*,HTMLDocument*,REFIID,ConnectionPoint*); +void ConnectionPoint_Init(ConnectionPoint*,IConnectionPointContainer*,REFIID,ConnectionPoint*); void ConnectionPointContainer_Init(ConnectionPointContainer*,ConnectionPoint*,IUnknown*); void ConnectionPointContainer_Destroy(ConnectionPointContainer*);

1 0

Jacek Caban : mshtml: Don't use dynamic allocation for connection points.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: fb16633d6f7c6522c3453e3efca0296630198977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb16633d6f7c6522c3453e3ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:47:59 2007 +0200 mshtml: Don't use dynamic allocation for connection points. --- dlls/mshtml/conpoint.c | 50 ++++++++++++----------------------------- dlls/mshtml/mshtml_private.h | 21 +++++++++++++++-- dlls/mshtml/persist.c | 2 +- dlls/mshtml/task.c | 6 ++-- 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 9077baf..421a72e 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -36,21 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl); -struct ConnectionPoint { - const IConnectionPointVtbl *lpConnectionPointVtbl; - - HTMLDocument *doc; - - union { - IUnknown *unk; - IDispatch *disp; - IPropertyNotifySink *propnotif; - } *sinks; - DWORD sinks_size; - - IID iid; -}; - void call_property_onchanged(ConnectionPoint *This, DISPID dispid) { DWORD i; @@ -199,17 +184,13 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -static void ConnectionPoint_Create(HTMLDocument *doc, REFIID riid, ConnectionPoint **cp) +static void ConnectionPoint_Init(HTMLDocument *doc, REFIID riid, ConnectionPoint *cp) { - ConnectionPoint *ret = mshtml_alloc(sizeof(ConnectionPoint)); - - ret->lpConnectionPointVtbl = &ConnectionPointVtbl; - ret->doc = doc; - ret->sinks = NULL; - ret->sinks_size = 0; - memcpy(&ret->iid, riid, sizeof(IID)); - - *cp = ret; + cp->lpConnectionPointVtbl = &ConnectionPointVtbl; + cp->doc = doc; + cp->sinks = NULL; + cp->sinks_size = 0; + cp->iid = *riid; } static void ConnectionPoint_Destroy(ConnectionPoint *This) @@ -222,7 +203,6 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) } mshtml_free(This->sinks); - mshtml_free(This); } #define CONPTCONT_THIS(iface) DEFINE_THIS(HTMLDocument, ConnectionPointContainer, iface) @@ -263,13 +243,13 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo if(IsEqualGUID(&DIID_HTMLDocumentEvents, riid)) { TRACE("(%p)->(DIID_HTMLDocumentEvents %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_htmldocevents); + *ppCP = CONPOINT(&This->cp_htmldocevents); }else if(IsEqualGUID(&DIID_HTMLDocumentEvents2, riid)) { TRACE("(%p)->(DIID_HTMLDocumentEvents2 %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_htmldocevents2); + *ppCP = CONPOINT(&This->cp_htmldocevents2); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_propnotif); + *ppCP = CONPOINT(&This->cp_propnotif); } if(*ppCP) { @@ -295,14 +275,14 @@ void HTMLDocument_ConnectionPoints_Init(HTMLDocument *This) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; - ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_propnotif); - ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents, &This->cp_htmldocevents); - ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents2, &This->cp_htmldocevents2); + ConnectionPoint_Init(This, &IID_IPropertyNotifySink, &This->cp_propnotif); + ConnectionPoint_Init(This, &DIID_HTMLDocumentEvents, &This->cp_htmldocevents); + ConnectionPoint_Init(This, &DIID_HTMLDocumentEvents2, &This->cp_htmldocevents2); } void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument *This) { - ConnectionPoint_Destroy(This->cp_propnotif); - ConnectionPoint_Destroy(This->cp_htmldocevents); - ConnectionPoint_Destroy(This->cp_htmldocevents2); + ConnectionPoint_Destroy(&This->cp_propnotif); + ConnectionPoint_Destroy(&This->cp_htmldocevents); + ConnectionPoint_Destroy(&This->cp_htmldocevents2); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1b8b02f..b343697 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -71,6 +71,21 @@ typedef enum { EDITMODE } USERMODE; +struct ConnectionPoint { + const IConnectionPointVtbl *lpConnectionPointVtbl; + + HTMLDocument *doc; + + union { + IUnknown *unk; + IDispatch *disp; + IPropertyNotifySink *propnotif; + } *sinks; + DWORD sinks_size; + + IID iid; +}; + struct HTMLDocument { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; @@ -120,9 +135,9 @@ struct HTMLDocument { DWORD update; - ConnectionPoint *cp_htmldocevents; - ConnectionPoint *cp_htmldocevents2; - ConnectionPoint *cp_propnotif; + ConnectionPoint cp_htmldocevents; + ConnectionPoint cp_htmldocevents2; + ConnectionPoint cp_propnotif; HTMLDOMNode *nodes; }; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 58ca422..3b606d6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -177,7 +177,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } This->readystate = READYSTATE_LOADING; - call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + call_property_onchanged(&This->cp_propnotif, DISPID_READYSTATE); update_doc(This, UPDATE_TITLE); HTMLDocument_LockContainer(This, TRUE); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 540c969..5204a89 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -135,10 +135,10 @@ static void set_parsecomplete(HTMLDocument *doc) if(doc->usermode == EDITMODE) init_editor(doc); - call_property_onchanged(doc->cp_propnotif, 1005); + call_property_onchanged(&doc->cp_propnotif, 1005); doc->readystate = READYSTATE_INTERACTIVE; - call_property_onchanged(doc->cp_propnotif, DISPID_READYSTATE); + call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE); if(doc->client) IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); @@ -163,7 +163,7 @@ static void set_parsecomplete(HTMLDocument *doc) } doc->readystate = READYSTATE_COMPLETE; - call_property_onchanged(doc->cp_propnotif, DISPID_READYSTATE); + call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE); if(doc->frame) { static const WCHAR wszDone[] = {'D','o','n','e',0};

1 0

Juan Lang : crypt32: Implement getting content for data messages opened to encode.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: f75b86f02be0d3caa030b6c89dc66e6338d5717c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b86f02be0d3caa030b6c89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 17:19:45 2007 -0700 crypt32: Implement getting content for data messages opened to encode. --- dlls/crypt32/msg.c | 11 ++++++++++- dlls/crypt32/tests/msg.c | 5 ----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c92d6ef..4ac5cf0 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -118,8 +118,17 @@ static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { case CMSG_CONTENT_PARAM: - FIXME("stub\n"); + { + CRYPT_CONTENT_INFO info; + char rsa_data[] = "1.2.840.113549.1.7.1"; + + info.pszObjId = rsa_data; + info.Content.cbData = msg->bare_content_len; + info.Content.pbData = msg->bare_content; + ret = CryptEncodeObject(X509_ASN_ENCODING, PKCS_CONTENT_INFO, &info, + pvData, pcbData); break; + } case CMSG_BARE_CONTENT_PARAM: if (!pvData) { diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index da534da..16ab7f6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -384,7 +384,6 @@ static void test_data_msg_get_param(void) /* Content and bare content are always gettable */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); @@ -426,14 +425,12 @@ static void test_data_msg_encoding(void) NULL); check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, dataEmptyBareContent, sizeof(dataEmptyBareContent)); - todo_wine check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, sizeof(dataEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, dataBareContent, sizeof(dataBareContent)); - todo_wine check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); CryptMsgClose(msg); @@ -442,14 +439,12 @@ static void test_data_msg_encoding(void) CMSG_DATA, NULL, NULL, NULL); check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, dataEmptyBareContent, sizeof(dataEmptyBareContent)); - todo_wine check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, sizeof(dataEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, dataBareContent, sizeof(dataBareContent)); - todo_wine check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); CryptMsgClose(msg);

1 0

Jacek Caban : mshtml: Store connection point as a list.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: fc4fd71e011e39e3522f1270c4b72f97a6a3b2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4fd71e011e39e3522f1270c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 29 02:48:50 2007 +0200 mshtml: Store connection point as a list. --- dlls/mshtml/conpoint.c | 36 ++++++++++++++++++------------------ dlls/mshtml/htmldoc.c | 5 +++++ dlls/mshtml/mshtml_private.h | 4 ++++ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 421a72e..7900ff6 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -184,13 +184,17 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -static void ConnectionPoint_Init(HTMLDocument *doc, REFIID riid, ConnectionPoint *cp) +void ConnectionPoint_Init(ConnectionPoint *cp, HTMLDocument *doc, REFIID riid, ConnectionPoint *prev) { cp->lpConnectionPointVtbl = &ConnectionPointVtbl; cp->doc = doc; cp->sinks = NULL; cp->sinks_size = 0; cp->iid = *riid; + cp->next = NULL; + + if(prev) + prev->next = cp; } static void ConnectionPoint_Destroy(ConnectionPoint *This) @@ -238,18 +242,15 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo REFIID riid, IConnectionPoint **ppCP) { HTMLDocument *This = CONPTCONT_THIS(iface); + ConnectionPoint *iter; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); *ppCP = NULL; - if(IsEqualGUID(&DIID_HTMLDocumentEvents, riid)) { - TRACE("(%p)->(DIID_HTMLDocumentEvents %p)\n", This, ppCP); - *ppCP = CONPOINT(&This->cp_htmldocevents); - }else if(IsEqualGUID(&DIID_HTMLDocumentEvents2, riid)) { - TRACE("(%p)->(DIID_HTMLDocumentEvents2 %p)\n", This, ppCP); - *ppCP = CONPOINT(&This->cp_htmldocevents2); - }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { - TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(&This->cp_propnotif); + for(iter = &This->cp_propnotif; iter; iter = iter->next) { + if(IsEqualGUID(&iter->iid, riid)) + *ppCP = CONPOINT(iter); } if(*ppCP) { @@ -257,7 +258,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo return S_OK; } - FIXME("(%p)->(%s %p) unsupported riid\n", This, debugstr_guid(riid), ppCP); + FIXME("unsupported riid %s\n", debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; } @@ -274,15 +275,14 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { void HTMLDocument_ConnectionPoints_Init(HTMLDocument *This) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; - - ConnectionPoint_Init(This, &IID_IPropertyNotifySink, &This->cp_propnotif); - ConnectionPoint_Init(This, &DIID_HTMLDocumentEvents, &This->cp_htmldocevents); - ConnectionPoint_Init(This, &DIID_HTMLDocumentEvents2, &This->cp_htmldocevents2); } void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument *This) { - ConnectionPoint_Destroy(&This->cp_propnotif); - ConnectionPoint_Destroy(&This->cp_htmldocevents); - ConnectionPoint_Destroy(&This->cp_htmldocevents2); + ConnectionPoint *iter = &This->cp_propnotif; + + while(iter) { + ConnectionPoint_Destroy(iter); + iter = iter->next; + } } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a606dac..649a849 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1143,6 +1143,11 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) HTMLDocument_Hlink_Init(ret); HTMLDocument_ConnectionPoints_Init(ret); + ConnectionPoint_Init(&ret->cp_propnotif, ret, &IID_IPropertyNotifySink, NULL); + ConnectionPoint_Init(&ret->cp_htmldocevents, ret, &DIID_HTMLDocumentEvents, &ret->cp_propnotif); + ConnectionPoint_Init(&ret->cp_htmldocevents2, ret, &DIID_HTMLDocumentEvents2, + &ret->cp_htmldocevents); + ret->nscontainer = NSContainer_Create(ret, NULL); ret->window = HTMLWindow_Create(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b343697..40bf08f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -84,6 +84,8 @@ struct ConnectionPoint { DWORD sinks_size; IID iid; + + ConnectionPoint *next; }; struct HTMLDocument { @@ -340,6 +342,8 @@ void HTMLDocument_ConnectionPoints_Init(HTMLDocument*); void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument*); +void ConnectionPoint_Init(ConnectionPoint*,HTMLDocument*,REFIID,ConnectionPoint*); + NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*);

1 0

Juan Lang : crypt32: Add tests for data message encoding.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: d1f379340a5d9936c76db78778fc4ba36e6472a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f379340a5d9936c76db7877… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 17:16:49 2007 -0700 crypt32: Add tests for data message encoding. --- dlls/crypt32/tests/msg.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0d4ea3a..47e353a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -280,6 +280,26 @@ static void test_msg_close(void) ok(ret, "CryptMsgClose failed: %x\n", GetLastError()); } +static void check_param(LPCSTR test, HCRYPTMSG msg, DWORD param, + const BYTE *expected, DWORD expectedSize) +{ + DWORD size; + LPBYTE buf; + BOOL ret; + + size = 0; + ret = CryptMsgGetParam(msg, param, 0, NULL, &size); + ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); + buf = HeapAlloc(GetProcessHeap(), 0, size); + ret = CryptMsgGetParam(msg, param, 0, buf, &size); + ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); + ok(size == expectedSize, "%s: expected size %d, got %d\n", test, + expectedSize, size); + if (size) + ok(!memcmp(buf, expected, size), "%s: unexpected data\n", test); + HeapFree(GetProcessHeap(), 0, buf); +} + static void test_data_msg_open(void) { HCRYPTMSG msg; @@ -389,11 +409,63 @@ static void test_data_msg_get_param(void) CryptMsgClose(msg); } +static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; +static const BYTE dataEmptyContent[] = { +0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x02, +0x04,0x00 }; +static const BYTE dataBareContent[] = { 0x04,0x04,0x01,0x02,0x03,0x04 }; +static const BYTE dataContent[] = { +0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06, +0x04,0x04,0x01,0x02,0x03,0x04 }; + +static void test_data_msg_encoding(void) +{ + HCRYPTMSG msg; + BOOL ret; + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + todo_wine { + check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataEmptyBareContent, sizeof(dataEmptyBareContent)); + check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, + sizeof(dataEmptyContent)); + } + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + todo_wine { + check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataBareContent, sizeof(dataBareContent)); + check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, + sizeof(dataContent)); + } + CryptMsgClose(msg); + /* Same test, but with CMSG_BARE_CONTENT_FLAG set */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_BARE_CONTENT_FLAG, + CMSG_DATA, NULL, NULL, NULL); + todo_wine { + check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataEmptyBareContent, sizeof(dataEmptyBareContent)); + check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, + sizeof(dataEmptyContent)); + } + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + todo_wine { + check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataBareContent, sizeof(dataBareContent)); + check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, + sizeof(dataContent)); + } + CryptMsgClose(msg); +} + static void test_data_msg(void) { test_data_msg_open(); test_data_msg_update(); test_data_msg_get_param(); + test_data_msg_encoding(); } START_TEST(msg)

1 0

Juan Lang : crypt32: Implement getting bare content for data messages opened to encode.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 263f424c3b27a99553d7d564b9032db17018dd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=263f424c3b27a99553d7d564b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 17:19:04 2007 -0700 crypt32: Implement getting bare content for data messages opened to encode. --- dlls/crypt32/msg.c | 20 +++++++++++++++++++- dlls/crypt32/tests/msg.c | 15 +++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index e392b79..c92d6ef 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -112,14 +112,32 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { + CDataEncodeMsg *msg = (CDataEncodeMsg *)hCryptMsg; BOOL ret = FALSE; switch (dwParamType) { case CMSG_CONTENT_PARAM: - case CMSG_BARE_CONTENT_PARAM: FIXME("stub\n"); break; + case CMSG_BARE_CONTENT_PARAM: + if (!pvData) + { + *pcbData = msg->bare_content_len; + ret = TRUE; + } + else if (*pcbData < msg->bare_content_len) + { + *pcbData = msg->bare_content_len; + SetLastError(ERROR_MORE_DATA); + } + else + { + *pcbData = msg->bare_content_len; + memcpy(pvData, msg->bare_content, msg->bare_content_len); + ret = TRUE; + } + break; default: SetLastError(CRYPT_E_INVALID_MSG_TYPE); } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 47e353a..da534da 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -384,12 +384,11 @@ static void test_data_msg_get_param(void) /* Content and bare content are always gettable */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - todo_wine { + todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - } /* But for this type of message, the signer and hash aren't applicable, * and the type isn't available. */ @@ -425,38 +424,34 @@ static void test_data_msg_encoding(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); - todo_wine { check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, dataEmptyBareContent, sizeof(dataEmptyBareContent)); + todo_wine check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, sizeof(dataEmptyContent)); - } ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); - todo_wine { check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, dataBareContent, sizeof(dataBareContent)); + todo_wine check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); - } CryptMsgClose(msg); /* Same test, but with CMSG_BARE_CONTENT_FLAG set */ msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_BARE_CONTENT_FLAG, CMSG_DATA, NULL, NULL, NULL); - todo_wine { check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM, dataEmptyBareContent, sizeof(dataEmptyBareContent)); + todo_wine check_param("data empty content", msg, CMSG_CONTENT_PARAM, dataEmptyContent, sizeof(dataEmptyContent)); - } ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); - todo_wine { check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, dataBareContent, sizeof(dataBareContent)); + todo_wine check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add a stub get param function for data messages and remove stub message from open function .
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 0546cf1a696125b82843959a5d0d7de36a5abb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0546cf1a696125b82843959a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 17:16:15 2007 -0700 crypt32: Add a stub get param function for data messages and remove stub message from open function. --- dlls/crypt32/msg.c | 19 ++++++++++++++++++- dlls/crypt32/tests/msg.c | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b88694a..e392b79 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -109,6 +109,23 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } +static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_CONTENT_PARAM: + case CMSG_BARE_CONTENT_PARAM: + FIXME("stub\n"); + break; + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; +} + static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { @@ -119,13 +136,13 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, SetLastError(E_INVALIDARG); return NULL; } - FIXME("semi-stub\n"); msg = CryptMemAlloc(sizeof(CDataEncodeMsg)); if (msg) { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo); msg->base.close = CDataEncodeMsg_Close; msg->base.update = CDataEncodeMsg_Update; + msg->base.get_param = CDataEncodeMsg_GetParam; msg->bare_content_len = sizeof(empty_data_content); msg->bare_content = (LPBYTE)empty_data_content; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 03d0abf..0d4ea3a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -369,6 +369,7 @@ static void test_data_msg_get_param(void) size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + } /* But for this type of message, the signer and hash aren't applicable, * and the type isn't available. */ @@ -384,7 +385,6 @@ static void test_data_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add a finalized member to message.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: b6bf594aa571731392acace33cab4ae731a4dbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bf594aa571731392acace33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:53:37 2007 -0700 crypt32: Add a finalized member to message. --- dlls/crypt32/msg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 5087308..c701107 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -40,6 +40,7 @@ typedef struct _CryptMsgBase LONG ref; DWORD open_flags; PCMSG_STREAM_INFO stream_info; + BOOL finalized; CryptMsgCloseFunc close; CryptMsgUpdateFunc update; CryptMsgGetParamFunc get_param; @@ -51,6 +52,7 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, msg->ref = 1; msg->open_flags = dwFlags; msg->stream_info = pStreamInfo; + msg->finalized = FALSE; } typedef struct _CDataEncodeMsg

1 0

Juan Lang : crypt32: Implement CryptMsgUpdate for data messages opened to encode.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 74bf713be79c40be97c37f2a83257e04447300e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bf713be79c40be97c37f2a8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 17:14:02 2007 -0700 crypt32: Implement CryptMsgUpdate for data messages opened to encode. --- dlls/crypt32/msg.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 8 ------- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c701107..b88694a 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -58,8 +58,57 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, typedef struct _CDataEncodeMsg { CryptMsgBase base; + DWORD bare_content_len; + LPBYTE bare_content; } CDataEncodeMsg; +static const BYTE empty_data_content[] = { 0x04,0x00 }; + +static void CDataEncodeMsg_Close(HCRYPTMSG hCryptMsg) +{ + CDataEncodeMsg *msg = (CDataEncodeMsg *)hCryptMsg; + + if (msg->bare_content != empty_data_content) + LocalFree(msg->bare_content); +} + +static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal) +{ + CDataEncodeMsg *msg = (CDataEncodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + if (msg->base.finalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (!fFinal) + { + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + SetLastError(E_INVALIDARG); + else + SetLastError(CRYPT_E_MSG_ERROR); + } + else + { + msg->base.finalized = TRUE; + if (!cbData) + SetLastError(E_INVALIDARG); + else + { + CRYPT_DATA_BLOB blob = { cbData, (LPBYTE)pbData }; + + /* data messages don't allow non-final updates, don't bother + * checking whether data already exist, they can't. + */ + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, + &msg->bare_content_len); + if (ret && msg->base.stream_info) + FIXME("stream info unimplemented\n"); + } + } + return ret; +} + static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { @@ -75,6 +124,10 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, if (msg) { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo); + msg->base.close = CDataEncodeMsg_Close; + msg->base.update = CDataEncodeMsg_Update; + msg->bare_content_len = sizeof(empty_data_content); + msg->bare_content = (LPBYTE)empty_data_content; } return (HCRYPTMSG)msg; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index df5e83f..03d0abf 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -309,17 +309,14 @@ static void test_data_msg_update(void) /* Can't update a message that wasn't opened detached with final = FALSE */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); /* Updating it with final = TRUE succeeds */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* Any subsequent update will fail, as the last was final */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); @@ -329,7 +326,6 @@ static void test_data_msg_update(void) /* Can't update a message with no data */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine { ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); /* Curiously, a valid update will now fail as well, presumably because of @@ -338,7 +334,6 @@ static void test_data_msg_update(void) ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); - } CryptMsgClose(msg); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, @@ -346,16 +341,13 @@ static void test_data_msg_update(void) /* Dont appear to be able to update CMSG-DATA with non-final updates */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Test CryptMsgGetParam for data messages opened to encode.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: e829833986de44ee1ab950594589243dce6815c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e829833986de44ee1ab950594… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:46:55 2007 -0700 crypt32: Test CryptMsgGetParam for data messages opened to encode. --- dlls/crypt32/tests/msg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2b0b3fe..1895f82 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -361,10 +361,48 @@ static void test_data_msg_update(void) CryptMsgClose(msg); } +static void test_data_msg_get_param(void) +{ + HCRYPTMSG msg; + DWORD size; + BOOL ret; + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + + /* Content and bare content are always gettable */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + size = 0; + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* But for this type of message, the signer and hash aren't applicable, + * and the type isn't available. + */ + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + } + + CryptMsgClose(msg); +} + static void test_data_msg(void) { test_data_msg_open(); test_data_msg_update(); + test_data_msg_get_param(); } START_TEST(msg)

1 0