wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Hans Leidekker : wmiutils: Add a stub implementation of IWbemPathKeyList.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 39a1b7050f532d37e3db2df25397f3944179ee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1b7050f532d37e3db2df25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:51 2013 +0100 wmiutils: Add a stub implementation of IWbemPathKeyList. --- dlls/wmiutils/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 221 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7b7e46f..5f64aa0 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -32,12 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); -struct key +struct keylist { - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; + IWbemPathKeyList IWbemPathKeyList_iface; + IWbemPath *parent; + LONG refs; }; struct path @@ -59,6 +58,207 @@ struct path ULONGLONG flags; }; +static inline struct keylist *impl_from_IWbemPathKeyList( IWbemPathKeyList *iface ) +{ + return CONTAINING_RECORD(iface, struct keylist, IWbemPathKeyList_iface); +} + +static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) +{ + return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); +} + +static ULONG WINAPI keylist_AddRef( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + return InterlockedIncrement( &keylist->refs ); +} + +static ULONG WINAPI keylist_Release( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + LONG refs = InterlockedDecrement( &keylist->refs ); + if (!refs) + { + TRACE("destroying %p\n", keylist); + IWbemPath_Release( keylist->parent ); + heap_free( keylist ); + } + return refs; +} + +static HRESULT WINAPI keylist_QueryInterface( + IWbemPathKeyList *iface, + REFIID riid, + void **ppvObject ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + + TRACE("%p, %s, %p\n", keylist, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID( riid, &IID_IWbemPathKeyList ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemPathKeyList_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI keylist_GetCount( + IWbemPathKeyList *iface, + ULONG *puKeyCount ) +{ + FIXME("%p, %p\n", iface, puKeyCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + LPVOID pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey2( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + VARIANT *pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + ULONG *puKeyValBufSize, + LPVOID pKeyVal, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey2( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + VARIANT *pKeyValue, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, pKeyValue, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags ) +{ + FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveAllKeys( + IWbemPathKeyList *iface, + ULONG uFlags ) +{ + FIXME("%p, 0x%x\n", iface, uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_MakeSingleton( + IWbemPathKeyList *iface, + boolean bSet ) +{ + FIXME("%p, %d\n", iface, bSet); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetInfo( + IWbemPathKeyList *iface, + ULONG uRequestedInfo, + ULONGLONG *puResponse ) +{ + FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetText( + IWbemPathKeyList *iface, + LONG lFlags, + ULONG *puBuffLength, + LPWSTR pszText ) +{ + FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + return E_NOTIMPL; +} + +static const struct IWbemPathKeyListVtbl keylist_vtbl = +{ + keylist_QueryInterface, + keylist_AddRef, + keylist_Release, + keylist_GetCount, + keylist_SetKey, + keylist_SetKey2, + keylist_GetKey, + keylist_GetKey2, + keylist_RemoveKey, + keylist_RemoveAllKeys, + keylist_MakeSingleton, + keylist_GetInfo, + keylist_GetText +}; + +static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +{ + struct keylist *keylist; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; + + keylist->IWbemPathKeyList_iface.lpVtbl = &keylist_vtbl; + keylist->refs = 1; + keylist->parent = parent; + IWbemPath_AddRef( keylist->parent ); + + *ppObj = &keylist->IWbemPathKeyList_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} + +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + static void init_path( struct path *path ) { path->text = NULL; @@ -93,11 +293,6 @@ static void clear_path( struct path *path ) init_path( path ); } -static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) -{ - return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); -} - static ULONG WINAPI path_AddRef( IWbemPath *iface ) { @@ -922,8 +1117,22 @@ static HRESULT WINAPI path_GetKeyList( IWbemPath *iface, IWbemPathKeyList **pOut) { - FIXME("%p, %p\n", iface, pOut); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; + + TRACE("%p, %p\n", iface, pOut); + + EnterCriticalSection( &path->cs ); + + if (!path->class) + { + LeaveCriticalSection( &path->cs ); + return WBEM_E_INVALID_PARAMETER; + } + hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + + LeaveCriticalSection( &path->cs ); + return hr; } static HRESULT WINAPI path_CreateClassPart(

1 0

Hans Leidekker : wmiutils: Implement IWbemPathKeyList::GetCount.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 13974194709e678e82144e1dc7aa0f8b84e8f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=13974194709e678e82144e1dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:46:19 2013 +0100 wmiutils: Implement IWbemPathKeyList::GetCount. --- dlls/wmiutils/path.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 5f64aa0..98f22db 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -116,8 +116,19 @@ static HRESULT WINAPI keylist_GetCount( IWbemPathKeyList *iface, ULONG *puKeyCount ) { - FIXME("%p, %p\n", iface, puKeyCount); - return E_NOTIMPL; + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + struct path *parent = impl_from_IWbemPath( keylist->parent ); + + TRACE("%p, %p\n", iface, puKeyCount); + + if (!puKeyCount) return WBEM_E_INVALID_PARAMETER; + + EnterCriticalSection( &parent->cs ); + + *puKeyCount = parent->num_keys; + + LeaveCriticalSection( &parent->cs ); + return S_OK; } static HRESULT WINAPI keylist_SetKey(

1 0

Hans Leidekker : wmiutils: Add support for for parsing and serializing a key list.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 7b00683d6e4fdaccd5aede140e32a9c84f1dff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b00683d6e4fdaccd5aede140… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:17 2013 +0100 wmiutils: Add support for for parsing and serializing a key list. --- dlls/wmiutils/path.c | 180 +++++++++++++++++++++++++++++++++----- dlls/wmiutils/tests/path.c | 48 ++++++++++- dlls/wmiutils/wmiutils_private.h | 6 ++ 3 files changed, 210 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b00683d6e4fdaccd5aed…

1 0

Andrew Talbot : ntdll: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: d0d28b96a4ee1c370ee48f12328e91883c77afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d28b96a4ee1c370ee48f123… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 20 21:25:56 2013 +0000 ntdll: Avoid signed-unsigned integer comparisons. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/nt.c | 6 +++--- dlls/ntdll/sync.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 863a320..c552a8b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -145,7 +145,7 @@ struct file_identity }; static struct file_identity ignored_files[MAX_IGNORED_FILES]; -static int ignored_files_count; +static unsigned int ignored_files_count; union file_directory_info { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a2e0716..ee89bb7 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1166,7 +1166,7 @@ void fill_cpu_info(void) static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, DWORD proc) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1192,7 +1192,7 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1891,7 +1891,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - int n; + unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 09151a9..58dde65 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1091,7 +1091,8 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN const LARGE_INTEGER *timeout, HANDLE signal_object ) { NTSTATUS ret; - int i, cookie; + UINT i; + int cookie; BOOL user_apc = FALSE; obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0;

1 0

Dmitry Timoshkov : gdiplus: Correct the GdipDrawString .spec entry.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 668cfb1c5ae75e0e1eed919117a2010f442f03af URL: http://source.winehq.org/git/wine.git/?a=commit;h=668cfb1c5ae75e0e1eed91911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 21 13:31:44 2013 +0800 gdiplus: Correct the GdipDrawString .spec entry. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ccf47f9..920d78e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -187,7 +187,7 @@ 187 stdcall GdipDrawRectangleI(ptr ptr long long long long) 188 stdcall GdipDrawRectangles(ptr ptr ptr long) 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) -190 stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) +190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) 193 stub GdipEnumerateMetafileDestPoint

1 0

André Hentschel : comctl32/tests: Mark win8 behaviour as broken.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 2c966be6c3bd8121ef87f65f9a3e3e7ac446e0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c966be6c3bd8121ef87f65f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 23:37:45 2013 +0100 comctl32/tests: Mark win8 behaviour as broken. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d8b3dbe..4870910 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -492,7 +492,7 @@ static void test_gettext(void) expect(4, r); /* A size of 0 returns the length of the text */ r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0); - expect(4, r); + ok( r == 4 || broken(r == 2) /* win8 */, "Expected 4 got %d\n", r ); /* A size of 1 only stores the NULL terminator */ buf[0] = 0xa; r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf);

1 0

Daniel Jelinski : comctl32/listview: Fix incorrect message parameters.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 75d774a43b53c934ae3b848f618a9be21bef655d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d774a43b53c934ae3b848f6… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Feb 20 22:36:23 2013 +0100 comctl32/listview: Fix incorrect message parameters. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a22b2da..83bdf56 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3549,8 +3549,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iFrom = nFirst; nmlv.iTo = nLast; - nmlv.uNewState = 0; - nmlv.uOldState = item.state; + nmlv.uOldState = 0; + nmlv.uNewState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf))

1 0

Nozomi Kodama : d3dx9: Avoid useless computations.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: de852879d1c9c3678307bb94ed2dda4b3a6d66fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de852879d1c9c3678307bb94e… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 23:04:25 2013 -1000 d3dx9: Avoid useless computations. --- dlls/d3dx9_36/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 10623f7..69c3297 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -388,10 +388,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, c D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2) { + D3DXMATRIX temp; + int i, j; + TRACE("pout %p, pm1 %p, pm2 %p\n", pout, pm1, pm2); - D3DXMatrixMultiply(pout, pm1, pm2); - D3DXMatrixTranspose(pout, pout); + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + temp.u.m[j][i] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; + + *pout = temp; return pout; }

1 0

Nozomi Kodama : d3dx9: Add a missing trace.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: f9347a8f0ea4c356d8cbed7b2c2e3f35f57d87c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9347a8f0ea4c356d8cbed7b2… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:52:42 2013 -1000 d3dx9: Add a missing trace. --- dlls/d3dx9_36/math.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 0afb36b..10623f7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1743,6 +1743,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2* out, UINT outstride D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { const D3DXVECTOR2 v = *pv; + + TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout;

1 0

Nozomi Kodama : d3dx9: Specify arguments in trace to ease debugging.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: bd5921814003a162edd20f811e48629614974f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5921814003a162edd20f811… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:43:29 2013 -1000 d3dx9: Specify arguments in trace to ease debugging. --- dlls/d3dx9_36/math.c | 174 +++++++++++++++++++++++++------------------------ 1 files changed, 89 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd5921814003a162edd20…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
46
Older →

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 February 2013