February 2008 - Wine-Commits

Michael Stefaniuc : gdi32: Move two 16bit function stubs to gdi16.c.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 3db6eeeda9a3f2228df49398f5a6a9d81c04f5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6eeeda9a3f2228df49398f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 13 01:47:59 2008 +0100 gdi32: Move two 16bit function stubs to gdi16.c. --- dlls/gdi32/font.c | 29 ----------------------------- dlls/gdi32/gdi16.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3a0beed..3624e97 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1455,26 +1455,6 @@ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) /*********************************************************************** - * GetOutlineTextMetrics [GDI.308] Gets metrics for TrueType fonts. - * - * NOTES - * lpOTM should be LPOUTLINETEXTMETRIC - * - * RETURNS - * Success: Non-zero or size of required buffer - * Failure: 0 - */ -UINT16 WINAPI GetOutlineTextMetrics16( - HDC16 hdc, /* [in] Handle of device context */ - UINT16 cbData, /* [in] Size of metric data array */ - LPOUTLINETEXTMETRIC16 lpOTM) /* [out] Address of metric data array */ -{ - FIXME("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM); - return 0; -} - - -/*********************************************************************** * GetOutlineTextMetricsA (GDI32.@) * Gets metrics for TrueType fonts. * @@ -2408,15 +2388,6 @@ DWORD WINAPI SetMapperFlags( HDC hDC, DWORD dwFlag ) } /*********************************************************************** - * GetAspectRatioFilterEx (GDI.486) - */ -BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio ) -{ - FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio); - return FALSE; -} - -/*********************************************************************** * GetAspectRatioFilterEx (GDI32.@) */ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index b7d1293..02bb16f 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1728,6 +1728,31 @@ BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar, /*********************************************************************** + * GetOutlineTextMetrics (GDI.308) + * + * Gets metrics for TrueType fonts. + * + * PARAMS + * hdc [In] Handle of device context + * cbData [In] Size of metric data array + * lpOTM [Out] Address of metric data array + * + * RETURNS + * Success: Non-zero or size of required buffer + * Failure: 0 + * + * NOTES + * lpOTM should be LPOUTLINETEXTMETRIC + */ +UINT16 WINAPI GetOutlineTextMetrics16( HDC16 hdc, UINT16 cbData, + LPOUTLINETEXTMETRIC16 lpOTM ) +{ + FIXME("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM); + return 0; +} + + +/*********************************************************************** * GetGlyphOutline (GDI.309) */ DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat, @@ -2611,6 +2636,16 @@ BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom, } +/*********************************************************************** + * GetAspectRatioFilterEx (GDI.486) + */ +BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio ) +{ + FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio); + return FALSE; +} + + /****************************************************************************** * PolyBezier (GDI.502) */

1 0

Huw Davies : inetcomm: Stub IMime{Message, Body}_GetCharset to return a NULL charset.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 43958866a300183d8b93aee1871ad214c85eaee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43958866a300183d8b93aee18… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 14:20:37 2008 +0000 inetcomm: Stub IMime{Message, Body}_GetCharset to return a NULL charset. --- dlls/inetcomm/mimeole.c | 6 ++++-- dlls/inetcomm/tests/mimeole.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6f24f69..98f04c8 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -715,7 +715,8 @@ static HRESULT WINAPI MimeBody_GetCharset( LPHCHARSET phCharset) { FIXME("stub\n"); - return E_NOTIMPL; + *phCharset = NULL; + return S_OK; } static HRESULT WINAPI MimeBody_SetCharset( @@ -2023,7 +2024,8 @@ static HRESULT WINAPI MimeMessage_GetCharset( LPHCHARSET phCharset) { FIXME("(%p)->(%p)\n", iface, phCharset); - return E_NOTIMPL; + *phCharset = NULL; + return S_OK; } static HRESULT WINAPI MimeMessage_SetCharset( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d268e9d..1c82a2a 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -215,6 +215,7 @@ static void test_CreateMessage(void) BODYOFFSETS offsets; ULONG count; FINDBODY find_struct; + HCHARSET hcs; char text[] = "text"; HBODY *body_list; PROPVARIANT prop; @@ -268,6 +269,11 @@ static void test_CreateMessage(void) ok(offsets.cbHeaderStart == 428, "got %d\n", offsets.cbHeaderStart); ok(offsets.cbBodyStart == 518, "got %d\n", offsets.cbBodyStart); ok(offsets.cbBodyEnd == 523, "got %d\n", offsets.cbBodyEnd); + + hr = IMimeBody_GetCharset(body, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs == NULL, "ret %p\n", hcs); + IMimeBody_Release(body); hr = IMimeMessage_GetBody(msg, IBL_NEXT, hbody, &hbody); @@ -299,6 +305,10 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); CoTaskMemFree(body_list); + hr = IMimeMessage_GetCharset(body, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs == NULL, "ret %p\n", hcs); + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0

Huw Davies : inetcomm: Implement IMimeMessage_Find{First,Next}.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: d56033eedfdc2a04ca3d22f331297bd418d498ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56033eedfdc2a04ca3d22f33… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 12:18:26 2008 +0000 inetcomm: Implement IMimeMessage_Find{First,Next}. --- dlls/inetcomm/mimeole.c | 45 +++++++++++++++++++++++++++++++++++++--- dlls/inetcomm/tests/mimeole.c | 13 +++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d6b4274..6398f29 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1921,13 +1921,49 @@ static HRESULT WINAPI MimeMessage_CountBodies( return S_OK; } +static HRESULT find_next(IMimeMessage *msg, LPFINDBODY find_body, HBODY *out) +{ + HRESULT hr; + IMimeBody *mime_body; + HBODY next; + + if(find_body->dwReserved == 0) + find_body->dwReserved = (DWORD)HBODY_ROOT; + else + { + hr = IMimeMessage_GetBody(msg, IBL_FIRST, (HBODY)find_body->dwReserved, &next); + if(hr == S_OK) + find_body->dwReserved = (DWORD)next; + else + { + hr = IMimeMessage_GetBody(msg, IBL_NEXT, (HBODY)find_body->dwReserved, &next); + if(hr == S_OK) + find_body->dwReserved = (DWORD)next; + else + return MIME_E_NOT_FOUND; + } + } + + hr = IMimeMessage_BindToObject(msg, (HBODY)find_body->dwReserved, &IID_IMimeBody, (void**)&mime_body); + if(IMimeBody_IsContentType(mime_body, find_body->pszPriType, find_body->pszSubType) == S_OK) + { + IMimeBody_Release(mime_body); + *out = (HBODY)find_body->dwReserved; + return S_OK; + } + IMimeBody_Release(mime_body); + return find_next(msg, find_body, out); +} + static HRESULT WINAPI MimeMessage_FindFirst( IMimeMessage *iface, LPFINDBODY pFindBody, LPHBODY phBody) { - FIXME("(%p)->(%p, %p)\n", iface, pFindBody, phBody); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); + + pFindBody->dwReserved = 0; + return find_next(iface, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_FindNext( @@ -1935,8 +1971,9 @@ static HRESULT WINAPI MimeMessage_FindNext( LPFINDBODY pFindBody, LPHBODY phBody) { - FIXME("(%p)->(%p, %p)\n", iface, pFindBody, phBody); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); + + return find_next(iface, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_ResolveURL( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c40952f..ee53d15 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -213,6 +213,8 @@ static void test_CreateMessage(void) IMimeBody *body; BODYOFFSETS offsets; ULONG count; + FINDBODY find_struct; + char text[] = "text"; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -268,6 +270,17 @@ static void test_CreateMessage(void) ok(offsets.cbBodyEnd == 639, "got %d\n", offsets.cbBodyEnd); IMimeBody_Release(body); + find_struct.pszPriType = text; + find_struct.pszSubType = NULL; + + hr = IMimeMessage_FindFirst(msg, &find_struct, &hbody); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeMessage_FindNext(msg, &find_struct, &hbody); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeMessage_FindNext(msg, &find_struct, &hbody); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); IMimeMessage_Release(msg);

1 0

Huw Davies : inetcomm: Implement IMimeMessage_GetBody.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: e15ff2ef86c4913e6f463896edfcf98a64642c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15ff2ef86c4913e6f463896e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 11:49:47 2008 +0000 inetcomm: Implement IMimeMessage_GetBody. --- dlls/inetcomm/mimeole.c | 78 +++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 27 ++++++++++++++ 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index bdce35b..099d2b6 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1777,6 +1777,71 @@ static HRESULT WINAPI MimeMessage_SaveBody( return E_NOTIMPL; } +static HRESULT get_body(MimeMessage *msg, BODYLOCATION location, HBODY pivot, body_t **out) +{ + body_t *root = LIST_ENTRY(list_head(&msg->body_tree), body_t, entry); + body_t *body; + HRESULT hr; + struct list *list; + + if(location == IBL_ROOT) + { + *out = root; + return S_OK; + } + + hr = find_body(&msg->body_tree, pivot, &body); + + if(hr == S_OK) + { + switch(location) + { + case IBL_PARENT: + *out = body->parent; + break; + + case IBL_FIRST: + list = list_head(&body->children); + if(list) + *out = LIST_ENTRY(list, body_t, entry); + else + hr = MIME_E_NOT_FOUND; + break; + + case IBL_LAST: + list = list_tail(&body->children); + if(list) + *out = LIST_ENTRY(list, body_t, entry); + else + hr = MIME_E_NOT_FOUND; + break; + + case IBL_NEXT: + list = list_next(&body->parent->children, &body->entry); + if(list) + *out = LIST_ENTRY(list, body_t, entry); + else + hr = MIME_E_NOT_FOUND; + break; + + case IBL_PREVIOUS: + list = list_prev(&body->parent->children, &body->entry); + if(list) + *out = LIST_ENTRY(list, body_t, entry); + else + hr = MIME_E_NOT_FOUND; + break; + + default: + hr = E_FAIL; + break; + } + } + + return hr; +} + + static HRESULT WINAPI MimeMessage_InsertBody( IMimeMessage *iface, BODYLOCATION location, @@ -1793,8 +1858,17 @@ static HRESULT WINAPI MimeMessage_GetBody( HBODY hPivot, LPHBODY phBody) { - FIXME("(%p)->(%d, %p, %p)\n", iface, location, hPivot, phBody); - return E_NOTIMPL; + MimeMessage *This = (MimeMessage *)iface; + body_t *body; + HRESULT hr; + + TRACE("(%p)->(%d, %p, %p)\n", iface, location, hPivot, phBody); + + hr = get_body(This, location, hPivot, &body); + + if(hr == S_OK) *phBody = body->hbody; + + return hr; } static HRESULT WINAPI MimeMessage_DeleteBody( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5f5fa0c..3d49e61 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -209,6 +209,7 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; + HBODY hbody; IMimeBody *body; BODYOFFSETS offsets; @@ -233,6 +234,32 @@ static void test_CreateMessage(void) ok(offsets.cbBodyEnd == 666, "got %d\n", offsets.cbBodyEnd); IMimeBody_Release(body); + hr = IMimeMessage_GetBody(msg, IBL_ROOT, NULL, &hbody); + hr = IMimeMessage_GetBody(msg, IBL_FIRST, hbody, &hbody); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetOffsets(body, &offsets); + ok(hr == S_OK, "ret %08x\n", hr); + ok(offsets.cbBoundaryStart == 405, "got %d\n", offsets.cbBoundaryStart); + ok(offsets.cbHeaderStart == 428, "got %d\n", offsets.cbHeaderStart); + ok(offsets.cbBodyStart == 518, "got %d\n", offsets.cbBodyStart); + ok(offsets.cbBodyEnd == 523, "got %d\n", offsets.cbBodyEnd); + IMimeBody_Release(body); + + hr = IMimeMessage_GetBody(msg, IBL_NEXT, hbody, &hbody); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetOffsets(body, &offsets); + ok(hr == S_OK, "ret %08x\n", hr); + ok(offsets.cbBoundaryStart == 525, "got %d\n", offsets.cbBoundaryStart); + ok(offsets.cbHeaderStart == 548, "got %d\n", offsets.cbHeaderStart); + ok(offsets.cbBodyStart == 629, "got %d\n", offsets.cbBodyStart); + ok(offsets.cbBodyEnd == 639, "got %d\n", offsets.cbBodyEnd); + IMimeBody_Release(body); + + IMimeMessage_Release(msg); ref = IStream_AddRef(stream);

1 0

Huw Davies : inetcomm: Forward a few IMimeMessage functions to the appropriate IMimeBody functions .
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: a9287e3595a57988019373aadf5c069606fc42a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9287e3595a57988019373aad… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 12:27:05 2008 +0000 inetcomm: Forward a few IMimeMessage functions to the appropriate IMimeBody functions. --- dlls/inetcomm/mimeole.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6398f29..5628728 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2029,8 +2029,16 @@ static HRESULT WINAPI MimeMessage_IsBodyType( HBODY hBody, IMSGBODYTYPE bodytype) { - FIXME("(%p)->(%p, %d)\n", iface, hBody, bodytype); - return E_NOTIMPL; + HRESULT hr; + IMimeBody *mime_body; + TRACE("(%p)->(%p, %d)\n", iface, hBody, bodytype); + + hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); + if(hr != S_OK) return hr; + + hr = IMimeBody_IsType(mime_body, bodytype); + MimeBody_Release(mime_body); + return hr; } static HRESULT WINAPI MimeMessage_IsContentType( @@ -2039,8 +2047,16 @@ static HRESULT WINAPI MimeMessage_IsContentType( LPCSTR pszPriType, LPCSTR pszSubType) { - FIXME("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType); - return E_NOTIMPL; + HRESULT hr; + IMimeBody *mime_body; + TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType); + + hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); + if(FAILED(hr)) return hr; + + hr = IMimeBody_IsContentType(mime_body, pszPriType, pszSubType); + IMimeBody_Release(mime_body); + return hr; } static HRESULT WINAPI MimeMessage_QueryBodyProp( @@ -2062,8 +2078,18 @@ static HRESULT WINAPI MimeMessage_GetBodyProp( DWORD dwFlags, LPPROPVARIANT pValue) { - FIXME("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue); - return E_NOTIMPL; + HRESULT hr; + IMimeBody *mime_body; + + TRACE("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue); + + hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); + if(hr != S_OK) return hr; + + hr = IMimeBody_GetProp(mime_body, pszName, dwFlags, pValue); + IMimeBody_Release(mime_body); + + return hr; } static HRESULT WINAPI MimeMessage_SetBodyProp(

1 0

Huw Davies : inetcomm: Implement IMimeMessage_CountBodies.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 8be6df34347ad0c986fdb9e34cc320f4035dce6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be6df34347ad0c986fdb9e34… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 11:59:36 2008 +0000 inetcomm: Implement IMimeMessage_CountBodies. --- dlls/inetcomm/mimeole.c | 26 ++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 9 +++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 099d2b6..d6b4274 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1889,14 +1889,36 @@ static HRESULT WINAPI MimeMessage_MoveBody( return E_NOTIMPL; } +static void count_children(body_t *body, boolean recurse, ULONG *count) +{ + body_t *child; + + LIST_FOR_EACH_ENTRY(child, &body->children, body_t, entry) + { + (*count)++; + if(recurse) count_children(child, recurse, count); + } +} + static HRESULT WINAPI MimeMessage_CountBodies( IMimeMessage *iface, HBODY hParent, boolean fRecurse, ULONG *pcBodies) { - FIXME("(%p)->(%p, %s, %p)\n", iface, hParent, fRecurse ? "TRUE" : "FALSE", pcBodies); - return E_NOTIMPL; + HRESULT hr; + MimeMessage *This = (MimeMessage *)iface; + body_t *body; + + TRACE("(%p)->(%p, %s, %p)\n", iface, hParent, fRecurse ? "TRUE" : "FALSE", pcBodies); + + hr = find_body(&This->body_tree, hParent, &body); + if(hr != S_OK) return hr; + + *pcBodies = 1; + count_children(body, fRecurse, pcBodies); + + return S_OK; } static HRESULT WINAPI MimeMessage_FindFirst( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 3d49e61..c40952f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -212,6 +212,7 @@ static void test_CreateMessage(void) HBODY hbody; IMimeBody *body; BODYOFFSETS offsets; + ULONG count; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); @@ -224,6 +225,14 @@ static void test_CreateMessage(void) hr = IMimeMessage_Load(msg, stream); 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 == 3, "got %d\n", count); + + hr = IMimeMessage_CountBodies(msg, HBODY_ROOT, FALSE, &count); + ok(hr == S_OK, "ret %08x\n", hr); + ok(count == 3, "got %d\n", count); + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeBody_GetOffsets(body, &offsets);

1 0

Huw Davies : inetcomm: Create a body tree for multipart messages.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: db4881cfb627350dad34dd0a2d2be166c5917b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4881cfb627350dad34dd0a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 11:36:31 2008 +0000 inetcomm: Create a body tree for multipart messages. --- dlls/inetcomm/mimeole.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 707a1e0..bdce35b 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1446,6 +1446,97 @@ static body_t *new_body_entry(IMimeBody *mime_body, HBODY hbody, body_t *parent) return body; } +typedef struct +{ + struct list entry; + BODYOFFSETS offsets; +} offset_entry_t; + +static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struct list *body_offsets) +{ + HRESULT hr; + DWORD read; + int boundary_len = strlen(boundary); + char *buf, *nl_boundary, *ptr, *overlap; + DWORD total_read = 0; + DWORD start = 0, overlap_no; + offset_entry_t *cur_body = NULL; + ULARGE_INTEGER cur; + LARGE_INTEGER zero; + + list_init(body_offsets); + nl_boundary = HeapAlloc(GetProcessHeap(), 0, 4 + boundary_len + 1); + memcpy(nl_boundary, "\r\n--", 4); + memcpy(nl_boundary + 4, boundary, boundary_len + 1); + + overlap_no = boundary_len + 5; + + overlap = buf = HeapAlloc(GetProcessHeap(), 0, overlap_no + PARSER_BUF_SIZE + 1); + + zero.QuadPart = 0; + hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur); + start = cur.LowPart; + + do { + hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); + if(FAILED(hr)) goto end; + if(read == 0) break; + total_read += read; + overlap[read] = '\0'; + + ptr = buf; + do { + ptr = strstr(ptr, nl_boundary); + if(ptr) + { + DWORD boundary_start = start + ptr - buf; + char *end = ptr + boundary_len + 4; + + if(*end == '\0' || *(end + 1) == '\0') + break; + + if(*end == '\r' && *(end + 1) == '\n') + { + if(cur_body) + { + cur_body->offsets.cbBodyEnd = boundary_start; + list_add_tail(body_offsets, &cur_body->entry); + } + cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); + cur_body->offsets.cbBoundaryStart = boundary_start + 2; /* doesn't including the leading \r\n */ + cur_body->offsets.cbHeaderStart = boundary_start + boundary_len + 6; + } + else if(*end == '-' && *(end + 1) == '-') + { + if(cur_body) + { + cur_body->offsets.cbBodyEnd = boundary_start; + list_add_tail(body_offsets, &cur_body->entry); + goto end; + } + } + ptr = end + 2; + } + } while(ptr); + + if(overlap == buf) /* 1st iteration */ + { + memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + overlap = buf + overlap_no; + start += read - overlap_no; + } + else + { + memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + start += read; + } + } while(1); + +end: + HeapFree(GetProcessHeap(), 0, buf); + return hr; +} + static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { IMimeBody *mime_body; @@ -1458,11 +1549,51 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off IMimeBody_Load(mime_body, pStm); zero.QuadPart = 0; hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); - offset->cbBodyStart = cur.LowPart; + offset->cbBodyStart = cur.LowPart + offset->cbHeaderStart; + if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); body = new_body_entry(mime_body, msg->next_hbody, parent); msg->next_hbody = (HBODY)((DWORD)msg->next_hbody + 1); + if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) + { + MIMEPARAMINFO *param_info; + ULONG count, i; + IMimeAllocator *alloc; + + hr = IMimeBody_GetParameters(mime_body, "Content-Type", &count, &param_info); + if(hr != S_OK || count == 0) return body; + + MimeOleGetAllocator(&alloc); + + for(i = 0; i < count; i++) + { + if(!strcasecmp(param_info[i].pszName, "boundary")) + { + struct list offset_list; + offset_entry_t *cur, *cursor2; + hr = create_body_offset_list(pStm, param_info[i].pszData, &offset_list); + LIST_FOR_EACH_ENTRY_SAFE(cur, cursor2, &offset_list, offset_entry_t, entry) + { + body_t *sub_body; + IStream *sub_stream; + ULARGE_INTEGER start, length; + + start.LowPart = cur->offsets.cbHeaderStart; + length.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; + create_sub_stream(pStm, start, length, &sub_stream); + sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); + IStream_Release(sub_stream); + list_add_tail(&body->children, &sub_body->entry); + list_remove(&cur->entry); + HeapFree(GetProcessHeap(), 0, cur); + } + break; + } + } + IMimeAllocator_FreeParamInfoArray(alloc, count, param_info, TRUE); + IMimeAllocator_Release(alloc); + } return body; }

1 0

Huw Davies : inetcomm: Add a sub-stream implementation.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 8760cf5aa4088335d062ceef27f0c85eb411a390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8760cf5aa4088335d062ceef2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 11:18:09 2008 +0000 inetcomm: Add a sub-stream implementation. --- dlls/inetcomm/mimeole.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 247 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0e4a611..707a1e0 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1090,6 +1090,253 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) return S_OK; } +typedef struct +{ + IStreamVtbl *lpVtbl; + LONG refs; + + IStream *base; + ULARGE_INTEGER pos, start, length; +} sub_stream_t; + +static inline sub_stream_t *impl_from_IStream( IStream *iface ) +{ + return (sub_stream_t *)((char*)iface - FIELD_OFFSET(sub_stream_t, lpVtbl)); +} + +static HRESULT WINAPI sub_stream_QueryInterface( + IStream* iface, + REFIID riid, + void **ppvObject) +{ + sub_stream_t *This = impl_from_IStream(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); + *ppvObject = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISequentialStream) || + IsEqualIID(riid, &IID_IStream)) + { + IStream_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI sub_stream_AddRef( + IStream* iface) +{ + sub_stream_t *This = impl_from_IStream(iface); + + TRACE("(%p)\n", This); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI sub_stream_Release( + IStream* iface) +{ + sub_stream_t *This = impl_from_IStream(iface); + LONG refs; + + TRACE("(%p)\n", This); + refs = InterlockedDecrement(&This->refs); + if(!refs) + { + IStream_Release(This->base); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI sub_stream_Read( + IStream* iface, + void *pv, + ULONG cb, + ULONG *pcbRead) +{ + sub_stream_t *This = impl_from_IStream(iface); + HRESULT hr; + ULARGE_INTEGER base_pos; + LARGE_INTEGER tmp_pos; + + TRACE("(%p, %d, %p)\n", pv, cb, pcbRead); + + tmp_pos.QuadPart = 0; + IStream_Seek(This->base, tmp_pos, STREAM_SEEK_CUR, &base_pos); + tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart; + IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); + + if(This->pos.QuadPart + cb > This->length.QuadPart) + cb = This->length.QuadPart - This->pos.QuadPart; + + hr = IStream_Read(This->base, pv, cb, pcbRead); + + This->pos.QuadPart += *pcbRead; + + tmp_pos.QuadPart = base_pos.QuadPart; + IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); + + return hr; +} + +static HRESULT WINAPI sub_stream_Write( + IStream* iface, + const void *pv, + ULONG cb, + ULONG *pcbWritten) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Seek( + IStream* iface, + LARGE_INTEGER dlibMove, + DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + sub_stream_t *This = impl_from_IStream(iface); + LARGE_INTEGER new_pos; + + TRACE("(%08x.%08x, %x, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + + switch(dwOrigin) + { + case STREAM_SEEK_SET: + new_pos = dlibMove; + break; + case STREAM_SEEK_CUR: + new_pos.QuadPart = This->pos.QuadPart + dlibMove.QuadPart; + break; + case STREAM_SEEK_END: + new_pos.QuadPart = This->length.QuadPart + dlibMove.QuadPart; + break; + } + + if(new_pos.QuadPart < 0) new_pos.QuadPart = 0; + else if(new_pos.QuadPart > This->length.QuadPart) new_pos.QuadPart = This->length.QuadPart; + + This->pos.QuadPart = new_pos.QuadPart; + + if(plibNewPosition) *plibNewPosition = This->pos; + return S_OK; +} + +static HRESULT WINAPI sub_stream_SetSize( + IStream* iface, + ULARGE_INTEGER libNewSize) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_CopyTo( + IStream* iface, + IStream *pstm, + ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, + ULARGE_INTEGER *pcbWritten) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Commit( + IStream* iface, + DWORD grfCommitFlags) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Revert( + IStream* iface) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_LockRegion( + IStream* iface, + ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, + DWORD dwLockType) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_UnlockRegion( + IStream* iface, + ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, + DWORD dwLockType) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Stat( + IStream* iface, + STATSTG *pstatstg, + DWORD grfStatFlag) +{ + sub_stream_t *This = impl_from_IStream(iface); + FIXME("(%p)->(%p, %08x)\n", This, pstatstg, grfStatFlag); + memset(pstatstg, 0, sizeof(*pstatstg)); + pstatstg->cbSize = This->length; + return S_OK; +} + +static HRESULT WINAPI sub_stream_Clone( + IStream* iface, + IStream **ppstm) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static struct IStreamVtbl sub_stream_vtbl = +{ + sub_stream_QueryInterface, + sub_stream_AddRef, + sub_stream_Release, + sub_stream_Read, + sub_stream_Write, + sub_stream_Seek, + sub_stream_SetSize, + sub_stream_CopyTo, + sub_stream_Commit, + sub_stream_Revert, + sub_stream_LockRegion, + sub_stream_UnlockRegion, + sub_stream_Stat, + sub_stream_Clone +}; + +static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_INTEGER length, IStream **out) +{ + sub_stream_t *This; + + *out = NULL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->lpVtbl = &sub_stream_vtbl; + This->refs = 1; + This->start = start; + This->length = length; + This->pos.QuadPart = 0; + IStream_AddRef(stream); + This->base = stream; + + *out = (IStream*)&This->lpVtbl; + return S_OK; +} + + typedef struct body_t { struct list entry;

1 0

Huw Davies : inetcomm: Added missing initialization.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 8a6fa1bf8d2f0e08468a1c97613c4226839fbc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6fa1bf8d2f0e08468a1c976… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 22:52:24 2008 +0000 inetcomm: Added missing initialization. --- dlls/inetcomm/mimeole.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ab68090..0e4a611 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1856,6 +1856,8 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag This->lpVtbl = &MimeMessageVtbl; This->refs = 1; This->stream = NULL; + list_init(&This->body_tree); + This->next_hbody = (HBODY)1; *ppMessage = (IMimeMessage *)&This->lpVtbl; return S_OK;

1 0

Frans Kool : winefile: Added Dutch translations.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 9d2320c933880006641dfadd221f48ddc1589d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2320c933880006641dfadd2… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Feb 12 22:22:22 2008 +0100 winefile: Added Dutch translations. --- programs/winefile/Nl.rc | 125 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index 8b85139..50ee5fe 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -158,3 +158,128 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", 2, 158, 23, 47, 14 PUSHBUTTON "&Help", 254, 158, 43, 47, 14 } + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecteer bestemming" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Locatie:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Annuleren", 2, 158, 23, 47, 14 + PUSHBUTTON "&Bladeren", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Per Bestandstype" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Naam:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Bestandstype",-1,7,23,87,56 + CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programma's",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&menten",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Overige bestanden",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Toon Verborgen/&Systeem Bestanden",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Eigenschappen voor %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Annuleren",IDCANCEL,191,29,50,14 + LTEXT "&Bestandsnaam:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Volledig &Pad:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Laatste Wijziging:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versie:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Grootte:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributen",-1,7,79,158,46 + CONTROL "A&lleen Lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "V&erborgen",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archiveren",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Systeem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Ge&comprimeerd",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versie Informatie",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Lettertype wordt toegepast" + IDS_FONT_SEL_ERROR "Probleem tijdens het selecteren van het nieuwe lettertype." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Fout" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Bureaublad" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Nog niet geimplementeerd" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Naam" + IDS_COL_SIZE "Grootte" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Links" + IDS_COL_ATTR "Attributen" + IDS_COL_SEC "Beveiliging" + + IDS_FREE_SPACE_FMT "%s van %s vrij" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENTIE" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +}

1 0