March 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLCurrentStyle2::get_filter tests.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 8e2f97fa65ac0d15ad1f146ab344d5d1f68e08e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2f97fa65ac0d15ad1f146ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 12:18:19 2012 +0100 mshtml: Added IHTMLCurrentStyle2::get_filter tests. --- dlls/mshtml/tests/style.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 793b51c..9fe8512 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -52,6 +52,17 @@ static BSTR a2bstr(const char *str) return ret; } +#define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) +static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return elem; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -1837,6 +1848,23 @@ static void _test_style_filter(unsigned line, IHTMLStyle *style, const char *exv SysFreeString(str); } +#define test_current_style_filter(a,b) _test_current_style_filter(__LINE__,a,b) +static void _test_current_style_filter(unsigned line, IHTMLCurrentStyle2 *style, const char *exval) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLCurrentStyle2_get_filter(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(str && !strcmp_wa(str, exval), "filter = %s, expected %s\n", wine_dbgstr_w(str), exval); + else + ok_(__FILE__,line)(!str, "str = %s, expected NULL\n", wine_dbgstr_w(str)); + + SysFreeString(str); +} + #define set_style_filter(a,b) _set_style_filter(__LINE__,a,b) static void _set_style_filter(unsigned line, IHTMLStyle *style, const char *val) { @@ -1852,14 +1880,26 @@ static void _set_style_filter(unsigned line, IHTMLStyle *style, const char *val) static void test_style_filters(IHTMLElement *elem) { + IHTMLElement2 *elem2 = get_elem2_iface((IUnknown*)elem); + IHTMLCurrentStyle2 *current_style2; + IHTMLCurrentStyle *current_style; IHTMLStyle *style; HRESULT hres; hres = IHTMLElement_get_style(elem, &style); ok(hres == S_OK, "get_style failed: %08x\n", hres); + hres = IHTMLElement2_get_currentStyle(elem2, &current_style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + IHTMLCurrentStyle_Release(current_style); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + test_style_filter(style, NULL); + test_current_style_filter(current_style2, NULL); set_style_filter(style, "alpha(opacity=50.0040)"); + test_current_style_filter(current_style2, "alpha(opacity=50.0040)"); set_style_filter(style, "alpha(opacity=100)"); IHTMLStyle_Release(style); @@ -1871,7 +1911,9 @@ static void test_style_filters(IHTMLElement *elem) set_style_filter(style, "xxx(a,b,c) alpha(opacity=100)"); set_style_filter(style, NULL); + IHTMLCurrentStyle2_Release(current_style2); IHTMLStyle_Release(style); + IHTMLElement2_Release(elem2); } static void test_current_style(IHTMLCurrentStyle *current_style)

1 0

Christian Costa : d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 549f8796dd0ad40afb2375f6484c46209d333539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549f8796dd0ad40afb2375f64… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:02 2012 +0100 d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now. --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1641a5c..6f5451b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -440,8 +440,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2* TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); + if (cb) + FIXME("Texture callback is not yet supported\n"); + return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name, - loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg); + loadflags, NULL, arg); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Save(IDirect3DRMMeshBuilder2* iface,

1 0

Ken Thomases : shell32: Partially implement Mac Trash backing for the Recycle Bin.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: cd454fdc2ed6c4a8b432dd4617fb61949c786087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd454fdc2ed6c4a8b432dd461… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 14 16:49:47 2012 -0500 shell32: Partially implement Mac Trash backing for the Recycle Bin. --- configure | 4 ++ configure.ac | 2 + dlls/shell32/Makefile.in | 1 + dlls/shell32/trash.c | 86 +++++++++++++++++++++++++++++++++++++++++++--- include/config.h.in | 3 ++ 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 3c4c966..d28b52a 100755 --- a/configure +++ b/configure @@ -666,6 +666,7 @@ COREAUDIO SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS +CORESERVICESLIB APPLICATIONSERVICESLIB IOKITLIB COREFOUNDATIONLIB @@ -5752,6 +5753,7 @@ for ac_header in \ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ + CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ @@ -6495,6 +6497,8 @@ fi APPLICATIONSERVICESLIB="-framework ApplicationServices" + CORESERVICESLIB="-framework CoreServices" + case $host_os in darwin11*) LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" diff --git a/configure.ac b/configure.ac index 023e46e..a0e785b 100644 --- a/configure.ac +++ b/configure.ac @@ -392,6 +392,7 @@ AC_CHECK_HEADERS(\ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ + CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ @@ -714,6 +715,7 @@ case $host_os in AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") + AC_SUBST(CORESERVICESLIB,"-framework CoreServices") case $host_os in darwin11*) AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;; diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index cf61e43..ef2d734 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,6 +3,7 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version +EXTRALIBS = @CORESERVICESLIB@ C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index c2e4ab2..a5d53a1 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -22,7 +22,20 @@ #include "config.h" +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include <stdarg.h> +#include <stdio.h> +#include <fcntl.h> +#include <errno.h> +#include <time.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -41,17 +54,78 @@ #include "winreg.h" #include "shlwapi.h" #include "winternl.h" - -#include <stdio.h> -#include <fcntl.h> -#include <errno.h> -#include <time.h> #include "wine/debug.h" #include "shell32_main.h" #include "xdg.h" WINE_DEFAULT_DEBUG_CHANNEL(trash); +#ifdef HAVE_CORESERVICES_CORESERVICES_H + +BOOL TRASH_CanTrashFile(LPCWSTR wszPath) +{ + char *unix_path; + OSStatus status; + FSRef ref; + FSCatalogInfo catalogInfo; + + TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) + return FALSE; + + status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); + HeapFree(GetProcessHeap(), 0, unix_path); + if (status == noErr) + status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, + NULL, NULL); + if (status == noErr) + status = FSFindFolder(catalogInfo.volume, kTrashFolderType, + kCreateFolder, &ref); + + return (status == noErr); +} + +BOOL TRASH_TrashFile(LPCWSTR wszPath) +{ + char *unix_path; + OSStatus status; + + TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) + return FALSE; + + status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); + + HeapFree(GetProcessHeap(), 0, unix_path); + return (status == noErr); +} + +HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +#else /* HAVE_CORESERVICES_CORESERVICES_H */ + static CRITICAL_SECTION TRASH_Creating; static CRITICAL_SECTION_DEBUG TRASH_Creating_Debug = { @@ -603,3 +677,5 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) SHFree(file_path); return S_OK; } + +#endif /* HAVE_CORESERVICES_CORESERVICES_H */ diff --git a/include/config.h.in b/include/config.h.in index c26def2..0332f69 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -61,6 +61,9 @@ /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H +/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */ +#undef HAVE_CORESERVICES_CORESERVICES_H + /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H

1 0

Alistair Leslie-Hughes : mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in GetRequestedRuntimeInfo.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: f67d34f7afd405811e25ecc8f46468aa64eb9767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67d34f7afd405811e25ecc8f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 12 16:15:31 2012 +1100 mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in GetRequestedRuntimeInfo. --- dlls/mscoree/metahost.c | 24 +++++++++++++++++++++--- dlls/mscoree/tests/mscoree.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 49fb0ee..e15a638 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1310,11 +1310,21 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (version) { - return CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + hr = CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + if(SUCCEEDED(hr)) + return hr; } if (runtimeinfo_flags & RUNTIME_INFO_UPGRADE_VERSION) { + DWORD major, minor, build; + + if (version && !parse_runtime_version(version, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(version)); + return CLR_E_SHIM_RUNTIME; + } + find_runtimes(); if (legacy) @@ -1325,8 +1335,16 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, while (i--) { if (runtimes[i].mono_abi_version) - return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, - &IID_ICLRRuntimeInfo, (void **)result); + { + /* Must be greater or equal to the version passed in. */ + if (!version || ((runtimes[i].major >= major && runtimes[i].minor >= minor && runtimes[i].build >= build) || + (runtimes[i].major >= major && runtimes[i].minor > minor) || + (runtimes[i].major > major))) + { + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); + } + } } if (legacy) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 56351c3..9b115c0 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -60,8 +60,11 @@ static BOOL init_functionpointers(void) static void test_versioninfo(void) { + const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + const WCHAR v2_0_0[] = {'v','2','.','0','.','0',0}; const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; + const WCHAR v1_1_0[] = {'v','1','.','1','.','0',0}; WCHAR version[MAX_PATH]; WCHAR path[MAX_PATH]; @@ -143,6 +146,40 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); + if(hr == S_OK) + { + /* .NET 1.1 may not be installed. */ + ok(!winetest_strcmpW(version, v1_1) || !winetest_strcmpW(version, v2_0), + "version is %s , expected %s or %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v1_1), wine_dbgstr_w(v2_0)); + + } + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v9_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); } static void test_loadlibraryshim(void)

1 0

Austin English : wevtapi: Add stub dll.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 9381e9334e7b61e023315a2df74766deb762d94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381e9334e7b61e023315a2df… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 16:08:21 2012 -0800 wevtapi: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/wevtapi/Makefile.in | 6 +++++ dlls/wevtapi/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wevtapi/wevtapi.spec | 46 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a62558..3c4c966 100755 --- a/configure +++ b/configure @@ -15362,6 +15362,7 @@ wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test +wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 472ef12..023e46e 100644 --- a/configure.ac +++ b/configure.ac @@ -2871,6 +2871,7 @@ WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) +WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in new file mode 100644 index 0000000..cf63838 --- /dev/null +++ b/dlls/wevtapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wevtapi.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c new file mode 100644 index 0000000..583ddba --- /dev/null +++ b/dlls/wevtapi/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec new file mode 100644 index 0000000..f6a5786 --- /dev/null +++ b/dlls/wevtapi/wevtapi.spec @@ -0,0 +1,46 @@ +@ stub EvtArchiveExportedLog +@ stub EvtCancel +@ stub EvtClearLog +@ stub EvtClose +@ stub EvtCreateBookmark +@ stub EvtCreateRenderContext +@ stub EvtExportLog +@ stub EvtFormatMessage +@ stub EvtGetChannelConfigProperty +@ stub EvtGetEventInfo +@ stub EvtGetEventMetadataProperty +@ stub EvtGetExtendedStatus +@ stub EvtGetLogInfo +@ stub EvtGetObjectArrayProperty +@ stub EvtGetObjectArraySize +@ stub EvtGetPublisherMetadataProperty +@ stub EvtGetQueryInfo +@ stub EvtIntAssertConfig +@ stub EvtIntCreateBinXMLFromCustomXML +@ stub EvtIntCreateLocalLogfile +@ stub EvtIntGetClassicLogDisplayName +@ stub EvtIntRenderResourceEventTemplate +@ stub EvtIntReportAuthzEventAndSourceAsync +@ stub EvtIntReportEventAndSourceAsync +@ stub EvtIntRetractConfig +@ stub EvtIntSysprepCleanup +@ stub EvtIntWriteXmlEventToLocalLogfile +@ stub EvtNext +@ stub EvtNextChannelPath +@ stub EvtNextEventMetadata +@ stub EvtNextPublisherId +@ stub EvtOpenChannelConfig +@ stub EvtOpenChannelEnum +@ stub EvtOpenEventMetadataEnum +@ stub EvtOpenLog +@ stub EvtOpenPublisherEnum +@ stub EvtOpenPublisherMetadata +@ stub EvtOpenSession +@ stub EvtQuery +@ stub EvtRender +@ stub EvtSaveChannelConfig +@ stub EvtSeek +@ stub EvtSetChannelConfigProperty +@ stub EvtSetObjectArrayProperty +@ stub EvtSubscribe +@ stub EvtUpdateBookmark

1 0

Alessandro Pignotti : oleaut32: Avoid converting variants if it is not needed.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 25d6e9aee86c7fce2970889ba850df156e727b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d6e9aee86c7fce2970889ba… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 2 19:02:17 2012 +0100 oleaut32: Avoid converting variants if it is not needed. --- dlls/oleaut32/typelib.c | 129 +++++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 61 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 95cdc36..302edbf 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6427,83 +6427,90 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { dump_Variant(src_arg); - if (rgvt[i] == VT_VARIANT) - hres = VariantCopy(&rgvarg[i], src_arg); - else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) + if(rgvt[i]!=V_VT(src_arg)) { - if (rgvt[i] == V_VT(src_arg)) - V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); - else + if (rgvt[i] == VT_VARIANT) + hres = VariantCopy(&rgvarg[i], src_arg); + else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) + { + if (rgvt[i] == V_VT(src_arg)) + V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); + else + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + if (wParamFlags & PARAMFLAG_FIN) + hres = VariantCopy(&missing_arg[i], src_arg); + V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; + } + V_VT(&rgvarg[i]) = rgvt[i]; + } + else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) + { + SAFEARRAY *a; + SAFEARRAYBOUND bound; + VARIANT *v; + LONG j; + bound.lLbound = 0; + bound.cElements = pDispParams->cArgs-i; + if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) + { + ERR("SafeArrayCreate failed\n"); + break; + } + hres = SafeArrayAccessData(a, (LPVOID)&v); + if (hres != S_OK) + { + ERR("SafeArrayAccessData failed with %x\n", hres); + break; + } + for (j = 0; j < bound.cElements; j++) + VariantCopy(&v[j], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i - j]); + hres = SafeArrayUnaccessData(a); + if (hres != S_OK) + { + ERR("SafeArrayUnaccessData failed with %x\n", hres); + break; + } + V_ARRAY(&rgvarg[i]) = a; + V_VT(&rgvarg[i]) = rgvt[i]; + } + else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FIN) - hres = VariantCopy(&missing_arg[i], src_arg); - V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; + hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + else + V_VT(&missing_arg[i]) = rgvt[i] & ~VT_BYREF; + V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) - { - SAFEARRAY *a; - SAFEARRAYBOUND bound; - VARIANT *v; - LONG j; - bound.lLbound = 0; - bound.cElements = pDispParams->cArgs-i; - if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) + else if ((rgvt[i] & VT_BYREF) && (rgvt[i] == V_VT(src_arg))) { - ERR("SafeArrayCreate failed\n"); - break; + V_BYREF(&rgvarg[i]) = V_BYREF(src_arg); + V_VT(&rgvarg[i]) = rgvt[i]; } - hres = SafeArrayAccessData(a, (LPVOID)&v); - if (hres != S_OK) + else { - ERR("SafeArrayAccessData failed with %x\n", hres); - break; + /* FIXME: this doesn't work for VT_BYREF arguments if + * they are not the same type as in the paramdesc */ + V_VT(&rgvarg[i]) = V_VT(src_arg); + hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } - for (j = 0; j < bound.cElements; j++) - VariantCopy(&v[j], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i - j]); - hres = SafeArrayUnaccessData(a); - if (hres != S_OK) + + if (FAILED(hres)) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("failed to convert param %d to %s%s from %s%s\n", i, + debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), + debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } - V_ARRAY(&rgvarg[i]) = a; - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) - { - VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); - if (wParamFlags & PARAMFLAG_FIN) - hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); - else - V_VT(&missing_arg[i]) = rgvt[i] & ~VT_BYREF; - V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if ((rgvt[i] & VT_BYREF) && (rgvt[i] == V_VT(src_arg))) - { - V_BYREF(&rgvarg[i]) = V_BYREF(src_arg); - V_VT(&rgvarg[i]) = rgvt[i]; + prgpvarg[i] = &rgvarg[i]; } else { - /* FIXME: this doesn't work for VT_BYREF arguments if - * they are not the same type as in the paramdesc */ - V_VT(&rgvarg[i]) = V_VT(src_arg); - hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); - V_VT(&rgvarg[i]) = rgvt[i]; - } - - if (FAILED(hres)) - { - ERR("failed to convert param %d to %s%s from %s%s\n", i, - debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), - debugstr_VT(src_arg), debugstr_VF(src_arg)); - break; + prgpvarg[i] = src_arg; } - prgpvarg[i] = &rgvarg[i]; } else if (wParamFlags & PARAMFLAG_FOPT) {

1 0

Christian Costa : d3drm: Implement SetTextureCoordinates.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 7a320e5ca4afdfc760efcbb31f4ad9774231828b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a320e5ca4afdfc760efcbb31… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:26 2012 +0100 d3drm: Implement SetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 15 +++++++++++---- dlls/d3drm/tests/d3drm.c | 28 ++++++++++++++++------------ 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 43ce2d6..b386cbf 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -681,9 +681,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%f,%f): stub\n", This, u, v); + TRACE("(%p)->(%u,%f,%f)\n", This, index, u, v); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + index, u, v); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetVertexColor(IDirect3DRMMeshBuilder2* iface, @@ -1555,9 +1556,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%f,%f): stub\n", This, u, v); + TRACE("(%p)->(%u,%f,%f)\n", This, index, u, v); - return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_BADVALUE; + + This->pCoords2d[index].u = u; + This->pCoords2d[index].v = v; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertexColor(IDirect3DRMMeshBuilder3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 341519b..454a935 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -210,15 +210,17 @@ static void test_MeshBuilder(void) valu = 1.23f; valv = 3.21f; - hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 1, valu, valv); - todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 0.0f; valv = 0.0f; - hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); - todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder_Release(pMeshBuilder); @@ -353,15 +355,17 @@ static void test_MeshBuilder3(void) valu = 1.23f; valv = 3.21f; - hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 1, valu, valv); - todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 0.0f; valv = 0.0f; - hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); - todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); IDirect3DRM3_Release(pD3DRM3);

1 0

Christian Costa : d3drm: Remove "partial stub" mention of forwarded methods .
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: c6ce077f413d958186d83d7bc733c7952368a542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce077f413d958186d83d7bc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:15:53 2012 +0100 d3drm: Remove "partial stub" mention of forwarded methods. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index d8d9ff2..1641a5c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -438,7 +438,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2* { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p,%p,%x,%p,%p): partial stub\n", This, filename, name, loadflags, cb, arg); + TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name, loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg); @@ -745,7 +745,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); + TRACE("(%p)->(%u,%p,%p)\n", This, index, u, v); return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, index, u, v);

1 0

Alexandre Julliard : dbghelp: Add support for jump instructions in function epilogs on x86_64.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 0a7827b8b2416d60eccd507c1e8c5137eea0bf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7827b8b2416d60eccd507c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 13:15:38 2012 +0100 dbghelp: Add support for jump instructions in function epilogs on x86_64. --- dlls/dbghelp/cpu_x86_64.c | 47 ++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 8de28ef..711c78c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -290,9 +290,11 @@ static int get_opcode_size(UNWIND_CODE op) } } -static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc) +static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc, + DWORD64 base, const RUNTIME_FUNCTION *function ) { - BYTE op0, op1, op2; + BYTE op0, op1, op2; + LONG val32; if (!sw_read_mem(csw, pc, &op0, 1)) return FALSE; @@ -338,12 +340,9 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc) /* now check for various pop instructions */ for (;;) { - BYTE rex = 0; - if (!sw_read_mem(csw, pc, &op0, 1)) return FALSE; - if ((op0 & 0xf0) == 0x40) + if ((op0 & 0xf0) == 0x40) /* rex prefix */ { - rex = op0 & 0x0f; /* rex prefix */ if (!sw_read_mem(csw, ++pc, &op0, 1)) return FALSE; } @@ -362,7 +361,21 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc) case 0xc2: /* ret $nn */ case 0xc3: /* ret */ return TRUE; - /* FIXME: add various jump instructions */ + case 0xe9: /* jmp nnnn */ + if (!sw_read_mem(csw, pc + 1, &val32, sizeof(LONG))) return FALSE; + pc += 5 + val32; + if (pc - base >= function->BeginAddress && pc - base < function->EndAddress) + continue; + break; + case 0xeb: /* jmp n */ + if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE; + pc += 2 + (signed char)op1; + if (pc - base >= function->BeginAddress && pc - base < function->EndAddress) + continue; + break; + case 0xf3: /* rep; ret (for amd64 prediction bug) */ + if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE; + return op1 == 0xc3; } return FALSE; } @@ -402,8 +415,8 @@ static BOOL interpret_epilog(struct cpu_stack_walk* csw, ULONG64 pc, CONTEXT *co pc++; continue; case 0x81: /* add $nnnn,%rsp */ - if (!sw_read_mem(csw, pc + 2, &val32, sizeof(ULONG))) return FALSE; - context->Rsp += (LONG)val32; + if (!sw_read_mem(csw, pc + 2, &val32, sizeof(LONG))) return FALSE; + context->Rsp += val32; pc += 2 + sizeof(LONG); continue; case 0x83: /* add $n,%rsp */ @@ -421,8 +434,8 @@ static BOOL interpret_epilog(struct cpu_stack_walk* csw, ULONG64 pc, CONTEXT *co } else /* lea nnnn(reg),%rsp */ { - if (!sw_read_mem(csw, pc + 2, &val32, sizeof(ULONG))) return FALSE; - context->Rsp = get_int_reg( context, (insn & 7) + (rex & 1) * 8 ) + (LONG)val32; + if (!sw_read_mem(csw, pc + 2, &val32, sizeof(LONG))) return FALSE; + context->Rsp = get_int_reg( context, (insn & 7) + (rex & 1) * 8 ) + val32; pc += 2 + sizeof(LONG); } continue; @@ -433,11 +446,19 @@ static BOOL interpret_epilog(struct cpu_stack_walk* csw, ULONG64 pc, CONTEXT *co context->Rsp += sizeof(ULONG64) + val16; return TRUE; case 0xc3: /* ret */ + case 0xf3: /* rep; ret */ if (!sw_read_mem(csw, context->Rsp, &val64, sizeof(DWORD64))) return FALSE; context->Rip = val64; context->Rsp += sizeof(ULONG64); return TRUE; - /* FIXME: add various jump instructions */ + case 0xe9: /* jmp nnnn */ + if (!sw_read_mem(csw, pc + 1, &val32, sizeof(LONG))) return FALSE; + pc += 5 + val32; + continue; + case 0xeb: /* jmp n */ + if (!sw_read_mem(csw, pc + 1, &val8, sizeof(BYTE))) return FALSE; + pc += 2 + (signed char)val8; + continue; } FIXME("unsupported insn %x\n", insn); return FALSE; @@ -497,7 +518,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, else { prolog_offset = ~0; - if (is_inside_epilog(csw, context->Rip)) + if (is_inside_epilog(csw, context->Rip, base, function)) { interpret_epilog(csw, context->Rip, context); return TRUE;

1 0

Alexandre Julliard : msxml3: Avoid building code that isn' t used without libxml.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 58fe32e1eaa2686fe0ad0bdb1a0e080862d4c2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fe32e1eaa2686fe0ad0bdb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 13:02:24 2012 +0100 msxml3: Avoid building code that isn't used without libxml. --- dlls/msxml3/xmlview.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index 5434667..f3e7f89 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#ifdef HAVE_LIBXML2 + typedef struct { IPersistMoniker IPersistMoniker_iface; @@ -1422,7 +1424,6 @@ static IOleObjectVtbl XMLView_OleObjectVtbl = { XMLView_OleObject_SetColorScheme }; -#ifdef HAVE_LIBXML2 HRESULT XMLView_create(IUnknown *outer, void **ppObj) { XMLView *This; @@ -1453,11 +1454,14 @@ HRESULT XMLView_create(IUnknown *outer, void **ppObj) *ppObj = &This->IPersistMoniker_iface; return S_OK; } + #else + HRESULT XMLView_create(IUnknown *outer, void **ppObj) { MESSAGE("This program tried to use a XMLView object, but\n" "libxml2 support was not present at compile time.\n"); return E_NOTIMPL; } -#endif + +#endif /* HAVE_LIBXML2 */

1 0