April 2007 - Wine-Commits - list.winehq.org

Francois Gouget : d3drm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 0e1a34d2a226092e3adaba89a9a6bfcb9d17a28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1a34d2a226092e3adaba89a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 02:07:42 2007 +0200 d3drm: Fix compilation on systems that don't support nameless unions. --- dlls/d3drm/math.c | 54 +++++++++++++++++--------------- dlls/d3drm/tests/vector.c | 75 +++++++++++++++++++++++---------------------- 2 files changed, 66 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e1a34d2a226092e3adab…

1 0

Francois Gouget : d3drm/tests: Add missing '\n' to ok() calls.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 75e5fb933a04d8ed871544510cdb68ff687d149e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e5fb933a04d8ed871544510… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 02:06:46 2007 +0200 d3drm/tests: Add missing '\n' to ok() calls. --- dlls/d3drm/tests/vector.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 1c25c50..cc16a05 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -89,11 +89,11 @@ static void VectorTest(void) /*_______________________VectorDotProduct__________________________*/ mod=D3DRMVectorDotProduct(&u,&v); - ok((mod == 16.0), "Expected 16.0, Got %f",mod); + ok((mod == 16.0), "Expected 16.0, Got %f\n",mod); /*_______________________VectorModulus_____________________________*/ mod=D3DRMVectorModulus(&u); - ok((mod == 3.0), "Expected 3.0, Got %f",mod); + ok((mod == 3.0), "Expected 3.0, Got %f\n",mod); /*_______________________VectorNormalize___________________________*/ D3DRMVectorNormalize(&u);

1 0

Rob Shearman : atl: Implement AtlComQIPtrAssign.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: fec8156cc3dd4ce9757d5240465acbd6d97c6d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec8156cc3dd4ce9757d52404… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:46:50 2007 +0100 atl: Implement AtlComQIPtrAssign. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 6204c5d..cbeecb6 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -23,7 +23,7 @@ 28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A 30 stdcall AtlComPtrAssign(ptr ptr) -31 stub AtlComQIPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stub AtlGetVersion 35 stub AtlAxDialogBoxW diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 3b5703e..d4d950a 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -208,6 +208,18 @@ IUnknown* WINAPI AtlComPtrAssign(IUnknown** pp, IUnknown *p) return p; } +IUnknown* WINAPI AtlComQIPtrAssign(IUnknown** pp, IUnknown *p, REFIID riid) +{ + IUnknown *new_p = NULL; + + TRACE("(%p %p %s)\n", pp, p, debugstr_guid(riid)); + + if (p) IUnknown_QueryInterface(p, riid, (void **)&new_p); + if (*pp) IUnknown_Release(*pp); + *pp = new_p; + return new_p; +} + HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject) {

1 0

Rob Shearman : atl: Add stubs for AtlIPersistStreamInit_Load and AtlIPersistStreamInit_Save.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: be16475191af859b17b74ff5238fe23752bc57a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be16475191af859b17b74ff52… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:48:07 2007 +0100 atl: Add stubs for AtlIPersistStreamInit_Load and AtlIPersistStreamInit_Save. Based on a patch by Anastasius Focht and information from Inside ATL. --- dlls/atl/atl.spec | 4 ++-- dlls/atl/atl_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index cbeecb6..27fb171 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -41,8 +41,8 @@ 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) 49 stub AtlRegisterClassCategoriesHelper -50 stub AtlIPersistStreamInit_Load -51 stub AtlIPersistStreamInit_Save +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index d4d950a..938df36 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -534,3 +534,32 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) } return NULL; } + +/* FIXME: should be in a header file */ +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; + DISPID dispid; + const CLSID* pclsidPropPage; + const IID* piidDispatch; + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load( LPSTREAM pStm, ATL_PROPMAP_ENTRY *pMap, + void *pThis, IUnknown *pUnk) +{ + FIXME("(%p, %p, %p, %p)\n", pStm, pMap, pThis, pUnk); + + return S_OK; +} + +HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, + ATL_PROPMAP_ENTRY *pMap, void *pThis, + IUnknown *pUnk) +{ + FIXME("(%p, %d, %p, %p, %p)\n", pStm, fClearDirty, pMap, pThis, pUnk); + + return S_OK; +}

1 0

Rob Shearman : winex11.drv: Remove an unneeded include.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: ec4be6a258f3e2e882fd211f325f5692fd36f3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4be6a258f3e2e882fd211f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:45:11 2007 +0100 winex11.drv: Remove an unneeded include. --- dlls/winex11.drv/xdnd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index cfb28ab..af04d75 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -32,7 +32,6 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" -#include "wownt32.h" #include "x11drv.h" #include "shlobj.h" /* DROPFILES */

1 0

Rob Shearman : rpcrt4: Print the correct values when warning about a bad frag length.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 35e99b50f165307af3fc11add928c70d41aaaef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e99b50f165307af3fc11add… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:46:16 2007 +0100 rpcrt4: Print the correct values when warning about a bad frag length. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 1086602..a30c925 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -691,7 +691,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if (((*Header)->common.frag_len < hdr_length) || ((*Header)->common.frag_len - hdr_length < header_auth_len)) { WARN("frag_len %d too small for hdr_length %d and auth_len %d\n", - common_hdr.frag_len, hdr_length, common_hdr.auth_len); + (*Header)->common.frag_len, hdr_length, header_auth_len); status = RPC_S_PROTOCOL_ERROR; goto fail; }

1 0

Rob Shearman : dsound: Implement QueryInterface for KsPropertySet objects.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 543a7d8f2de0f12a6310915cd956866fe24e0827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=543a7d8f2de0f12a6310915cd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:45:44 2007 +0100 dsound: Implement QueryInterface for KsPropertySet objects. --- dlls/dsound/propset.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 66a4af6..b83ae37 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdarg.h> #include "windef.h" @@ -241,8 +242,14 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IKsPropertySet)) { + *ppobj = iface; + IUnknown_AddRef(iface); + return S_OK; + } *ppobj = NULL; - return DSERR_INVALIDPARAM; + return E_NOINTERFACE; } static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)

1 0

Vitaliy Margolen : kernel32: Fix off by one error.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 2bd4d6b1801c1d33fb92bf878558aea63ac317db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd4d6b1801c1d33fb92bf878… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 28 15:50:22 2007 -0600 kernel32: Fix off by one error. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8b8bd3c..8e5999f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -346,7 +346,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) env_value.Buffer = (WCHAR *)(buffer + info->DataOffset); env_value.Length = env_value.MaximumLength = info->DataLength; if (env_value.Length && !env_value.Buffer[env_value.Length/sizeof(WCHAR)-1]) - env_value.Length--; /* don't count terminating null if any */ + env_value.Length -= sizeof(WCHAR); /* don't count terminating null if any */ if (info->Type == REG_EXPAND_SZ) { WCHAR buf_expanded[1024];

1 0

Rob Shearman : dsound: Implement QueryInterface for the class factory objects.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: ade2984e0374852fef18836e9e78aa1713370a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade2984e0374852fef18836e9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 29 17:44:36 2007 +0100 dsound: Implement QueryInterface for the class factory objects. --- dlls/dsound/dsound_main.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 94d2122..1736fe3 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -439,9 +439,17 @@ static HRESULT WINAPI DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p, %s, %p) stub!\n", This, debugstr_guid(riid), ppobj); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); if (ppobj == NULL) return E_POINTER; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + *ppobj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Vitaliy Margolen : ntdll: Use correct full access bitmask in NtQuerySecurityObject.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: cf1b810d747358167681a38d8f2e1e40dd354c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1b810d747358167681a38d8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 28 15:50:00 2007 -0600 ntdll: Use correct full access bitmask in NtQuerySecurityObject. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 35ce1be..0e94e35 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -247,7 +247,7 @@ NtQuerySecurityObject( pace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; pace->Header.AceFlags = CONTAINER_INHERIT_ACE; pace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD) + RtlLengthRequiredSid(1); - pace->Mask = DELETE | READ_CONTROL | WRITE_DAC | WRITE_OWNER | 0x3f; + pace->Mask = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; pace->SidStart = BufferIndex; /* SID S-1-5-12 (System) */ @@ -267,7 +267,7 @@ NtQuerySecurityObject( pace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; pace->Header.AceFlags = CONTAINER_INHERIT_ACE; pace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD) + RtlLengthRequiredSid(2); - pace->Mask = DELETE | READ_CONTROL | WRITE_DAC | WRITE_OWNER | 0x3f; + pace->Mask = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; pace->SidStart = BufferIndex; /* S-1-5-12 (Administrators) */

1 0