wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Piotr Caban : riched20: Don' t allow negative margins in ME_WrapTextParagraph.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 3dbd46716299883761be9c4c4173a5f0402b2f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbd46716299883761be9c4c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:39 2016 +0200 riched20: Don't allow negative margins in ME_WrapTextParagraph. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/wrap.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5f4cc05..ae9c0a5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -732,7 +732,7 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); - todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + ok(pt.x == 1, "pt.x = %d\n", pt.x); fmt.cbSize = sizeof(fmt); SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 49a62ce..b488bf1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -879,6 +879,11 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + + if (wc.nFirstMargin < 0) + wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) + wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE)

1 0

Piotr Caban : riched20/tests: Add negative indentation display test.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: d11c758faf187e9ae52872526a7474ebd4a9795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11c758faf187e9ae52872526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:33 2016 +0200 riched20/tests: Add negative indentation display test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c6444ff..5f4cc05 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -601,6 +601,7 @@ static void test_EM_POSFROMCHAR(void) POINTL pt; LOCALESIGNATURE sig; BOOL rtl; + PARAFORMAT2 fmt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -727,6 +728,18 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, -1); ok(pt.x == 1, "pt.x = %d\n", pt.x); + /* test negative indentation */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, + (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); + SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); + todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + + fmt.cbSize = sizeof(fmt); + SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == -400, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 200, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); + DestroyWindow(hwndRichEdit); }

1 0

Michael Stefaniuc : user32/tests: Use SetRect instead of open coding it.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 4ee81394878f5917f9484a4ce0952aa07f866c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee81394878f5917f9484a4ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 18 10:12:23 2016 +0200 user32/tests: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 11 ++--------- dlls/user32/tests/sysparams.c | 5 +---- dlls/user32/tests/uitools.c | 3 +-- dlls/user32/tests/win.c | 6 +++--- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6ff7225..c9e31f7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -574,11 +574,7 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle) HWND editWnd; RECT rect; BOOL b; - - rect.left = 0; - rect.top = 0; - rect.right = 300; - rect.bottom = 300; + SetRect(&rect, 0, 0, 300, 300); b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); ok(b, "AdjustWindowRect failed\n"); @@ -1468,10 +1464,7 @@ static void test_margins(void) the rectangle must not change */ SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); - old_rect.left = 1; - old_rect.right = 99; - old_rect.top = 1; - old_rect.bottom = 99; + SetRect(&old_rect, 1, 1, 99, 99); SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index cffc815..075a0c7 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1835,10 +1835,7 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ * Changing the work area by just one pixel should make this occurrence * reasonably unlikely. */ - curr_val.left = old_area.left; - curr_val.top = old_area.top; - curr_val.right = old_area.right-1; - curr_val.bottom = old_area.bottom-1; + SetRect(&curr_val, old_area.left, old_area.top, old_area.right - 1, old_area.bottom - 1); rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); if (!test_error_msg(rc,"SPI_SETWORKAREA")) return; diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 5f10b00..e1ddf2b 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -49,8 +49,7 @@ static void test_FillRect(void) /* select black brush */ old_brush = SelectObject(hdcmem, GetStockObject(BLACK_BRUSH)); - r.left = r.top = 0; - r.right = r.bottom = 5; + SetRect(&r, 0, 0, 5, 5); FillRect(hdcmem, &r, 0); SelectObject(hdcmem, old_brush); /* bitmap filled with last selected brush */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dd5f967..673b9b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7578,7 +7578,7 @@ static void test_winregion(void) ok( ret == ERROR, "Expected ERROR, got %d\n", ret); ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = pGetWindowRgnBox(hwnd, &r); ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, @@ -7589,10 +7589,10 @@ static void test_winregion(void) hrgn = CreateRectRgn(2, 3, 10, 15); ret = pMirrorRgn( hwnd, hrgn ); ok( ret == TRUE, "MirrorRgn failed %u\n", ret ); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); GetWindowRect( hwnd, &r ); width = r.right - r.left; - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = GetRgnBox( hrgn, &r ); ok( ret == SIMPLEREGION, "GetRgnBox failed %u\n", ret ); ok( r.left == width - 10 && r.top == 3 && r.right == width - 2 && r.bottom == 15,

1 0

Sebastian Lackner : krnl386.exe16: Do not reassign default handles after they got closed.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 414c73feabb6d33be969f3927f8b3e8a8075bcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414c73feabb6d33be969f3927… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 11:29:29 2016 +0200 krnl386.exe16: Do not reassign default handles after they got closed. Based on a patch by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index b66b753..4e7f7c4 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -113,8 +113,7 @@ HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) if (!handle || (handle == INVALID_HANDLE_VALUE)) return HFILE_ERROR; - FILE_InitProcessDosHandles(); - for (i = 0; i < DOS_TABLE_SIZE; i++) + for (i = 5; i < DOS_TABLE_SIZE; i++) if (!dos_handles[i]) { dos_handles[i] = handle;

1 0

Michael Müller : wbemprox/tests: Add initial tests for ASSOCIATORS query.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: df5388b977df7b822ea7cf53f73b538905629c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5388b977df7b822ea7cf53f… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 18 11:04:49 2016 +0200 wbemprox/tests: Add initial tests for ASSOCIATORS query. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 9dc0db4..c0889f9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -147,6 +147,29 @@ static void test_select( IWbemServices *services ) SysFreeString( query ); } +static void test_associators( IWbemServices *services ) +{ + static const WCHAR query1[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; + static const WCHAR query2[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR *test[] = { query1, query2 }; + HRESULT hr; + IEnumWbemClassObject *result; + UINT i; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } +} + static void test_Win32_Service( IWbemServices *services ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -1054,6 +1077,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_associators( services ); test_Win32_Bios( services ); test_Win32_Process( services ); test_Win32_Service( services );

1 0

Alistair Leslie-Hughes : mimeole.idl: Correct IMimePropertySchema interface.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 3a974b1c5e7effd3bd0d324a6d21c6f3181d5da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a974b1c5e7effd3bd0d324a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:59 2016 +0000 mimeole.idl: Correct IMimePropertySchema interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 65c0b42..dddfc26 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -469,6 +469,8 @@ library MIMEOLE ] interface IMimePropertySchema : IUnknown { + typedef [unique] IMimePropertySchema *LPMIMEPROPERTYSCHEMA; + typedef enum tagMIMEPROPFLAGS { MPF_INETCSET = 0x01, @@ -479,7 +481,30 @@ library MIMEOLE MPF_READONLY = 0x20 } MIMEPROPFLAGS; - /* FIXME: fill this in */ + HRESULT RegisterProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault, + [out] DWORD *propid); + + HRESULT ModifyProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault); + + HRESULT GetPropertyId( + [in] const char *name, + [out] DWORD *propid); + + HRESULT GetPropertyName( + [in] DWORD propid, + [out] char **name); + + HRESULT RegisterAddressType( + [in] const char *name, + [out] DWORD *adrtype); } [

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleGetPropertySchema stub.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 9b8d63d168bd96e32b5de61cb20860cc96a26776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d63d168bd96e32b5de61cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:47 2016 +0000 inetcomm: Add MimeOleGetPropertySchema stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 6 ++++++ include/mimeole.idl | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 0c90b4d..86eb9bd 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -79,7 +79,7 @@ @ stdcall MimeOleGetInternat(ptr) @ stub MimeOleGetPropA @ stub MimeOleGetPropW -@ stub MimeOleGetPropertySchema +@ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime @ stub MimeOleObjectFromMoniker diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8ca8b35..8aebb38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3031,3 +3031,9 @@ HRESULT VirtualStream_create(IUnknown *outer, void **obj) return MimeOleCreateVirtualStream((IStream **)obj); } + +HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +{ + FIXME("(%p) stub\n", schema); + return E_NOTIMPL; +} diff --git a/include/mimeole.idl b/include/mimeole.idl index c10d8e0..65c0b42 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1378,6 +1378,8 @@ cpp_quote("HRESULT WINAPI MimeEditCreateMimeDocument(IUnknown*,IMimeMessage*,DWO cpp_quote("HRESULT WINAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") +cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") + cpp_quote("#ifdef __cplusplus") cpp_quote("}") cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : inetcomm: Trace all IMimeBody function parameters.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 860460424427202e0ce49a64b2fa8383435d01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=860460424427202e0ce49a64b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:33 2016 +0000 inetcomm: Trace all IMimeBody function parameters. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 93 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=860460424427202e0ce49…

1 0

Alistair Leslie-Hughes : mimeole.idl: Add missing Mime Property IDS.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 0e727d42640b59358560734bacf47cb92208a3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e727d42640b59358560734ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:20 2016 +0000 mimeole.idl: Add missing Mime Property IDS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index ab1239f..c10d8e0 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -84,10 +84,56 @@ cpp_quote(" PID_HDR_PATH = 26,") cpp_quote(" PID_HDR_FOLLOWUPTO = 27,") cpp_quote(" PID_HDR_EXPIRES = 28,") cpp_quote(" PID_HDR_CC = 29,") - +cpp_quote(" PID_HDR_CONTROL = 30,") +cpp_quote(" PID_HDR_DISTRIB = 31,") +cpp_quote(" PID_HDR_KEYWORDS = 32,") +cpp_quote(" PID_HDR_SUMMARY = 33,") +cpp_quote(" PID_HDR_APPROVED = 34,") +cpp_quote(" PID_HDR_LINES = 35,") +cpp_quote(" PID_HDR_XREF = 36,") +cpp_quote(" PID_HDR_ORG = 37,") +cpp_quote(" PID_HDR_XNEWSRDR = 38,") +cpp_quote(" PID_HDR_XPRI = 39,") +cpp_quote(" PID_HDR_XMSPRI = 40,") +cpp_quote(" PID_PAR_FILENAME = 41,") +cpp_quote(" PID_PAR_BOUNDARY = 42,") +cpp_quote(" PID_PAR_CHARSET = 43,") +cpp_quote(" PID_PAR_NAME = 44,") +cpp_quote(" PID_ATT_FILENAME = 45,") +cpp_quote(" PID_ATT_GENFNAME = 46,") +cpp_quote(" PID_ATT_PRITYPE = 47,") +cpp_quote(" PID_ATT_SUBTYPE = 48,") +cpp_quote(" PID_ATT_NORMSUBJ = 49,") +cpp_quote(" PID_ATT_ILLEGAL = 50,") +cpp_quote(" PID_ATT_RENDERED = 51,") +cpp_quote(" PID_ATT_SENTTIME = 52,") +cpp_quote(" PID_ATT_RECVTIME = 53,") +cpp_quote(" PID_ATT_PRIORITY = 54,") +cpp_quote(" PID_HDR_COMMENT = 55,") +cpp_quote(" PID_HDR_ENCODING = 56,") +cpp_quote(" PID_HDR_ENCRYPTED = 57,") +cpp_quote(" PID_HDR_OFFSETS = 58,") +cpp_quote(" PID_HDR_XUNSENT = 59,") +cpp_quote(" PID_HDR_ARTICLEID = 60,") cpp_quote(" PID_HDR_SENDER = 61,") - -cpp_quote(" PID_HDR_INREPLYTO = 77,") +cpp_quote(" PID_ATT_SERVER = 62,") +cpp_quote(" PID_ATT_ACCOUNT = 63,") +cpp_quote(" PID_ATT_UIDL = 64,") +cpp_quote(" PID_ATT_STOREMSGID = 65,") +cpp_quote(" PID_ATT_USERNAME = 66,") +cpp_quote(" PID_ATT_FORWARDTO = 67,") +cpp_quote(" PID_ATT_STOREFOLDERID = 68,") +cpp_quote(" PID_ATT_GHOSTED = 69,") +cpp_quote(" PID_ATT_UNCACHEDSIZE = 70,") +cpp_quote(" PID_ATT_COMBINED = 71,") +cpp_quote(" PID_ATT_AUTOINLINED = 72,") +cpp_quote(" PID_HDR_DISP_NOTIFICATION_TO = 73,") +cpp_quote(" PID_PAR_REPLYTYPE = 74,") +cpp_quote(" PID_PAR_FORMAT = 75,") +cpp_quote(" PID_ATT_FORMAT = 76,") +cpp_quote(" PID_HDR_INREPLYTO = 77,") +cpp_quote(" PID_ATT_ACCOUNTNAME = 78,") +cpp_quote(" PID_LAST = 79,") cpp_quote("} MIMEPROPID;") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)")

1 0

Alistair Leslie-Hughes : inetcomm: IMimeMessage has a HBODY_ROOT node by default.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 7a2e5b038d063704f187bb9d3742d1ad8248777c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2e5b038d063704f187bb9d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 14 10:11:14 2016 +0000 inetcomm: IMimeMessage has a HBODY_ROOT node by default. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 8 ++++++++ dlls/inetcomm/tests/mimeole.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d63da8c..36c3ec9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1706,6 +1706,8 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) return E_FAIL; } + empty_body_list(&This->body_tree); + IStream_AddRef(pStm); This->stream = pStm; offsets.cbBoundaryStart = offsets.cbHeaderStart = 0; @@ -2544,6 +2546,8 @@ static const IMimeMessageVtbl MimeMessageVtbl = HRESULT MimeMessage_create(IUnknown *outer, void **obj) { MimeMessage *This; + MimeBody *mime_body; + body_t *root_body; TRACE("(%p, %p)\n", outer, obj); @@ -2564,6 +2568,10 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) list_init(&This->body_tree); This->next_index = 1; + mime_body = mimebody_create(); + root_body = new_body_entry(mime_body, This->next_index++, NULL); + list_add_head(&This->body_tree, &root_body->entry); + *obj = &This->IMimeMessage_iface; return S_OK; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7e98563..2b6dee2 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -332,6 +332,27 @@ static void test_CreateMessage(void) IStream_Release(stream); } +void test_BindToObject(void) +{ + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + ULONG count; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeMessage_CountBodies(msg, HBODY_ROOT, TRUE, &count); + ok(hr == S_OK, "ret %08x\n", hr); + ok(count == 1, "got %d\n", count); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + IMimeBody_Release(body); + + IMimeMessage_Release(msg); +} + START_TEST(mimeole) { OleInitialize(NULL); @@ -340,5 +361,6 @@ START_TEST(mimeole) test_CreateBody(); test_Allocator(); test_CreateMessage(); + test_BindToObject(); OleUninitialize(); }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016