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

Huw Davies : gdi32: Remove unused variable.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 18d19e7f18df0d29440989b69d34b260c7851bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d19e7f18df0d29440989b69… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 16 14:52:00 2012 +0000 gdi32: Remove unused variable. --- dlls/gdi32/freetype.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ec39814..461d646 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1707,7 +1707,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { FT_Face ft_face; TT_OS2 *pOS2; - TT_Header *pHeader = NULL; FT_Error err; FT_Long face_index = 0, num_faces; INT ret = 0; @@ -1769,7 +1768,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { if(!(pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2)) || !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) || - !(pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head))) + !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head)) { TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" "Skipping this font.\n", debugstr_a(file), font_data_ptr);

1 0

Alessandro Pignotti : oleaut32: Avoid converting variants if it is not needed.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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

Austin English : wevtapi: Add stub dll.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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

Alistair Leslie-Hughes : advapi32: Assign a default value (clang).
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 77b9d585562154b6b810b8e1ac0738f84bb826f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9d585562154b6b810b8e1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:14:42 2012 +1100 advapi32: Assign a default value (clang). --- dlls/advapi32/service.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bdebc91..025d6c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -755,7 +755,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; LONG r; TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), @@ -899,7 +899,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); @@ -942,7 +942,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDependencies, LPCWSTR lpServiceStartName, LPCWSTR lpPassword ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; SIZE_T passwdlen;

1 0

Alistair Leslie-Hughes : ole32/tests: Assign a default value (clang).
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: d764b5188edb5187f736a3708679222f3b496dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d764b5188edb5187f736a3708… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:00:39 2012 +1100 ole32/tests: Assign a default value (clang). --- dlls/ole32/tests/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6641683..7b4f36a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -914,6 +914,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); trace("end\n"); + g_expected_fetc = NULL; } static void test_OleLoad(IStorage *pStorage)

1 0

André Hentschel : windowscodecs: Add stub for DllCanUnloadNow.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 10cd34db38d7b982294e123d0bcdfa67ab1af193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cd34db38d7b982294e123d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 20:17:42 2012 +0100 windowscodecs: Add stub for DllCanUnloadNow. --- dlls/windowscodecs/main.c | 5 +++++ dlls/windowscodecs/windowscodecs.spec | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index a6588fd..8dd847e 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -49,6 +49,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); } +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index d0b6a7e..71022cb 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Alistair Leslie-Hughes : mscoree: Better support RUNTIME_INFO_UPGRADE_VERSION in GetRequestedRuntimeInfo.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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

Ken Thomases : shell32: Partially implement Mac Trash backing for the Recycle Bin.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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

Alexandre Julliard : msxml3: Avoid building code that isn' t used without libxml.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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

Alexandre Julliard : dbghelp: Add support for jump instructions in function epilogs on x86_64.
by Alexandre Julliard 16 Mar '12

16 Mar '12

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