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

Nigel Liang : winex11.drv: Take into account position of preedit area in PreEditCaretCallback.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 3f02c27da96d45eb16d3efece4bd0d071fc2c4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02c27da96d45eb16d3efece… Author: Nigel Liang <ncliang(a)gmail.com> Date: Tue Jul 24 16:53:54 2007 -0700 winex11.drv: Take into account position of preedit area in PreEditCaretCallback. --- dlls/winex11.drv/xim.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 9e2d232..a586af2 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -61,6 +61,7 @@ static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; static LPBYTE ResultString = NULL; static DWORD dwResultStringSize = 0; +static DWORD dwPreeditPos = 0; static HMODULE hImmDll = NULL; static HIMC (WINAPI *pImmAssociateContext)(HWND,HIMC); @@ -276,6 +277,8 @@ static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreEditStartCallback %p\n",ic); X11DRV_ImmSetOpenStatus(TRUE); ximInComposeMode = TRUE; + SendMessageW(((InputContextData*)root_context)->IMC.hWnd, + EM_GETSEL, 0, (LPARAM)&dwPreeditPos); return -1; } @@ -284,6 +287,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreeditDoneCallback %p\n",ic); ximInComposeMode = FALSE; X11DRV_ImmSetOpenStatus(FALSE); + dwPreeditPos = 0; } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, @@ -362,7 +366,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, break; } SendMessageW(((InputContextData*)root_context)->IMC.hWnd, - EM_SETSEL, pos, pos); + EM_SETSEL, dwPreeditPos + pos, dwPreeditPos + pos); P_C->position = pos; } TRACE("Finished\n");

1 0

Rob Shearman : mshtml: Events are reset when a new document URI is loaded, so re-initialise them in start_binding.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: addc9957afa5091d0a563c8d7ffea379bfdac7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addc9957afa5091d0a563c8d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:07:10 2007 -0500 mshtml: Events are reset when a new document URI is loaded, so re-initialise them in start_binding. --- dlls/mshtml/navigate.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3e05fdc..76fd5f2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -815,6 +815,11 @@ HRESULT start_binding(BSCallback *bscallback) IMoniker_Release(bscallback->mon); bscallback->mon = NULL; + + /* events are reset when a new document URI is loaded, so re-initialise them here */ + if(bscallback->doc && bscallback->doc->nscontainer) + init_nsevents(bscallback->doc->nscontainer); + return S_OK; }

1 0

Jason Edmeades : cmd: Fix trap when batch pgm runs another batch pgm.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 85c5dcb13f98f2d403d9c9ea80ef8b50b37365b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c5dcb13f98f2d403d9c9ea8… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Jul 24 23:36:30 2007 +0100 cmd: Fix trap when batch pgm runs another batch pgm. --- programs/cmd/batch.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 8f0187c..8faa297 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -122,13 +122,10 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN LocalFree ((HANDLE)context); if ((prev_context != NULL) && (!called)) { - CloseHandle (prev_context -> h); - context = prev_context -> prev_context; - LocalFree ((HANDLE)prev_context); - } - else { + prev_context -> skip_rest = TRUE; context = prev_context; } + context = prev_context; } /*******************************************************************

1 0

Rob Shearman : mshtml: Set focus to the Gecko window in OleInPlaceActiveObject_OnFrameWindowActivate .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: fbdc76aaf7a1ff6693a0837f7c294cc3de0cb26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdc76aaf7a1ff6693a0837f7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:07:05 2007 -0500 mshtml: Set focus to the Gecko window in OleInPlaceActiveObject_OnFrameWindowActivate. --- dlls/mshtml/olewnd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 5ce3209..613f71d 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -101,6 +101,9 @@ static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceAc if(This->hostui) IDocHostUIHandler_OnFrameWindowActivate(This->hostui, fActivate); + if(fActivate && This->nscontainer) + nsIWebBrowserFocus_Activate(This->nscontainer->focus); + return S_OK; }

1 0

H. Verbeet : wined3d: Fix the stretch_rect_fbo() declaration to match the implementation.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: d7c7cbf6b63769e6de9889b51adccc7be61e2ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c7cbf6b63769e6de9889b51… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 24 23:38:40 2007 +0200 wined3d: Fix the stretch_rect_fbo() declaration to match the implementation. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d735bb5..7743051 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2057,6 +2057,6 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, WINED3DTEXTUREFILTERTYPE filter, BOOL flip); + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); #endif

1 0

Rob Shearman : mshtml: OleDocumentView_UIActivate should call IOleInPlaceUIWindow_SetActiveObject and IOleInPlaceFrame_SetBorderSpace .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 92b3cab7916445d79d2559e4b580f99e3b0de479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b3cab7916445d79d2559e4b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:42 2007 -0500 mshtml: OleDocumentView_UIActivate should call IOleInPlaceUIWindow_SetActiveObject and IOleInPlaceFrame_SetBorderSpace. Add a test to show this behaviour. Don't call nsIWebBrowserFocus_Activate when just activating the window. Instead call it when UI-activating the window. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/htmldoc.c | 99 ++++++++++++++++++++++++++++++++++++------ dlls/mshtml/view.c | 39 ++++++++++++----- 3 files changed, 114 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92b3cab7916445d79d255…

1 0

Rob Shearman : mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 9a67e1ffe536c7c65f4a028ac03ae4c22bcb8593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a67e1ffe536c7c65f4a028ac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:47 2007 -0500 mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI. Don't reset window_active in OleDocumentView_UIActivate. --- dlls/mshtml/view.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index c79da80..a201de0 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -596,8 +596,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } - hres = IDocHostUIHandler_ShowUI(This->hostui, 0, ACTOBJ(This), CMDTARGET(This), - This->frame, This->ip_window); + hres = IDocHostUIHandler_ShowUI(This->hostui, + This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, + ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); if(FAILED(hres)) IDocHostUIHandler_HideUI(This->hostui); @@ -609,7 +610,6 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f This->ui_active = TRUE; }else { - This->window_active = FALSE; if(This->ui_active) { This->ui_active = FALSE; if(This->ip_window)

1 0

Rob Shearman : mshtml: Call IDocHostUIHandler_HideUI and IDocHostUIHandler_ShowUI when changing an UI active window to be in edit mode .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: bbb03cf16bc86749f2b9e876204f2485d31e5dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb03cf16bc86749f2b9e8762… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:56 2007 -0500 mshtml: Call IDocHostUIHandler_HideUI and IDocHostUIHandler_ShowUI when changing an UI active window to be in edit mode. Add tests for the behaviour of changing edit mode when a UI window is active. --- dlls/mshtml/editor.c | 29 +++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/tests/htmldoc.c | 53 ++++++++++++++++++++++++++++++++++++++---- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 2a02567..f9005b6 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -34,6 +34,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -570,6 +571,34 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) nsIDOMKeyEvent_Release(key_event); } +void handle_edit_load(HTMLDocument *This) +{ + This->nscontainer->editor_controller = get_editor_controller(This->nscontainer); + + if(This->ui_active) { + OLECHAR wszHTMLDocument[30]; + RECT rcBorderWidths; + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + if(This->hostui) + IDocHostUIHandler_HideUI(This->hostui); + + if(This->hostui) + IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), + This->frame, This->ip_window); + + LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, + sizeof(wszHTMLDocument)/sizeof(WCHAR)); + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); + } +} + static void set_ns_fontname(NSContainer *This, const char *fontname) { nsICommandParams *nsparam = create_nscommand_params(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f45f90a..27f9ba7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -442,6 +442,7 @@ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +void handle_edit_load(HTMLDocument *This); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 255716c..f03b731 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -142,7 +142,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event } if(This->doc->usermode == EDITMODE) - This->editor_controller = get_editor_controller(This); + handle_edit_load(This->doc); task = mshtml_alloc(sizeof(task_t)); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 38d3290..5306d84 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -130,7 +130,7 @@ DEFINE_EXPECT(InPlaceUIWindow_SetActiveObject); static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; -static BOOL expect_SetActiveObject_active, expect_InPlaceUIWindow_SetActiveObject_active; +static BOOL expect_SetActiveObject_active, expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; static BOOL readystate_set_loading = FALSE, load_from_stream; @@ -1139,6 +1139,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, ok(pActiveObject == NULL, "pActiveObject=%p, expected NULL\n", pActiveObject); ok(pszObjName == NULL, "pszObjName=%p, expected NULL\n", pszObjName); } + expect_InPlaceUIWindow_SetActiveObject_active = !expect_InPlaceUIWindow_SetActiveObject_active; return S_OK; } @@ -1778,7 +1779,10 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d { CHECK_EXPECT(ShowUI); - ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%d, expected DOCHOSTUITYPE_BROWSE\n", dwID); + if (editmode) + ok(dwID == DOCHOSTUITYPE_AUTHOR, "dwID=%d, expected DOCHOSTUITYPE_AUTHOR\n", dwID); + else + ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%d, expected DOCHOSTUITYPE_BROWSE\n", dwID); ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(pCommandTarget != NULL, "pCommandTarget = NULL\n"); ok(pFrame == &InPlaceFrame, "pFrame=%p, expected %p\n", pFrame, &InPlaceFrame); @@ -2862,6 +2866,10 @@ static void test_exec_editmode(IUnknown *unk) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceFrame_SetBorderSpace); expect_status_text = NULL; readystate_set_loading = TRUE; @@ -2875,6 +2883,10 @@ static void test_exec_editmode(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); @@ -3300,7 +3312,6 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags) SET_EXPECT(ShowUI); SET_EXPECT(InPlaceUIWindow_SetActiveObject); SET_EXPECT(InPlaceFrame_SetBorderSpace); - expect_InPlaceUIWindow_SetActiveObject_active = TRUE; expect_SetActiveObject_active = TRUE; expect_status_text = NULL; @@ -3383,7 +3394,6 @@ static void test_UIDeactivate(void) } expect_SetActiveObject_active = FALSE; - expect_InPlaceUIWindow_SetActiveObject_active = FALSE; hres = IOleDocumentView_UIActivate(view, FALSE); ok(hres == S_OK, "UIActivate failed: %08x\n", hres); @@ -3686,6 +3696,34 @@ static void test_HTMLDocument_StreamLoad(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_edit_uiactivate(IOleObject *oleobj) +{ + IOleDocumentView *docview; + HRESULT hres; + + hres = IOleObject_QueryInterface(oleobj, &IID_IOleDocumentView, (void **)&docview); + ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08x\n", hres); + + SET_EXPECT(OnFocus_TRUE); + SET_EXPECT(SetActiveObject); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(InPlaceFrame_SetBorderSpace); + expect_SetActiveObject_active = TRUE; + expect_status_text = NULL; + + hres = IOleDocumentView_UIActivate(docview, TRUE); + ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08x\n", hres); + + CHECK_CALLED(OnFocus_TRUE); + CHECK_CALLED(SetActiveObject); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); + + IOleDocumentView_Release(docview); +} + static void test_editing_mode(void) { IUnknown *unk; @@ -3696,6 +3734,7 @@ static void test_editing_mode(void) trace("Testing HTMLDocument (edit)...\n"); init_test(LD_DOLOAD); + call_UIActivate = CallUIActivate_AfterShow; hres = create_document(&unk); if(FAILED(hres)) @@ -3709,11 +3748,15 @@ static void test_editing_mode(void) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); + test_edit_uiactivate(oleobj); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_exec_editmode(unk); + test_UIDeactivate(); + call_UIActivate = CallUIActivate_None; IOleObject_Release(oleobj); - test_exec_editmode(unk); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_download(TRUE, FALSE); test_timer(EXPECT_UPDATEUI);

1 0

Andrew Talbot : msxml3: Cast-qual warning fix.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 11904c80fa5029fab9b608cf22d9fe11877b782b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11904c80fa5029fab9b608cf2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 24 19:16:09 2007 +0100 msxml3: Cast-qual warning fix. --- dlls/msxml3/xmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index cf2a21a..bd3c8a6 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -229,7 +229,7 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyN ptr = This->node->properties; while (ptr) { - if (!lstrcmpiA((LPSTR)name, (LPSTR)ptr->name)) + if (!lstrcmpiA((LPSTR)name, (LPCSTR)ptr->name)) { val = xmlNodeListGetString(ptr->doc, ptr->children, 1); break;

1 0

Juan Lang : crypt32: Test and implement getting the encoded signers from an encoded signed message .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: f987ca01d0c30481fae09158ff71d4cf15260691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f987ca01d0c30481fae09158f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 24 11:18:52 2007 -0700 crypt32: Test and implement getting the encoded signers from an encoded signed message. --- dlls/crypt32/msg.c | 9 ++++++++- dlls/crypt32/tests/msg.c | 14 +++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8a1fea0..ba75cb6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -865,12 +865,19 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CryptGetHashParam(msg->signerHandles[dwIndex].hash, HP_HASHVAL, pvData, pcbData, 0); break; + case CMSG_ENCODED_SIGNER: + if (dwIndex >= msg->info.cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CryptEncodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + PKCS7_SIGNER_INFO, &msg->info.rgSignerInfo[dwIndex], 0, NULL, + pvData, pcbData); + break; case CMSG_VERSION_PARAM: ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->info.version, sizeof(msg->info.version)); break; default: - FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8665594..3bd0882 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1256,6 +1256,15 @@ static const BYTE signedContent[] = { static const BYTE signedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static const BYTE signedEncodedSigner[] = { +0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, +0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, +0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05, +0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0x81,0xa6,0x70,0xb3,0xef, +0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a,0xb6,0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59, +0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e,0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63, +0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64,0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf, +0xe0,0xee,0x93,0x19,0x39,0x51,0xe4,0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; static BYTE cert[] = { 0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, 0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, @@ -1427,6 +1436,8 @@ static void test_signed_msg_encoding(void) ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + check_param("detached signed encoded signer", msg, CMSG_ENCODED_SIGNER, + signedEncodedSigner, sizeof(signedEncodedSigner)); CryptMsgClose(msg); @@ -1536,7 +1547,6 @@ static void test_signed_msg_get_param(void) size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1573,14 +1583,12 @@ static void test_signed_msg_get_param(void) */ size = 0; ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 1, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0