Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62948: [WINTRUST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:47:48 2014 New Revision: 62948 URL: http://svn.reactos.org/svn/reactos?rev=62948&view=rev Log: [WINTRUST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… ============================================================================== --- trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] Thu Apr 24 15:47:48 2014 @@ -104,7 +104,7 @@ TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); - if (!catAdmin) + if (!catAdmin || dwFlags) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -900,6 +900,7 @@ if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } sum += size; @@ -907,6 +908,7 @@ if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); SetLastError(ERROR_OUTOFMEMORY); return INVALID_HANDLE_VALUE; } @@ -917,12 +919,14 @@ { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } p += size; @@ -939,6 +943,7 @@ cc->magic = CRYPTCAT_MAGIC; return cc; } + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Thu Apr 24 15:47:48 2014 @@ -215,7 +215,7 @@ * * NOTES * Adding definitions is basically only adding relevant information - * to the registry. No verification takes place whether a DLL or it's + * to the registry. No verification takes place whether a DLL or its * entrypoints exist. * Information in the registry will always be overwritten. * @@ -948,10 +948,10 @@ TRACE("\n"); /* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls - * the rest of these calls is skipped. Registering is however continued for the trust providers. + * the rest of these calls are skipped. Registering is however continued for the trust providers. * - * We are not totally in line with native as there all decoding functions are registered after all encoding - * functions. + * We are not totally in line with native as all decoding functions are registered after all encoding + * functions there. */ #define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \ do { \ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Apr 24 15:47:48 2014 @@ -212,7 +212,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.7.1 +reactos/dll/win32/wintrust # Synced to Wine-1.7.17 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1

10 years, 6 months

[akhaldi] 62947: [MSXML3_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:44:13 2014 New Revision: 62947 URL: http://svn.reactos.org/svn/reactos?rev=62947&view=rev Log: [MSXML3_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/schema.c trunk/rostests/winetests/msxml3/xmldoc.c trunk/rostests/winetests/msxml3/xmlview.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/CMakeLis… Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… Modified: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… Modified: trunk/rostests/winetests/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmldoc.c… Modified: trunk/rostests/winetests/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlview.…

10 years, 6 months

[akhaldi] 62946: [MSXML3] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:40:52 2014 New Revision: 62946 URL: http://svn.reactos.org/svn/reactos?rev=62946&view=rev Log: [MSXML3] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msxml3/bsc.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/domimpl.c trunk/reactos/dll/win32/msxml3/factory.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/msxml3_v1.idl trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/mxnamespace.c trunk/reactos/dll/win32/msxml3/mxwriter.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/selection.c trunk/reactos/dll/win32/msxml3/stylesheet.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/dll/win32/msxml3/xmlparser.c trunk/reactos/dll/win32/msxml3/xmlparser.idl trunk/reactos/dll/win32/msxml3/xmlview.c trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxml6.idl trunk/reactos/include/reactos/wine/typeof.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev… Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/domimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domimpl.c… Modified: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c… Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… Modified: trunk/reactos/dll/win32/msxml3/msxml3_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3_v1… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/mxnamespace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxnamespa… Modified: trunk/reactos/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxwriter.… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… Modified: trunk/reactos/dll/win32/msxml3/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/selection… Modified: trunk/reactos/dll/win32/msxml3/stylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/styleshee… Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… Modified: trunk/reactos/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… Modified: trunk/reactos/dll/win32/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… Modified: trunk/reactos/dll/win32/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlview.c… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… Modified: trunk/reactos/include/psdk/msxml6.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6.idl?re… Modified: trunk/reactos/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/typeo… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 6 months

[akhaldi] 62945: [LIBXSLT] * Move imports.h to the appropriate folder.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:37:18 2014 New Revision: 62945 URL: http://svn.reactos.org/svn/reactos?rev=62945&view=rev Log: [LIBXSLT] * Move imports.h to the appropriate folder. Added: trunk/reactos/include/reactos/libs/libxslt/imports.h - copied unchanged from r62940, trunk/reactos/dll/3rdparty/libxslt/imports.h Removed: trunk/reactos/dll/3rdparty/libxslt/imports.h Removed: trunk/reactos/dll/3rdparty/libxslt/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/imports.h [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/imports.h (removed) @@ -1,75 +0,0 @@ -/* - * Summary: interface for the XSLT import support - * Description: macros and fuctions needed to implement and - * access the import tree - * - * Copy: See Copyright for the status of this software. - * - * Author: Daniel Veillard - */ - -#ifndef __XML_XSLT_IMPORTS_H__ -#define __XML_XSLT_IMPORTS_H__ - -#include <libxml/tree.h> -#include "xsltexports.h" -#include "xsltInternals.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * XSLT_GET_IMPORT_PTR: - * - * A macro to import pointers from the stylesheet cascading order. - */ -#define XSLT_GET_IMPORT_PTR(res, style, name) { \ - xsltStylesheetPtr st = style; \ - res = NULL; \ - while (st != NULL) { \ - if (st->name != NULL) { res = st->name; break; } \ - st = xsltNextImport(st); \ - }} - -/** - * XSLT_GET_IMPORT_INT: - * - * A macro to import intergers from the stylesheet cascading order. - */ -#define XSLT_GET_IMPORT_INT(res, style, name) { \ - xsltStylesheetPtr st = style; \ - res = -1; \ - while (st != NULL) { \ - if (st->name != -1) { res = st->name; break; } \ - st = xsltNextImport(st); \ - }} - -/* - * Module interfaces - */ -XSLTPUBFUN int XSLTCALL - xsltParseStylesheetImport(xsltStylesheetPtr style, - xmlNodePtr cur); -XSLTPUBFUN int XSLTCALL - xsltParseStylesheetInclude - (xsltStylesheetPtr style, - xmlNodePtr cur); -XSLTPUBFUN xsltStylesheetPtr XSLTCALL - xsltNextImport (xsltStylesheetPtr style); -XSLTPUBFUN int XSLTCALL - xsltNeedElemSpaceHandling(xsltTransformContextPtr ctxt); -XSLTPUBFUN int XSLTCALL - xsltFindElemSpaceHandling(xsltTransformContextPtr ctxt, - xmlNodePtr node); -XSLTPUBFUN xsltTemplatePtr XSLTCALL - xsltFindTemplate (xsltTransformContextPtr ctxt, - const xmlChar *name, - const xmlChar *nameURI); - -#ifdef __cplusplus -} -#endif - -#endif /* __XML_XSLT_IMPORTS_H__ */ -

10 years, 6 months

[akhaldi] 62944: [OLE32] * Add ole32_ros.diff. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:13:55 2014 New Revision: 62944 URL: http://svn.reactos.org/svn/reactos?rev=62944&view=rev Log: [OLE32] * Add ole32_ros.diff. CORE-8080 Added: trunk/reactos/dll/win32/ole32/ole32_ros.diff (with props) Added: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32_ros.diff (added) +++ trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] Thu Apr 24 15:13:55 2014 @@ -0,0 +1,187 @@ +diff -prudN e:\Wine\dlls\ole32/compobj.c e:\reactos\dll\win32\ole32/compobj.c +--- e:\Wine\dlls\ole32/compobj.c 2014-04-04 14:12:42.091208400 +0100 ++++ e:\reactos\dll\win32\ole32/compobj.c 2014-04-24 12:30:07.466625200 +0100 +@@ -331,8 +303,12 @@ static NTSTATUS create_key( HKEY *retkey + return status; + } + ++#ifdef __REACTOS__ ++static const WCHAR classes_rootW[] = L"\\REGISTRY\\Machine\\Software\\Classes"; ++#else + static const WCHAR classes_rootW[] = + {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; ++#endif + + static HKEY classes_root_hkey; + +@@ -1635,6 +1611,7 @@ static HRESULT apartment_hostobject_in_h + return hr; + } + ++#ifndef __REACTOS__ + static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context ) + { + WNDCLASSW wclass; +@@ -1655,24 +1632,20 @@ static BOOL WINAPI register_class( INIT_ + RegisterClassW(&wclass); + return TRUE; + } ++#endif + + /* create a window for the apartment or return the current one if one has + * already been created */ + HRESULT apartment_createwindowifneeded(struct apartment *apt) + { +- static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; +- + if (apt->multi_threaded) + return S_OK; + + if (!apt->win) + { +- HWND hwnd; +- +- InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL ); +- +- hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, +- HWND_MESSAGE, 0, hProxyDll, NULL); ++ HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, ++ 0, 0, 0, 0, ++ HWND_MESSAGE, 0, hProxyDll, NULL); + if (!hwnd) + { + ERR("CreateWindow failed with error %d\n", GetLastError()); +@@ -1699,6 +1672,35 @@ void apartment_joinmta(void) + COM_CurrentInfo()->apt = MTA; + } + ++#ifdef __REACTOS__ ++ ++static void COMPOBJ_InitProcess( void ) ++{ ++ WNDCLASSW wclass; ++ ++ /* Dispatching to the correct thread in an apartment is done through ++ * window messages rather than RPC transports. When an interface is ++ * marshalled into another apartment in the same process, a window of the ++ * following class is created. The *caller* of CoMarshalInterface (i.e., the ++ * application) is responsible for pumping the message loop in that thread. ++ * The WM_USER messages which point to the RPCs are then dispatched to ++ * apartment_wndproc by the user's code from the apartment in which the ++ * interface was unmarshalled. ++ */ ++ memset(&wclass, 0, sizeof(wclass)); ++ wclass.lpfnWndProc = apartment_wndproc; ++ wclass.hInstance = hProxyDll; ++ wclass.lpszClassName = wszAptWinClass; ++ RegisterClassW(&wclass); ++} ++ ++static void COMPOBJ_UninitProcess( void ) ++{ ++ UnregisterClassW(wszAptWinClass, hProxyDll); ++} ++ ++#endif ++ + static void COM_TlsDestroy(void) + { + struct oletls *info = NtCurrentTeb()->ReservedForOle; +@@ -4984,12 +4986,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + hProxyDll = hinstDLL; ++ COMPOBJ_InitProcess(); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + release_std_git(); +- UnregisterClassW( wszAptWinClass, hProxyDll ); ++ COMPOBJ_UninitProcess(); + RPC_UnregisterAllChannelHooks(); + COMPOBJ_DllList_Free(); + DeleteCriticalSection(&csRegisteredClassList); +diff -prudN e:\Wine\dlls\ole32/stg_prop.c e:\reactos\dll\win32\ole32/stg_prop.c +--- e:\Wine\dlls\ole32/stg_prop.c 2014-04-04 14:12:42.103216400 +0100 ++++ e:\reactos\dll\win32\ole32/stg_prop.c 2014-04-08 19:21:32.097336500 +0100 +@@ -36,32 +36,15 @@ + * PropertyStorage_ReadFromStream + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <assert.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +- +-#define COBJMACROS +-#define NONAMELESSUNION +-#define NONAMELESSSTRUCT +- +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "winuser.h" +-#include "wine/unicode.h" +-#include "wine/debug.h" +-#include "dictionary.h" ++#include "precomp.h" + #include "storage32.h" +-#include "enumx.h" +-#include "oleauto.h" + + WINE_DEFAULT_DEBUG_CHANNEL(storage); + ++#ifdef _MSC_VER ++#define __ASM_STDCALL_FUNC(name,args,code) ++#endif ++ + static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) + { + return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); +@@ -1035,12 +1018,12 @@ static HRESULT PropertyStorage_ReadDicti + } + + #ifdef __i386__ +-#define __thiscall __stdcall ++#define __thiscall_wrapper __stdcall + #else +-#define __thiscall __cdecl ++#define __thiscall_wrapper __cdecl + #endif + +-static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size) ++static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *userdata, ULONG size) + { + return CoTaskMemAlloc(size); + } +@@ -1049,7 +1032,7 @@ static __thiscall void* Allocate_CoTaskM + * end of the buffer. + */ + static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, +- UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data) ++ UINT codepage, void* (__thiscall_wrapper *allocate)(void *userdata, ULONG size), void *allocate_data) + { + HRESULT hr = S_OK; + +@@ -2738,13 +2721,13 @@ end: + "jmp *(4*(" #num "))(%eax)" ) + + DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) +-extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize); ++extern void* __stdcall Allocate_PMemoryAllocator(void *this, ULONG cbSize); + + #else + +-static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) ++static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize) + { +- void* (__thiscall *fn)(void*,ULONG) = **(void***)this; ++ void* (__cdecl *fn)(void*,ULONG) = **(void***)this; + return fn(this, cbSize); + } + Propchange: trunk/reactos/dll/win32/ole32/ole32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 6 months

[akhaldi] 62943: [OLEAUT32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:13:22 2014 New Revision: 62943 URL: http://svn.reactos.org/svn/reactos?rev=62943&view=rev Log: [OLEAUT32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt trunk/rostests/winetests/oleaut32/dispatch.c trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/safearray.c trunk/rostests/winetests/oleaut32/test_reg.idl trunk/rostests/winetests/oleaut32/test_tlb.idl trunk/rostests/winetests/oleaut32/tmarshal.c trunk/rostests/winetests/oleaut32/tmarshal.idl trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… Modified: trunk/rostests/winetests/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/dispat… Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… Modified: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… Modified: trunk/rostests/winetests/oleaut32/test_reg.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_r… Modified: trunk/rostests/winetests/oleaut32/test_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_t… Modified: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/tmarshal.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp…

10 years, 6 months

[akhaldi] 62942: [OLEAUT32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:12:07 2014 New Revision: 62942 URL: http://svn.reactos.org/svn/reactos?rev=62942&view=rev Log: [OLEAUT32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/oleaut32/connpt.c trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/oleaut32_oaidl.idl trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/connpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/connpt.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/connpt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/connpt.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -241,9 +241,7 @@ ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p)\n", This, ppCPC); - return IUnknown_QueryInterface(This->Obj, - &IID_IConnectionPointContainer, - (LPVOID)ppCPC); + return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); } /************************************************************************ @@ -260,7 +258,7 @@ TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); *pdwCookie = 0; - if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (LPVOID)&lpSink))) + if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (void**)&lpSink))) return CONNECT_E_CANNOTCONNECT; for(i = 0; i < This->maxSinks; i++) { @@ -336,7 +334,7 @@ EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, - &IID_IEnumConnections, (LPVOID)ppEnum); + &IID_IEnumConnections, (void**)ppEnum); IEnumConnections_Release(&EnumObj->IEnumConnections_iface); HeapFree(GetProcessHeap(), 0, pCD); @@ -610,7 +608,7 @@ if(!Obj) return E_OUTOFMEMORY; hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, - &IID_IConnectionPoint, (LPVOID)pCP); + &IID_IConnectionPoint, (void**)pCP); IConnectionPoint_Release(&Obj->IConnectionPoint_iface); return hr; } Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/dispatch.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -22,8 +22,6 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); - -static IDispatch * StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); /****************************************************************************** * DispInvoke (OLEAUT32.30) @@ -153,32 +151,6 @@ return hr; } -/****************************************************************************** - * CreateStdDispatch [OLEAUT32.32] - * - * Create and return a standard IDispatch object. - * - * RETURNS - * Success: S_OK. ppunkStdDisp contains the new object. - * Failure: An HRESULT error code. - * - * NOTES - * Outer unknown appears to be completely ignored. - */ -HRESULT WINAPI CreateStdDispatch( - IUnknown* punkOuter, - void* pvThis, - ITypeInfo* ptinfo, - IUnknown** ppunkStdDisp) -{ - TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, ppunkStdDisp); - - *ppunkStdDisp = (LPUNKNOWN)StdDispatch_Construct(punkOuter, pvThis, ptinfo); - if (!*ppunkStdDisp) - return E_OUTOFMEMORY; - return S_OK; -} - /****************************************************************************** * IDispatch {OLEAUT32} @@ -238,13 +210,15 @@ void** ppvObject) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; if (IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = This; - IUnknown_AddRef((LPUNKNOWN)*ppvObject); + *ppvObject = iface; + IDispatch_AddRef(iface); return S_OK; } return E_NOINTERFACE; @@ -305,10 +279,8 @@ */ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) { - StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%p)\n", pctinfo); - - *pctinfo = This->pTypeInfo ? 1 : 0; + *pctinfo = 1; return S_OK; } @@ -339,11 +311,9 @@ if (iTInfo != 0) return DISP_E_BADINDEX; - if (This->pTypeInfo) - { - *ppTInfo = This->pTypeInfo; - ITypeInfo_AddRef(*ppTInfo); - } + *ppTInfo = This->pTypeInfo; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } @@ -435,25 +405,44 @@ StdDispatch_Invoke }; -static IDispatch * StdDispatch_Construct( - IUnknown * punkOuter, - void * pvThis, - ITypeInfo * pTypeInfo) -{ - StdDispatch * pStdDispatch; +/****************************************************************************** + * CreateStdDispatch [OLEAUT32.32] + * + * Create and return a standard IDispatch object. + * + * RETURNS + * Success: S_OK. ppunkStdDisp contains the new object. + * Failure: An HRESULT error code. + * + * NOTES + * Outer unknown appears to be completely ignored. + */ +HRESULT WINAPI CreateStdDispatch( + IUnknown* punkOuter, + void* pvThis, + ITypeInfo* ptinfo, + IUnknown** stddisp) +{ + StdDispatch *pStdDispatch; + + TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, stddisp); + + if (!pvThis || !ptinfo || !stddisp) + return E_INVALIDARG; pStdDispatch = CoTaskMemAlloc(sizeof(StdDispatch)); if (!pStdDispatch) - return &pStdDispatch->IDispatch_iface; + return E_OUTOFMEMORY; pStdDispatch->IDispatch_iface.lpVtbl = &StdDispatch_VTable; pStdDispatch->pvThis = pvThis; - pStdDispatch->pTypeInfo = pTypeInfo; + pStdDispatch->pTypeInfo = ptinfo; pStdDispatch->ref = 1; /* we keep a reference to the type info so prevent it from * being destroyed until we are done with it */ - ITypeInfo_AddRef(pTypeInfo); - - return &pStdDispatch->IDispatch_iface; -} + ITypeInfo_AddRef(ptinfo); + *stddisp = (IUnknown*)&pStdDispatch->IDispatch_iface; + + return S_OK; +} Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -860,7 +860,8 @@ { static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; - bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + if(fdwReason == DLL_PROCESS_ATTACH) + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); } @@ -887,6 +888,6 @@ HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon) { FIXME("(%p,%p), partially implemented.\n",hinstExe,hIcon); - /* FIXME: make a extended conversation from HICON to HCURSOR */ + /* FIXME: make an extended conversation from HICON to HCURSOR */ return CopyCursor(hIcon); } Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -46,9 +46,9 @@ 47 stdcall VarNumFromParseNum(ptr ptr long ptr) 48 stdcall VarI2FromUI1(long ptr) 49 stdcall VarI2FromI4(long ptr) -50 stdcall VarI2FromR4(long ptr) +50 stdcall VarI2FromR4(float ptr) 51 stdcall VarI2FromR8(double ptr) -52 stdcall VarI2FromCy(double ptr) +52 stdcall VarI2FromCy(int64 ptr) 53 stdcall VarI2FromDate(double ptr) 54 stdcall VarI2FromStr(wstr long long ptr) 55 stdcall VarI2FromDisp(ptr long ptr) @@ -56,9 +56,9 @@ 57 stdcall SafeArraySetIID(ptr ptr) 58 stdcall VarI4FromUI1(long ptr) 59 stdcall VarI4FromI2(long ptr) -60 stdcall VarI4FromR4(long ptr) +60 stdcall VarI4FromR4(float ptr) 61 stdcall VarI4FromR8(double ptr) -62 stdcall VarI4FromCy(double ptr) +62 stdcall VarI4FromCy(int64 ptr) 63 stdcall VarI4FromDate(double ptr) 64 stdcall VarI4FromStr(wstr long long ptr) 65 stdcall VarI4FromDisp(ptr long ptr) @@ -68,7 +68,7 @@ 69 stdcall VarR4FromI2(long ptr) 70 stdcall VarR4FromI4(long ptr) 71 stdcall VarR4FromR8(double ptr) -72 stdcall VarR4FromCy(double ptr) +72 stdcall VarR4FromCy(int64 ptr) 73 stdcall VarR4FromDate(double ptr) 74 stdcall VarR4FromStr(wstr long long ptr) 75 stdcall VarR4FromDisp(ptr long ptr) @@ -77,8 +77,8 @@ 78 stdcall VarR8FromUI1(long ptr) 79 stdcall VarR8FromI2(long ptr) 80 stdcall VarR8FromI4(long ptr) -81 stdcall VarR8FromR4(long ptr) -82 stdcall VarR8FromCy(double ptr) +81 stdcall VarR8FromR4(float ptr) +82 stdcall VarR8FromCy(int64 ptr) 83 stdcall VarR8FromDate(double ptr) 84 stdcall VarR8FromStr(wstr long long ptr) 85 stdcall VarR8FromDisp(ptr long ptr) @@ -87,9 +87,9 @@ 88 stdcall VarDateFromUI1(long ptr) 89 stdcall VarDateFromI2(long ptr) 90 stdcall VarDateFromI4(long ptr) -91 stdcall VarDateFromR4(long ptr) +91 stdcall VarDateFromR4(float ptr) 92 stdcall VarDateFromR8(double ptr) -93 stdcall VarDateFromCy(double ptr) +93 stdcall VarDateFromCy(int64 ptr) 94 stdcall VarDateFromStr(wstr long long ptr) 95 stdcall VarDateFromDisp(ptr long ptr) 96 stdcall VarDateFromBool(long ptr) @@ -97,7 +97,7 @@ 98 stdcall VarCyFromUI1(long ptr) 99 stdcall VarCyFromI2(long ptr) 100 stdcall VarCyFromI4(long ptr) -101 stdcall VarCyFromR4(long ptr) +101 stdcall VarCyFromR4(float ptr) 102 stdcall VarCyFromR8(double ptr) 103 stdcall VarCyFromDate(double ptr) 104 stdcall VarCyFromStr(wstr long long ptr) @@ -107,9 +107,9 @@ 108 stdcall VarBstrFromUI1(long long long ptr) 109 stdcall VarBstrFromI2(long long long ptr) 110 stdcall VarBstrFromI4(long long long ptr) -111 stdcall VarBstrFromR4(long long long ptr) +111 stdcall VarBstrFromR4(float long long ptr) 112 stdcall VarBstrFromR8(double long long ptr) -113 stdcall VarBstrFromCy(double long long ptr) +113 stdcall VarBstrFromCy(int64 long long ptr) 114 stdcall VarBstrFromDate(double long long ptr) 115 stdcall VarBstrFromDisp(ptr long long ptr) 116 stdcall VarBstrFromBool(long long long ptr) @@ -117,10 +117,10 @@ 118 stdcall VarBoolFromUI1(long ptr) 119 stdcall VarBoolFromI2(long ptr) 120 stdcall VarBoolFromI4(long ptr) -121 stdcall VarBoolFromR4(long ptr) +121 stdcall VarBoolFromR4(float ptr) 122 stdcall VarBoolFromR8(double ptr) 123 stdcall VarBoolFromDate(double ptr) -124 stdcall VarBoolFromCy(double ptr) +124 stdcall VarBoolFromCy(int64 ptr) 125 stdcall VarBoolFromStr(wstr long long ptr) 126 stdcall VarBoolFromDisp(ptr long ptr) 127 stdcall VarFormatCurrency(ptr long long long long long ptr) @@ -128,9 +128,9 @@ 129 stdcall VarMonthName(long long long ptr) 130 stdcall VarUI1FromI2(long ptr) 131 stdcall VarUI1FromI4(long ptr) -132 stdcall VarUI1FromR4(long ptr) +132 stdcall VarUI1FromR4(float ptr) 133 stdcall VarUI1FromR8(double ptr) -134 stdcall VarUI1FromCy(double ptr) +134 stdcall VarUI1FromCy(int64 ptr) 135 stdcall VarUI1FromDate(double ptr) 136 stdcall VarUI1FromStr(wstr long long ptr) 137 stdcall VarUI1FromDisp(ptr long ptr) @@ -187,10 +187,10 @@ 190 stdcall VarDecFromUI1(long ptr) 191 stdcall VarDecFromI2(long ptr) 192 stdcall VarDecFromI4(long ptr) -193 stdcall VarDecFromR4(long ptr) +193 stdcall VarDecFromR4(float ptr) 194 stdcall VarDecFromR8(double ptr) 195 stdcall VarDecFromDate(double ptr) -196 stdcall VarDecFromCy(double ptr) +196 stdcall VarDecFromCy(int64 ptr) 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) @@ -241,10 +241,10 @@ 244 stdcall VarI1FromUI1(long ptr) 245 stdcall VarI1FromI2(long ptr) 246 stdcall VarI1FromI4(long ptr) -247 stdcall VarI1FromR4(long ptr) +247 stdcall VarI1FromR4(float ptr) 248 stdcall VarI1FromR8(double ptr) 249 stdcall VarI1FromDate(double ptr) -250 stdcall VarI1FromCy(double ptr) +250 stdcall VarI1FromCy(int64 ptr) 251 stdcall VarI1FromStr(wstr long long ptr) 252 stdcall VarI1FromDisp(ptr long ptr) 253 stdcall VarI1FromBool(long ptr) @@ -254,10 +254,10 @@ 257 stdcall VarUI2FromUI1(long ptr) 258 stdcall VarUI2FromI2(long ptr) 259 stdcall VarUI2FromI4(long ptr) -260 stdcall VarUI2FromR4(long ptr) +260 stdcall VarUI2FromR4(float ptr) 261 stdcall VarUI2FromR8(double ptr) 262 stdcall VarUI2FromDate(double ptr) -263 stdcall VarUI2FromCy(double ptr) +263 stdcall VarUI2FromCy(int64 ptr) 264 stdcall VarUI2FromStr(wstr long long ptr) 265 stdcall VarUI2FromDisp(ptr long ptr) 266 stdcall VarUI2FromBool(long ptr) @@ -267,10 +267,10 @@ 270 stdcall VarUI4FromUI1(long ptr) 271 stdcall VarUI4FromI2(long ptr) 272 stdcall VarUI4FromI4(long ptr) -273 stdcall VarUI4FromR4(long ptr) +273 stdcall VarUI4FromR4(float ptr) 274 stdcall VarUI4FromR8(double ptr) 275 stdcall VarUI4FromDate(double ptr) -276 stdcall VarUI4FromCy(double ptr) +276 stdcall VarUI4FromCy(int64 ptr) 277 stdcall VarUI4FromStr(wstr long long ptr) 278 stdcall VarUI4FromDisp(ptr long ptr) 279 stdcall VarUI4FromBool(long ptr) @@ -293,21 +293,21 @@ 296 stub LPSAFEARRAY_Marshal 297 stub LPSAFEARRAY_Unmarshal 298 stdcall VarDecCmpR8(ptr double) -299 stdcall VarCyAdd(double double ptr) -303 stdcall VarCyMul(double double ptr) -304 stdcall VarCyMulI4(double long ptr) -305 stdcall VarCySub(double double ptr) -306 stdcall VarCyAbs(double ptr) -307 stdcall VarCyFix(double ptr) -308 stdcall VarCyInt(double ptr) -309 stdcall VarCyNeg(double ptr) -310 stdcall VarCyRound(double long ptr) -311 stdcall VarCyCmp(double double) -312 stdcall VarCyCmpR8(double double) +299 stdcall VarCyAdd(int64 int64 ptr) +303 stdcall VarCyMul(int64 int64 ptr) +304 stdcall VarCyMulI4(int64 long ptr) +305 stdcall VarCySub(int64 int64 ptr) +306 stdcall VarCyAbs(int64 ptr) +307 stdcall VarCyFix(int64 ptr) +308 stdcall VarCyInt(int64 ptr) +309 stdcall VarCyNeg(int64 ptr) +310 stdcall VarCyRound(int64 long ptr) +311 stdcall VarCyCmp(int64 int64) +312 stdcall VarCyCmpR8(int64 double) 313 stdcall VarBstrCat(wstr wstr ptr) 314 stdcall VarBstrCmp(wstr wstr long long) 315 stdcall VarR8Pow(double double ptr) -316 stdcall VarR4CmpR8(long double) +316 stdcall VarR4CmpR8(float double) 317 stdcall VarR8Round(double long ptr) 318 stdcall VarCat(ptr ptr ptr) 319 stdcall VarDateFromUdateEx(ptr long long ptr) @@ -316,15 +316,15 @@ 325 stub SetVarConversionLocaleSetting 326 stub GetVarConversionLocaleSetting 327 stdcall SetOaNoCache() -329 stdcall VarCyMulI8(double double ptr) +329 stdcall VarCyMulI8(int64 int64 ptr) 330 stdcall VarDateFromUdate(ptr long ptr) 331 stdcall VarUdateFromDate(double long ptr) 332 stub GetAltMonthNames 333 stdcall VarI8FromUI1(long long) 334 stdcall VarI8FromI2(long long) -335 stdcall VarI8FromR4(long long) +335 stdcall VarI8FromR4(float long) 336 stdcall VarI8FromR8(double long) -337 stdcall VarI8FromCy(double ptr) +337 stdcall VarI8FromCy(int64 ptr) 338 stdcall VarI8FromDate(double long) 339 stdcall VarI8FromStr(wstr long long ptr) 340 stdcall VarI8FromDisp(ptr long ptr) @@ -333,30 +333,30 @@ 343 stdcall VarI8FromUI2(long long) 344 stdcall VarI8FromUI4(long long) 345 stdcall VarI8FromDec(ptr ptr) -346 stdcall VarI2FromI8(double ptr) -347 stdcall VarI2FromUI8(double ptr) -348 stdcall VarI4FromI8(double ptr) -349 stdcall VarI4FromUI8(double ptr) -360 stdcall VarR4FromI8(double ptr) -361 stdcall VarR4FromUI8(double ptr) -362 stdcall VarR8FromI8(double ptr) -363 stdcall VarR8FromUI8(double ptr) -364 stdcall VarDateFromI8(double ptr) -365 stdcall VarDateFromUI8(double ptr) -366 stdcall VarCyFromI8(double ptr) -367 stdcall VarCyFromUI8(double ptr) -368 stdcall VarBstrFromI8(double long long ptr) -369 stdcall VarBstrFromUI8(double long long ptr) -370 stdcall VarBoolFromI8(double ptr) -371 stdcall VarBoolFromUI8(double ptr) -372 stdcall VarUI1FromI8(double ptr) -373 stdcall VarUI1FromUI8(double ptr) -374 stdcall VarDecFromI8(double ptr) -375 stdcall VarDecFromUI8(double ptr) -376 stdcall VarI1FromI8(double ptr) -377 stdcall VarI1FromUI8(double ptr) -378 stdcall VarUI2FromI8(double ptr) -379 stdcall VarUI2FromUI8(double ptr) +346 stdcall VarI2FromI8(int64 ptr) +347 stdcall VarI2FromUI8(int64 ptr) +348 stdcall VarI4FromI8(int64 ptr) +349 stdcall VarI4FromUI8(int64 ptr) +360 stdcall VarR4FromI8(int64 ptr) +361 stdcall VarR4FromUI8(int64 ptr) +362 stdcall VarR8FromI8(int64 ptr) +363 stdcall VarR8FromUI8(int64 ptr) +364 stdcall VarDateFromI8(int64 ptr) +365 stdcall VarDateFromUI8(int64 ptr) +366 stdcall VarCyFromI8(int64 ptr) +367 stdcall VarCyFromUI8(int64 ptr) +368 stdcall VarBstrFromI8(int64 long long ptr) +369 stdcall VarBstrFromUI8(int64 long long ptr) +370 stdcall VarBoolFromI8(int64 ptr) +371 stdcall VarBoolFromUI8(int64 ptr) +372 stdcall VarUI1FromI8(int64 ptr) +373 stdcall VarUI1FromUI8(int64 ptr) +374 stdcall VarDecFromI8(int64 ptr) +375 stdcall VarDecFromUI8(int64 ptr) +376 stdcall VarI1FromI8(int64 ptr) +377 stdcall VarI1FromUI8(int64 ptr) +378 stdcall VarUI2FromI8(int64 ptr) +379 stdcall VarUI2FromUI8(int64 ptr) 380 stub UserHWND_from_local 381 stub UserHWND_to_local 382 stub UserHWND_free_inst @@ -393,15 +393,15 @@ 422 stub OleLoadPictureFile 423 stub OleSavePictureFile 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) -425 stdcall VarUI4FromI8(double ptr) -426 stdcall VarUI4FromUI8(double ptr) -427 stdcall VarI8FromUI8(double ptr) -428 stdcall VarUI8FromI8(double ptr) +425 stdcall VarUI4FromI8(int64 ptr) +426 stdcall VarUI4FromUI8(int64 ptr) +427 stdcall VarI8FromUI8(int64 ptr) +428 stdcall VarUI8FromI8(int64 ptr) 429 stdcall VarUI8FromUI1(long ptr) 430 stdcall VarUI8FromI2(long ptr) -431 stdcall VarUI8FromR4(long ptr) +431 stdcall VarUI8FromR4(float ptr) 432 stdcall VarUI8FromR8(double ptr) -433 stdcall VarUI8FromCy(double ptr) +433 stdcall VarUI8FromCy(int64 ptr) 434 stdcall VarUI8FromDate(double ptr) 435 stdcall VarUI8FromStr(wstr long long ptr) 436 stdcall VarUI8FromDisp(ptr long ptr) Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_oaidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32_oaidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32_oaidl.idl [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -20,6 +20,9 @@ including oaidl.h at some point. This will cause all sorts of errors so the easiest thing to do is just comment out our entire header. */ +#pragma makedep proxy +#pragma makedep register + cpp_quote("#if 0 /* oleaut32_oaidl.idl hack */") #include "oaidl.idl" cpp_quote("#endif /* oleaut32_oaidl.idl hack */") Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep proxy +#pragma makedep register #include "ocidl.idl" Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -333,9 +333,9 @@ fd.cySize.s.Hi = 0; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; lpFontDesc = &fd; } @@ -368,7 +368,7 @@ static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR wszCharset[] = {'C','h','a','r','s','s','e','t',0}; + static const WCHAR wszCharset[] = {'C','h','a','r','s','e','t',0}; static const LPCWSTR dispid_mapping[] = { wszName, @@ -394,7 +394,7 @@ while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IPropertyNotifySink *sink; - IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); + IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (void**)&sink); IPropertyNotifySink_OnChanged(sink, dispID); IPropertyNotifySink_Release(sink); IUnknown_Release(CD.pUnk); @@ -420,7 +420,7 @@ while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IFontEventsDisp *disp; - IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp); + IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (void**)&disp); IFontEventsDisp_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL, LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL, NULL, NULL); @@ -1063,7 +1063,12 @@ TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric); if(cyLogical == 0 || cyHimetric == 0) - return E_INVALIDARG; + return E_FAIL; + + /* cyLogical and cyHimetric both set to 1 is a special case that + does not change the scaling but also does not fail */ + if(cyLogical == 1 && cyHimetric == 1) + return S_OK; this->cyLogical = cyLogical; this->cyHimetric = cyHimetric; @@ -1280,9 +1285,6 @@ /************************************************************************ * OLEFontImpl_Invoke (IDispatch) * - * Note: Do not call _put_Xxx methods, since setting things here - * should not call notify functions as I found out debugging the generic - * MS VB5 installer. */ static HRESULT WINAPI OLEFontImpl_Invoke( IDispatch* iface, @@ -1828,13 +1830,11 @@ TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppCp); if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { - return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, &IID_IConnectionPoint, + (void**)ppCp); } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) { - return IConnectionPoint_QueryInterface(this->pFontEventsCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pFontEventsCP, &IID_IConnectionPoint, + (void**)ppCp); } else { FIXME("no connection point for %s\n", debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -902,7 +902,7 @@ return E_POINTER; *ppCP = NULL; if (IsEqualGUID(riid,&IID_IPropertyNotifySink)) - return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP); + return IConnectionPoint_QueryInterface(This->pCP, &IID_IConnectionPoint, (void**)ppCP); FIXME("no connection point for %s\n",debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; } @@ -1369,12 +1369,17 @@ } headerread += xread; xread = 0; - + if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (toread != 0 && toread != header[1]) FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", toread, header[1]); toread = header[1]; + if (statfailed) + { + statstg.cbSize.QuadPart = header[1] + 8; + statfailed = FALSE; + } if (toread == 0) break; } else { if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ @@ -1506,9 +1511,9 @@ return hr; } -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) -{ - int iSuccess = 0; +static BOOL serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) +{ + BOOL success = FALSE; HDC hDC; BITMAPINFO * pInfoBitmap; int iNumPaletteEntries; @@ -1564,17 +1569,17 @@ sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD), pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - iSuccess = 1; + success = TRUE; HeapFree(GetProcessHeap(), 0, pPixelData); HeapFree(GetProcessHeap(), 0, pInfoBitmap); - return iSuccess; -} - -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) + return success; +} + +static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) { ICONINFO infoIcon; - int iSuccess = 0; + BOOL success = FALSE; *ppBuffer = NULL; *pLength = 0; if (GetIconInfo(hIcon, &infoIcon)) { @@ -1696,7 +1701,7 @@ /* Write out everything produced so far to the stream */ *ppBuffer = pIconData; *pLength = iDataSize; - iSuccess = 1; + success = TRUE; } else { /* printf("ERROR: unable to get bitmap information via GetDIBits() (error %u)\n", @@ -1719,7 +1724,7 @@ printf("ERROR: Unable to get icon information (error %u)\n", GetLastError()); } - return iSuccess; + return success; } static HRESULT WINAPI OLEPictureImpl_Save( @@ -1730,7 +1735,7 @@ unsigned int iDataSize; DWORD header[2]; ULONG dummy; - int iSerializeResult = 0; + BOOL serializeResult = FALSE; OLEPictureImpl *This = impl_from_IPersistStream(iface); TRACE("%p %p %d\n", This, pStm, fClearDirty); @@ -1764,7 +1769,7 @@ if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); + serializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); @@ -1780,7 +1785,7 @@ break; } - if (!iSerializeResult) + if (!serializeResult) { hResult = E_FAIL; break; @@ -1974,6 +1979,7 @@ UINT* puArgErr) { OLEPictureImpl *This = impl_from_IDispatch(iface); + HRESULT hr; /* validate parameters */ @@ -2031,7 +2037,7 @@ else if (wFlags & DISPATCH_PROPERTYPUT) { VARIANTARG vararg; - HRESULT hr; + TRACE("DISPID_PICT_HPAL\n"); VariantInit(&vararg); @@ -2067,6 +2073,40 @@ TRACE("DISPID_PICT_HEIGHT\n"); V_VT(pVarResult) = VT_I4; return IPicture_get_Height(&This->IPicture_iface, &V_I4(pVarResult)); + } + break; + case DISPID_PICT_RENDER: + if (wFlags & DISPATCH_METHOD) + { + VARIANTARG *args = pDispParams->rgvarg; + int i; + + TRACE("DISPID_PICT_RENDER\n"); + + if (pDispParams->cArgs != 10) + return DISP_E_BADPARAMCOUNT; + + /* All parameters are supposed to be VT_I4 (on 64 bits too). */ + for (i = 0; i < pDispParams->cArgs; i++) + if (V_VT(&args[i]) != VT_I4) + { + ERR("DISPID_PICT_RENDER: wrong argument type %d:%d\n", i, V_VT(&args[i])); + return DISP_E_TYPEMISMATCH; + } + + /* FIXME: rectangle pointer argument handling seems broken on 64 bits, + currently Render() doesn't use it at all so for now NULL is passed. */ + return IPicture_Render(&This->IPicture_iface, + LongToHandle(V_I4(&args[9])), + V_I4(&args[8]), + V_I4(&args[7]), + V_I4(&args[6]), + V_I4(&args[5]), + V_I4(&args[4]), + V_I4(&args[3]), + V_I4(&args[2]), + V_I4(&args[1]), + NULL); } break; } @@ -2252,7 +2292,7 @@ HANDLE hFile; DWORD dwFileSize; HGLOBAL hGlobal = NULL; - DWORD dwBytesRead = 0; + DWORD dwBytesRead; IStream *stream; BOOL bRead; IPersistStream *pStream; @@ -2296,7 +2336,7 @@ hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); if ( hGlobal) { - bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL); + bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL) && dwBytesRead == dwFileSize; if (!bRead) { GlobalFree(hGlobal); Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -135,6 +135,8 @@ { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + *ppvObject = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IRecordInfo, riid)) { *ppvObject = iface; IRecordInfo_AddRef(iface); @@ -223,6 +225,7 @@ case VT_UI8: case VT_INT: case VT_UINT: + case VT_HRESULT: break; case VT_INT_PTR: case VT_UINT_PTR: @@ -231,6 +234,15 @@ case VT_SAFEARRAY: SafeArrayDestroy(var); break; + case VT_UNKNOWN: + case VT_DISPATCH: + { + IUnknown *unk = *(IUnknown**)var; + if (unk) + IUnknown_Release(unk); + *(void**)var = NULL; + break; + } default: FIXME("Not supported vt = %d\n", This->fields[i].vt); break; @@ -240,18 +252,75 @@ return S_OK; } -static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExisting, - PVOID pvNew) -{ - IRecordInfoImpl *This = impl_from_IRecordInfo(iface); - - TRACE("(%p)->(%p %p)\n", This, pvExisting, pvNew); - - if(!pvExisting || !pvNew) - return E_INVALIDARG; - - memcpy(pvExisting, pvNew, This->size); - return S_OK; +static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, void *src_rec, void *dest_rec) +{ + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); + HRESULT hr = S_OK; + int i; + + TRACE("(%p)->(%p %p)\n", This, src_rec, dest_rec); + + if(!src_rec || !dest_rec) + return E_INVALIDARG; + + /* release already stored data */ + IRecordInfo_RecordClear(iface, dest_rec); + + for (i = 0; i < This->n_vars; i++) + { + void *src, *dest; + + if (This->fields[i].varkind != VAR_PERINSTANCE) { + ERR("varkind != VAR_PERINSTANCE\n"); + continue; + } + + src = ((BYTE*)src_rec) + This->fields[i].offset; + dest = ((BYTE*)dest_rec) + This->fields[i].offset; + switch (This->fields[i].vt) + { + case VT_BSTR: + { + BSTR src_str = *(BSTR*)src; + + if (src_str) + { + BSTR str = SysAllocString(*(BSTR*)src); + if (!str) hr = E_OUTOFMEMORY; + + *(BSTR*)dest = str; + } + else + *(BSTR*)dest = NULL; + break; + } + case VT_UNKNOWN: + case VT_DISPATCH: + { + IUnknown *unk = *(IUnknown**)src; + *(IUnknown**)dest = unk; + if (unk) IUnknown_AddRef(unk); + break; + } + case VT_SAFEARRAY: + hr = SafeArrayCopy(src, dest); + break; + default: + { + /* copy directly for types that don't need deep copy */ + int len = get_type_size(NULL, This->fields[i].vt); + memcpy(dest, src, len); + break; + } + } + + if (FAILED(hr)) break; + } + + if (FAILED(hr)) + IRecordInfo_RecordClear(iface, dest_rec); + + return hr; } static HRESULT WINAPI IRecordInfoImpl_GetGuid(IRecordInfo *iface, GUID *pguid) @@ -445,10 +514,14 @@ static PVOID WINAPI IRecordInfoImpl_RecordCreate(IRecordInfo *iface) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); + void *record; TRACE("(%p)\n", This); - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->size); + record = HeapAlloc(GetProcessHeap(), 0, This->size); + IRecordInfo_RecordInit(iface, record); + TRACE("created record at %p\n", record); + return record; } static HRESULT WINAPI IRecordInfoImpl_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, @@ -518,8 +591,8 @@ ITypeLib *pTypeLib; HRESULT hres; - TRACE("(%p,%d,%d,%d,%p,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, - lcid, rGuidTypeInfo, ppRecInfo); + TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, + lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib); if(FAILED(hres)) { @@ -618,6 +691,7 @@ NULL, NULL, NULL); if(FAILED(hres)) WARN("GetDocumentation failed: %08x\n", hres); + TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); } Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -72,6 +72,15 @@ /* Undocumented hidden space before the start of a SafeArray descriptor */ #define SAFEARRAY_HIDDEN_SIZE sizeof(GUID) + +/* features listed here are not propagated to newly created array or data copy + created with SafeArrayCopy()/SafeArrayCopyData() */ +static const USHORT ignored_copy_features = + FADF_AUTO | + FADF_STATIC | + FADF_EMBEDDED | + FADF_FIXEDSIZE | + FADF_CREATEVECTOR; /* Allocate memory */ static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) @@ -165,7 +174,7 @@ if (!ptr) { *ppsaOut = NULL; - return E_UNEXPECTED; + return E_OUTOFMEMORY; } *ppsaOut = (SAFEARRAY*)(ptr + SAFEARRAY_HIDDEN_SIZE); @@ -285,7 +294,7 @@ lpUnknown++; } } - else if (psa->fFeatures & (FADF_RECORD)) + else if (psa->fFeatures & FADF_RECORD) { IRecordInfo *lpRecInfo; @@ -326,86 +335,104 @@ return S_OK; } -/* Copy data items from one array to another */ +/* Copy data items from one array to another. Destination data is freed before copy. */ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { + HRESULT hr = S_OK; + if (!psa->pvData) return S_OK; - else if (!dest->pvData || psa->fFeatures & FADF_DATADELETED) + + if (!dest->pvData || psa->fFeatures & FADF_DATADELETED) return E_INVALIDARG; else { ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | - (psa->fFeatures & ~(FADF_CREATEVECTOR|FADF_DATADELETED)); + dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | (psa->fFeatures & ~ignored_copy_features); if (psa->fFeatures & FADF_VARIANT) { - VARIANT* lpVariant = psa->pvData; - VARIANT* lpDest = dest->pvData; + VARIANT *src_var = psa->pvData; + VARIANT *dest_var = dest->pvData; while(ulCellCount--) { HRESULT hRet; - hRet = VariantCopy(lpDest, lpVariant); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); - lpVariant++; - lpDest++; + /* destination is cleared automatically */ + hRet = VariantCopy(dest_var, src_var); + if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%08x, element %u\n", hRet, ulCellCount); + src_var++; + dest_var++; } } else if (psa->fFeatures & FADF_BSTR) { - BSTR* lpBstr = psa->pvData; - BSTR* lpDest = dest->pvData; + BSTR *src_bstr = psa->pvData; + BSTR *dest_bstr = dest->pvData; while(ulCellCount--) { - if (*lpBstr) + SysFreeString(*dest_bstr); + if (*src_bstr) { - *lpDest = SysAllocStringByteLen((char*)*lpBstr, SysStringByteLen(*lpBstr)); - if (!*lpDest) + *dest_bstr = SysAllocStringByteLen((char*)*src_bstr, SysStringByteLen(*src_bstr)); + if (!*dest_bstr) return E_OUTOFMEMORY; } else - *lpDest = NULL; - lpBstr++; - lpDest++; + *dest_bstr = NULL; + src_bstr++; + dest_bstr++; + } + } + else if (psa->fFeatures & FADF_RECORD) + { + BYTE *dest_data = dest->pvData; + BYTE *src_data = psa->pvData; + IRecordInfo *record; + + SafeArrayGetRecordInfo(psa, &record); + while (ulCellCount--) + { + /* RecordCopy() clears destination record */ + hr = IRecordInfo_RecordCopy(record, src_data, dest_data); + if (FAILED(hr)) break; + src_data += psa->cbElements; + dest_data += psa->cbElements; + } + + SafeArraySetRecordInfo(dest, record); + /* This value is set to 32 bytes by default on descriptor creation, + update with actual structure size. */ + dest->cbElements = psa->cbElements; + IRecordInfo_Release(record); + } + else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) + { + IUnknown **dest_unk = dest->pvData; + IUnknown **src_unk = psa->pvData; + + /* release old iface, addref new one */ + while (ulCellCount--) + { + if (*dest_unk) + IUnknown_Release(*dest_unk); + *dest_unk = *src_unk; + if (*dest_unk) + IUnknown_AddRef(*dest_unk); + src_unk++; + dest_unk++; } } else { /* Copy the data over */ memcpy(dest->pvData, psa->pvData, ulCellCount * psa->cbElements); - - if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) - { - LPUNKNOWN *lpUnknown = dest->pvData; - - while(ulCellCount--) - { - if (*lpUnknown) - IUnknown_AddRef(*lpUnknown); - lpUnknown++; - } - } - } - - if (psa->fFeatures & FADF_RECORD) - { - IRecordInfo* pRecInfo = NULL; - - SafeArrayGetRecordInfo(psa, &pRecInfo); - SafeArraySetRecordInfo(dest, pRecInfo); - - if (pRecInfo) - { - /* Release because Get() adds a reference */ - IRecordInfo_Release(pRecInfo); - } - } - else if (psa->fFeatures & FADF_HAVEIID) + } + + if (psa->fFeatures & FADF_HAVEIID) { GUID guid; SafeArrayGetIID(psa, &guid); @@ -416,7 +443,8 @@ SAFEARRAY_SetHiddenDWORD(dest, SAFEARRAY_GetHiddenDWORD(psa)); } } - return S_OK; + + return hr; } /************************************************************************* @@ -438,6 +466,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) { LONG allocSize; + HRESULT hr; TRACE("(%d,%p)\n", cDims, ppsaOut); @@ -450,8 +479,9 @@ /* We need enough space for the header and its bounds */ allocSize = sizeof(SAFEARRAY) + sizeof(SAFEARRAYBOUND) * (cDims - 1); - if (FAILED(SAFEARRAY_AllocDescriptor(allocSize, ppsaOut))) - return E_UNEXPECTED; + hr = SAFEARRAY_AllocDescriptor(allocSize, ppsaOut); + if (FAILED(hr)) + return hr; (*ppsaOut)->cDims = cDims; @@ -481,7 +511,7 @@ HRESULT WINAPI SafeArrayAllocDescriptorEx(VARTYPE vt, UINT cDims, SAFEARRAY **ppsaOut) { ULONG cbElements; - HRESULT hRet = E_UNEXPECTED; + HRESULT hRet; TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, ppsaOut); @@ -846,8 +876,6 @@ VARIANT* lpVariant = pvData; VARIANT* lpDest = lpvDest; - hRet = VariantClear(lpDest); - if (FAILED(hRet)) FIXME("VariantClear failed with 0x%x\n", hRet); hRet = VariantCopy(lpDest, lpVariant); if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); } @@ -862,23 +890,27 @@ if (!*lpDest) hRet = E_OUTOFMEMORY; } - else + else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) { - if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) - { - LPUNKNOWN lpUnknown = pvData; - LPUNKNOWN *lpDest = lpvDest; - - if (lpUnknown) - IUnknown_AddRef(lpUnknown); - if (*lpDest) - IUnknown_Release(*lpDest); - *lpDest = lpUnknown; - } else { - /* Copy the data over */ - memcpy(lpvDest, pvData, psa->cbElements); - } + IUnknown *lpUnknown = pvData; + IUnknown **lpDest = lpvDest; + + if (lpUnknown) + IUnknown_AddRef(lpUnknown); + if (*lpDest) + IUnknown_Release(*lpDest); + *lpDest = lpUnknown; } + else if (psa->fFeatures & FADF_RECORD) + { + IRecordInfo *record; + + SafeArrayGetRecordInfo(psa, &record); + hRet = IRecordInfo_RecordCopy(record, pvData, lpvDest); + IRecordInfo_Release(record); + } else + /* Copy the data over */ + memcpy(lpvDest, pvData, psa->cbElements); } SafeArrayUnlock(psa); } @@ -946,18 +978,26 @@ else *lpDest = NULL; } + else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) + { + IUnknown **src_unk = lpvSrc; + IUnknown **dest_unk = pvData; + + if (*src_unk) + IUnknown_AddRef(*src_unk); + *dest_unk = *src_unk; + } + else if (psa->fFeatures & FADF_RECORD) + { + IRecordInfo *record; + + SafeArrayGetRecordInfo(psa, &record); + hRet = IRecordInfo_RecordCopy(record, lpvSrc, pvData); + IRecordInfo_Release(record); + } else - { - if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) - { - LPUNKNOWN *lpUnknown = lpvSrc; - - if (*lpUnknown) - IUnknown_AddRef(*lpUnknown); - } /* Copy the data over */ memcpy(pvData, lpvSrc, psa->cbElements); - } } SafeArrayUnlock(psa); } @@ -1087,18 +1127,17 @@ */ HRESULT WINAPI SafeArrayAccessData(SAFEARRAY *psa, void **ppvData) { + HRESULT hr; + TRACE("(%p,%p)\n", psa, ppvData); if(!psa || !ppvData) return E_INVALIDARG; - if (SUCCEEDED(SafeArrayLock(psa))) - { - *ppvData = psa->pvData; - return S_OK; - } - *ppvData = NULL; - return E_UNEXPECTED; + hr = SafeArrayLock(psa); + *ppvData = SUCCEEDED(hr) ? psa->pvData : NULL; + + return hr; } @@ -1207,6 +1246,8 @@ */ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) { + HRESULT hr; + TRACE("(%p)\n", psa); if (!psa) @@ -1216,8 +1257,9 @@ return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */ /* Delete the actual item data */ - if (FAILED(SAFEARRAY_DestroyData(psa, 0))) - return E_UNEXPECTED; + hr = SAFEARRAY_DestroyData(psa, 0); + if (FAILED(hr)) + return hr; if (psa->pvData) { @@ -1276,10 +1318,7 @@ psaTarget->rgsabound[dim].cElements) return E_INVALIDARG; - if (SUCCEEDED(SAFEARRAY_DestroyData(psaTarget, 0)) && - SUCCEEDED(SAFEARRAY_CopyData(psaSource, psaTarget))) - return S_OK; - return E_UNEXPECTED; + return SAFEARRAY_CopyData(psaSource, psaTarget); } /************************************************************************ @@ -1349,9 +1388,9 @@ if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) { VARTYPE vt; - if (FAILED(SafeArrayGetVartype(psa, &vt))) - hRet = E_UNEXPECTED; - else + + hRet = SafeArrayGetVartype(psa, &vt); + if (SUCCEEDED(hRet)) hRet = SafeArrayAllocDescriptorEx(vt, psa->cDims, ppsaOut); } else @@ -1359,7 +1398,7 @@ hRet = SafeArrayAllocDescriptor(psa->cDims, ppsaOut); if (SUCCEEDED(hRet)) { - (*ppsaOut)->fFeatures = psa->fFeatures & ~FADF_CREATEVECTOR; + (*ppsaOut)->fFeatures = psa->fFeatures & ~ignored_copy_features; (*ppsaOut)->cbElements = psa->cbElements; } } @@ -1370,19 +1409,23 @@ memcpy((*ppsaOut)->rgsabound, psa->rgsabound, psa->cDims * sizeof(SAFEARRAYBOUND)); (*ppsaOut)->pvData = SAFEARRAY_Malloc(SAFEARRAY_GetCellCount(psa) * psa->cbElements); - - if ((*ppsaOut)->pvData) - { - hRet = SAFEARRAY_CopyData(psa, *ppsaOut); - - if (SUCCEEDED(hRet)) - return hRet; - + if (!(*ppsaOut)->pvData) + { + SafeArrayDestroyDescriptor(*ppsaOut); + *ppsaOut = NULL; + return E_OUTOFMEMORY; + } + + hRet = SAFEARRAY_CopyData(psa, *ppsaOut); + if (FAILED(hRet)) + { SAFEARRAY_Free((*ppsaOut)->pvData); - } - SafeArrayDestroyDescriptor(*ppsaOut); - } - *ppsaOut = NULL; + SafeArrayDestroyDescriptor(*ppsaOut); + *ppsaOut = NULL; + return hRet; + } + } + return hRet; } @@ -1405,6 +1448,7 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) { SAFEARRAYBOUND *oldBounds; + HRESULT hr; TRACE("(%p,%p)\n", psa, psabound); @@ -1414,8 +1458,9 @@ if (psa->cLocks > 0) return DISP_E_ARRAYISLOCKED; - if (FAILED(SafeArrayLock(psa))) - return E_UNEXPECTED; + hr = SafeArrayLock(psa); + if (FAILED(hr)) + return hr; oldBounds = psa->rgsabound; oldBounds->lLbound = psabound->lLbound; @@ -1448,7 +1493,7 @@ if (!(pvNewData = SAFEARRAY_Malloc(ulNewSize))) { SafeArrayUnlock(psa); - return E_UNEXPECTED; + return E_OUTOFMEMORY; } memcpy(pvNewData, psa->pvData, ulOldSize); Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -281,8 +281,16 @@ sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { - ERR("Could not get typelib fn?\n"); - return E_FAIL; +#ifdef _WIN64 + sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); + tlfnlen = sizeof(tlfn); + if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { +#endif + ERR("Could not get typelib fn?\n"); + return E_FAIL; +#ifdef _WIN64 + } +#endif } MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); hres = LoadTypeLib(tlfnW,&tl); @@ -622,14 +630,11 @@ } /* Whether we pass this type by reference or by value */ -static int +static BOOL _passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { - if (td->vt == VT_USERDEFINED || - td->vt == VT_VARIANT || - td->vt == VT_PTR) - return 1; - - return 0; + return (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR); } static HRESULT Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -325,10 +325,23 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); +struct tlibredirect_data +{ + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + LANGID langid; + WORD flags; + ULONG help_len; + ULONG help_offset; + WORD major_version; + WORD minor_version; +}; /* Get the path to a registered type library. Helper for QueryPathOfRegTypeLib. */ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, - SYSKIND syskind, LCID lcid, LPBSTR path ) + SYSKIND syskind, LCID lcid, BSTR *path, BOOL redir ) { HRESULT hr = TYPE_E_LIBNOTREGISTERED; LCID myLCID = lcid; @@ -338,6 +351,30 @@ LONG res; TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + + if (redir) + { + ACTCTX_SECTION_KEYED_DATA data; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid( 0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, guid, &data )) + { + struct tlibredirect_data *tlib = (struct tlibredirect_data*)data.lpData; + WCHAR *nameW; + DWORD len; + + if (tlib->major_version != wMaj || tlib->minor_version < wMin) + return TYPE_E_LIBNOTREGISTERED; + + nameW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset); + len = SearchPathW( NULL, nameW, NULL, sizeof(Path)/sizeof(WCHAR), Path, NULL ); + if (!len) return TYPE_E_LIBNOTREGISTERED; + + TRACE_(typelib)("got path from context %s\n", debugstr_w(Path)); + *path = SysAllocString( Path ); + return S_OK; + } + } if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); @@ -410,12 +447,14 @@ */ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) { + BOOL redir = TRUE; #ifdef _WIN64 - HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path ); + HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path, TRUE ); if(SUCCEEDED(hres)) return hres; + redir = FALSE; #endif - return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); + return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path, redir ); } /****************************************************************************** @@ -536,6 +575,20 @@ { res= LoadTypeLib(bstr, ppTLib); SysFreeString(bstr); + + if (*ppTLib) + { + TLIBATTR *attr; + + res = ITypeLib_GetLibAttr(*ppTLib, &attr); + if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + { + ITypeLib_ReleaseTLibAttr(*ppTLib, attr); + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } + } } TRACE("(IID: %s) load %s (%p)\n",debugstr_guid(rguid), SUCCEEDED(res)? "SUCCESS":"FAILED", *ppTLib); @@ -550,6 +603,57 @@ static const WCHAR HELPDIRW[] = {'H','E','L','P','D','I','R',0}; static const WCHAR ProxyStubClsidW[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d',0}; static const WCHAR ProxyStubClsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; + +static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *tattr, DWORD flag) +{ + WCHAR keyName[60]; + HKEY key, subKey; + + static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + + get_interface_key( &tattr->guid, keyName ); + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, + KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) + { + if (name) + RegSetValueExW(key, NULL, 0, REG_SZ, + (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); + + if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) + { + WCHAR buffer[40]; + static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; + static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; + + StringFromGUID2(&libattr->guid, buffer, 40); + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + sprintfW(buffer, fmtver, libattr->wMajorVerNum, libattr->wMinorVerNum); + RegSetValueExW(subKey, VersionW, 0, REG_SZ, + (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + RegCloseKey(subKey); + } + + RegCloseKey(key); + } +} /****************************************************************************** * RegisterTypeLib [OLEAUT32.163] @@ -569,9 +673,6 @@ OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, may be NULL*/ { - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; HRESULT res; TLIBATTR *attr; WCHAR keyName[60]; @@ -744,47 +845,16 @@ if ((kind == TKIND_INTERFACE && (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* register interface<->typelib coupling */ - get_interface_key( &tattr->guid, keyName ); - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) - { - if (name) - RegSetValueExW(key, NULL, 0, REG_SZ, - (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); - - if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) - { - WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; - static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; - - StringFromGUID2(&attr->guid, buffer, 40); - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - sprintfW(buffer, fmtver, attr->wMajorVerNum, attr->wMinorVerNum); - RegSetValueExW(subKey, VersionW, 0, REG_SZ, - (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - RegCloseKey(subKey); - } - - RegCloseKey(key); - } + BOOL is_wow64; + DWORD opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + + /* register interface<->typelib coupling */ + TLB_register_interface(attr, name, tattr, 0); + + /* register TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) + TLB_register_interface(attr, name, tattr, opposite); } ITypeInfo_ReleaseTypeAttr(tinfo, tattr); @@ -847,7 +917,7 @@ } /* get the path to the typelib on disk */ - if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath) != S_OK) { + if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath, FALSE) != S_OK) { result = E_INVALIDARG; goto end; } @@ -1927,6 +1997,9 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) { TLBString *str; + + if(!new_str) + return NULL; LIST_FOR_EACH_ENTRY(str, string_list, TLBString, entry) { if (strcmpW(str->str, new_str) == 0) @@ -2297,24 +2370,17 @@ case VT_BSTR :{ char * ptr; MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); - if(size < 0) { - char next; - DWORD origPos = MSFT_Tell(pcx), nullPos; - - do { - MSFT_Read(&next, 1, pcx, DO_NOT_SEEK); - } while (next); - nullPos = MSFT_Tell(pcx); - size = nullPos - origPos; - MSFT_Seek(pcx, origPos); - } - ptr = heap_alloc_zero(size);/* allocate temp buffer */ - MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; - heap_free(ptr); + if(size == -1){ + V_BSTR(pVar) = NULL; + }else{ + ptr = heap_alloc_zero(size); + MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); + V_BSTR(pVar)=SysAllocStringLen(NULL,size); + /* FIXME: do we need a AtoW conversion here? */ + V_UNION(pVar, bstrVal[size])='\0'; + while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + heap_free(ptr); + } } size=-4; break; /* FIXME: this will not work AT ALL when the variant contains a pointer */ @@ -2380,7 +2446,7 @@ TRACE_(typelib)("vt type = %X\n", pTd->vt); } -static int TLB_is_propgetput(INVOKEKIND invkind) +static BOOL TLB_is_propgetput(INVOKEKIND invkind) { return (invkind == INVOKE_PROPERTYGET || invkind == INVOKE_PROPERTYPUT || @@ -3110,7 +3176,7 @@ /* Read in NE header */ nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; if ( !resTabSize ) @@ -3378,8 +3444,7 @@ if(file != pszFileName) heap_free(file); - h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ FILE_NAME_INFORMATION *info; char data[MAX_PATH * sizeof(WCHAR) + sizeof(info->FileNameLength)]; @@ -3519,7 +3584,7 @@ cx.length = dwTLBLength; /* read header */ - MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); + MSFT_ReadLEDWords(&tlbHeader, sizeof(tlbHeader), &cx, 0); TRACE_(typelib)("header:\n"); TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { @@ -3558,7 +3623,7 @@ pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); - pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->libflags = ((WORD) tlbHeader.flags & 0xffff) /* check mask */ | LIBFLAG_FHASDISKIMAGE; pTypeLibImpl->set_lcid = tlbHeader.lcid2; pTypeLibImpl->lcid = tlbHeader.lcid; @@ -4514,7 +4579,7 @@ len = SLTG_ReadLibBlk(pLibBlk, pTypeLibImpl); - /* Now there's 0x40 bytes of 0xffff with the numbers 0 to TypeInfoCount + /* Now there are 0x40 bytes of 0xffff with the numbers 0 to TypeInfoCount interspersed */ len += 0x40; @@ -5119,8 +5184,8 @@ *pfName=FALSE; ITypeLib2_fnIsName_exit: - TRACE("(%p)slow! search for %s: %s found!\n", This, - debugstr_w(szNameBuf), *pfName?"NOT":""); + TRACE("(%p)slow! search for %s: %sfound!\n", This, + debugstr_w(szNameBuf), *pfName ? "" : "NOT "); return S_OK; } @@ -5150,26 +5215,30 @@ return E_INVALIDARG; len = (lstrlenW(name) + 1)*sizeof(WCHAR); - for(tic = 0; tic < This->TypeInfoCount; ++tic) { + for(tic = 0; count < *found && tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; TLBVarDesc *var; UINT fdc; - if(!TLB_str_memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, pTInfo->Name, len)) { + memid[count] = MEMBERID_NIL; + goto ITypeLib2_fnFindName_exit; + } + for(fdc = 0; fdc < pTInfo->cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - int pc; - - if(!TLB_str_memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; - for(pc = 0; pc < func->funcdesc.cParams; pc++) { - if(!TLB_str_memcmp(name, func->pParamDesc[pc].Name, len)) - goto ITypeLib2_fnFindName_exit; + + if(!TLB_str_memcmp(name, func->Name, len)) { + memid[count] = func->funcdesc.memid; + goto ITypeLib2_fnFindName_exit; } } var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->cVars, name); - if (var) + if (var) { + memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; + } continue; ITypeLib2_fnFindName_exit: @@ -5317,7 +5386,7 @@ ct = list_count(custdata_list); - pCustData->prgCustData = heap_alloc_zero(ct * sizeof(CUSTDATAITEM)); + pCustData->prgCustData = CoTaskMemAlloc(ct * sizeof(CUSTDATAITEM)); if(!pCustData->prgCustData) return E_OUTOFMEMORY; @@ -5401,9 +5470,10 @@ BINDPTR * pBindPtr) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int typemismatch=0, i; - - TRACE("(%s, 0x%x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + BOOL typemismatch = FALSE; + int i; + + TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lptcomp = NULL; @@ -5442,7 +5512,7 @@ return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } if ((pTypeInfo->typekind == TKIND_COCLASS) && @@ -5513,7 +5583,7 @@ return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } } @@ -7687,7 +7757,7 @@ ref_type->pImpTLInfo->wVersionMajor, ref_type->pImpTLInfo->wVersionMinor, This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam); + ref_type->pImpTLInfo->lcid, &libnam, TRUE); if(FAILED(result)) libnam = SysAllocString(ref_type->pImpTLInfo->name); @@ -8514,7 +8584,7 @@ for(fdc = 0; fdc < This->cFuncs; ++fdc){ pFDesc = &This->funcdescs[fdc]; - if (!strcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { + if (!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { if (!wFlags || (pFDesc->funcdesc.invkind & wFlags)) break; else @@ -8547,7 +8617,7 @@ return S_OK; } } - /* FIXME: search each inherited interface, not just the first */ + if (hr == DISP_E_MEMBERNOTFOUND && This->impltypes) { /* recursive search */ ITypeInfo *pTInfo; @@ -8563,6 +8633,13 @@ { hr = ITypeComp_Bind(pTComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); ITypeComp_Release(pTComp); + if (SUCCEEDED(hr) && *pDescKind == DESCKIND_FUNCDESC && + This->typekind == TKIND_DISPATCH) + { + FUNCDESC *tmp = pBindPtr->lpfuncdesc; + hr = TLB_AllocAndInitFuncDesc(tmp, &pBindPtr->lpfuncdesc, TRUE); + SysFreeString((BSTR)tmp); + } return hr; } WARN("Could not search inherited interface!\n"); @@ -9181,41 +9258,6 @@ out_size = &junk2; vt = desc->vt & VT_TYPEMASK; - switch(vt){ - case VT_INT: - subtype = VT_I4; - break; - case VT_UINT: - subtype = VT_UI4; - break; - case VT_VOID: - subtype = VT_EMPTY; - break; - default: - subtype = vt; - break; - } - - switch(vt){ - case VT_INT: - case VT_UINT: - case VT_I1: - case VT_UI1: - case VT_I2: - case VT_UI2: - case VT_I4: - case VT_UI4: - case VT_BOOL: - case VT_R4: - case VT_ERROR: - case VT_BSTR: - case VT_HRESULT: - case VT_CY: - case VT_VOID: - case VT_VARIANT: - *out_mix = subtype; - return 0x80000000 | (subtype << 16) | desc->vt; - } if(vt == VT_PTR || vt == VT_SAFEARRAY){ DWORD mix; @@ -9232,9 +9274,25 @@ encoded[1] = desc->u.hreftype; *out_mix = 0x7FFF; /* FIXME: Should get TYPEKIND of the hreftype, e.g. TKIND_ENUM => VT_I4 */ }else{ - FIXME("Don't know what to do! VT: 0x%x\n", desc->vt); - *out_mix = desc->vt; - return 0x80000000 | (desc->vt << 16) | desc->vt; + TRACE("Mixing in-place, VT: 0x%x\n", desc->vt); + + switch(vt){ + case VT_INT: + subtype = VT_I4; + break; + case VT_UINT: + subtype = VT_UI4; + break; + case VT_VOID: + subtype = VT_EMPTY; + break; + default: + subtype = vt; + break; + } + + *out_mix = subtype; + return 0x80000000 | (subtype << 16) | desc->vt; } data = file->typdesc_seg.data; @@ -9626,7 +9684,7 @@ size = sizeof(MSFT_TypeInfoBase); if(data){ - MSFT_TypeInfoBase *base = (void*)data; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase*)data; if(info->wTypeFlags & TYPEFLAG_FDUAL) base->typekind = TKIND_DISPATCH; else @@ -10727,8 +10785,17 @@ UINT index, LPOLESTR name) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(name)); + + if(!name) + return E_INVALIDARG; + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + This->vardescs[index].Name = TLB_append_str(&This->pTypeLib->name_list, name); + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(ICreateTypeInfo2 *iface, @@ -10768,8 +10835,19 @@ UINT index, LPOLESTR docString) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString)); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString)); + + if(!docString) + return E_INVALIDARG; + + if(index >= This->cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + func_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface, @@ -11195,8 +11273,7 @@ for (i = 0; i < lpCust->cCustData; i++) VariantClear(&lpCust->prgCustData[i].varValue); - /* FIXME - Should be using a per-thread IMalloc */ - heap_free(lpCust->prgCustData); + CoTaskMemFree(lpCust->prgCustData); lpCust->prgCustData = NULL; } lpCust->cCustData = 0; Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -181,7 +181,7 @@ DWORD switch_is; } variant_wire_t; -static unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) +unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) { if (vt & VT_ARRAY) return 4; @@ -197,6 +197,7 @@ return sizeof(SHORT); case VT_I4: case VT_UI4: + case VT_HRESULT: return sizeof(LONG); case VT_INT: case VT_UINT: Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -2397,7 +2397,7 @@ if (SUCCEEDED(hRet)) { DWORD dwLen = strlenW(*pbstrOut); - BOOL bBracket = (*pbstrOut)[dwLen] == ')' ? TRUE : FALSE; + BOOL bBracket = (*pbstrOut)[dwLen] == ')'; dwLen -= bBracket; memcpy(buff, *pbstrOut, dwLen * sizeof(WCHAR)); Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -559,7 +559,8 @@ { TRACE("(%p)\n", pVarg); - V_VT(pVarg) = VT_EMPTY; /* Native doesn't set any other fields */ + /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ + V_VT(pVarg) = VT_EMPTY; } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) @@ -678,34 +679,32 @@ /****************************************************************************** * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(struct __tagBRECORD* pBr) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) { - HRESULT hres = S_OK; - - if (pBr->pRecInfo) + struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); + struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + HRESULT hr = S_OK; + ULONG size; + + if (!src_rec->pRecInfo) { - ULONG ulSize; - - hres = IRecordInfo_GetSize(pBr->pRecInfo, &ulSize); - if (SUCCEEDED(hres)) - { - PVOID pvRecord = HeapAlloc(GetProcessHeap(), 0, ulSize); - if (!pvRecord) - hres = E_OUTOFMEMORY; - else - { - memcpy(pvRecord, pBr->pvRecord, ulSize); - pBr->pvRecord = pvRecord; - - hres = IRecordInfo_RecordCopy(pBr->pRecInfo, pvRecord, pvRecord); - if (SUCCEEDED(hres)) - IRecordInfo_AddRef(pBr->pRecInfo); - } - } + if (src_rec->pvRecord) return E_INVALIDARG; + return S_OK; } - else if (pBr->pvRecord) - hres = E_INVALIDARG; - return hres; + + hr = IRecordInfo_GetSize(src_rec->pRecInfo, &size); + if (FAILED(hr)) return hr; + + /* This could look cleaner if only RecordCreate() was used, but native doesn't use it. + Memory should be allocated in a same way as RecordCreate() does, so RecordDestroy() + could free it later. */ + dest_rec->pvRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!dest_rec->pvRecord) return E_OUTOFMEMORY; + + dest_rec->pRecInfo = src_rec->pRecInfo; + IRecordInfo_AddRef(src_rec->pRecInfo); + + return IRecordInfo_RecordCopy(src_rec->pRecInfo, src_rec->pvRecord, dest_rec->pvRecord); } /****************************************************************************** @@ -755,29 +754,25 @@ if (!V_ISBYREF(pvargSrc)) { - if (V_ISARRAY(pvargSrc)) + switch (V_VT(pvargSrc)) { - if (V_ARRAY(pvargSrc)) - hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); - } - else if (V_VT(pvargSrc) == VT_BSTR) - { + case VT_BSTR: V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); if (!V_BSTR(pvargDest)) - { - TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); hres = E_OUTOFMEMORY; - } - } - else if (V_VT(pvargSrc) == VT_RECORD) - { - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); - } - else if (V_VT(pvargSrc) == VT_DISPATCH || - V_VT(pvargSrc) == VT_UNKNOWN) - { + break; + case VT_RECORD: + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); + break; + case VT_DISPATCH: + case VT_UNKNOWN: + V_UNKNOWN(pvargDest) = V_UNKNOWN(pvargSrc); if (V_UNKNOWN(pvargSrc)) IUnknown_AddRef(V_UNKNOWN(pvargSrc)); + break; + default: + if (V_ISARRAY(pvargSrc)) + hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); } } } @@ -896,8 +891,7 @@ } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - V_UNION(pvargDest,brecVal) = V_UNION(pvargSrc,brecVal); - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF)) @@ -1295,6 +1289,10 @@ lpSt->wYear, lpSt->wHour, lpSt->wMinute, lpSt->wSecond, pDateOut); if (lpSt->wMonth > 12) + return FALSE; + if (lpSt->wDay > 31) + return FALSE; + if ((short)lpSt->wYear < 0) return FALSE; ud.st = *lpSt; Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -121,7 +121,7 @@ WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; - +unsigned int get_type_size(ULONG*, VARTYPE); BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -112,6 +112,7 @@ return DISP_E_BADVARTYPE; /* Get the default 'value' property from the IDispatch */ + VariantInit(&srcVar); hRet = IDispatch_Invoke(pdispIn, DISPID_VALUE, &IID_NULL, lcid, DISPATCH_PROPERTYGET, &emptyParams, &srcVar, NULL, NULL); @@ -351,7 +352,7 @@ */ HRESULT WINAPI VarI1FromR8(double dblIn, signed char* pcOut) { - if (dblIn < (double)I1_MIN || dblIn > (double)I1_MAX) + if (dblIn < I1_MIN - 0.5 || dblIn >= I1_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(CHAR, dblIn, *pcOut); return S_OK; @@ -641,7 +642,7 @@ */ HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut) { - if (dblIn < -0.5 || dblIn > (double)UI1_MAX) + if (dblIn < -0.5 || dblIn >= UI1_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(BYTE, dblIn, *pbOut); return S_OK; @@ -947,7 +948,7 @@ */ HRESULT WINAPI VarI2FromR8(double dblIn, SHORT* psOut) { - if (dblIn < (double)I2_MIN || dblIn > (double)I2_MAX) + if (dblIn < I2_MIN - 0.5 || dblIn >= I2_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(SHORT, dblIn, *psOut); return S_OK; @@ -1259,7 +1260,7 @@ */ HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* pusOut) { - if (dblIn < -0.5 || dblIn > (double)UI2_MAX) + if (dblIn < -0.5 || dblIn >= UI2_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(USHORT, dblIn, *pusOut); return S_OK; @@ -1539,7 +1540,7 @@ */ HRESULT WINAPI VarI4FromR8(double dblIn, LONG *piOut) { - if (dblIn < (double)I4_MIN || dblIn > (double)I4_MAX) + if (dblIn < I4_MIN - 0.5 || dblIn >= I4_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(LONG, dblIn, *piOut); return S_OK; @@ -1848,7 +1849,7 @@ */ HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG *pulOut) { - if (dblIn < -0.5 || dblIn > (double)UI4_MAX) + if (dblIn < -0.5 || dblIn >= UI4_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(ULONG, dblIn, *pulOut); return S_OK; @@ -4484,19 +4485,19 @@ /* Subtract two unsigned 32 bit values with underflow */ static ULONG VARIANT_Sub(ULONG ulLeft, ULONG ulRight, ULONG* pulHigh) { - int invert = 0; + BOOL invert = FALSE; ULARGE_INTEGER ul64; ul64.QuadPart = (LONG64)ulLeft - (ULONG64)ulRight; if (ulLeft < ulRight) - invert = 1; + invert = TRUE; if (ul64.QuadPart > (ULONG64)*pulHigh) ul64.QuadPart -= (ULONG64)*pulHigh; else { ul64.QuadPart -= (ULONG64)*pulHigh; - invert = 1; + invert = TRUE; } if (invert) ul64.u.HighPart = -ul64.u.HighPart ; @@ -4672,10 +4673,10 @@ } /* check to test if encoded number is a zero. Returns 1 if zero, 0 for nonzero */ -static int VARIANT_int_iszero(const DWORD * p, unsigned int n) -{ - for (; n > 0; n--) if (*p++ != 0) return 0; - return 1; +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n) +{ + for (; n > 0; n--) if (*p++ != 0) return FALSE; + return TRUE; } /* multiply two DECIMALS, without changing either one, and place result in third @@ -4685,7 +4686,7 @@ */ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI * result) { - int r_overflow = 0; + BOOL r_overflow = FALSE; DWORD running[6]; signed int mulstart; @@ -4776,12 +4777,12 @@ } /* cast DECIMAL into string. Any scale should be handled properly. en_US locale is - hardcoded (period for decimal separator, dash as negative sign). Returns 0 for - success, nonzero if insufficient space in output buffer. - */ -static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) -{ - int overflow = 0; + hardcoded (period for decimal separator, dash as negative sign). Returns TRUE for + success, FALSE if insufficient space in output buffer. + */ +static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) +{ + BOOL overflow = FALSE; DWORD quotient[3]; unsigned char remainder; unsigned int i; @@ -4792,7 +4793,7 @@ *s++ = '-'; n--; } - else overflow = 1; + else overflow = TRUE; } /* prepare initial 0 */ @@ -4800,7 +4801,7 @@ if (n >= 2) { s[0] = '0'; s[1] = '\0'; - } else overflow = 1; + } else overflow = TRUE; } i = 0; @@ -4808,7 +4809,7 @@ while (!overflow && !VARIANT_int_iszero(quotient, sizeof(quotient) / sizeof(DWORD))) { remainder = VARIANT_int_divbychar(quotient, sizeof(quotient) / sizeof(DWORD), 10); if (i + 2 > n) { - overflow = 1; + overflow = TRUE; } else { s[i++] = '0' + remainder; s[i] = '\0'; @@ -4829,7 +4830,7 @@ if (i <= a->scale) { unsigned int numzeroes = a->scale + 1 - i; if (i + 1 + numzeroes >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + numzeroes, s, (i + 1) * sizeof(WCHAR)); i += numzeroes; @@ -4843,7 +4844,7 @@ if (a->scale > 0) { unsigned int periodpos = i - a->scale; if (i + 2 >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + periodpos + 1, s + periodpos, (i + 1 - periodpos) * sizeof(WCHAR)); s[periodpos] = '.'; i++; @@ -4855,7 +4856,7 @@ } } - return overflow; + return !overflow; } /* shift the bits of a DWORD array to the left. p[0] is assumed LSB */ @@ -5127,7 +5128,7 @@ in case of quotient overflow. */ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * divisor, - VARIANT_DI * quotient) + VARIANT_DI * quotient, BOOL round_remainder) { HRESULT r_overflow = S_OK; @@ -5170,8 +5171,21 @@ underflow = VARIANT_int_addlossy( quotient->bitsnum, &quotientscale, sizeof(quotient->bitsnum) / sizeof(DWORD), remainderplusquotient, &tempquotientscale, 4); - VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); - memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + if (round_remainder) { + if(remainderplusquotient[4] >= 5){ + unsigned int i; + unsigned char remainder = 1; + for (i = 0; i < sizeof(quotient->bitsnum) / sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = quotient->bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + quotient->bitsnum[i] = digit & 0xFFFFFFFF; + } + } + memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); + } else { + VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); + memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + } tempquotientscale = ++remainderscale; } while (!underflow && !VARIANT_int_iszero(remainderplusquotient + 4, 4)); @@ -5204,7 +5218,7 @@ into the VARIANT_DI and is therefore no longer necessary. Returns S_OK if successful, or DISP_E_OVERFLOW if the represented value is too big to fit into a DECIMAL. */ -static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, int isDouble) +static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, BOOL isDouble) { HRESULT hres = S_OK; int exponent5, exponent10; @@ -5408,7 +5422,7 @@ compensate. */ exponent2 -= 23; - hres = VARIANT_DI_normalize(dest, exponent2, 0); + hres = VARIANT_DI_normalize(dest, exponent2, FALSE); } return hres; @@ -5469,37 +5483,22 @@ compensate. */ exponent2 -= 52; - hres = VARIANT_DI_normalize(dest, exponent2, 1); + hres = VARIANT_DI_normalize(dest, exponent2, TRUE); } return hres; } -/************************************************************************ - * VarDecDiv (OLEAUT32.178) - * - * Divide one DECIMAL by another. - * - * PARAMS - * pDecLeft [I] Source - * pDecRight [I] Value to divide by - * pDecOut [O] Destination - * - * RETURNS - * Success: S_OK. - * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination - */ -HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecRight, DECIMAL *pDecOut, + BOOL round) { HRESULT hRet = S_OK; VARIANT_DI di_left, di_right, di_result; HRESULT divresult; - if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; - VARIANT_DIFromDec(pDecLeft, &di_left); VARIANT_DIFromDec(pDecRight, &di_right); - divresult = VARIANT_DI_div(&di_left, &di_right, &di_result); + divresult = VARIANT_DI_div(&di_left, &di_right, &di_result, round); if (divresult != S_OK) { /* division actually overflowed */ @@ -5547,6 +5546,27 @@ } /************************************************************************ + * VarDecDiv (OLEAUT32.178) + * + * Divide one DECIMAL by another. + * + * PARAMS + * pDecLeft [I] Source + * pDecRight [I] Value to divide by + * pDecOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination + */ +HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +{ + if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; + + return VARIANT_do_division(pDecLeft, pDecRight, pDecOut, FALSE); +} + +/************************************************************************ * VarDecMul (OLEAUT32.179) * * Multiply one DECIMAL by another. @@ -5755,6 +5775,10 @@ */ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOut) { + DECIMAL divisor, tmp; + HRESULT hr; + unsigned int i; + if (cDecimals < 0 || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG) || DEC_SCALE(pDecIn) > DEC_MAX_SCALE) return E_INVALIDARG; @@ -5764,9 +5788,26 @@ return S_OK; } - FIXME("semi-stub!\n"); - - return DISP_E_OVERFLOW; + /* truncate significant digits and rescale */ + memset(&divisor, 0, sizeof(divisor)); + DEC_LO64(&divisor) = 1; + + memset(&tmp, 0, sizeof(tmp)); + DEC_LO64(&tmp) = 10; + for (i = 0; i < DEC_SCALE(pDecIn) - cDecimals; ++i) + { + hr = VarDecMul(&divisor, &tmp, &divisor); + if (FAILED(hr)) + return hr; + } + + hr = VARIANT_do_division(pDecIn, &divisor, pDecOut, TRUE); + if (FAILED(hr)) + return hr; + + DEC_SCALE(pDecOut) = cDecimals; + + return S_OK; } /************************************************************************ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Apr 24 15:12:07 2014 @@ -147,7 +147,7 @@ reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 reactos/dll/win32/ole32 # Synced to Wine-1.7.17 reactos/dll/win32/oleacc # Synced to Wine-1.7.17 -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 +reactos/dll/win32/oleaut32 # Synced to Wine-1.7.17 reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 reactos/dll/win32/oledlg # Synced to Wine-1.7.1 reactos/dll/win32/olepro32 # Synced to Wine-1.7.1

10 years, 6 months

[akhaldi] 62941: [OLEACC] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 15:10:29 2014 New Revision: 62941 URL: http://svn.reactos.org/svn/reactos?rev=62941&view=rev Log: [OLEACC] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.spec trunk/reactos/dll/win32/oleacc/oleacc_classes.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Thu Apr 24 15:10:29 2014 @@ -85,6 +85,12 @@ return TRUE; } +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; +} + HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Thu Apr 24 15:10:29 2014 @@ -1,10 +1,11 @@ @ stub AccessibleChildren @ stub AccessibleObjectFromEvent -@ stdcall AccessibleObjectFromPoint(double ptr ptr) +@ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA @ stub CreateStdAccessibleProxyW +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr) Modified: trunk/reactos/dll/win32/oleacc/oleacc_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_cl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_classes.idl [iso-8859-1] Thu Apr 24 15:10:29 2014 @@ -15,4 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep regtypelib + #include "oleacc.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Apr 24 15:10:29 2014 @@ -146,7 +146,7 @@ reactos/dll/win32/odbc32 # Synced to Wine-1.7.17. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 reactos/dll/win32/ole32 # Synced to Wine-1.7.17 -reactos/dll/win32/oleacc # Synced to Wine-1.7.1 +reactos/dll/win32/oleacc # Synced to Wine-1.7.17 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 reactos/dll/win32/oledlg # Synced to Wine-1.7.1

10 years, 6 months

[akhaldi] 62940: [MSHTML.TLB] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 12:15:27 2014 New Revision: 62940 URL: http://svn.reactos.org/svn/reactos?rev=62940&view=rev Log: [MSHTML.TLB] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml.tlb/mshtm… ============================================================================== --- trunk/reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl [iso-8859-1] Thu Apr 24 12:15:27 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "mshtml.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Apr 24 12:15:27 2014 @@ -118,7 +118,7 @@ reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mshtml # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.17 reactos/dll/win32/msi # Synced to Wine-1.7.17 reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 reactos/dll/win32/msimtf # Synced to Wine-1.7.1

10 years, 6 months

[akhaldi] 62939: [OLE32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 24 12:14:32 2014 New Revision: 62939 URL: http://svn.reactos.org/svn/reactos?rev=62939&view=rev Log: [OLE32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/defaulthandler.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/ole_server.c trunk/rostests/winetests/ole32/propvariant.c trunk/rostests/winetests/ole32/stg_prop.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… Modified: trunk/rostests/winetests/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/defaultha… Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… Modified: trunk/rostests/winetests/ole32/ole_server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole_serve… Modified: trunk/rostests/winetests/ole32/propvariant.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/propvaria… Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha…

10 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014