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

Christian Costa : dmusic: Add tests to enumerate master clocks.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 0eaf5c156bd74607ba467c0f63d63572bc04c462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaf5c156bd74607ba467c0f6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:25:45 2012 +0200 dmusic: Add tests to enumerate master clocks. --- dlls/dmusic/tests/dmusic.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a05afcc..fb4b307 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -47,6 +47,7 @@ static void test_dmusic(void) DMUS_PORTCAPS port_caps; DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; + DMUS_CLOCKINFO clock_info; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); if (hr != S_OK) @@ -99,6 +100,18 @@ static void test_dmusic(void) index++; } + index = 0; + clock_info.dwSize = sizeof(clock_info); + while (IDirectMusic_EnumMasterClock(dmusic, index, &clock_info) == S_OK) + { + ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); + trace("Clock %u:\n", index); + trace(" ctType = %u\n", clock_info.ctType); + trace(" guidClock = %s\n", debugstr_guid(&clock_info.guidClock)); + trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); + index++; + } + if (port) IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic);

1 0

Christian Costa : dmusic: COM cleanup of IDirectMusic8.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 16071b244ac9ff08acf5890e97e66f754be1ff8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16071b244ac9ff08acf5890e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:06:58 2012 +0200 dmusic: COM cleanup of IDirectMusic8. --- dlls/dmusic/dmusic.c | 87 ++++++++++++++++++++++++++--------------- dlls/dmusic/dmusic_private.h | 16 ++++---- 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 3f22fe0..f4b6c8c 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -23,9 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface); +} + /* IDirectMusic8Impl IUnknown part: */ -static HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -41,8 +47,9 @@ static HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, RE return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -52,8 +59,9 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) { return refCount; } -static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -71,7 +79,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { /* IDirectMusic8Impl IDirectMusic part: */ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_PORTCAPS port_caps) { - IDirectMusic8Impl *This = (IDirectMusic8Impl*)iface; + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); ULONG nb_midi_out; ULONG nb_midi_in; const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; @@ -155,7 +163,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER* ppBuffer, LPUNKNOWN pUnkOuter) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); TRACE("(%p, %p, %p, %p)\n", This, pBufferDesc, ppBuffer, pUnkOuter); @@ -170,7 +178,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); int i; DMUS_PORTCAPS PortCaps; IDirectMusicPort* pNewPort = NULL; @@ -223,14 +231,18 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI return E_NOINTERFACE; } -static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock (LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - FIXME("(%p, %d, %p): stub\n", This, dwIndex, lpClockInfo); - return S_FALSE; +static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, index, clock_info); + + return S_FALSE; } -static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); TRACE("(%p, %p, %p)\n", This, pguidClock, ppReferenceClock); if (pguidClock) @@ -241,14 +253,18 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LP return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_SetMasterClock (LPDIRECTMUSIC8 iface, REFGUID rguidClock) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidClock)); - return S_OK; +static HRESULT WINAPI IDirectMusic8Impl_SetMasterClock(LPDIRECTMUSIC8 iface, REFGUID rguidClock) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + + FIXME("(%p)->(%s): stub\n", This, debugstr_dmguid(rguidClock)); + + return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static HRESULT WINAPI IDirectMusic8Impl_Activate(LPDIRECTMUSIC8 iface, BOOL fEnable) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); int i; FIXME("(%p, %d): stub\n", This, fEnable); @@ -259,8 +275,9 @@ static HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEn return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pguidPort) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; +static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPGUID pguidPort) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); HKEY hkGUID; DWORD returnTypeGUID, sizeOfReturnBuffer = 50; char returnBuffer[51]; @@ -283,16 +300,22 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LP return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - FIXME("(%p, %p, %p): stub\n", This, pDirectSound, hWnd); - return S_OK; +static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, dsound, wnd); + + return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - FIXME("(%p, %p): stub\n", This, pClock); - return S_OK; +static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock(LPDIRECTMUSIC8 iface, IReferenceClock* clock) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + + FIXME("(%p)->(%p): stub\n", This, clock); + + return S_OK; } static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { @@ -322,7 +345,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPU *ppobj = NULL; return E_OUTOFMEMORY; } - dmusic->lpVtbl = &DirectMusic8_Vtbl; + dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; dmusic->ref = 0; /* will be inited with QueryInterface */ dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 23d010d..896e207 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -91,14 +91,14 @@ extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* * IDirectMusic8Impl implementation structure */ struct IDirectMusic8Impl { - /* IUnknown fields */ - const IDirectMusic8Vtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusic8 IDirectMusic8_iface; + LONG ref; - /* IDirectMusicImpl fields */ - IReferenceClockImpl* pMasterClock; - IDirectMusicPort** ppPorts; - int nrofports; + /* IDirectMusicImpl fields */ + IReferenceClockImpl* pMasterClock; + IDirectMusicPort** ppPorts; + int nrofports; }; /*****************************************************************************

1 0

Christian Costa : dmusic: Implement IDirectMusic8Impl_EnumMasterClock.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 5ae038b2e80dd057534d41fe81c56392b3fa76dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae038b2e80dd057534d41fe8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:07:09 2012 +0200 dmusic: Implement IDirectMusic8Impl_EnumMasterClock. --- dlls/dmusic/dmusic.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index f4b6c8c..28c8d35 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -233,11 +233,34 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + TRACE("(%p)->(%d, %p)\n", iface, index, clock_info); - FIXME("(%p)->(%d, %p): stub\n", This, index, clock_info); + if (!clock_info) + return E_POINTER; - return S_FALSE; + if (index > 1) + return S_FALSE; + + if (!index) + { + static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; + static const WCHAR name_system_clock[] = { 'S','y','s','t','e','m',' ','C','l','o','c','k',0 }; + + clock_info->ctType = 0; + clock_info->guidClock = guid_system_clock; + strcpyW(clock_info->wszDescription, name_system_clock); + } + else + { + static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; + static const WCHAR name_dsound_clock[] = { 'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0 }; + + clock_info->ctType = 0; + clock_info->guidClock = guid_dsound_clock; + strcpyW(clock_info->wszDescription, name_dsound_clock); + } + + return S_OK; } static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock)

1 0

Christian Costa : dmusic: Check errors in IDirectMusic8Impl_Activate and remove FIXME.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 4c0f0281bd1d53461df43155032605cff5a5a01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0f0281bd1d53461df431550… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:07:23 2012 +0200 dmusic: Check errors in IDirectMusic8Impl_Activate and remove FIXME. --- dlls/dmusic/dmusic.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 28c8d35..1a00236 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -285,17 +285,22 @@ static HRESULT WINAPI IDirectMusic8Impl_SetMasterClock(LPDIRECTMUSIC8 iface, REF return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_Activate(LPDIRECTMUSIC8 iface, BOOL fEnable) +static HRESULT WINAPI IDirectMusic8Impl_Activate(LPDIRECTMUSIC8 iface, BOOL enable) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - int i; - - FIXME("(%p, %d): stub\n", This, fEnable); - for (i = 0; i < This->nrofports; i++) { - IDirectMusicPort_Activate(This->ppPorts[i], fEnable); - } - - return S_OK; + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + int i; + HRESULT hr; + + TRACE("(%p)->(%u)\n", This, enable); + + for (i = 0; i < This->nrofports; i++) + { + hr = IDirectMusicPort_Activate(This->ppPorts[i], enable); + if (FAILED(hr)) + return hr; + } + + return S_OK; } static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPGUID pguidPort)

1 0

Austin English : kernel32: Add a stub for FlushProcessWriteBuffers.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 80ef24b057374fa498b493ef66d55f9d52911caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ef24b057374fa498b493ef6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 1 15:26:24 2012 -0500 kernel32: Add a stub for FlushProcessWriteBuffers. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 10d6da5..9b786a9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -409,6 +409,7 @@ @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) +@ stdcall FlushProcessWriteBuffers() @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall FoldStringW(long wstr long ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 21f0817..dca8561 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3856,5 +3856,12 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) FIXME("(%p %p %p): stub\n", process, flags, permanent); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; +} +/********************************************************************** + * FlushProcessWriteBuffers (KERNEL32.@) + */ +VOID WINAPI FlushProcessWriteBuffers(void) +{ + FIXME(": stub\n"); }

1 0

Józef Kucia : ddraw: Correct wrong comment in ddraw.h.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: e0fab0d39ccd19ca5bc3499305b0927e6f350431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fab0d39ccd19ca5bc349930… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Wed May 2 15:06:34 2012 +0200 ddraw: Correct wrong comment in ddraw.h. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 5feddf4..1765b1e 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -885,7 +885,7 @@ typedef struct _DDPIXELFORMAT { #define DDOVER_OVERRIDEBOBWEAVE 0x00400000 #define DDOVER_INTERLEAVED 0x00800000 -/* DDCOLORKEY.dwFlags */ +/* DDPIXELFORMAT.dwFlags */ #define DDPF_ALPHAPIXELS 0x00000001 #define DDPF_ALPHA 0x00000002 #define DDPF_FOURCC 0x00000004

1 0

Jacek Caban : oleaut32: Use a struct for internal BSTR representation to avoid pointer magic.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 4eebe0bcf099c9b5a41104c531e6ef3d33045df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eebe0bcf099c9b5a41104c53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 2 16:24:57 2012 +0200 oleaut32: Use a struct for internal BSTR representation to avoid pointer magic. --- dlls/oleaut32/oleaut.c | 96 ++++++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 40 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index bb3bac6..b84fdc4 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -81,9 +81,18 @@ static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; typedef struct { + DWORD size; + union { + char ptr[1]; + WCHAR str[1]; + DWORD dwptr[1]; + } u; +} bstr_t; + +typedef struct { unsigned short head; unsigned short cnt; - DWORD *buf[6]; + bstr_t *buf[6]; } bstr_cache_entry_t; #define BUCKET_SIZE 16 @@ -92,28 +101,32 @@ static bstr_cache_entry_t bstr_cache[0x10000/BUCKET_SIZE]; static inline size_t bstr_alloc_size(size_t size) { - return (size+sizeof(DWORD)+BUCKET_SIZE) & ~(BUCKET_SIZE-1); + return (FIELD_OFFSET(bstr_t, u.ptr[size]) + sizeof(WCHAR) + BUCKET_SIZE-1) & ~(BUCKET_SIZE-1); +} + +static inline bstr_t *bstr_from_str(BSTR str) +{ + return CONTAINING_RECORD(str, bstr_t, u.str); } static inline bstr_cache_entry_t *get_cache_entry(size_t size) { - unsigned cache_idx = (size+sizeof(DWORD)-1)/BUCKET_SIZE; + unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size-1])/BUCKET_SIZE; return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) ? bstr_cache + cache_idx : NULL; } -static DWORD *alloc_bstr(size_t size) +static bstr_t *alloc_bstr(size_t size) { - bstr_cache_entry_t *cache_entry = get_cache_entry(size); + bstr_cache_entry_t *cache_entry = get_cache_entry(size+sizeof(WCHAR)); + bstr_t *ret; if(cache_entry) { - DWORD *ret = NULL; - EnterCriticalSection(&cs_bstr_cache); if(!cache_entry->cnt) { - cache_entry = get_cache_entry(size+BUCKET_SIZE); + cache_entry = get_cache_entry(size+sizeof(WCHAR)+BUCKET_SIZE); if(cache_entry && !cache_entry->cnt) cache_entry = NULL; } @@ -126,11 +139,16 @@ static DWORD *alloc_bstr(size_t size) LeaveCriticalSection(&cs_bstr_cache); - if(ret) + if(cache_entry) { + ret->size = size; return ret; + } } - return HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); + ret = HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); + if(ret) + ret->size = size; + return ret; } /****************************************************************************** @@ -152,7 +170,7 @@ static DWORD *alloc_bstr(size_t size) */ UINT WINAPI SysStringLen(BSTR str) { - return str ? *((DWORD*)str-1)/sizeof(WCHAR) : 0; + return str ? bstr_from_str(str)->size/sizeof(WCHAR) : 0; } /****************************************************************************** @@ -171,7 +189,7 @@ UINT WINAPI SysStringLen(BSTR str) */ UINT WINAPI SysStringByteLen(BSTR str) { - return str ? *((DWORD*)str-1) : 0; + return str ? bstr_from_str(str)->size : 0; } /****************************************************************************** @@ -218,19 +236,20 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) void WINAPI SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; - DWORD *ptr; + bstr_t *bstr; if(!str) return; - ptr = (DWORD*)str-1; - cache_entry = get_cache_entry(*ptr+sizeof(WCHAR)); + bstr = bstr_from_str(str); + cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); if(cache_entry) { EnterCriticalSection(&cs_bstr_cache); if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { - cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = ptr; + cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = bstr; cache_entry->cnt++; + LeaveCriticalSection(&cs_bstr_cache); return; } @@ -238,7 +257,7 @@ void WINAPI SysFreeString(BSTR str) LeaveCriticalSection(&cs_bstr_cache); } - HeapFree(GetProcessHeap(), 0, ptr); + HeapFree(GetProcessHeap(), 0, bstr); } /****************************************************************************** @@ -259,28 +278,28 @@ void WINAPI SysFreeString(BSTR str) */ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) { - DWORD size, *ptr; - BSTR ret; + bstr_t *bstr; + DWORD size; /* Detect integer overflow. */ if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) return NULL; + TRACE("%s\n", debugstr_wn(str, len)); + size = len*sizeof(WCHAR); - ptr = alloc_bstr(size + sizeof(WCHAR)); - if(!ptr) + bstr = alloc_bstr(size); + if(!bstr) return NULL; - *ptr = size; - ret = (BSTR)(ptr+1); if(str) { - memcpy(ret, str, size); - ret[len] = 0; + memcpy(bstr->u.str, str, size); + bstr->u.str[len] = 0; }else { - memset(ret, 0, size+sizeof(WCHAR)); + memset(bstr->u.str, 0, size+sizeof(WCHAR)); } - return ret; + return bstr->u.str; } /****************************************************************************** @@ -310,9 +329,9 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen+sizeof(WCHAR))); - *old = (BSTR)(ptr+1); - *ptr = newbytelen; + bstr_t *bstr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen)); + *old = bstr->u.str; + bstr->size = newbytelen; /* Subtle hidden feature: The old string data is still there * when 'in' is NULL! * Some Microsoft program needs it. @@ -352,27 +371,24 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) */ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) { - DWORD *ptr; - char *ret; + bstr_t *bstr; /* Detect integer overflow. */ if (len >= (UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))) return NULL; - ptr = alloc_bstr(len + sizeof(WCHAR)); - if(!ptr) + bstr = alloc_bstr(len); + if(!bstr) return NULL; - *ptr = len; - ret = (char*)(ptr+1); if(str) { - memcpy(ret, str, len); - ret[len] = ret[len+1] = 0; + memcpy(bstr->u.ptr, str, len); + bstr->u.ptr[len] = bstr->u.ptr[len+1] = 0; }else { - memset(ret, 0, len+sizeof(WCHAR)); + memset(bstr->u.ptr, 0, len+sizeof(WCHAR)); } - return (BSTR)ret; + return bstr->u.str; } /******************************************************************************

1 0

Jacek Caban : oleaut32: Added warn+heap support for cached BSTRs.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 2217e42c9d351a250fb27550d2262218721ebac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2217e42c9d351a250fb27550d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 2 16:25:11 2012 +0200 oleaut32: Added warn+heap support for cached BSTRs. --- dlls/oleaut32/oleaut.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index b84fdc4..97d1b96 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DECLARE_DEBUG_CHANNEL(heap); /****************************************************************************** * BSTR {OLEAUT32} @@ -97,6 +98,10 @@ typedef struct { #define BUCKET_SIZE 16 +#define ARENA_INUSE_FILLER 0x55 +#define ARENA_TAIL_FILLER 0xab +#define ARENA_FREE_FILLER 0xfeeefeee + static bstr_cache_entry_t bstr_cache[0x10000/BUCKET_SIZE]; static inline size_t bstr_alloc_size(size_t size) @@ -140,6 +145,14 @@ static bstr_t *alloc_bstr(size_t size) LeaveCriticalSection(&cs_bstr_cache); if(cache_entry) { + if(WARN_ON(heap)) { + size_t tail; + + memset(ret, ARENA_INUSE_FILLER, FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)])); + tail = bstr_alloc_size(size) - FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)]); + if(tail) + memset(ret->u.ptr+size+sizeof(WCHAR), ARENA_TAIL_FILLER, tail); + } ret->size = size; return ret; } @@ -250,6 +263,13 @@ void WINAPI SysFreeString(BSTR str) cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = bstr; cache_entry->cnt++; + if(WARN_ON(heap)) { + unsigned i, n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + bstr->size = ARENA_FREE_FILLER; + for(i=0; i<n; i++) + bstr->u.dwptr[i] = ARENA_FREE_FILLER; + } + LeaveCriticalSection(&cs_bstr_cache); return; }

1 0

Jacek Caban : jscript: Properly test if double may be converted to int32.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 5b83abced78628763262fa10a2f82baa15260e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b83abced78628763262fa10a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 2 17:43:08 2012 +0200 jscript: Properly test if double may be converted to int32. --- dlls/jscript/jscript.h | 15 ++++++++++++++- dlls/jscript/regexp.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ad39b45..c9bd6c0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -405,6 +405,19 @@ static inline DOUBLE num_val(const VARIANT *v) return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); } +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif + +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif + +static inline BOOL is_int32(double d) +{ + return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; +} + static inline void num_set_int(VARIANT *v, INT i) { V_VT(v) = VT_I4; @@ -413,7 +426,7 @@ static inline void num_set_int(VARIANT *v, INT i) static inline void num_set_val(VARIANT *v, DOUBLE d) { - if(d == (DOUBLE)(INT)d) { + if(is_int32(d)) { V_VT(v) = VT_I4; V_I4(v) = d; }else { diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0cf1270..0f6b0e2 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3531,7 +3531,7 @@ static INT index_from_var(script_ctx_t *ctx, VARIANT *v) } n = floor(n); - return (double)(INT)n == n ? n : 0; + return is_int32(n) ? n : 0; } static HRESULT RegExp_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

André Hentschel : d3drm: Add IDirect3DRMLight interface.
by Alexandre Julliard 02 May '12

02 May '12

Module: wine Branch: master Commit: 107b3d2c19e9b4a4d24e86e3a0a5079f587750f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107b3d2c19e9b4a4d24e86e3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 22:15:39 2012 +0200 d3drm: Add IDirect3DRMLight interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 61 +++++--- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/light.c | 405 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 448 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=107b3d2c19e9b4a4d24e8…

1 0