April 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdi32: ntmCellHeight and ntmAvgWidth should be in font units.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 5476c0e2b9221508ea912a5e0e489ae3650ce8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5476c0e2b9221508ea912a5e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:03:35 2012 +0900 gdi32: ntmCellHeight and ntmAvgWidth should be in font units. --- dlls/gdi32/freetype.c | 13 ++++++++++--- dlls/gdi32/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 401cfd1..3de31f6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -342,6 +342,7 @@ struct tagGdiFont { SHORT yMax; SHORT yMin; DWORD ntmFlags; + UINT ntmCellHeight, ntmAvgWidth; FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; @@ -5070,6 +5071,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, memcpy(&pntm->ntmTm, &font->potm->otmTextMetrics, sizeof(TEXTMETRICW)); pntm->ntmTm.ntmSizeEM = font->potm->otmEMSquare; + pntm->ntmTm.ntmCellHeight = font->ntmCellHeight; + pntm->ntmTm.ntmAvgWidth = font->ntmAvgWidth; lstrcpynW(pelf->elfLogFont.lfFaceName, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), @@ -5086,6 +5089,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, get_text_metrics(font, (TEXTMETRICW *)&pntm->ntmTm); pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; + pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; + pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); if (face->FullName) @@ -5096,8 +5101,6 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, } pntm->ntmTm.ntmFlags = face->ntmFlags; - pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; - pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; pntm->ntmFontSig = face->fs; pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ @@ -6611,9 +6614,10 @@ static BOOL get_outline_text_metrics(GdiFont *font) pPost = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_post); /* we can live with this failing */ - TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", + TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", pOS2->usWinAscent, pOS2->usWinDescent, pOS2->sTypoAscender, pOS2->sTypoDescender, pOS2->sTypoLineGap, + pOS2->xAvgCharWidth, ft_face->ascender, ft_face->descender, ft_face->height, pHori->Ascender, pHori->Descender, pHori->Line_Gap, ft_face->bbox.yMax, ft_face->bbox.yMin); @@ -6631,6 +6635,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) descent = pOS2->usWinDescent; } + font->ntmCellHeight = ascent + descent; + font->ntmAvgWidth = pOS2->xAvgCharWidth; + if(font->yMax) { TM.tmAscent = font->yMax; TM.tmDescent = -font->yMin; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bda8fc8..1708c49 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2056,11 +2056,15 @@ struct enum_font_dataW static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWORD type, LPARAM lParam) { struct enum_font_data *efd = (struct enum_font_data *)lParam; + const NEWTEXTMETRIC *ntm = (const NEWTEXTMETRIC *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); + if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); @@ -2075,11 +2079,15 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, DWORD type, LPARAM lParam) { struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; + const NEWTEXTMETRICW *ntm = (const NEWTEXTMETRICW *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); + if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);

1 0

Dmitry Timoshkov : gdiplus: Use symbolic name of the font style.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 1e12570d72ae1c913550a157c9a9db8af785b18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e12570d72ae1c913550a157c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 23 23:31:59 2012 +0900 gdiplus: Use symbolic name of the font style. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index eab8284..8e61aba 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -779,7 +779,7 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, static INT CALLBACK font_has_style_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - INT fontstyle=0; + INT fontstyle = FontStyleRegular; if (!ntm) return 1;

1 0

Dmitry Timoshkov : winex11.drv: Windows always generates VK_DECIMAL for Del /. on a keypad.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: bdae6d7dc05628920db38b6ad23983835f475581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdae6d7dc05628920db38b6ad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 15:08:50 2012 +0900 winex11.drv: Windows always generates VK_DECIMAL for Del/. on a keypad. --- dlls/winex11.drv/keyboard.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3b91d8f..090eae4 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -994,7 +994,11 @@ static const WORD nonchar_key_vkey[256] = VK_END, VK_CLEAR, VK_INSERT, VK_DELETE, 0, 0, 0, 0, 0, 0, 0, 0, /* FFA0 */ 0, 0, VK_MULTIPLY, VK_ADD, /* FFA8 */ - VK_SEPARATOR, VK_SUBTRACT, VK_DECIMAL, VK_DIVIDE, + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + VK_DECIMAL, VK_SUBTRACT, VK_DECIMAL, VK_DIVIDE, VK_NUMPAD0, VK_NUMPAD1, VK_NUMPAD2, VK_NUMPAD3, /* FFB0 */ VK_NUMPAD4, VK_NUMPAD5, VK_NUMPAD6, VK_NUMPAD7, VK_NUMPAD8, VK_NUMPAD9, 0, 0, 0, VK_OEM_NEC_EQUAL, /* FFB8 */ @@ -2211,8 +2215,12 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) if ((wCode>=VK_NUMPAD0) && (wCode<=VK_NUMPAD9)) e.keycode = XKeysymToKeycode(e.display, wCode-VK_NUMPAD0+XK_KP_0); - if (wCode==VK_DECIMAL) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + if (wCode == VK_DECIMAL || wCode == VK_SEPARATOR) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); if (!e.keycode) { @@ -2545,10 +2553,11 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if ((virtKey>=VK_NUMPAD0) && (virtKey<=VK_NUMPAD9)) e.keycode = XKeysymToKeycode(e.display, virtKey-VK_NUMPAD0+XK_KP_0); - if (virtKey==VK_DECIMAL) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); - - if (virtKey==VK_SEPARATOR) + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + if (virtKey == VK_DECIMAL || virtKey == VK_SEPARATOR) e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); if (!e.keycode && virtKey != VK_NONAME)

1 0

Piotr Caban : msvcrt: Rework wcsncpy_s to work on overlapping pointers.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: dc830aa640f114bb6596d8bf23405be5d14df98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc830aa640f114bb6596d8bf2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 18:44:07 2012 +0200 msvcrt: Rework wcsncpy_s to work on overlapping pointers. --- dlls/msvcrt/tests/string.c | 10 ++++++++++ dlls/msvcrt/wcs.c | 32 +++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index afa9954..6f36928 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -688,6 +688,16 @@ static void test_wcscpy_s(void) ok(ret == STRUNCATE, "expected STRUNCATE got %d\n", ret); ok(szDest[4] == 0, "szDest[4] not 0\n"); ok(!memcmp(szDest, szLongText, 4*sizeof(WCHAR)), "szDest = %s\n", wine_dbgstr_w(szDest)); + + ret = p_wcsncpy_s(NULL, 0, (void*)0xdeadbeef, 0); + ok(ret == 0, "ret = %d\n", ret); + + szDestShort[0] = '1'; + szDestShort[1] = 0; + ret = p_wcsncpy_s(szDestShort+1, 4, szDestShort, -1); + ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); + ok(szDestShort[0]=='1' && szDestShort[1]=='1' && szDestShort[2]=='1' && szDestShort[3]=='1', + "szDestShort = %s\n", wine_dbgstr_w(szDestShort)); } static void test__wcsupr_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 21cee47..e150a87 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1229,34 +1229,40 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc, MSVCRT_size_t count ) { - MSVCRT_size_t size = 0; - INT ret = 0; + WCHAR *p = wcDest; + BOOL truncate = (count == MSVCRT__TRUNCATE); + + if(!wcDest && !numElement && !count) + return 0; if (!wcDest || !numElement) return MSVCRT_EINVAL; - wcDest[0] = 0; - if (!wcSrc) { + *wcDest = 0; return count ? MSVCRT_EINVAL : 0; } - size = min(strlenW(wcSrc), count); - if (count==MSVCRT__TRUNCATE && size>=numElement) + while (numElement && count && *wcSrc) { - ret = MSVCRT_STRUNCATE; - size = numElement-1; + *p++ = *wcSrc++; + numElement--; + count--; } - else if (size >= numElement) + if (!numElement && truncate) { + *(p-1) = 0; + return MSVCRT_STRUNCATE; + } + else if (!numElement) + { + *wcDest = 0; return MSVCRT_ERANGE; } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); - wcDest[size] = '\0'; - - return ret; + *p = 0; + return 0; } /******************************************************************

1 0

Vincent Povirk : gdiplus: Implement accessors for graphics rendering origin .
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 075775a81b6036a466343f9b5d3c497bcf4a6d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075775a81b6036a466343f9b5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 23 13:12:05 2012 -0500 gdiplus: Implement accessors for graphics rendering origin. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5d5a92c..06dee29 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -161,6 +161,7 @@ struct GpGraphics{ UINT textcontrast; /* not used yet. get/set only */ struct list containers; GraphicsContainer contid; /* last-issued container ID */ + INT origin_x, origin_y; /* For giving the caller an HDC when we technically can't: */ HBITMAP temp_hbitmap; int temp_hbitmap_width; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0845579..92bc27e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1976,6 +1976,7 @@ typedef struct _GraphicsContainerItem { UINT textcontrast; GpMatrix* worldtrans; GpRegion* clip; + INT origin_x, origin_y; } GraphicsContainerItem; static GpStatus init_container(GraphicsContainerItem** container, @@ -1997,6 +1998,8 @@ static GpStatus init_container(GraphicsContainerItem** container, (*container)->unit = graphics->unit; (*container)->textcontrast = graphics->textcontrast; (*container)->pixeloffset = graphics->pixeloffset; + (*container)->origin_x = graphics->origin_x; + (*container)->origin_y = graphics->origin_y; sts = GdipCloneMatrix(graphics->worldtrans, &(*container)->worldtrans); if(sts != Ok){ @@ -2055,6 +2058,8 @@ static GpStatus restore_container(GpGraphics* graphics, graphics->unit = container->unit; graphics->textcontrast = container->textcontrast; graphics->pixeloffset = container->pixeloffset; + graphics->origin_x = container->origin_x; + graphics->origin_y = container->origin_y; return Ok; } @@ -5499,23 +5504,28 @@ GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y) TRACE("(%p,%i,%i)\n", graphics, x, y); if (!(calls++)) - FIXME("not implemented\n"); + FIXME("value is unused in rendering\n"); - return NotImplemented; + if (!graphics) + return InvalidParameter; + + graphics->origin_x = x; + graphics->origin_y = y; + + return Ok; } GpStatus WINGDIPAPI GdipGetRenderingOrigin(GpGraphics *graphics, INT *x, INT *y) { - static int calls; - TRACE("(%p,%p,%p)\n", graphics, x, y); - if (!(calls++)) - FIXME("not implemented\n"); + if (!graphics || !x || !y) + return InvalidParameter; - *x = *y = 0; + *x = graphics->origin_x; + *y = graphics->origin_y; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode)

1 0

Nikolay Sivov : msxml3: Implement getLocalName() for IMXAttributes.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 3f5ec72fcf2113292e95d7227b1c7c6b88bee042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5ec72fcf2113292e95d7227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 24 11:30:24 2012 +0400 msxml3: Implement getLocalName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index e4224ed..48d9f8d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1795,12 +1795,20 @@ static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, co return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int nIndex, const WCHAR **localName, - int *length) +static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int index, const WCHAR **name, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, localName, length); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, name, len); + + if (index >= This->length || index < 0) return E_INVALIDARG; + if (!name || !len) return E_POINTER; + + *len = SysStringLen(This->attr[index].local); + *name = This->attr[index].local; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, const WCHAR **qname, int *length)

1 0

Nikolay Sivov : msxml3: Implement getURI() for IMXAttributes.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 9472b8ca43b5e136882779b706201df7a605e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9472b8ca43b5e136882779b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 24 11:32:51 2012 +0400 msxml3: Implement getURI() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 48d9f8d..779ca7a 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1787,12 +1787,20 @@ static HRESULT WINAPI SAXAttributes_getLength(ISAXAttributes *iface, int *length return S_OK; } -static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, const WCHAR **pUrl, - int *pUriSize) +static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int index, const WCHAR **uri, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pUrl, pUriSize); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, uri, len); + + if (index >= This->length || index < 0) return E_INVALIDARG; + if (!uri || !len) return E_POINTER; + + *len = SysStringLen(This->attr[index].uri); + *uri = This->attr[index].uri; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int index, const WCHAR **name,

1 0

Owen Rudge : include: Add MAPISendMailW definition and structures.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: e82e3e7fb6a913b7289f56aa4322b19253b85f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82e3e7fb6a913b7289f56aa4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:05:43 2012 +0100 include: Add MAPISendMailW definition and structures. --- include/mapi.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/mapi.h b/include/mapi.h index 548e130..1bd69e7 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -47,6 +47,16 @@ typedef struct LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; +typedef struct +{ + ULONG ulReserved; + ULONG flFlags; + ULONG nPosition; + PWSTR lpszPathName; + PWSTR lpszFileName; + PVOID lpFileType; +} MapiFileDescW, *lpMapiFileDescW; + #ifndef MAPI_ORIG #define MAPI_ORIG 0 #define MAPI_TO 1 @@ -67,6 +77,16 @@ typedef struct typedef struct { ULONG ulReserved; + ULONG ulRecipClass; + PWSTR lpszName; + PWSTR lpszAddress; + ULONG ulEIDSize; + PVOID lpEntryID; +} MapiRecipDescW, *lpMapiRecipDescW; + +typedef struct +{ + ULONG ulReserved; LPSTR lpszSubject; LPSTR lpszNoteText; LPSTR lpszMessageType; @@ -80,6 +100,21 @@ typedef struct lpMapiFileDesc lpFiles; } MapiMessage, *lpMapiMessage; +typedef struct +{ + ULONG ulReserved; + PWSTR lpszSubject; + PWSTR lpszNoteText; + PWSTR lpszMessageType; + PWSTR lpszDateReceived; + PWSTR lpszConversationID; + FLAGS flFlags; + lpMapiRecipDescW lpOriginator; + ULONG nRecipCount; + lpMapiRecipDescW lpRecips; + ULONG nFileCount; + lpMapiFileDescW lpFiles; +} MapiMessageW, *lpMapiMessageW; /* Error codes */ @@ -140,6 +175,10 @@ typedef struct #define MAPI_DIALOG 0x00000008 +/* MAPISendMailW */ + +#define MAPI_FORCE_UNICODE 0x00040000 + /* API typedefs and prototypes */ @@ -194,6 +233,10 @@ typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG) typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; +typedef ULONG (WINAPI MAPISENDMAILW)(LHANDLE,ULONG_PTR,lpMapiMessageW,FLAGS,ULONG); +typedef MAPISENDMAILW *LPMAPISENDMAILW; +MAPISENDMAILW MAPISendMailW; + #ifdef __cplusplus } #endif

1 0

Owen Rudge : mapi32: Add stub implementation of MAPISendMailW.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 7031588c7668fdee0561f0fa55c84ce1cc0d41a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7031588c7668fdee0561f0fa5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:05:49 2012 +0100 mapi32: Add stub implementation of MAPISendMailW. --- dlls/mapi32/mapi32.spec | 1 + dlls/mapi32/sendmail.c | 28 ++++++++++++++++++++++++++++ dlls/mapi32/util.c | 1 + dlls/mapi32/util.h | 1 + 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index ae85b4a..c84cfd4 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI(a)0 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath(a)20(str str ptr long long) FGetComponentPath +256 stdcall MAPISendMailW(ptr ptr ptr long long) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 89daf0f..e313b53 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -408,6 +408,34 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return MAPI_E_NOT_SUPPORTED; } +/************************************************************************** + * MAPISendMailW (MAPI32.256) + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessageW structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessageW message, FLAGS flags, ULONG reserved) +{ + /* Check to see if we have a Simple MAPI provider loaded */ + if (mapiFunctions.MAPISendMailW) + return mapiFunctions.MAPISendMailW(session, uiparam, message, flags, reserved); + + WARN("STUB\n"); + return MAPI_E_NOT_SUPPORTED; +} + ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, LPSTR filenames, ULONG reserved) { diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 90cfa6e..abc4db6 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -1075,6 +1075,7 @@ void load_mapi_providers(void) mapiFunctions.MAPISaveMail = (void*) GetProcAddress(mapi_provider, "MAPISaveMail"); mapiFunctions.MAPISendDocuments = (void*) GetProcAddress(mapi_provider, "MAPISendDocuments"); mapiFunctions.MAPISendMail = (void*) GetProcAddress(mapi_provider, "MAPISendMail"); + mapiFunctions.MAPISendMailW = (void*) GetProcAddress(mapi_provider, "MAPISendMailW"); } /* Extended MAPI functions */ diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 6fbf81e..4582855 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -41,6 +41,7 @@ typedef struct MAPI_FUNCTIONS { LPMAPIRESOLVENAME MAPIResolveName; LPMAPISAVEMAIL MAPISaveMail; LPMAPISENDMAIL MAPISendMail; + LPMAPISENDMAILW MAPISendMailW; LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize;

1 0

Owen Rudge : mapistub: Forward MAPISendMailW.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: c0b006f868f95fe121b8a142b61be0300f4f2971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b006f868f95fe121b8a142b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:29:02 2012 +0100 mapistub: Forward MAPISendMailW. --- dlls/mapistub/mapistub.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mapistub/mapistub.spec b/dlls/mapistub/mapistub.spec index 15cd25d..fce027d 100644 --- a/dlls/mapistub/mapistub.spec +++ b/dlls/mapistub/mapistub.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI(a)0 254 stdcall FGetComponentPath(str str ptr long long) mapi32.FGetComponentPath 255 stdcall FGetComponentPath(a)20(str str ptr long long) mapi32.FGetComponentPath +256 stdcall MAPISendMailW(long long ptr long long) mapi32.MAPISendMailW

1 0