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

Christian Costa : amstream: Add stubbed implementation of AudioStreamSample .
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 5c09a11e084aa90d10d3fc6da054775c7e73b3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c09a11e084aa90d10d3fc6da… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 07:58:14 2012 +0200 amstream: Add stubbed implementation of AudioStreamSample. --- dlls/amstream/mediastream.c | 150 +++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 150 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 896d316..2aeaaa4 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); +static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); typedef struct { IDirectDrawMediaStream IDirectDrawMediaStream_iface; @@ -407,9 +408,12 @@ static HRESULT WINAPI IAudioMediaStreamImpl_CreateSample(IAudioMediaStream *ifac { IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p,%u,%p) stub!\n", iface, This, audio_data, flags, sample); + TRACE("(%p/%p)->(%p,%u,%p)\n", iface, This, audio_data, flags, sample); - return E_NOTIMPL; + if (!audio_data) + return E_POINTER; + + return audiostreamsample_create(iface, audio_data, sample); } static const struct IAudioMediaStreamVtbl AudioMediaStream_Vtbl = @@ -605,3 +609,145 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD return S_OK; } + +typedef struct { + IAudioStreamSample IAudioStreamSample_iface; + LONG ref; + IMediaStream *parent; + IAudioData *audio_data; +} IAudioStreamSampleImpl; + +static inline IAudioStreamSampleImpl *impl_from_IAudioStreamSample(IAudioStreamSample *iface) +{ + return CONTAINING_RECORD(iface, IAudioStreamSampleImpl, IAudioStreamSample_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_QueryInterface(IAudioStreamSample *iface, + REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IStreamSample) || + IsEqualGUID(riid, &IID_IAudioStreamSample)) + { + IAudioStreamSample_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + ERR("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioStreamSampleImpl_AddRef(IAudioStreamSample *iface) +{ + IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) +{ + IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IStreamSample methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) +{ + FIXME("(%p)->(%p): stub\n", iface, media_stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, + STREAM_TIME *end_time, STREAM_TIME *current_time) +{ + FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, + const STREAM_TIME *end_time) +{ + FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_Update(IAudioStreamSample *iface, DWORD flags, HANDLE event, + PAPCFUNC func_APC, DWORD APC_data) +{ + FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_CompletionStatus(IAudioStreamSample *iface, DWORD flags, DWORD milliseconds) +{ + FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); + + return E_NOTIMPL; +} + +/*** IAudioStreamSample methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_GetAudioData(IAudioStreamSample *iface, IAudioData **audio_data) +{ + FIXME("(%p)->(%p): stub\n", iface, audio_data); + + return E_NOTIMPL; +} + +static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioStreamSampleImpl_QueryInterface, + IAudioStreamSampleImpl_AddRef, + IAudioStreamSampleImpl_Release, + /*** IStreamSample methods ***/ + IAudioStreamSampleImpl_GetMediaStream, + IAudioStreamSampleImpl_GetSampleTimes, + IAudioStreamSampleImpl_SetSampleTimes, + IAudioStreamSampleImpl_Update, + IAudioStreamSampleImpl_CompletionStatus, + /*** IAudioStreamSample methods ***/ + IAudioStreamSampleImpl_GetAudioData +}; + +static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) +{ + IAudioStreamSampleImpl *object; + + TRACE("(%p)\n", audio_stream_sample); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioStreamSampleImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; + object->ref = 1; + object->parent = (IMediaStream*)parent; + object->audio_data = audio_data; + + *audio_stream_sample = (IAudioStreamSample*)&object->IAudioStreamSample_iface; + + return S_OK; +} diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6d4b601..f613c8c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -337,9 +337,9 @@ static void test_media_streams(void) ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); - todo_wine ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); - todo_wine ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); if (audio_data) IAudioData_Release(audio_data);

1 0

Nikolay Sivov : msxml3: Support disabled escaping mode for characters() callback.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 622c94acad8fdfeabf8dd2c1957fcfd59fe3f45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=622c94acad8fdfeabf8dd2c19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 20:22:27 2012 +0400 msxml3: Support disabled escaping mode for characters() callback. --- dlls/msxml3/mxwriter.c | 2 +- dlls/msxml3/tests/saxreader.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 779ca7a..c512d5c 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1109,7 +1109,7 @@ static HRESULT WINAPI SAXContentHandler_characters( if (nchars) { - if (This->cdata) + if (This->cdata || This->props[MXWriter_DisableEscaping] == VARIANT_TRUE) write_output_buffer(This->buffer, chars, nchars); else { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 340bdd0..04a0648 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3248,6 +3248,7 @@ static void test_mxwriter_characters(void) { ISAXContentHandler *content; IMXWriter *writer; + VARIANT dest; HRESULT hr; if (!is_clsid_supported(table->clsid, mxwriter_support_data)) @@ -3276,17 +3277,41 @@ static void test_mxwriter_characters(void) /* test output */ if (hr == S_OK) { - VARIANT dest; - V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), - "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + "test %d: got wrong content %s, expected \"%s\"\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + /* with disabled escaping */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_disableOutputEscaping(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, _bstr_(table->data), strlen(table->data)); + EXPECT_HR(hr, S_OK); + + /* test output */ + if (hr == S_OK) + { + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->data), V_BSTR(&dest)), + "test %d: got wrong content %s, expected \"%s\"\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->data); VariantClear(&dest); } + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + table++; i++; }

1 0

Aric Stewart : strmbase: Track internal window styles in baseWindow. WindowStyles.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: f38318705c4d234de95c4676799e52c8757a93eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38318705c4d234de95c46767… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 26 11:29:09 2012 -0500 strmbase: Track internal window styles in baseWindow.WindowStyles. --- dlls/quartz/videorenderer.c | 5 ++--- dlls/strmbase/window.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 96f9815..87f3ea9 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -72,7 +72,6 @@ typedef struct VideoRendererImpl IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; - LONG WindowStyle; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -982,7 +981,7 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); if (FullScreenMode) { - This->WindowStyle = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); + This->baseControlWindow.baseWindow.WindowStyles = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, 0); SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, WS_POPUP); @@ -992,7 +991,7 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, } else { ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, This->baseControlWindow.hwndOwner); - SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->WindowStyle); + SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->baseControlWindow.baseWindow.WindowStyles); GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->DestRect); SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index ffb0425..cb448e3 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -300,6 +300,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + This->baseWindow.WindowStyles = WindowStyle; return S_OK; } @@ -310,7 +311,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_WindowStyle(IVideoWindow *iface, LONG * TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyle); - *WindowStyle = GetWindowLongW(This->baseWindow.hWnd, GWL_STYLE); + *WindowStyle = This->baseWindow.WindowStyles; return S_OK; } @@ -534,6 +535,15 @@ HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND Owner This->hwndOwner = (HWND)Owner; SetParent(This->baseWindow.hWnd, This->hwndOwner); + if (This->baseWindow.WindowStyles & WS_CHILD) + { + LONG old = GetWindowLongW(This->baseWindow.hWnd, GWL_STYLE); + if (old != This->baseWindow.WindowStyles) + { + SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, This->baseWindow.WindowStyles); + SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + } + } return S_OK; }

1 0

Christian Costa : amstream: Add stubbed implementation of DirectDrawStreamSample.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 60a8a27b2bf7f11bc9e03057abf2bff23d513248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a8a27b2bf7f11bc9e03057a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 07:58:05 2012 +0200 amstream: Add stubbed implementation of DirectDrawStreamSample. --- dlls/amstream/mediastream.c | 155 +++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index afebdcd..896d316 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); + typedef struct { IDirectDrawMediaStream IDirectDrawMediaStream_iface; LONG ref; @@ -194,9 +196,9 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaSt IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags, IDirectDrawStreamSample **ppSample) { - FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample); + TRACE("(%p)->(%p,%p,%x,%p)\n", iface, pSurface, pRect, dwFlags, ppSample); - return E_NOTIMPL; + return ddrawstreamsample_create(iface, ppSample); } static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -454,3 +456,152 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ return S_OK; } + +typedef struct { + IDirectDrawStreamSample IDirectDrawStreamSample_iface; + LONG ref; + IMediaStream *parent; +} IDirectDrawStreamSampleImpl; + +static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawStreamSampleImpl, IDirectDrawStreamSample_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStreamSample *iface, + REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IStreamSample) || + IsEqualGUID(riid, &IID_IDirectDrawStreamSample)) + { + IDirectDrawStreamSample_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + ERR("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirectDrawStreamSampleImpl_AddRef(IDirectDrawStreamSample *iface) +{ + IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample *iface) +{ + IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IStreamSample methods ***/ +static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) +{ + FIXME("(%p)->(%p): stub\n", iface, media_stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, + STREAM_TIME *end_time, STREAM_TIME *current_time) +{ + FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, + const STREAM_TIME *end_time) +{ + FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, + PAPCFUNC func_APC, DWORD APC_data) +{ + FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) +{ + FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); + + return E_NOTIMPL; +} + +/*** IDirectDrawStreamSample methods ***/ +static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, + RECT *rect) +{ + FIXME("(%p)->(%p,%p): stub\n", iface, ddraw_surface, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) +{ + FIXME("(%p)->(%p): stub\n", iface, rect); + + return E_NOTIMPL; +} + +static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = +{ + /*** IUnknown methods ***/ + IDirectDrawStreamSampleImpl_QueryInterface, + IDirectDrawStreamSampleImpl_AddRef, + IDirectDrawStreamSampleImpl_Release, + /*** IStreamSample methods ***/ + IDirectDrawStreamSampleImpl_GetMediaStream, + IDirectDrawStreamSampleImpl_GetSampleTimes, + IDirectDrawStreamSampleImpl_SetSampleTimes, + IDirectDrawStreamSampleImpl_Update, + IDirectDrawStreamSampleImpl_CompletionStatus, + /*** IDirectDrawStreamSample methods ***/ + IDirectDrawStreamSampleImpl_GetSurface, + IDirectDrawStreamSampleImpl_SetRect +}; + +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample) +{ + IDirectDrawStreamSampleImpl *object; + + TRACE("(%p)\n", ddraw_stream_sample); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawStreamSampleImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; + object->ref = 1; + object->parent = (IMediaStream*)parent; + + *ddraw_stream_sample = (IDirectDrawStreamSample*)&object->IDirectDrawStreamSample_iface; + + return S_OK; +} diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 14c3e42..6d4b601 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -151,7 +151,7 @@ static void test_renderfile(void) if (FAILED(hr)) goto error; hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); - todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); error: if (pddsample) @@ -249,7 +249,7 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); - todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); } if (ddraw_sample)

1 0

Piotr Caban : kernel32: Added IdnToNameprepUnicode implementation.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: a08710f3d042ecc950723c8bdbd4b34b71dbbe9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08710f3d042ecc950723c8bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:10:53 2012 +0200 kernel32: Added IdnToNameprepUnicode implementation. --- dlls/kernel32/locale.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 20451ff..02a351c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -172,6 +172,10 @@ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) if (n) *dst = 0; } +static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) +{ + return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; +} /*********************************************************************** * get_lcid_codepage @@ -3895,10 +3899,174 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, LPWSTR lpNameprepCharStr, INT cchNameprepChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + enum { + UNASSIGNED = 0x1, + PROHIBITED = 0x2, + BIDI_RAL = 0x4, + BIDI_L = 0x8 + }; + + extern const unsigned short nameprep_char_type[]; + extern const WCHAR nameprep_mapping[]; + const WCHAR *ptr; + WORD flags; + WCHAR *map_str, *norm_str, ch; + DWORD i, map_len, norm_len, mask; + BOOL have_bidi_ral = FALSE, prohibit_bidi_ral = FALSE, ascii_only = TRUE; + + TRACE("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, lpNameprepCharStr, cchNameprepChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + if(dwFlags & ~(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES)) { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if(!lpUnicodeCharStr || cchUnicodeChar<-1) { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if(cchUnicodeChar == -1) + cchUnicodeChar = strlenW(lpUnicodeCharStr)+1; + if(!cchUnicodeChar || (cchUnicodeChar==1 && lpUnicodeCharStr[0]==0)) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + if(ch > 0x8f) { + ascii_only = FALSE; + continue; + } + + if(i==cchUnicodeChar-1 && !ch) + continue; + if(!ch) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) == 0) + continue; + if((ch>='a' && ch<='z') || (ch>='A' && ch<='Z') + || (ch>='0' && ch<='9') || ch=='-') + continue; + + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && + (lpUnicodeCharStr[0]=='-' || lpUnicodeCharStr[cchUnicodeChar-1]=='-' || + (cchUnicodeChar>1 && lpUnicodeCharStr[cchUnicodeChar-1]==0 && + lpUnicodeCharStr[cchUnicodeChar-2]=='-'))) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(ascii_only) { + if(!lpNameprepCharStr) + return cchUnicodeChar; + if(cchNameprepChar < cchUnicodeChar) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + memcpy(lpNameprepCharStr, lpUnicodeCharStr, cchUnicodeChar*sizeof(WCHAR)); + return cchUnicodeChar; + } + + map_len = 0; + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + ptr = nameprep_mapping + nameprep_mapping[ch>>8]; + ptr = nameprep_mapping + ptr[(ch>>4)&0x0f] + 3*(ch&0x0f); + + if(!ptr[0]) map_len++; + else if(!ptr[1]) map_len++; + else if(!ptr[2]) map_len += 2; + else if(ptr[0]!=0xffff || ptr[1]!=0xffff || ptr[2]!=0xffff) map_len += 3; + } + map_str = HeapAlloc(GetProcessHeap(), 0, map_len*sizeof(WCHAR)); + if(!map_str) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + map_len = 0; + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + ptr = nameprep_mapping + nameprep_mapping[ch>>8]; + ptr = nameprep_mapping + ptr[(ch>>4)&0x0f] + 3*(ch&0x0f); + + if(!ptr[0]) { + map_str[map_len++] = ch; + }else if(!ptr[1]) { + map_str[map_len++] = ptr[0]; + }else if(!ptr[2]) { + map_str[map_len++] = ptr[0]; + map_str[map_len++] = ptr[1]; + }else if(ptr[0]!=0xffff || ptr[1]!=0xffff || ptr[2]!=0xffff) { + map_str[map_len++] = ptr[0]; + map_str[map_len++] = ptr[1]; + map_str[map_len++] = ptr[2]; + } + } + + norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, lpNameprepCharStr, cchNameprepChar); + if(lpNameprepCharStr) { + norm_str = lpNameprepCharStr; + }else { + norm_str = HeapAlloc(GetProcessHeap(), 0, norm_len*sizeof(WCHAR)); + if(!norm_str) { + HeapFree(GetProcessHeap(), 0, map_str); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + FoldStringW(MAP_FOLDCZONE, map_str, map_len, norm_str, norm_len); + } + HeapFree(GetProcessHeap(), 0, map_str); + + mask = PROHIBITED; + if((dwFlags&IDN_ALLOW_UNASSIGNED) == 0) + mask |= UNASSIGNED; + for(i=0; i<norm_len; i++) { + ch = norm_str[i]; + flags = get_table_entry( nameprep_char_type, ch ); + + if(flags & mask) { + if(norm_str != lpNameprepCharStr) + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError((flags & PROHIBITED) ? ERROR_INVALID_NAME : ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + if(flags & BIDI_RAL) + have_bidi_ral = TRUE; + if(flags & BIDI_L) + prohibit_bidi_ral = TRUE; + } + + if(have_bidi_ral) { + ch = norm_str[0]; + flags = get_table_entry( nameprep_char_type, ch ); + if((flags & BIDI_RAL) == 0) + prohibit_bidi_ral = TRUE; + + ch = norm_str[norm_len-1]; + flags = get_table_entry( nameprep_char_type, ch ); + if((flags & BIDI_RAL) == 0) + prohibit_bidi_ral = TRUE; + } + + if(norm_str != lpNameprepCharStr) + HeapFree(GetProcessHeap(), 0, norm_str); + + if(have_bidi_ral && prohibit_bidi_ral) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + return norm_len; } /******************************************************************************

1 0

Jacek Caban : jscript: Get rid of parser function collecting hack by moving the logic to compiler .
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: ca15adfde6a0c9acf3c45fa2aa9ce0825ff8cb99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca15adfde6a0c9acf3c45fa2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 26 16:17:31 2012 +0200 jscript: Get rid of parser function collecting hack by moving the logic to compiler. --- dlls/jscript/compile.c | 12 +++++++++--- dlls/jscript/engine.h | 23 ++++------------------- dlls/jscript/parser.y | 46 +++------------------------------------------- 3 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c903651..df3acb4 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -56,6 +56,9 @@ typedef struct { variable_declaration_t *var_head; variable_declaration_t *var_tail; + + function_expression_t *func_head; + function_expression_t *func_tail; } compiler_ctx_t; static const struct { @@ -815,6 +818,8 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { + ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); + /* FIXME: not exactly right */ if(expr->identifier) { ctx->func->func_cnt++; @@ -1787,13 +1792,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval, function_code_t *func) { variable_declaration_t *var_iter; - function_declaration_t *iter; + function_expression_t *iter; unsigned off, i; HRESULT hres; TRACE("\n"); ctx->var_head = ctx->var_tail = NULL; + ctx->func_head = ctx->func_tail = NULL; off = ctx->code_off; ctx->func = func; @@ -1856,8 +1862,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; memset(func->funcs, 0, func->func_cnt * sizeof(*func->funcs)); - for(iter = source->functions, i=0; iter; iter = iter->next, i++) { - hres = compile_function(ctx, iter->expr->source_elements, iter->expr, FALSE, func->funcs+i); + for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { + hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6a318c7..a842a35 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -17,23 +17,9 @@ */ typedef struct _source_elements_t source_elements_t; -typedef struct _function_expression_t function_expression_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _function_declaration_t { - function_expression_t *expr; - - struct _function_declaration_t *next; -} function_declaration_t; - -typedef struct _func_stack { - function_declaration_t *func_head; - function_declaration_t *func_tail; - - struct _func_stack *next; -} func_stack_t; - typedef struct { const WCHAR *begin; const WCHAR *end; @@ -47,8 +33,6 @@ typedef struct { HRESULT hres; jsheap_t heap; - - func_stack_t *func_stack; } parser_ctx_t; #define OP_LIST \ @@ -497,17 +481,18 @@ typedef struct _parameter_t { struct _source_elements_t { statement_t *statement; statement_t *statement_tail; - function_declaration_t *functions; }; -struct _function_expression_t { +typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; parameter_t *parameter_list; source_elements_t *source_elements; const WCHAR *src_str; DWORD src_len; -}; + + struct _function_expression_t *next; /* for compiler */ +} function_expression_t; typedef struct { expression_t expr; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index c5984b2..d108ab0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -29,7 +29,6 @@ static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); -static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); typedef struct _statement_list_t { statement_t *head; @@ -117,12 +116,6 @@ typedef struct _parameter_list_t { static parameter_list_t *new_parameter_list(parser_ctx_t*,const WCHAR*); static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,const WCHAR*); -static void push_func(parser_ctx_t*); -static inline void pop_func(parser_ctx_t *ctx) -{ - ctx->func_stack = ctx->func_stack->next; -} - static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, source_elements_t*,const WCHAR*,DWORD); @@ -271,11 +264,11 @@ FunctionExpression { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction - : kFUNCTION { push_func(ctx); $$ = $1; } + : kFUNCTION { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FunctionBody - : SourceElements { $$ = function_body_parsed(ctx, $1); } + : SourceElements { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FormalParameterList @@ -1307,23 +1300,13 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); - function_declaration_t *decl; ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; ret->source_elements = source_elements; ret->src_str = src_str; ret->src_len = src_len; - - decl = parser_alloc(ctx, sizeof(function_declaration_t)); - - decl->expr = ret; - decl->next = NULL; - - if(ctx->func_stack->func_tail) - ctx->func_stack->func_tail = ctx->func_stack->func_tail->next = decl; - else - ctx->func_stack->func_head = ctx->func_stack->func_tail = decl; + ret->next = NULL; return &ret->expr; } @@ -1490,29 +1473,8 @@ static statement_list_t *statement_list_add(statement_list_t *list, statement_t return list; } -static void push_func(parser_ctx_t *ctx) -{ - func_stack_t *new_func = parser_alloc_tmp(ctx, sizeof(func_stack_t)); - - new_func->func_head = new_func->func_tail = NULL; - - new_func->next = ctx->func_stack; - ctx->func_stack = new_func; -} - -static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_elements_t *source) -{ - source->functions = ctx->func_stack->func_head; - pop_func(ctx); - - return source; -} - static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) { - source->functions = ctx->func_stack->func_head; - pop_func(ctx); - ctx->source = source; if(!ctx->lexer_error) ctx->hres = S_OK; @@ -1550,8 +1512,6 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite mark = jsheap_mark(&ctx->tmp_heap); jsheap_init(&parser_ctx->heap); - push_func(parser_ctx); - parser_parse(parser_ctx); jsheap_clear(mark); hres = parser_ctx->hres;

1 0

Hans Leidekker : fusion: Implement IAssemblyCache::UninstallAssembly.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 25ba5c8b593e5763407a036d614d980a82d1ce9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ba5c8b593e5763407a036d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:57 2012 +0200 fusion: Implement IAssemblyCache::UninstallAssembly. --- dlls/fusion/asmcache.c | 71 ++++++++++++++++++++++++++++++++++++++++- dlls/fusion/tests/asmcache.c | 46 +++++++++------------------ 2 files changed, 84 insertions(+), 33 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index fe4e12a..d0b45c7 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -183,10 +183,77 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface LPCFUSION_INSTALL_REFERENCE pRefData, ULONG *pulDisposition) { - FIXME("(%p, %d, %s, %p, %p) stub!\n", iface, dwFlags, + HRESULT hr; + IAssemblyName *asmname, *next = NULL; + IAssemblyEnum *asmenum = NULL; + WCHAR *p, *path = NULL; + ULONG disp; + DWORD len; + + TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition); - return E_NOTIMPL; + if (pRefData) + { + FIXME("application reference not supported\n"); + return E_NOTIMPL; + } + hr = CreateAssemblyNameObject( &asmname, pszAssemblyName, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) + return hr; + + hr = CreateAssemblyEnum( &asmenum, NULL, asmname, ASM_CACHE_GAC, NULL ); + if (FAILED( hr )) + goto done; + + hr = IAssemblyEnum_GetNextAssembly( asmenum, NULL, &next, 0 ); + if (hr == S_FALSE) + { + if (pulDisposition) + *pulDisposition = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + goto done; + } + hr = IAssemblyName_GetPath( next, NULL, &len ); + if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + goto done; + + if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IAssemblyName_GetPath( next, path, &len ); + if (FAILED( hr )) + goto done; + + if (DeleteFileW( path )) + { + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + } + } + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED; + hr = S_OK; + } + else + { + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + hr = S_FALSE; + } + if (pulDisposition) *pulDisposition = disp; + +done: + IAssemblyName_Release( asmname ); + if (next) IAssemblyName_Release( next ); + if (asmenum) IAssemblyEnum_Release( asmenum ); + HeapFree( GetProcessHeap(), 0, path ); + return hr; } static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface, diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 3910488..141e442 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -888,7 +888,6 @@ static void test_InstallAssembly(void) ULONG disp; DWORD attr; char dllpath[MAX_PATH]; - UINT size; static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -942,7 +941,7 @@ static void test_InstallAssembly(void) hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - size = GetWindowsDirectoryA(dllpath, MAX_PATH); + GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); attr = GetFileAttributes(dllpath); @@ -951,19 +950,18 @@ static void test_InstallAssembly(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + attr = GetFileAttributes(dllpath); + ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); + + disp = 0xf00dbad; + hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll"); @@ -987,8 +985,6 @@ static void test_QueryAssemblyInfo(void) HRESULT hr; DWORD size; ULONG disp; - char dllpath[MAX_PATH]; - UINT len; static const WCHAR empty[] = {0}; static const WCHAR commasep[] = {',',' ',0}; @@ -1503,21 +1499,9 @@ static void test_QueryAssemblyInfo(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } - - /* FIXME: remove once UninstallAssembly is implemented */ - len = GetWindowsDirectoryA(dllpath, MAX_PATH); - strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - DeleteFileA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

Henri Verbeet : ddraw: Get rid of IClassFactoryImpl.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 9fd2d34d6887aef5e7f9d2b3b87a0f78780cbdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd2d34d6887aef5e7f9d2b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:21 2012 +0200 ddraw: Get rid of IClassFactoryImpl. --- dlls/ddraw/main.c | 65 ++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 400bb30..db79184 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -511,21 +511,17 @@ static const struct object_creation_info object_creation[] = { &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper } }; - -/****************************************************************************** - * DirectDraw ClassFactory implementation - ******************************************************************************/ -typedef struct +struct ddraw_class_factory { IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct ddraw_class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct ddraw_class_factory, IClassFactory_iface); } /******************************************************************************* @@ -542,16 +538,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) * Failure: E_NOINTERFACE * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, - void **obj) +static HRESULT WINAPI ddraw_class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = iface; + *out = iface; return S_OK; } @@ -569,12 +564,12 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory * * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); - TRACE("%p increasing refcount to %u.\n", This, ref); + TRACE("%p increasing refcount to %u.\n", factory, ref); return ref; } @@ -589,15 +584,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); - TRACE("%p decreasing refcount to %u.\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", factory, ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + HeapFree(GetProcessHeap(), 0, factory); return ref; } @@ -615,15 +610,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * ??? * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, REFIID riid, void **obj) +static HRESULT WINAPI ddraw_class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer_unknown, REFIID riid, void **out) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); - TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n", - iface, UnkOuter, debugstr_guid(riid), obj); + TRACE("iface %p, outer_unknown %p, riid %s, out %p.\n", + iface, outer_unknown, debugstr_guid(riid), out); - return This->pfnCreateInstance(UnkOuter, riid, obj); + return factory->pfnCreateInstance(outer_unknown, riid, out); } /******************************************************************************* @@ -638,7 +633,7 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory * * S_OK, because it's a stub * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI ddraw_class_factory_LockServer(IClassFactory *iface, BOOL dolock) { FIXME("iface %p, dolock %#x stub!\n", iface, dolock); @@ -650,11 +645,11 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *ifac *******************************************************************************/ static const IClassFactoryVtbl IClassFactory_Vtbl = { - IDirectDrawClassFactoryImpl_QueryInterface, - IDirectDrawClassFactoryImpl_AddRef, - IDirectDrawClassFactoryImpl_Release, - IDirectDrawClassFactoryImpl_CreateInstance, - IDirectDrawClassFactoryImpl_LockServer + ddraw_class_factory_QueryInterface, + ddraw_class_factory_AddRef, + ddraw_class_factory_Release, + ddraw_class_factory_CreateInstance, + ddraw_class_factory_LockServer }; /******************************************************************************* @@ -676,8 +671,8 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + struct ddraw_class_factory *factory; unsigned int i; - IClassFactoryImpl *factory; TRACE("rclsid %s, riid %s, object %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Henri Verbeet : wined3d: Move the resource bind_count field up to wined3d_resource.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: de43de510ac9042970f16591b6a30e8f8c7bd43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de43de510ac9042970f16591b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:22 2012 +0200 wined3d: Move the resource bind_count field up to wined3d_resource. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 495fe2f..e4f3668 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -767,7 +767,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->bind_count > 0) + if (device->isInDraw && buffer->resource.bind_count > 0) { decl_changed = buffer_find_decl(buffer); buffer->flags |= WINED3D_BUFFER_HASDESC; @@ -836,7 +836,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) FIXME("Too many full buffer conversions, stopping converting.\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); return; } @@ -1063,7 +1063,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("Dynamic buffer, dropping VBO\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ad30afa..e477021 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,12 +1696,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } @@ -2328,12 +2328,12 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, device_invalidate_state(device, STATE_INDEXBUFFER); if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } } @@ -3669,7 +3669,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (texture) { - LONG bind_count = InterlockedIncrement(&texture->bind_count); + LONG bind_count = InterlockedIncrement(&texture->resource.bind_count); wined3d_texture_incref(texture); @@ -3691,7 +3691,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (prev) { - LONG bind_count = InterlockedDecrement(&prev->bind_count); + LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); wined3d_texture_decref(prev); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cc7edb0..94589ae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -502,7 +502,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) texture->texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; texture->texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - if (texture->bind_count) + if (texture->resource.bind_count) device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); } @@ -1056,7 +1056,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); - if (texture->bind_count > 0) + if (texture->resource.bind_count > 0) { BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; BOOL sampler_srgb = texture_srgb_mode(texture, srgb); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0a110f8..92b259e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1837,6 +1837,7 @@ struct wined3d_resource_ops struct wined3d_resource { LONG ref; + LONG bind_count; struct wined3d_device *device; enum wined3d_resource_type type; const struct wined3d_format *format; @@ -1929,7 +1930,6 @@ struct wined3d_texture float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; - LONG bind_count; DWORD sampler; DWORD flags; const struct min_lookup *min_mip_lookup; @@ -2408,7 +2408,6 @@ struct wined3d_buffer GLenum buffer_object_usage; GLenum buffer_type_hint; UINT buffer_object_size; - LONG bind_count; DWORD flags; LONG lock_count;

1 0

Hans Leidekker : msi: Don't free cached tables in MsiDatabaseCommit.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: fde66de6a5c86db4daee1b5c11052288af21d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde66de6a5c86db4daee1b5c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:31 2012 +0200 msi: Don't free cached tables in MsiDatabaseCommit. --- dlls/msi/table.c | 3 -- dlls/msi/tests/package.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 54743bd..dd25fbb 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2195,9 +2195,6 @@ UINT MSI_CommitTables( MSIDATABASE *db ) } } - /* force everything to reload next time */ - free_cached_tables( db ); - hr = IStorage_Commit( db->storage, 0 ); if (FAILED( hr )) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fc77c03..8cf8f27 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8746,6 +8746,52 @@ error: DeleteFileA( msifile ); } +static void test_MsiDatabaseCommit(void) +{ + UINT r; + MSIHANDLE hdb, hpkg = 0; + char buf[32], package[12]; + DWORD sz; + + hdb = create_package_db(); + ok( hdb, "failed to create database\n" ); + + r = create_property_table( hdb ); + ok( r == ERROR_SUCCESS, "can't create Property table %u\n", r ); + + sprintf( package, "#%u", hdb ); + r = MsiOpenPackage( package, &hpkg ); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + r = MsiSetPropertyA( hpkg, "PROP", "value" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "MsiDatabaseCommit returned %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + MsiCloseHandle( hpkg ); +error: + MsiCloseHandle( hdb ); + DeleteFileA( msifile ); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -8802,6 +8848,7 @@ START_TEST(package) test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); test_MsiEnumComponentCosts(); + test_MsiDatabaseCommit(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0