November 2008 - Wine-commits

Jacek Caban : jscript: Added SCRIPTSTATE_CONNECTED implementation.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 73658a8bc02304e7c876725dfb4b6ae45c68c429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73658a8bc02304e7c876725df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 01:03:19 2008 +0100 jscript: Added SCRIPTSTATE_CONNECTED implementation. --- dlls/jscript/jscript.c | 11 +++++++++-- dlls/jscript/tests/jscript.c | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 938b64e..c4bd890 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -264,6 +264,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_CONNECTED: /* FIXME */ if(This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; @@ -308,9 +309,15 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) if(This->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; - clear_script_queue(This); - if(This->ctx) { + if(This->ctx->state == SCRIPTSTATE_CONNECTED) + change_state(This, SCRIPTSTATE_DISCONNECTED); + + clear_script_queue(This); + + if(This->ctx->state == SCRIPTSTATE_DISCONNECTED) + change_state(This, SCRIPTSTATE_INITIALIZED); + if(This->ctx->named_items) { named_item_t *iter, *iter2; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 35818cc..4cc01c9 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -61,6 +61,8 @@ static const CLSID CLSID_JScript = DEFINE_EXPECT(GetLCID); DEFINE_EXPECT(OnStateChange_STARTED); +DEFINE_EXPECT(OnStateChange_CONNECTED); +DEFINE_EXPECT(OnStateChange_DISCONNECTED); DEFINE_EXPECT(OnStateChange_CLOSED); DEFINE_EXPECT(OnStateChange_INITIALIZED); DEFINE_EXPECT(OnEnterScript); @@ -134,6 +136,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S case SCRIPTSTATE_STARTED: CHECK_EXPECT(OnStateChange_STARTED); return S_OK; + case SCRIPTSTATE_CONNECTED: + CHECK_EXPECT(OnStateChange_CONNECTED); + return S_OK; + case SCRIPTSTATE_DISCONNECTED: + CHECK_EXPECT(OnStateChange_DISCONNECTED); + return S_OK; case SCRIPTSTATE_CLOSED: CHECK_EXPECT(OnStateChange_CLOSED); return S_OK; @@ -376,9 +384,20 @@ static void test_jscript2(void) hres = IActiveScriptParse_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + test_state(script, SCRIPTSTATE_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(script); ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); CHECK_CALLED(OnStateChange_CLOSED); test_state(script, SCRIPTSTATE_CLOSED);

1 0

Jacek Caban : jscript: Added SCRIPTITEM_ISVISIBLE flag implementation.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 1b51a43a7c7403ff903fbcc8436f99628e78265a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b51a43a7c7403ff903fbcc84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 01:03:38 2008 +0100 jscript: Added SCRIPTITEM_ISVISIBLE flag implementation. --- dlls/jscript/engine.c | 10 ++++++++++ dlls/jscript/jscript.c | 8 ++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/tests/run.c | 2 ++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ec503f6..ecf62ae 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -458,6 +458,16 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex } for(item = ctx->parser->script->named_items; item; item = item->next) { + if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpW(item->name, identifier)) { + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_DISPATCH; + V_DISPATCH(&ret->u.var) = item->disp; + IDispatch_AddRef(item->disp); + return S_OK; + } + } + + for(item = ctx->parser->script->named_items; item; item = item->next) { hres = disp_get_id(item->disp, identifier, 0, &id); if(SUCCEEDED(hres)) break; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c4bd890..fb13d08 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -326,6 +326,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) iter2 = iter->next; IDispatch_Release(iter->disp); + heap_free(iter->name); heap_free(iter); iter = iter2; } @@ -390,6 +391,13 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, item->disp = disp; item->flags = dwFlags; + item->name = heap_strdupW(pstrName); + if(!item->name) { + IDispatch_Release(disp); + heap_free(item); + return E_OUTOFMEMORY; + } + item->next = This->ctx->named_items; This->ctx->named_items = item; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b416f6e..6930ec6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -154,6 +154,7 @@ HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); typedef struct named_item_t { IDispatch *disp; DWORD flags; + LPWSTR name; struct named_item_t *next; } named_item_t; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 3904a36..20d710d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -702,6 +702,8 @@ static void run_tests(void) parse_script_a("delete testObj.deleteTest;"); CHECK_CALLED(testobj_delete); + parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Paul Vriens : shlwapi/tests: Fix a failure on Win9x and NT4.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: d64f8a887fc90874476d76b61f06a694f441a49f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64f8a887fc90874476d76b61… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 19:21:50 2008 +0100 shlwapi/tests: Fix a failure on Win9x and NT4. --- dlls/shlwapi/tests/assoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 3e4d8d4..3799ecc 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -130,7 +130,9 @@ static void test_getstring_basic(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); - expect_hr(S_FALSE, hr); + ok(hr == S_FALSE || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ + "Unexpected result : %08x\n", hr); if (hr != S_FALSE) { HeapFree(GetProcessHeap(), 0, executableName);

1 0

Paul Vriens : shell32/tests: Fix a test failure on NT4.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: ec2258169cfca4aac63fe15d0f0564b40096dce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2258169cfca4aac63fe15d0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 5 08:20:34 2008 +0100 shell32/tests: Fix a test failure on NT4. --- dlls/shell32/tests/shelllink.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7657fe0..7206df3 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -650,7 +650,9 @@ static void test_datalink(void) r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl ); - ok( r == S_OK || r == E_NOINTERFACE, "CoCreateInstance failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* Win9x */ + "CoCreateInstance failed (0x%08x)\n", r); if (!sl) { skip("no shelllink\n"); @@ -658,11 +660,14 @@ static void test_datalink(void) } r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); - ok(r == S_OK, "IShellLinkW_QueryInterface failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "IShellLinkW_QueryInterface failed (0x%08x)\n", r); if (!dl) { skip("no datalink interface\n"); + IShellLinkW_Release( sl ); return; }

1 0

Aric Stewart : comctl32: Add implementation of LVS_EX_ONECLICKACTIVATE.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: e46a87599660f2bc92676df3dba6b27eb24bf8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46a87599660f2bc92676df3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 4 12:11:57 2008 -0600 comctl32: Add implementation of LVS_EX_ONECLICKACTIVATE. --- dlls/comctl32/listview.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 47d79d6..ce1e1b4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -95,10 +95,8 @@ * -- LVS_EX_INFOTIP * -- LVS_EX_LABELTIP * -- LVS_EX_MULTIWORKAREAS - * -- LVS_EX_ONECLICKACTIVATE * -- LVS_EX_REGIONAL * -- LVS_EX_SIMPLESELECT - * -- LVS_EX_TRACKSELECT * -- LVS_EX_TWOCLICKACTIVATE * -- LVS_EX_UNDERLINECOLD * -- LVS_EX_UNDERLINEHOT @@ -3270,6 +3268,13 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } +static inline BOOL LISTVIEW_isHotTracking(const LISTVIEW_INFO *infoPtr) +{ + return ((infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) || + (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) || + (infoPtr->dwLvExStyle & LVS_EX_TWOCLICKACTIVATE)); +} + /*** * DESCRIPTION: * Called when the mouse is being actively tracked and has hovered for a specified @@ -3290,7 +3295,7 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte */ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { - if (infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) + if (LISTVIEW_isHotTracking(infoPtr)) { LVITEMW item; POINT pt; @@ -3364,7 +3369,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ - if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { + if (LISTVIEW_isHotTracking(infoPtr)) { /* fill in the trackinfo struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -8694,6 +8699,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN LISTVIEW_SetSelection(infoPtr, nItem); } } + + if (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) + if(lvHitTestInfo.iItem != -1) notify_itemactivate(infoPtr,&lvHitTestInfo); } else { @@ -9235,7 +9243,7 @@ static BOOL LISTVIEW_SetCursor(const LISTVIEW_INFO *infoPtr, HWND hwnd, UINT nHi { LVHITTESTINFO lvHitTestInfo; - if(!(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT)) return FALSE; + if(!(LISTVIEW_isHotTracking(infoPtr))) return FALSE; if(!infoPtr->hHotCursor) return FALSE;

1 0

Alexandre Julliard : kernel32/tests: Fix a couple of failures on Windows.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: fdf2e7a3389601b38e7a7b28ae9cc9ee294fcc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf2e7a3389601b38e7a7b28a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 16:13:30 2008 +0100 kernel32/tests: Fix a couple of failures on Windows. --- dlls/kernel32/tests/heap.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 271a221..c196c23 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -75,7 +75,8 @@ START_TEST(heap) /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024); ok( mem != NULL, "failed for size 512K\n" ); - ok( (ULONG_PTR)mem % 16 == 0, "512K block not 16-byte aligned\n" ); + ok( (ULONG_PTR)mem % 16 == 0 || broken((ULONG_PTR)mem % 16) /* win9x */, + "512K block not 16-byte aligned\n" ); HeapFree(GetProcessHeap(), 0, mem); /* Global*() functions */ @@ -191,10 +192,11 @@ START_TEST(heap) /* invalid free */ SetLastError(MAGIC_DEAD); mem = GlobalFree(gbl); - ok(mem == gbl, "Expected gbl, got %p\n", mem); - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); + if (mem == gbl) + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); gbl = GlobalAlloc(GMEM_DDESHARE, 100);

1 0

Alexandre Julliard : kernel32/tests: Add a few more tests, fix some failures on Windows.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 503269a4db5f6de5a22fa519efb6d66345c39efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=503269a4db5f6de5a22fa519e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 16:13:41 2008 +0100 kernel32/tests: Add a few more tests, fix some failures on Windows. --- dlls/kernel32/tests/virtual.c | 103 ++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503269a4db5f6de5a22fa…

1 0

Paul Vriens : ddraw/tests: Fix a test on W2K3.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: fbdb78c88805d08ef3dcc22fa59886e833f2516f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdb78c88805d08ef3dcc22fa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 19:05:06 2008 +0100 ddraw/tests: Fix a test on W2K3. --- dlls/ddraw/tests/overlay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 8dd8805..d1edc1d 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -170,7 +170,8 @@ static void offscreen_test(void) { ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + ok(hr == DD_OK || broken(hr == E_NOTIMPL), + "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); /* Try to overlay the primary with a non-overlay surface */ hr = IDirectDrawSurface7_UpdateOverlay(offscreen, NULL, primary, NULL, DDOVER_SHOW, NULL);

1 0

Paul Vriens : shlwapi/tests: Fix some failures on XP and W2K3.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 6fd4c628022c73bf86f091fd33ab4fb8e07cf379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd4c628022c73bf86f091fd3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 13:49:02 2008 +0100 shlwapi/tests: Fix some failures on XP and W2K3. --- dlls/shlwapi/tests/assoc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index d1c15aa..3e4d8d4 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -219,6 +219,10 @@ static void test_getstring_no_extra(void) } hr = pAssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, buf, &len); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP and W2K3 */ + "Unexpected result : %08x\n", hr); + hr = pAssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, "foo", buf, &len); expect_hr(S_OK, hr); ok(strstr(buf, action) != NULL, "got '%s' (Expected result to include 'notepad.exe')\n", buf);

1 0

Hans Leidekker : inetcomm: Advertise support for a couple more interfaces.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 157d18bbf8b25c9b5e3082f162576c0d4e8e09c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157d18bbf8b25c9b5e3082f16… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:35:07 2008 +0100 inetcomm: Advertise support for a couple more interfaces. --- dlls/inetcomm/inetcomm_main.c | 21 +++++++++++++++++++- dlls/inetcomm/inetcomm_private.h | 4 +++ dlls/inetcomm/mimeole.c | 40 +++++++++++++++++++++++-------------- dlls/inetcomm/regsvr.c | 12 +++++++++++ include/imnxport.idl | 1 + include/mimeole.idl | 2 + 6 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index cd412d2..1d71877 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -137,6 +137,8 @@ static const struct IClassFactoryVtbl cf_vtbl = static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; +static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; +static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -147,10 +149,27 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport)) + return SMTPTransportCF_Create(iid, ppv); + + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport2)) + return SMTPTransportCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_IIMAPTransport)) return IMAPTransportCF_Create(iid, ppv); - if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) + if (IsEqualCLSID(rclsid, &CLSID_IPOP3Transport)) + return POP3TransportCF_Create(iid, ppv); + + if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity )) + { + cf = (IClassFactory*) &mime_security_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage )) + { + cf = (IClassFactory*) &mime_message_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) { cf = (IClassFactory*) &mime_body_cf.lpVtbl; } diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 7752d69..589f92c 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -75,7 +75,11 @@ void InternetTransport_UnregisterClass(HINSTANCE hInstance); HRESULT MimeBody_create(IUnknown *outer, void **obj); HRESULT MimeAllocator_create(IUnknown *outer, void **obj); +HRESULT MimeMessage_create(IUnknown *outer, void **obj); +HRESULT MimeSecurity_create(IUnknown *outer, void **obj); HRESULT MimeInternational_Construct(IMimeInternational **internat); +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv); HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 10c6685..07aa6bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2540,22 +2540,19 @@ static const IMimeMessageVtbl MimeMessageVtbl = MimeMessage_GetRootMoniker, }; -/*********************************************************************** - * MimeOleCreateMessage (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +HRESULT MimeMessage_create(IUnknown *outer, void **obj) { MimeMessage *This; - TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + TRACE("(%p, %p)\n", outer, obj); - if (pUnkOuter) + if (outer) { FIXME("outer unknown not supported yet\n"); return E_NOTIMPL; } - *ppMessage = NULL; + *obj = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2566,11 +2563,20 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag list_init(&This->body_tree); This->next_hbody = (HBODY)1; - *ppMessage = (IMimeMessage *)&This->lpVtbl; + *obj = (IMimeMessage *)&This->lpVtbl; return S_OK; } /*********************************************************************** + * MimeOleCreateMessage (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +{ + TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + return MimeMessage_create(NULL, (void **)ppMessage); +} + +/*********************************************************************** * MimeOleSetCompatMode (INETCOMM.@) */ HRESULT WINAPI MimeOleSetCompatMode(DWORD dwMode) @@ -2754,16 +2760,13 @@ static const IMimeSecurityVtbl MimeSecurityVtbl = MimeSecurity_GetCertData }; -/*********************************************************************** - * MimeOleCreateSecurity (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +HRESULT MimeSecurity_create(IUnknown *outer, void **obj) { MimeSecurity *This; - TRACE("(%p)\n", ppSecurity); + *obj = NULL; - *ppSecurity = NULL; + if (outer) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2771,10 +2774,17 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) This->lpVtbl = &MimeSecurityVtbl; This->refs = 1; - *ppSecurity = (IMimeSecurity *)&This->lpVtbl; + *obj = (IMimeSecurity *)&This->lpVtbl; return S_OK; } +/*********************************************************************** + * MimeOleCreateSecurity (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +{ + return MimeSecurity_create(NULL, (void **)ppSecurity); +} typedef struct { diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index a21b85b..4c7310c 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -404,6 +404,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_ISMTPTransport2, + "CLSID_ISMTPTransport2", + NULL, + "inetcomm.dll", + "Both" + }, { &CLSID_IPOP3Transport, "CLSID_IPOP3Transport", NULL, @@ -452,6 +458,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IMimeSecurity, + "CLSID_IMimeSecurity", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ }; diff --git a/include/imnxport.idl b/include/imnxport.idl index 3b0e1c8..ef4f8ac 100644 --- a/include/imnxport.idl +++ b/include/imnxport.idl @@ -27,6 +27,7 @@ interface IIMAPTransport; cpp_quote("DEFINE_GUID(CLSID_IInternetMessageUrl, 0xca30cc91, 0xb1b3, 0x11d0, 0x85, 0xd0, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport, 0xfd853ce6, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport2, 0xdf2c7eC, 0x3435, 0x11d0, 0x81, 0xd0, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IPOP3Transport, 0xfd853ce7, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_INNTPTransport, 0xfd853ce8, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IRASTransport, 0xfd853ce9, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") diff --git a/include/mimeole.idl b/include/mimeole.idl index 487b9fc..d74cdb5 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -32,6 +32,8 @@ interface IMimeEnumProperties; cpp_quote("DEFINE_GUID(CLSID_IMimeBody, 0xfd853cdb, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeAllocator, 0xfd853cdd, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IMimeSecurity, 0xfd853cde, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IVirtualStream, 0xfd853cdf, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("#define MIME_E_REG_CREATE_KEY 0x800cce01") cpp_quote("#define MIME_E_REG_QUERY_INFO 0x800cce02")

1 0