September 2009 - Wine-commits

Zachary Goldberg : WWN 360
by Jeremy Newman 21 Sep '09

21 Sep '09

Module: website Branch: master Commit: 6257bc24e863fc7c3143a5ea5e756228c7245d95 URL: http://source.winehq.org/git/website.git/?a=commit;h=6257bc24e863fc7c3143a5… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Fri Sep 18 22:14:33 2009 -0400 WWN 360 --- news/en/2009091801.xml | 12 + wwn/en/wn20090918_360.xml | 1286 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1298 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=6257bc24e863fc7c31…

1 0

Marcus Meissner : LOSTWAGES: wwn359: fix typos
by Jeremy Newman 21 Sep '09

21 Sep '09

Module: website Branch: master Commit: 1da15f3806b485694a5ef2c042a9f950fff23dac URL: http://source.winehq.org/git/website.git/?a=commit;h=1da15f3806b485694a5ef2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 20 10:57:05 2009 +0200 LOSTWAGES: wwn359: fix typos --- wwn/en/wn20090913_359.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wwn/en/wn20090913_359.xml b/wwn/en/wn20090913_359.xml index 6443a3b..a8f0485 100644 --- a/wwn/en/wn20090913_359.xml +++ b/wwn/en/wn20090913_359.xml @@ -96,17 +96,17 @@ Keep it up! </p> </quote> <p> -Several Wine releases have occured since the last WWN. Below is a list of some of the many improvements in Wine lately: +Several Wine releases have occurred since the last WWN. Below is a list of some of the many improvements in Wine lately: </p> <quote> <p> <ul> -<li>Updated version of Gechko</li> +<li>Updated version of Gecko</li> <li>Significant Wine64 improvements</li> <li>Many new codecs, protocols and formats supported</li> -<li>Provied XShm and bitmap stretching performance. </li> +<li>Provide XShm and bitmap stretching performance. </li> <li>Improved Memory Management</li> -<li>FBO becomming the default for D3D</li> +<li>FBO becoming the default for D3D</li> </ul> </p> </quote></section> @@ -173,7 +173,7 @@ fixed, so if you're a developer and would rather work on patches then by all means do that instead. </p> <p>I've created a wiki page for the event here: <a href="http://wiki.winehq.org/BugDay">http://wiki.winehq.org/BugDay</a> -When we're done I'll poke bugzilla for some stats and we can see how +When we're done I'll poke BugZilla for some stats and we can see how much of a success the event was. </p> <p> @@ -182,10 +182,10 @@ Scott Ritchie </p> </quote> <p> -By all counts the first BugDay was a big success. An August BugDay also occured, and with any luck there will also be a September Bug Day. +By all counts the first BugDay was a big success. An August BugDay also occurred, and with any luck there will also be a September Bug Day. </p></section> <section - title="Wine and the Ubuntu Summut" + title="Wine and the Ubuntu Summit" subject="Desktop Integration" archive="http://www.winehq.org/pipermail/wine-devel/2009-June/076102.html" posts="5" @@ -210,7 +210,7 @@ need our ALSA stack to use the Pulseaudio safe subset: <a href="http://0pointer.de/blog/projects/guide-to-sound-apis.html.">http://0pointer.de/blog/projects/guide-to-sound-apis.html.</a> I've filed a metabug tracking this here: <a href="http://bugs.winehq.org/show_bug.cgi?id=18740.">http://bugs.winehq.org/show_bug.cgi?id=18740.</a> Use of this unsafe subset -can cause most problems with stuttering or even complete dropoff. +can cause most problems with stuttering or even complete drop off. </p><p> I'm not completely familiar with how sound works in Wine, but in the past I remember that one complaint about PulseAudio over ALSA was

1 0

Owen Rudge : mapi32: Implement the rest of the Simple MAPI functions.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: bae9e56ef4f453f96c677f0a9d14c0e74a13ba04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae9e56ef4f453f96c677f0a9… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Sep 18 15:15:53 2009 +0100 mapi32: Implement the rest of the Simple MAPI functions. --- dlls/mapi32/mapi32.spec | 16 +++++----- dlls/mapi32/mapi32_main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mapi32/sendmail.c | 9 ++++++ 3 files changed, 82 insertions(+), 8 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index abf79bf..04be363 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -145,17 +145,17 @@ 205 stub FDecodeID(a)12 206 stub CchOfEncoding(a)4 207 stdcall CbOfEncoded(a)4(ptr) CbOfEncoded -208 stub MAPISendDocuments +208 stdcall MAPISendDocuments(ptr ptr ptr ptr long) 209 stdcall MAPILogon(long ptr ptr long long ptr) 210 stdcall MAPILogoff(long long long long) 211 stdcall MAPISendMail(long long ptr long long) -212 stub MAPISaveMail -213 stub MAPIReadMail -214 stub MAPIFindNext -215 stub MAPIDeleteMail -217 stub MAPIAddress -218 stub MAPIDetails -219 stub MAPIResolveName +212 stdcall MAPISaveMail(ptr ptr ptr long long ptr) +213 stdcall MAPIReadMail(ptr ptr ptr long long ptr) +214 stdcall MAPIFindNext(ptr ptr ptr ptr long long ptr) +215 stdcall MAPIDeleteMail(ptr ptr ptr long long) +217 stdcall MAPIAddress(ptr ptr ptr long ptr long long ptr long ptr ptr) +218 stdcall MAPIDetails(ptr ptr ptr long long) +219 stdcall MAPIResolveName(ptr ptr ptr long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 5b6e6e5..5039c29 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -184,3 +184,68 @@ HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) *lppProfAdmin = NULL; return E_FAIL; } + +ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, + ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips, + FLAGS flags, ULONG reserved, LPULONG newRecips, lpMapiRecipDesc * lppNewRecips) +{ + if (mapiFunctions.MAPIAddress) + return mapiFunctions.MAPIAddress(session, uiparam, caption, editfields, labels, + nRecips, lpRecips, flags, reserved, newRecips, lppNewRecips); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIDeleteMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, + FLAGS flags, ULONG reserved) +{ + if (mapiFunctions.MAPIDeleteMail) + return mapiFunctions.MAPIDeleteMail(session, uiparam, msg_id, flags, reserved); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIDetails(LHANDLE session, ULONG_PTR uiparam, lpMapiRecipDesc recip, + FLAGS flags, ULONG reserved) +{ + if (mapiFunctions.MAPIDetails) + return mapiFunctions.MAPIDetails(session, uiparam, recip, flags, reserved); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIFindNext(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_type, + LPSTR seed_msg_id, FLAGS flags, ULONG reserved, LPSTR msg_id) +{ + if (mapiFunctions.MAPIFindNext) + return mapiFunctions.MAPIFindNext(session, uiparam, msg_type, seed_msg_id, flags, reserved, msg_id); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIReadMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, + FLAGS flags, ULONG reserved, lpMapiMessage msg) +{ + if (mapiFunctions.MAPIReadMail) + return mapiFunctions.MAPIReadMail(session, uiparam, msg_id, flags, reserved, msg); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, + FLAGS flags, ULONG reserved, lpMapiRecipDesc *recip) +{ + if (mapiFunctions.MAPIResolveName) + return mapiFunctions.MAPIResolveName(session, uiparam, name, flags, reserved, recip); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPISaveMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage msg, + FLAGS flags, ULONG reserved, LPSTR msg_id) +{ + if (mapiFunctions.MAPISaveMail) + return mapiFunctions.MAPISaveMail(session, uiparam, msg, flags, reserved, msg_id); + + return MAPI_E_NOT_SUPPORTED; +} diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 7cf8ec8..5054be8 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -211,3 +211,12 @@ exit: return ret; } + +ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, + LPSTR filenames, ULONG reserved) +{ + if (mapiFunctions.MAPISendDocuments) + return mapiFunctions.MAPISendDocuments(uiparam, delim, paths, filenames, reserved); + + return MAPI_E_NOT_SUPPORTED; +}

1 0

Owen Rudge : mapi32: Pass through MAPISendMail if Simple MAPI provider loaded.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 2e90bd6695ca11d967cf680c6930a0975156a724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e90bd6695ca11d967cf680c6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Sep 18 15:15:49 2009 +0100 mapi32: Pass through MAPISendMail if Simple MAPI provider loaded. --- dlls/mapi32/sendmail.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 7b8de66..7cf8ec8 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -2,6 +2,7 @@ * MAPISendMail implementation * * Copyright 2005 Hans Leidekker + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,7 @@ #include "shellapi.h" #include "shlwapi.h" #include "wine/debug.h" +#include "util.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -53,7 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); * Failure: MAPI_E_FAILURE * * NOTES - * This is a temporary hack. + * The fallback procedure is a temporary hack. */ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, lpMapiMessage message, FLAGS flags, ULONG reserved ) @@ -74,6 +76,14 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved ); + /* Check to see if we have a Simple MAPI provider loaded */ + if (mapiFunctions.MAPISendMail) + return mapiFunctions.MAPISendMail(session, uiparam, message, flags, reserved); + + /* TODO: Check if we have an Extended MAPI provider, if so, implement + wrapper around that. */ + + /* Fall back on our own implementation */ if (!message) return MAPI_E_FAILURE; for (i = 0; i < message->nRecipCount; i++)

1 0

Owen Rudge : mapi32: Implement MAPIInitialize, Logon, Logoff, LogonEx, Uninitialize.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 421ab509fc3c647a64c3e16cf9431f452fda5e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=421ab509fc3c647a64c3e16cf… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Sep 18 15:15:45 2009 +0100 mapi32: Implement MAPIInitialize, Logon, Logoff, LogonEx, Uninitialize. --- dlls/mapi32/mapi32_main.c | 66 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 0f82e76..5b6e6e5 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -83,36 +83,77 @@ HRESULT WINAPI DllCanUnloadNow(void) return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; } +/*********************************************************************** + * MAPIInitialize + * + * Initialises the MAPI library. In our case, we pass through to the + * loaded Extended MAPI provider. + */ HRESULT WINAPI MAPIInitialize(LPVOID init) { - FIXME("(%p) Stub\n", init); - return SUCCESS_SUCCESS; + TRACE("(%p)\n", init); + + if (mapiFunctions.MAPIInitialize) + return mapiFunctions.MAPIInitialize(init); + + return MAPI_E_NOT_INITIALIZED; } +/*********************************************************************** + * MAPILogon + * + * Logs on to a MAPI provider. If available, we pass this through to a + * Simple MAPI provider. Otherwise, we maintain basic functionality + * ourselves. + */ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - FIXME("(0x%08lx %s %p 0x%08x 0x%08x %p) Stub\n", uiparam, + TRACE("(0x%08lx %s %p 0x%08x 0x%08x %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); + if (mapiFunctions.MAPILogon) + return mapiFunctions.MAPILogon(uiparam, profile, password, flags, reserved, session); + if (session) *session = 1; return SUCCESS_SUCCESS; } +/*********************************************************************** + * MAPILogoff + * + * Logs off from a MAPI provider. If available, we pass this through to a + * Simple MAPI provider. Otherwise, we maintain basic functionality + * ourselves. + */ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - FIXME("(0x%08lx 0x%08lx 0x%08x 0x%08x) Stub\n", session, + TRACE("(0x%08lx 0x%08lx 0x%08x 0x%08x)\n", session, uiparam, flags, reserved); + + if (mapiFunctions.MAPILogoff) + return mapiFunctions.MAPILogoff(session, uiparam, flags, reserved); + return SUCCESS_SUCCESS; } +/*********************************************************************** + * MAPILogonEx + * + * Logs on to a MAPI provider. If available, we pass this through to an + * Extended MAPI provider. Otherwise, we return an error. + */ HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - FIXME("(0x%08lx %s %p 0x%08x %p) Stub\n", uiparam, + TRACE("(0x%08lx %s %p 0x%08x %p)\n", uiparam, debugstr_w(profile), password, flags, session); - return SUCCESS_SUCCESS; + + if (mapiFunctions.MAPILogonEx) + return mapiFunctions.MAPILogonEx(uiparam, profile, password, flags, session); + + return E_FAIL; } HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID *ppfcnt) @@ -121,9 +162,20 @@ HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID *ppfcnt) return E_FAIL; } +/*********************************************************************** + * MAPIUninitialize + * + * Uninitialises the MAPI library. In our case, we pass through to the + * loaded Extended MAPI provider. + * + */ VOID WINAPI MAPIUninitialize(void) { - FIXME("Stub\n"); + TRACE("()\n"); + + /* Try to uninitialise the Extended MAPI library */ + if (mapiFunctions.MAPIUninitialize) + mapiFunctions.MAPIUninitialize(); } HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin)

1 0

Owen Rudge : mapi32: Load and store MAPI function pointers after loading MAPI providers.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 69156f5ae26546f01bafe3795e3f194e34e9de80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69156f5ae26546f01bafe3795… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Sep 18 15:15:40 2009 +0100 mapi32: Load and store MAPI function pointers after loading MAPI providers. --- dlls/mapi32/util.c | 29 +++++++++++++++++++++++++++++ dlls/mapi32/util.h | 22 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 6044749..6a6a5cd 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -48,6 +48,8 @@ static const BYTE digitsToHex[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13, 14,15 }; +MAPI_FUNCTIONS mapiFunctions; + /************************************************************************** * ScInitMapiUtil (MAPI32.33) * @@ -1029,6 +1031,33 @@ void load_mapi_providers(void) load_mapi_provider(hkeyMail, regkey_dllpath, &mapi_provider); load_mapi_provider(hkeyMail, regkey_dllpath_ex, &mapi_ex_provider); + /* Now try to load our function pointers */ + ZeroMemory(&mapiFunctions, sizeof(mapiFunctions)); + + /* Simple MAPI functions */ + if (mapi_provider) + { + mapiFunctions.MAPIAddress = (void*) GetProcAddress(mapi_provider, "MAPIAddress"); + mapiFunctions.MAPIDeleteMail = (void*) GetProcAddress(mapi_provider, "MAPIDeleteMail"); + mapiFunctions.MAPIDetails = (void*) GetProcAddress(mapi_provider, "MAPIDetails"); + mapiFunctions.MAPIFindNext = (void*) GetProcAddress(mapi_provider, "MAPIFindNext"); + mapiFunctions.MAPILogoff = (void*) GetProcAddress(mapi_provider, "MAPILogoff"); + mapiFunctions.MAPILogon = (void*) GetProcAddress(mapi_provider, "MAPILogon"); + mapiFunctions.MAPIReadMail = (void*) GetProcAddress(mapi_provider, "MAPIReadMail"); + mapiFunctions.MAPIResolveName = (void*) GetProcAddress(mapi_provider, "MAPIResolveName"); + mapiFunctions.MAPISaveMail = (void*) GetProcAddress(mapi_provider, "MAPISaveMail"); + mapiFunctions.MAPISendDocuments = (void*) GetProcAddress(mapi_provider, "MAPISendDocuments"); + mapiFunctions.MAPISendMail = (void*) GetProcAddress(mapi_provider, "MAPISendMail"); + } + + /* Extended MAPI functions */ + if (mapi_ex_provider) + { + mapiFunctions.MAPIInitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIInitialize"); + mapiFunctions.MAPILogonEx = (void*) GetProcAddress(mapi_ex_provider, "MAPILogonEx"); + mapiFunctions.MAPIUninitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIUninitialize"); + } + cleanUp: RegCloseKey(hkeyMail); HeapFree(GetProcessHeap(), 0, appKey); diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 450d671..69b1603 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -22,7 +22,29 @@ #define _MAPI_UTIL_H +#include <mapi.h> +#include <mapix.h> + extern void load_mapi_providers(void); extern void unload_mapi_providers(void); +typedef struct MAPI_FUNCTIONS { + LPMAPIADDRESS MAPIAddress; + LPMAPIDELETEMAIL MAPIDeleteMail; + LPMAPIDETAILS MAPIDetails; + LPMAPIFINDNEXT MAPIFindNext; + LPMAPIINITIALIZE MAPIInitialize; + LPMAPILOGOFF MAPILogoff; + LPMAPILOGON MAPILogon; + LPMAPILOGONEX MAPILogonEx; + LPMAPIREADMAIL MAPIReadMail; + LPMAPIRESOLVENAME MAPIResolveName; + LPMAPISAVEMAIL MAPISaveMail; + LPMAPISENDMAIL MAPISendMail; + LPMAPISENDDOCUMENTS MAPISendDocuments; + LPMAPIUNINITIALIZE MAPIUninitialize; +} MAPI_FUNCTIONS; + +extern MAPI_FUNCTIONS mapiFunctions; + #endif

1 0

Owen Rudge : mapi32: Scan registry for MAPI providers and load them.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: b6e5ee604ac46d4a2d1c1cc547100cbe5c36187f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e5ee604ac46d4a2d1c1cc54… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Sep 18 15:15:34 2009 +0100 mapi32: Scan registry for MAPI providers and load them. --- dlls/mapi32/Makefile.in | 2 +- dlls/mapi32/mapi32_main.c | 5 +- dlls/mapi32/util.c | 144 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mapi32/util.h | 28 +++++++++ 4 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 3e311de..e38cfcf 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mapi32.dll IMPORTLIB = mapi32 -IMPORTS = uuid shlwapi shell32 kernel32 +IMPORTS = uuid shlwapi shell32 advapi32 kernel32 C_SRCS = \ imalloc.c \ diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index b9d5888..0f82e76 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -1,7 +1,7 @@ /* * MAPI basics * - * Copyright 2001 CodeWeavers Inc. + * Copyright 2001, 2009 CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +29,7 @@ #include "mapiform.h" #include "mapi.h" #include "wine/debug.h" +#include "util.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -45,9 +46,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); + load_mapi_providers(); break; case DLL_PROCESS_DETACH: TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); + unload_mapi_providers(); break; } return TRUE; diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index c621a0f..6044749 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -2,6 +2,7 @@ * MAPI Utility functions * * Copyright 2004 Jon Griffiths + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ #include "mapival.h" #include "xcmc.h" #include "msi.h" +#include "util.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -903,3 +905,145 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, *lppRows = NULL; return MAPI_E_CALL_FAILED; } + +static HMODULE mapi_provider; +static HMODULE mapi_ex_provider; + +/************************************************************************** + * load_mapi_provider + * + * Attempts to load a MAPI provider from the specified registry key. + * + * Returns a handle to the loaded module in `mapi_provider' if successful. + */ +static void load_mapi_provider(HKEY hkeyMail, LPCWSTR valueName, HMODULE *mapi_provider) +{ + static const WCHAR mapi32_dll[] = {'m','a','p','i','3','2','.','d','l','l',0 }; + + DWORD dwType, dwLen = 0; + LPWSTR dllPath; + + /* Check if we have a value set for DLLPath */ + if ((RegQueryValueExW(hkeyMail, valueName, NULL, &dwType, NULL, &dwLen) == ERROR_SUCCESS) && + ((dwType == REG_SZ) || (dwType == REG_EXPAND_SZ)) && (dwLen > 0)) + { + dllPath = HeapAlloc(GetProcessHeap(), 0, dwLen); + + if (dllPath) + { + RegQueryValueExW(hkeyMail, valueName, NULL, NULL, (LPBYTE)dllPath, &dwLen); + + /* Check that this value doesn't refer to mapi32.dll (eg, as Outlook does) */ + if (lstrcmpiW(dllPath, mapi32_dll) != 0) + { + if (dwType == REG_EXPAND_SZ) + { + DWORD dwExpandLen; + LPWSTR dllPathExpanded; + + /* Expand the path if necessary */ + dwExpandLen = ExpandEnvironmentStringsW(dllPath, NULL, 0); + dllPathExpanded = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwExpandLen + 1); + + if (dllPathExpanded) + { + ExpandEnvironmentStringsW(dllPath, dllPathExpanded, dwExpandLen + 1); + + HeapFree(GetProcessHeap(), 0, dllPath); + dllPath = dllPathExpanded; + } + } + + /* Load the DLL */ + TRACE("loading %s\n", debugstr_w(dllPath)); + *mapi_provider = LoadLibraryW(dllPath); + } + + HeapFree(GetProcessHeap(), 0, dllPath); + } + } +} + +/************************************************************************** + * load_mapi_providers + * + * Scans the registry for MAPI providers and attempts to load a Simple and + * Extended MAPI library. + * + * Returns TRUE if at least one library loaded, FALSE otherwise. + */ +void load_mapi_providers(void) +{ + static const WCHAR regkey_mail[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','i','e','n','t','s','\\', + 'M','a','i','l',0 }; + + static const WCHAR regkey_dllpath[] = {'D','L','L','P','a','t','h',0 }; + static const WCHAR regkey_dllpath_ex[] = {'D','L','L','P','a','t','h','E','x',0 }; + static const WCHAR regkey_backslash[] = { '\\', 0 }; + + HKEY hkeyMail; + DWORD dwType, dwLen = 0; + LPWSTR appName = NULL, appKey = NULL; + + TRACE("()\n"); + + /* Open the Mail key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, regkey_mail, 0, KEY_READ, &hkeyMail) != ERROR_SUCCESS) + return; + + /* Check if we have a default value set, and the length of it */ + if ((RegQueryValueExW(hkeyMail, NULL, NULL, &dwType, NULL, &dwLen) != ERROR_SUCCESS) || + !((dwType == REG_SZ) || (dwType == REG_EXPAND_SZ)) || (dwLen == 0)) + goto cleanUp; + + appName = HeapAlloc(GetProcessHeap(), 0, dwLen); + + if (!appName) + goto cleanUp; + + /* Get the value, and get the path to the app key */ + RegQueryValueExW(hkeyMail, NULL, NULL, NULL, (LPBYTE)appName, &dwLen); + + TRACE("appName: %s\n", debugstr_w(appName)); + + appKey = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(regkey_mail) + + lstrlenW(regkey_backslash) + lstrlenW(appName))); + + if (!appKey) + goto cleanUp; + + lstrcpyW(appKey, regkey_mail); + lstrcatW(appKey, regkey_backslash); + lstrcatW(appKey, appName); + + RegCloseKey(hkeyMail); + + TRACE("appKey: %s\n", debugstr_w(appKey)); + + /* Open the app's key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, appKey, 0, KEY_READ, &hkeyMail) != ERROR_SUCCESS) + return; + + /* Try to load the providers */ + load_mapi_provider(hkeyMail, regkey_dllpath, &mapi_provider); + load_mapi_provider(hkeyMail, regkey_dllpath_ex, &mapi_ex_provider); + +cleanUp: + RegCloseKey(hkeyMail); + HeapFree(GetProcessHeap(), 0, appKey); + HeapFree(GetProcessHeap(), 0, appName); +} + +/************************************************************************** + * unload_mapi_providers + * + * Unloads any loaded MAPI libraries. + */ +void unload_mapi_providers(void) +{ + TRACE("()\n"); + + FreeLibrary(mapi_provider); + FreeLibrary(mapi_ex_provider); +} diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h new file mode 100644 index 0000000..450d671 --- /dev/null +++ b/dlls/mapi32/util.h @@ -0,0 +1,28 @@ +/* + * MAPI utility header file + * + * Copyright 2009 Owen Rudge for CodeWeavers + * + * 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. + * + * 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. + * + * 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 + */ + +#ifndef _MAPI_UTIL_H + +#define _MAPI_UTIL_H + +extern void load_mapi_providers(void); +extern void unload_mapi_providers(void); + +#endif

1 0

Huw Davies : oledb32/tests: Skip tests on older versions of the conversion library.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 7b1f1c7123373e941aaa79500a7940e87e76718e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1f1c7123373e941aaa79500… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 18 15:14:35 2009 +0100 oledb32/tests: Skip tests on older versions of the conversion library. --- dlls/oledb32/tests/convert.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5ca06c3..cc67ab2 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -203,6 +203,16 @@ static void test_canconvert(void) return; } + /* Some older versions of the library don't support several conversions, we'll skip + if we have such a library */ + hr = IDataConvert_CanConvert(convert, DBTYPE_EMPTY, DBTYPE_DBTIMESTAMP); + if(hr == S_FALSE) + { + win_skip("Doesn't handle DBTYPE_EMPTY -> DBTYPE_DBTIMESTAMP conversion so skipping\n"); + IDataConvert_Release(convert); + return; + } + for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) {

1 0

Rico Schüller : wined3d: Fix shader spam.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 8a890d399a1b4260ed1b461487ebb29e46f68d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a890d399a1b4260ed1b46148… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 18 15:44:16 2009 +0200 wined3d: Fix shader spam. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b6fac0c..a78d827 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -187,14 +187,14 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA static const char * const spam[] = { "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ - "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ + "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx, with \n */ + "Fragment shader was successfully compiled to run on hardware.", /* fglrx, no \n */ "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ - "Fragment shader was successfully compiled to run on hardware.\n" - "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ }; if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return;

1 0

Austin English : Cancel in Italian is Annulla, not Anulla.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: c90333d5b37c12b12116520f27f9aa9432dfdc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90333d5b37c12b12116520f2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 17 11:02:25 2009 -0500 Cancel in Italian is Annulla, not Anulla. --- dlls/setupapi/It.rc | 2 +- programs/notepad/It.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/It.rc b/dlls/setupapi/It.rc index f30859f..b96d8e3 100644 --- a/dlls/setupapi/It.rc +++ b/dlls/setupapi/It.rc @@ -28,7 +28,7 @@ STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copia dei file in corso..." FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index e7cb5f0..ddd5b94 100644 --- a/programs/notepad/It.rc +++ b/programs/notepad/It.rc @@ -45,7 +45,7 @@ MAIN_MENU MENU MENUITEM "E&sci", CMD_EXIT } POPUP "&Modifica" { - MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO + MENUITEM "&Annulla\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "&Taglia\tCtrl+X", CMD_CUT MENUITEM "&Copia\tCtrl+C", CMD_COPY

1 0