October 2009 - Wine-commits

Hans Leidekker : wininet: Avoid accessing uninitialized memory in ConvertUrlComponentValue.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: b707a523e31256be818b69d279922b0c6524c23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b707a523e31256be818b69d27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:03:14 2009 +0100 wininet: Avoid accessing uninitialized memory in ConvertUrlComponentValue. Found by valgrind. --- dlls/wininet/internet.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dbee0a2..65bb3d2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1133,11 +1133,14 @@ static void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentL DWORD nASCIILength=WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,NULL,0,NULL,NULL); if (*lppszComponent == NULL) { - int nASCIIOffset=WideCharToMultiByte(CP_ACP,0,lpwszStart,lpwszComponent-lpwszStart,NULL,0,NULL,NULL); if (lpwszComponent) - *lppszComponent = (LPSTR)lpszStart+nASCIIOffset; + { + int offset = WideCharToMultiByte(CP_ACP, 0, lpwszStart, lpwszComponent-lpwszStart, NULL, 0, NULL, NULL); + *lppszComponent = (LPSTR)lpszStart + offset; + } else *lppszComponent = NULL; + *dwComponentLen = nASCIILength; } else @@ -1184,7 +1187,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, InternetCrackUrlW should not include it */ if (dwUrlLength == -1) nLength--; - lpwszUrl=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*nLength); + lpwszUrl = HeapAlloc(GetProcessHeap(), 0, nLength * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); memset(&UCW,0,sizeof(UCW));

1 0

Hans Leidekker : wininet: Avoid accessing uninitialized memory in HttpSendRequestExW.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: e62fdaf0f1fa08e82f54b72ce6ae4dabaac8e507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62fdaf0f1fa08e82f54b72ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:03:36 2009 +0100 wininet: Avoid accessing uninitialized memory in HttpSendRequestExW. Found by valgrind. --- dlls/wininet/http.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d8db8af..1426439 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3338,8 +3338,16 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, req = &workRequest.u.HttpSendRequestW; if (lpBuffersIn) { - /* FIXME: this should use dwHeadersLength or may not be necessary at all */ - req->lpszHeader = heap_strdupW(lpBuffersIn->lpcszHeader); + DWORD size; + + if (lpBuffersIn->dwHeadersLength == ~0u) + size = (strlenW( lpBuffersIn->lpcszHeader ) + 1) * sizeof(WCHAR); + else + size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); + + req->lpszHeader = HeapAlloc( GetProcessHeap(), 0, size ); + memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + req->dwHeaderLength = lpBuffersIn->dwHeadersLength; req->lpOptional = lpBuffersIn->lpvBuffer; req->dwOptionalLength = lpBuffersIn->dwBufferLength;

1 0

Hans Leidekker : winhttp: Clean up locks after closing libssl and libcrypto .
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 629fd8fcbca495ce8b8d5cd91e76299b5422fe94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629fd8fcbca495ce8b8d5cd91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:04:05 2009 +0100 winhttp: Clean up locks after closing libssl and libcrypto. SSL_CTX_free() triggers a call to the locking callback. Found by valgrind. --- dlls/winhttp/net.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 28b3972..53911d6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -316,13 +316,6 @@ void netconn_unload( void ) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) { - if (ssl_locks) - { - int i; - - for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] ); - HeapFree( GetProcessHeap(), 0, ssl_locks ); - } wine_dlclose( libcrypto_handle, NULL, 0 ); } if (libssl_handle) @@ -331,6 +324,12 @@ void netconn_unload( void ) pSSL_CTX_free( ctx ); wine_dlclose( libssl_handle, NULL, 0 ); } + if (ssl_locks) + { + int i; + for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] ); + HeapFree( GetProcessHeap(), 0, ssl_locks ); + } #endif }

1 0

Hans Leidekker : wininet: Clean up locks after closing libssl and libcrypto .
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 248939d358790c953dc7b002ae800e36b7c883e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248939d358790c953dc7b002a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:04:20 2009 +0100 wininet: Clean up locks after closing libssl and libcrypto. Found by valgrind. --- dlls/wininet/netconnection.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 97c764f..16cce40 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -289,14 +289,6 @@ void NETCON_unload(void) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (OpenSSL_crypto_handle) { - if (ssl_locks) - { - int i; - - for (i = 0; i < pCRYPTO_num_locks(); i++) - DeleteCriticalSection(&ssl_locks[i]); - HeapFree(GetProcessHeap(), 0, ssl_locks); - } wine_dlclose(OpenSSL_crypto_handle, NULL, 0); } if (OpenSSL_ssl_handle) @@ -305,6 +297,12 @@ void NETCON_unload(void) pSSL_CTX_free(ctx); wine_dlclose(OpenSSL_ssl_handle, NULL, 0); } + if (ssl_locks) + { + int i; + for (i = 0; i < pCRYPTO_num_locks(); i++) DeleteCriticalSection(&ssl_locks[i]); + HeapFree(GetProcessHeap(), 0, ssl_locks); + } #endif }

1 0

Yann Droneaud : libwine: Test against __linux__ define instead of just linux.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: fec1e88984fb2c3625a551995a59e31932b19c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1e88984fb2c3625a551995… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:36:20 2009 +0100 libwine: Test against __linux__ define instead of just linux. --- libs/wine/ldt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 7475d51..685ed6a 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -35,7 +35,7 @@ #ifdef __i386__ -#ifdef linux +#ifdef __linux__ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h>

1 0

Yann Droneaud : loader: Use __asm__ keyword instead of asm.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 23e91047210a05e1da780f451ae14c0eb78868f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e91047210a05e1da780f451… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:33:14 2009 +0100 loader: Use __asm__ keyword instead of asm. --- loader/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index 6de500e..628a0fa 100644 --- a/loader/main.c +++ b/loader/main.c @@ -40,8 +40,8 @@ #ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); -asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); +__asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); +__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000]; static const struct wine_preload_info wine_main_preload_info[] =

1 0

Yann Droneaud : ntdll: Use __asm__ keyword instead of asm in signal_sparc.c .
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c8553641ac8536ba6d61d3845cc24a56e607f44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8553641ac8536ba6d61d3845… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Oct 26 15:33:15 2009 +0100 ntdll: Use __asm__ keyword instead of asm in signal_sparc.c. --- dlls/ntdll/signal_sparc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index afde5f8..5450402 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -779,7 +779,7 @@ void signal_init_process(void) the process. wine-devel did not reach a conclusion on whether this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ - asm("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ + __asm__("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ return; error:

1 0

Owen Rudge : mapi32: Use separate pointer for drafts folder when sending via extended MAPI.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: d6bc1f5e229ce2ad59a5463adb08ddbb17a0f892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bc1f5e229ce2ad59a5463ad… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 26 13:19:05 2009 -0500 mapi32: Use separate pointer for drafts folder when sending via extended MAPI. This patch fixes a crash in the MAPISendMail extended mail wrapper due to reusing the "folder" variable for two separate objects. --- dlls/mapi32/sendmail.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 13fb4c7..08aceb0 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -59,7 +59,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM IMAPITable* msg_table; LPSRowSet rows = NULL; IMsgStore* msg_store; - IMAPIFolder* folder = NULL; + IMAPIFolder* folder = NULL, *draft_folder = NULL; LPENTRYID entry_id; LPSPropValue props; ULONG entry_len; @@ -151,10 +151,10 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM goto logoff; IMsgStore_OpenEntry(msg_store, props[0].Value.bin.cb, (LPENTRYID) props[0].Value.bin.lpb, - NULL, MAPI_MODIFY, &obj_type, (LPUNKNOWN *) &folder); + NULL, MAPI_MODIFY, &obj_type, (LPUNKNOWN *) &draft_folder); /* Create a new message */ - if (IMAPIFolder_CreateMessage(folder, NULL, 0, &msg) == S_OK) + if (IMAPIFolder_CreateMessage(draft_folder, NULL, 0, &msg) == S_OK) { ULONG token; SPropValue p; @@ -329,7 +329,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM { /* Show the message form (edit window) */ - ret = IMAPISession_ShowForm(session, 0, msg_store, folder, NULL, + ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL, token, NULL, 0, status, flags, access, props->Value.lpszA); @@ -354,6 +354,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM } /* Free up the resources we've used */ + IMAPIFolder_Release(draft_folder); IMAPIFolder_Release(folder); IMsgStore_Release(msg_store);

1 0

Owen Rudge : mapi32: Pass several extended MAPI functions through to provider.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 2d1a7173a4c6077894722a6ee9b535b38fd0afb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1a7173a4c6077894722a6ee… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 26 13:28:01 2009 -0500 mapi32: Pass several extended MAPI functions through to provider. --- dlls/mapi32/imalloc.c | 4 ++++ dlls/mapi32/mapi32_main.c | 16 +++++++++++++++- dlls/mapi32/util.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/mapi32/util.h | 15 ++++++++++++++- 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index a913eee..351c38b 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "shlwapi.h" #include "mapiutil.h" +#include "util.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -63,6 +64,9 @@ LPMALLOC WINAPI MAPIGetDefaultMalloc(void) { TRACE("()\n"); + if (mapiFunctions.MAPIGetDefaultMalloc) + return mapiFunctions.MAPIGetDefaultMalloc(); + IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc); return (LPMALLOC)&MAPI_IMalloc; } diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 28c2f14..906c22e 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -89,7 +89,15 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; + HRESULT ret = S_OK; + + if (mapiFunctions.DllCanUnloadNow) + { + ret = mapiFunctions.DllCanUnloadNow(); + TRACE("(): provider returns %d\n", ret); + } + + return MAPI_ObjectCount == 0 ? ret : S_FALSE; } /*********************************************************************** @@ -167,6 +175,9 @@ HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID *ppfcnt) { + if (mapiFunctions.MAPIOpenLocalFormContainer) + return mapiFunctions.MAPIOpenLocalFormContainer(ppfcnt); + FIXME("(%p) Stub\n", ppfcnt); return E_FAIL; } @@ -189,6 +200,9 @@ VOID WINAPI MAPIUninitialize(void) HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) { + if (mapiFunctions.MAPIAdminProfiles) + return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin); + FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); *lppProfAdmin = NULL; return E_FAIL; diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index fdb8497..71a5e1a 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -68,6 +68,9 @@ MAPI_FUNCTIONS mapiFunctions; */ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) { + if (mapiFunctions.ScInitMapiUtil) + return mapiFunctions.ScInitMapiUtil(ulReserved); + FIXME("(0x%08x)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; @@ -91,7 +94,10 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) */ VOID WINAPI DeinitMapiUtil(void) { - FIXME("()stub!\n"); + if (mapiFunctions.DeinitMapiUtil) + mapiFunctions.DeinitMapiUtil(); + else + FIXME("()stub!\n"); } typedef LPVOID *LPMAPIALLOCBUFFER; @@ -124,6 +130,9 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer) TRACE("(%d,%p)\n", cbSize, lppBuffer); + if (mapiFunctions.MAPIAllocateBuffer) + return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer); + if (!lppBuffer) return E_INVALIDARG; @@ -164,6 +173,9 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer) TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); + if (mapiFunctions.MAPIAllocateMore) + return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer); + if (!lppBuffer || !lpBuff || !--lpBuff) return E_INVALIDARG; @@ -200,6 +212,9 @@ ULONG WINAPI MAPIFreeBuffer(LPVOID lpBuffer) TRACE("(%p)\n", lpBuffer); + if (mapiFunctions.MAPIFreeBuffer) + return mapiFunctions.MAPIFreeBuffer(lpBuffer); + if (lpBuff && --lpBuff) { while (lpBuff) @@ -239,6 +254,9 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI */ HRESULT WINAPI HrThisThreadAdviseSink(LPMAPIADVISESINK lpSink, LPMAPIADVISESINK* lppNewSink) { + if (mapiFunctions.HrThisThreadAdviseSink) + return mapiFunctions.HrThisThreadAdviseSink(lpSink, lppNewSink); + FIXME("(%p,%p)semi-stub\n", lpSink, lppNewSink); if (!lpSink || !lppNewSink) @@ -695,6 +713,9 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); + if (mapiFunctions.OpenStreamOnFile) + return mapiFunctions.OpenStreamOnFile(lpAlloc, lpFree, ulFlags, lpszPath, lpszPrefix, lppStream); + if (lppStream) *lppStream = NULL; @@ -857,6 +878,9 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); + if (mapiFunctions.FGetComponentPath) + return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install); + dll_path[0] = 0; hmsi = LoadLibraryA("msi.dll"); @@ -903,6 +927,9 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, LONG crowsMax, LPSRowSet *lppRows) { + if (mapiFunctions.HrQueryAllRows) + return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; @@ -1057,7 +1084,20 @@ void load_mapi_providers(void) mapiFunctions.MAPILogonEx = (void*) GetProcAddress(mapi_ex_provider, "MAPILogonEx"); mapiFunctions.MAPIUninitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIUninitialize"); + mapiFunctions.DeinitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "DeinitMapiUtil(a)0"); + mapiFunctions.DllCanUnloadNow = (void*) GetProcAddress(mapi_ex_provider, "DllCanUnloadNow"); mapiFunctions.DllGetClassObject = (void*) GetProcAddress(mapi_ex_provider, "DllGetClassObject"); + mapiFunctions.FGetComponentPath = (void*) GetProcAddress(mapi_ex_provider, "FGetComponentPath"); + mapiFunctions.HrThisThreadAdviseSink = (void*) GetProcAddress(mapi_ex_provider, "HrThisThreadAdviseSink(a)8"); + mapiFunctions.HrQueryAllRows = (void*) GetProcAddress(mapi_ex_provider, "HrQueryAllRows(a)24"); + mapiFunctions.MAPIAdminProfiles = (void*) GetProcAddress(mapi_ex_provider, "MAPIAdminProfiles"); + mapiFunctions.MAPIAllocateBuffer = (void*) GetProcAddress(mapi_ex_provider, "MAPIAllocateBuffer"); + mapiFunctions.MAPIAllocateMore = (void*) GetProcAddress(mapi_ex_provider, "MAPIAllocateMore"); + mapiFunctions.MAPIFreeBuffer = (void*) GetProcAddress(mapi_ex_provider, "MAPIFreeBuffer"); + mapiFunctions.MAPIGetDefaultMalloc = (void*) GetProcAddress(mapi_ex_provider, "MAPIGetDefaultMalloc(a)0"); + mapiFunctions.MAPIOpenLocalFormContainer = (void *) GetProcAddress(mapi_ex_provider, "MAPIOpenLocalFormContainer"); + mapiFunctions.OpenStreamOnFile = (void*) GetProcAddress(mapi_ex_provider, "OpenStreamOnFile(a)24"); + mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil(a)4"); } cleanUp: diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 9899053..fd813ca 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -44,7 +44,20 @@ typedef struct MAPI_FUNCTIONS { LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize; - HRESULT (WINAPI *DllGetClassObject)(REFCLSID, REFIID, LPVOID *); + VOID (WINAPI *DeinitMapiUtil) (void); + HRESULT (WINAPI *DllCanUnloadNow) (void); + HRESULT (WINAPI *DllGetClassObject) (REFCLSID, REFIID, LPVOID *); + BOOL (WINAPI *FGetComponentPath) (LPCSTR, LPCSTR, LPSTR, DWORD, BOOL); + HRESULT (WINAPI *MAPIAdminProfiles) (ULONG, LPPROFADMIN *); + SCODE (WINAPI *MAPIAllocateBuffer) (ULONG, LPVOID *); + SCODE (WINAPI *MAPIAllocateMore) (ULONG, LPVOID, LPVOID *); + ULONG (WINAPI *MAPIFreeBuffer) (LPVOID); + LPMALLOC (WINAPI *MAPIGetDefaultMalloc) (void); + HRESULT (WINAPI *MAPIOpenLocalFormContainer) (LPVOID *); + HRESULT (WINAPI *HrThisThreadAdviseSink) (LPMAPIADVISESINK, LPMAPIADVISESINK*); + HRESULT (WINAPI *HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet *); + HRESULT (WINAPI *OpenStreamOnFile) (LPALLOCATEBUFFER, LPFREEBUFFER, ULONG, LPWSTR, LPWSTR, LPSTREAM *); + SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions;

1 0

Jacek Caban : mshtml: Store window reference in nsURI.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 45ce37fe64e689497fcfa6fd91476e25ce473581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ce37fe64e689497fcfa6fd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:02:50 2009 +0100 mshtml: Store window reference in nsURI. --- dlls/mshtml/htmlwindow.c | 13 ++++ dlls/mshtml/mshtml_private.h | 20 ++++++- dlls/mshtml/nsiface.idl | 18 +++++- dlls/mshtml/nsio.c | 137 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 168 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45ce37fe64e689497fcfa…

1 0