wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Alistair Leslie-Hughes : msxml3: Only compare strings if the transform was successful.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 3a63aebc1c73ca7b983e55ffc49d5b41a7110310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a63aebc1c73ca7b983e55ffc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 20:07:28 2011 +1000 msxml3: Only compare strings if the transform was successful. --- dlls/msxml3/tests/domdoc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 22fb3ae..a758880 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6978,8 +6978,11 @@ static void test_testTransforms(void) hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); ok(hr == S_OK, "ret %08x\n", hr ); - ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); - SysFreeString(bOut); + if(hr == S_OK) + { + ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); + SysFreeString(bOut); + } IXMLDOMNode_Release(pNode); }

1 0

André Hentschel : ntdll: Allow reading from a writable section.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 8fc74191205e03719ee275fcd957ddd6deda7ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc74191205e03719ee275fcd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 18:00:42 2011 +0200 ntdll: Allow reading from a writable section. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a7679da..dda1f37 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,7 +1341,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ | VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Francois Gouget : xcopy: Add full stops at the end of sentences in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: ca3b1046ca84fc5242e84ec8a1c8d8d7a7449257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3b1046ca84fc5242e84ec8a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 7 12:53:13 2011 +0200 xcopy: Add full stops at the end of sentences in the usage message. --- po/ar.po | 42 ++++++++++++------------ po/bg.po | 42 ++++++++++++------------ po/ca.po | 42 ++++++++++++------------ po/cs.po | 42 ++++++++++++------------ po/da.po | 43 ++++++++++++------------ po/de.po | 43 ++++++++++++------------ po/el.po | 42 ++++++++++++------------ po/en.po | 84 +++++++++++++++++++++++----------------------- po/en_US.po | 84 +++++++++++++++++++++++----------------------- po/eo.po | 42 ++++++++++++------------ po/es.po | 42 ++++++++++++------------ po/fa.po | 42 ++++++++++++------------ po/fi.po | 42 ++++++++++++------------ po/fr.po | 43 ++++++++++++------------ po/he.po | 43 ++++++++++++------------ po/hi.po | 42 ++++++++++++------------ po/hu.po | 42 ++++++++++++------------ po/it.po | 43 ++++++++++++------------ po/ja.po | 43 ++++++++++++------------ po/ko.po | 43 ++++++++++++------------ po/lt.po | 43 ++++++++++++------------ po/ml.po | 42 ++++++++++++------------ po/nb_NO.po | 43 ++++++++++++------------ po/nl.po | 43 ++++++++++++------------ po/or.po | 42 ++++++++++++------------ po/pa.po | 42 ++++++++++++------------ po/pl.po | 43 ++++++++++++------------ po/pt_BR.po | 43 ++++++++++++------------ po/pt_PT.po | 43 ++++++++++++------------ po/rm.po | 42 ++++++++++++------------ po/ro.po | 43 ++++++++++++------------ po/ru.po | 43 ++++++++++++------------ po/sk.po | 42 ++++++++++++------------ po/sl.po | 43 ++++++++++++------------ po/sr_RS(a)cyrillic.po | 43 ++++++++++++------------ po/sr_RS(a)latin.po | 43 ++++++++++++------------ po/sv.po | 43 ++++++++++++------------ po/te.po | 42 ++++++++++++------------ po/th.po | 42 ++++++++++++------------ po/tr.po | 42 ++++++++++++------------ po/uk.po | 43 ++++++++++++------------ po/wa.po | 42 ++++++++++++------------ po/wine.pot | 42 ++++++++++++------------ po/zh_CN.po | 42 ++++++++++++------------ po/zh_TW.po | 42 ++++++++++++------------ programs/xcopy/xcopy.rc | 42 ++++++++++++------------ 46 files changed, 1028 insertions(+), 1008 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3b1046ca84fc5242e84…

1 0

Francois Gouget : wineconsole: Add full stops at the end of sentences in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : net: Add a full stop at the end of a sentence in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : cmd: Fix the indentation of the IF usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : winecfg: Specify a context for the drive letter setting.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Bernhard Loos : wuapi: Add the SystemInformation coclass and interface.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: f8a215b09ca507408ad9032ff20e22d1db5f7db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a215b09ca507408ad9032ff… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 7 11:59:29 2011 +0200 wuapi: Add the SystemInformation coclass and interface. --- dlls/wuapi/Makefile.in | 1 + dlls/wuapi/main.c | 5 ++ dlls/wuapi/systeminfo.c | 163 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/wuapi_private.h | 1 + include/wuapi.idl | 29 ++++++++ 5 files changed, 199 insertions(+), 0 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 6387f07..81d50ba 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ main.c \ searcher.c \ session.c \ + systeminfo.c \ updates.c IDL_TLB_SRCS = wuapi_tlb.idl diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index c553ea2..80daca0 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -114,6 +114,7 @@ static const struct IClassFactoryVtbl wucf_vtbl = static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; +static wucf sysinfocf = { { &wucf_vtbl }, SystemInformation_create }; static HINSTANCE instance; @@ -147,6 +148,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &updatescf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_SystemInformation )) + { + cf = &sysinfocf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/dlls/wuapi/systeminfo.c b/dlls/wuapi/systeminfo.c new file mode 100644 index 0000000..f3f635f --- /dev/null +++ b/dlls/wuapi/systeminfo.c @@ -0,0 +1,163 @@ +/* + * IAutomaticUpdates implementation + * + * Copyright 2008 Hans Leidekker + * Copyright 2011 Bernhard Loos + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + +typedef struct _systeminfo +{ + ISystemInformation ISystemInformation_iface; + LONG refs; +} systeminfo; + +static inline systeminfo *impl_from_ISystemInformation(ISystemInformation *iface) +{ + return CONTAINING_RECORD(iface, systeminfo, ISystemInformation_iface); +} + +static ULONG WINAPI systeminfo_AddRef(ISystemInformation *iface) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI systeminfo_Release(ISystemInformation *iface) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + LONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI systeminfo_QueryInterface(ISystemInformation *iface, + REFIID riid, void **ppvObject) +{ + systeminfo *This = impl_from_ISystemInformation(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_ISystemInformation) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + ISystemInformation_AddRef(iface); + return S_OK; +} + +static HRESULT WINAPI systeminfo_GetTypeInfoCount(ISystemInformation *iface, + UINT *pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_GetTypeInfo(ISystemInformation *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_GetIDsOfNames(ISystemInformation *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, + DISPID *rgDispId) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_Invoke(ISystemInformation *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_get_OemHardwareSupportLink(ISystemInformation *iface, + BSTR *retval) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI systeminfo_get_RebootRequired(ISystemInformation *iface, + VARIANT_BOOL *retval) +{ + *retval = VARIANT_FALSE; + return S_OK; +} + +static const struct ISystemInformationVtbl systeminfo_vtbl = +{ + systeminfo_QueryInterface, + systeminfo_AddRef, + systeminfo_Release, + systeminfo_GetTypeInfoCount, + systeminfo_GetTypeInfo, + systeminfo_GetIDsOfNames, + systeminfo_Invoke, + systeminfo_get_OemHardwareSupportLink, + systeminfo_get_RebootRequired +}; + +HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + systeminfo *info; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); + if (!info) + return E_OUTOFMEMORY; + + info->ISystemInformation_iface.lpVtbl = &systeminfo_vtbl; + info->refs = 1; + + *ppObj = &info->ISystemInformation_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wuapi/wuapi_private.h b/dlls/wuapi/wuapi_private.h index e1db05a..444722b 100644 --- a/dlls/wuapi/wuapi_private.h +++ b/dlls/wuapi/wuapi_private.h @@ -21,3 +21,4 @@ extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSP extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/include/wuapi.idl b/include/wuapi.idl index 1989cd4..d1a3593 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1301,6 +1301,26 @@ interface IUpdateInstaller : IDispatch } [ + object, + uuid(ADE87BF7-7B56-4275-8FAB-B9B0E591844B), + oleautomation, + hidden, + dual, + nonextensible, + pointer_default(unique), +] +interface ISystemInformation : IDispatch +{ + [propget] + HRESULT OemHardwareSupportLink( + [out, retval] BSTR *retval); + + [propget] + HRESULT RebootRequired( + [out, retval] VARIANT_BOOL *retval); +} + +[ helpstring("AutomaticUpdates Class"), threading(both), progid("Microsoft.Update.AutoUpdate.1"), @@ -1318,4 +1338,13 @@ coclass AutomaticUpdates { interface IAutomaticUpdates; } ] coclass UpdateSession { interface IUpdateSession; } +[ + helpstring("SystemInformation Class"), + threading(both), + progid("Microsoft.Update.SystemInfo.1"), + vi_progid("Microsoft.Update.SystemInfo"), + uuid(C01B9BA0-BEA7-41BA-B604-D0A36F469133) +] +coclass SystemInformation { interface ISystemInformation; } + } /* WUApiLib */

1 0

Marcus Meissner : netapi32: Check for GetUserNameW return (Coverity).
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: f014487f9e4fc24d6a049abc967fd86ab5afef1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f014487f9e4fc24d6a049abc9… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Sep 7 15:18:58 2011 +0200 netapi32: Check for GetUserNameW return (Coverity). --- dlls/netapi32/access.c | 5 ++++- dlls/netapi32/local_group.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 255e51b..7cd05fc 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -437,7 +437,10 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, size = UNLEN + 1; NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); - GetUserNameW(currentuser, &size); + if (!GetUserNameW(currentuser, &size)) { + NetApiBufferFree(currentuser); + return ERROR_NOT_ENOUGH_MEMORY; + } if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) { diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index 7f7d3c1..f4f4214 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -196,7 +196,9 @@ NET_API_STATUS WINAPI NetLocalGroupGetMembers( *entriesread = 0; userNameLen = MAX_COMPUTERNAME_LENGTH + 1; - GetUserNameW(userName,&userNameLen); + if (!GetUserNameW(userName,&userNameLen)) + return ERROR_NOT_ENOUGH_MEMORY; + needlen = sizeof(LOCALGROUP_MEMBERS_INFO_3) + (userNameLen+2) * sizeof(WCHAR); if (prefmaxlen != MAX_PREFERRED_LENGTH)

1 0

Nikolay Sivov : comctl32/monthcal: Make day drawing helpers aware of multiple calendars.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 354d41685f62523e8008d8e38a1f737b6a3d92f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354d41685f62523e8008d8e38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 4 19:48:28 2011 +0400 comctl32/monthcal: Make day drawing helpers aware of multiple calendars. --- dlls/comctl32/monthcal.c | 163 ++++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=354d41685f62523e8008d…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011