March 2015 - Wine-Commits - list.winehq.org

Jacek Caban : wmvcore: Added IWMWriterAdvanced3 stub implementation.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 63dd502c3a9b476e576ebefd97b532df99c0a8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=63dd502c3a9b476e576ebefd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 16:12:15 2015 +0100 wmvcore: Added IWMWriterAdvanced3 stub implementation. --- dlls/wmvcore/writer.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 3629d4d..f570148 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); typedef struct { IWMWriter IWMWriter_iface; + IWMWriterAdvanced3 IWMWriterAdvanced3_iface; LONG ref; } WMWriter; @@ -43,6 +44,15 @@ static HRESULT WINAPI WMWriter_QueryInterface(IWMWriter *iface, REFIID riid, voi }else if(IsEqualGUID(&IID_IWMWriter, riid)) { TRACE("(%p)->(IID_IWMWriter %p)\n", This, ppv); *ppv = &This->IWMWriter_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced2, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced2 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced3, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced3 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -188,6 +198,160 @@ static const IWMWriterVtbl WMWriterVtbl = { WMWriter_Flush }; +static inline WMWriter *impl_from_IWMWriterAdvanced3(IWMWriterAdvanced3 *iface) +{ + return CONTAINING_RECORD(iface, WMWriter, IWMWriterAdvanced3_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_QueryInterface(IWMWriterAdvanced3 *iface, REFIID riid, void **ppv) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_QueryInterface(&This->IWMWriter_iface, riid, ppv); +} + +static ULONG WINAPI WMWriterAdvanced_AddRef(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_AddRef(&This->IWMWriter_iface); +} + +static ULONG WINAPI WMWriterAdvanced_Release(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_Release(&This->IWMWriter_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, DWORD *sinks) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sinks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_AddSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_RemoveSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *iface, WORD stream_num, + QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetLiveSource(IWMWriterAdvanced3 *iface, BOOL is_live_source) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%x)\n", This, is_live_source); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_IsRealTime(IWMWriterAdvanced3 *iface, BOOL *real_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, real_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetWriterTime(IWMWriterAdvanced3 *iface, QWORD *current_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, current_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, WORD stream_num, WM_WRITER_STATISTICS *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD *window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_GetStatisticsEx(IWMWriterAdvanced3 *iface, WORD stream_num, + WM_WRITER_STATISTICS_EX *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_SetNonBlocking(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMWriterAdvanced3Vtbl WMWriterAdvanced3Vtbl = { + WMWriterAdvanced_QueryInterface, + WMWriterAdvanced_AddRef, + WMWriterAdvanced_Release, + WMWriterAdvanced_GetSinkCount, + WMWriterAdvanced_GetSink, + WMWriterAdvanced_AddSink, + WMWriterAdvanced_RemoveSink, + WMWriterAdvanced_WriteStreamSample, + WMWriterAdvanced_SetLiveSource, + WMWriterAdvanced_IsRealTime, + WMWriterAdvanced_GetWriterTime, + WMWriterAdvanced_GetStatistics, + WMWriterAdvanced_SetSyncTolerance, + WMWriterAdvanced_GetSyncTolerance, + WMWriterAdvanced2_GetInputSetting, + WMWriterAdvanced2_SetInputSetting, + WMWriterAdvanced3_GetStatisticsEx, + WMWriterAdvanced3_SetNonBlocking +}; + HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) { WMWriter *ret; @@ -199,6 +363,7 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) return E_OUTOFMEMORY; ret->IWMWriter_iface.lpVtbl = &WMWriterVtbl; + ret->IWMWriterAdvanced3_iface.lpVtbl = &WMWriterAdvanced3Vtbl; ret->ref = 1; *writer = &ret->IWMWriter_iface;

1 0

Dmitry Timoshkov : shell32: Fix SHFileOperation(FO_MOVE) for a directory with subdirectories.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 5acb82fc2803d4bd623109e741bf2a6ee95017f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acb82fc2803d4bd623109e74… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 19 17:30:55 2015 +0800 shell32: Fix SHFileOperation(FO_MOVE) for a directory with subdirectories. --- dlls/shell32/shlfileop.c | 31 +------------------------------ dlls/shell32/tests/shlfileop.c | 1 - 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index e7e24e0..a8409f2 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1389,42 +1389,13 @@ static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) return ERROR_SUCCESS; } -static void move_dir_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) -{ - WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; - SHFILEOPSTRUCTW fileOp; - - static const WCHAR wildCardFiles[] = {'*','.','*',0}; - - if (IsDotDir(feFrom->szFilename)) - return; - - SHNotifyCreateDirectoryW(szDestPath, NULL); - - PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); - szFrom[lstrlenW(szFrom) + 1] = '\0'; - - lstrcpyW(szTo, szDestPath); - szTo[lstrlenW(szDestPath) + 1] = '\0'; - - fileOp = *lpFileOp; - fileOp.pFrom = szFrom; - fileOp.pTo = szTo; - - SHFileOperationW(&fileOp); -} - /* moves a file or directory to another directory */ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) { WCHAR szDestPath[MAX_PATH]; PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); - - if (IsAttribFile(feFrom->attributes)) - SHNotifyMoveFileW(feFrom->szFullPath, szDestPath); - else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) - move_dir_to_dir(lpFileOp, feFrom, szDestPath); + SHNotifyMoveFileW(feFrom->szFullPath, szDestPath); } /* the FO_MOVE operation */ diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index fa83adf..d33ad5b 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1860,7 +1860,6 @@ static void test_move(void) ok(file_exists("testdir2"), "dir should not be moved\n"); ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); -todo_wine ok(!file_exists("testdir2\\nested"), "dir should be moved\n"); ok(!file_exists("testdir2\\nested\\two.txt"), "file should be moved\n");

1 0

Jactry Zeng : riched20: Implement IOleInPlaceSite interface.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 6c425a169ac56ea32e5ed226d60aa6f6d4415818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c425a169ac56ea32e5ed226d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Mar 17 16:17:39 2015 +0800 riched20: Implement IOleInPlaceSite interface. --- dlls/riched20/richole.c | 131 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 54 +++++++++++++++++ 2 files changed, 185 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index db55e84..3818cfa 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -82,6 +82,7 @@ struct ITextSelectionImpl { struct IOleClientSiteImpl { IOleClientSite IOleClientSite_iface; IOleWindow IOleWindow_iface; + IOleInPlaceSite IOleInPlaceSite_iface; LONG ref; IRichEditOleImpl *reOle; @@ -228,6 +229,8 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) *ppvObj = me; else if (IsEqualGUID(riid, &IID_IOleWindow)) *ppvObj = &This->IOleWindow_iface; + else if (IsEqualGUID(riid, &IID_IOleInPlaceSite)) + *ppvObj = &This->IOleInPlaceSite_iface; if (*ppvObj) { IOleClientSite_AddRef(me); @@ -379,6 +382,133 @@ static const IOleWindowVtbl olewinvt = { IOleWindow_fnContextSensitiveHelp }; +/* IOleInPlaceSite interface */ +static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) +{ + return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceSite_iface); +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); +} + +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + return IOleWindow_GetWindow(&This->IOleWindow_iface, phwnd); +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + return IOleWindow_ContextSensitiveHelp(&This->IOleWindow_iface, fEnterMode); +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnCanInPlaceActivate(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnOnInPlaceActivate(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnOnUIActivate(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindowContext(IOleInPlaceSite *iface, IOleInPlaceFrame **ppFrame, + IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, + LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)->(%p %p %p %p %p\n)", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnScroll(IOleInPlaceSite *iface, SIZE scrollExtent) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnOnUIDeactivate(IOleInPlaceSite *iface, BOOL fUndoable) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)->(%d)\n", This, fUndoable); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnOnInPlaceDeactivate(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnDiscardUndoState(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnDeactivateAndUndo(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnOnPosRectChange(IOleInPlaceSite *iface, LPCRECT lprcPosRect) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + FIXME("not implemented: (%p)->(%p)\n", This, lprcPosRect); + return E_NOTIMPL; +} + +static const IOleInPlaceSiteVtbl olestvt = +{ + IOleInPlaceSite_fnQueryInterface, + IOleInPlaceSite_fnAddRef, + IOleInPlaceSite_fnRelease, + IOleInPlaceSite_fnGetWindow, + IOleInPlaceSite_fnContextSensitiveHelp, + IOleInPlaceSite_fnCanInPlaceActivate, + IOleInPlaceSite_fnOnInPlaceActivate, + IOleInPlaceSite_fnOnUIActivate, + IOleInPlaceSite_fnGetWindowContext, + IOleInPlaceSite_fnScroll, + IOleInPlaceSite_fnOnUIDeactivate, + IOleInPlaceSite_fnOnInPlaceDeactivate, + IOleInPlaceSite_fnDiscardUndoState, + IOleInPlaceSite_fnDeactivateAndUndo, + IOleInPlaceSite_fnOnPosRectChange +}; + static IOleClientSiteImpl * CreateOleClientSite(IRichEditOleImpl *reOle) { @@ -388,6 +518,7 @@ CreateOleClientSite(IRichEditOleImpl *reOle) clientSite->IOleClientSite_iface.lpVtbl = &ocst; clientSite->IOleWindow_iface.lpVtbl = &olewinvt; + clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; clientSite->reOle = reOle; return clientSite; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a89ee55..b4fbaa1 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -164,6 +164,10 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleWindow, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + punk = NULL; + hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle); @@ -956,6 +960,7 @@ static void test_IOleClientSite_QueryInterface(void) ITextDocument *txtDoc = NULL; IOleClientSite *clientSite = NULL, *clientSite1 = NULL, *clientSite2 = NULL; IOleWindow *oleWin = NULL, *oleWin1 = NULL; + IOleInPlaceSite *olePlace = NULL, *olePlace1 = NULL; HRESULT hres; LONG refcount1, refcount2; @@ -992,6 +997,26 @@ static void test_IOleClientSite_QueryInterface(void) ok(hres == S_OK, "IOleWindow_QueryInterface: 0x%08x\n", hres); ok(clientSite2 == clientSite1, "got wrong pointer\n"); + /* IOleInPlaceSite interface */ + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleInPlaceSite, (void **)&olePlace); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)olePlace); + refcount2 = get_refcount((IUnknown *)clientSite); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleInPlaceSite, (void **)&olePlace1); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + ok(olePlace == olePlace1, "Should not return a new pointer.\n"); + IOleInPlaceSite_Release(olePlace1); + + hres = IOleWindow_QueryInterface(oleWin, &IID_IOleInPlaceSite, (void **)&olePlace1); + ok(hres == S_OK, "IOleWindow_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)olePlace1); + refcount2 = get_refcount((IUnknown *)oleWin); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + IOleInPlaceSite_Release(olePlace1); + IOleInPlaceSite_Release(olePlace); IOleWindow_Release(oleWin1); IOleWindow_Release(oleWin); IOleClientSite_Release(clientSite2); @@ -1028,6 +1053,34 @@ static void test_IOleWindow_GetWindow(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_IOleInPlaceSite_GetWindow(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + IOleClientSite *clientSite = NULL; + IOleInPlaceSite *olePlace = NULL; + HRESULT hres; + HWND hwnd; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = IRichEditOle_GetClientSite(reOle, &clientSite); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleInPlaceSite, (void **)&olePlace); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + hres = IOleInPlaceSite_GetWindow(olePlace, &hwnd); + ok(hres == S_OK, "IOleInPlaceSite_GetWindow: 0x%08x\n", hres); + ok(w == hwnd, "got wrong pointer.\n"); + + hres = IOleInPlaceSite_GetWindow(olePlace, NULL); + ok(hres == E_INVALIDARG, "IOleInPlaceSite_GetWindow: 0x%08x\n", hres); + + IOleInPlaceSite_Release(olePlace); + IOleClientSite_Release(clientSite); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1048,4 +1101,5 @@ START_TEST(richole) test_ITextRange_Collapse(); test_IOleClientSite_QueryInterface(); test_IOleWindow_GetWindow(); + test_IOleInPlaceSite_GetWindow(); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: f505e6fb4a9f0d19894856afd0650f82350cb97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f505e6fb4a9f0d19894856afd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:44:56 2015 +0100 Assorted spelling fixes. --- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/dinput/joystick.c | 8 ++++---- dlls/kernel32/tests/volume.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlobject.c | 2 +- dlls/ntdll/tests/reg.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/sane.ds/sane_main.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- dlls/urlmon/sec_mgr.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- programs/cmd/builtins.c | 2 +- programs/winedbg/break.c | 2 +- tools/wrc/parser.y | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f505e6fb4a9f0d1989485…

1 0

Dmitry Timoshkov : shell32/tests: Add a couple of SHFileOperation(FO_MOVE) tests for a directory.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 5614ae23ee07c0b895f82559844c40686893a7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5614ae23ee07c0b895f825598… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 19 17:30:47 2015 +0800 shell32/tests: Add a couple of SHFileOperation(FO_MOVE) tests for a directory. --- dlls/shell32/tests/shlfileop.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 6bb28e1..fa83adf 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -164,6 +164,9 @@ static void clean_after_shfo_tests(void) DeleteFileA("test4.txt\\test1.txt"); DeleteFileA("test4.txt\\test2.txt"); DeleteFileA("test4.txt\\test3.txt"); + DeleteFileA("test4.txt\\one.txt"); + DeleteFileA("test4.txt\\nested\\two.txt"); + RemoveDirectoryA("test4.txt\\nested"); RemoveDirectoryA("test4.txt"); DeleteFileA("testdir2\\one.txt"); DeleteFileA("testdir2\\test1.txt"); @@ -1826,6 +1829,49 @@ static void test_move(void) CHAR to[5*MAX_PATH]; DWORD retval; + clean_after_shfo_tests(); + init_shfo_tests(); + + shfo.hwnd = NULL; + shfo.wFunc = FO_MOVE; + shfo.pFrom = from; + shfo.pTo = to; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR; + shfo.hNameMappings = NULL; + shfo.lpszProgressTitle = NULL; + shfo.fAnyOperationsAborted = FALSE; + + set_curr_dir_path(from, "testdir2\\*.*\0"); + set_curr_dir_path(to, "test4.txt\\*.*\0"); + retval = SHFileOperationA(&shfo); + ok(retval != 0, "SHFileOperation should fail\n"); + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + + ok(file_exists("testdir2"), "dir should not be moved\n"); + ok(file_exists("testdir2\\one.txt"), "file should not be moved\n"); + ok(file_exists("testdir2\\nested"), "dir should not be moved\n"); + ok(file_exists("testdir2\\nested\\two.txt"), "file should not be moved\n"); + + set_curr_dir_path(from, "testdir2\\*.*\0"); + set_curr_dir_path(to, "test4.txt\0"); + retval = SHFileOperationA(&shfo); + ok(!retval, "SHFileOperation error %#x\n", retval); + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + + ok(file_exists("testdir2"), "dir should not be moved\n"); + ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); +todo_wine + ok(!file_exists("testdir2\\nested"), "dir should be moved\n"); + ok(!file_exists("testdir2\\nested\\two.txt"), "file should be moved\n"); + + ok(file_exists("test4.txt"), "dir should exist\n"); + ok(file_exists("test4.txt\\one.txt"), "file should exist\n"); + ok(file_exists("test4.txt\\nested"), "dir should exist\n"); + ok(file_exists("test4.txt\\nested\\two.txt"), "file should exist\n"); + + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; shfo.pFrom = from;

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniform for the modelview matrix.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 9811d85141610f903d6c8de3b00be6c853ece182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9811d85141610f903d6c8de3b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:38 2015 +0100 wined3d: Don't use the builtin FFP uniform for the modelview matrix. --- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++++++++++-------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++--- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6a4f233..3d48da1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -116,6 +116,8 @@ struct glsl_vs_program GLint uniform_i_locations[MAX_CONST_I]; GLint uniform_b_locations[MAX_CONST_B]; GLint pos_fixup_location; + + GLint modelview_matrix_location; }; struct glsl_gs_program @@ -775,6 +777,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context checkGLcall("glUniform4fv"); } + if (update_mask & WINED3D_SHADER_CONST_FFP_MODELVIEW) + { + struct wined3d_matrix mat; + + get_modelview_matrix(context, state, &mat); + GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location, 1, FALSE, (GLfloat *)&mat)); + checkGLcall("glUniformMatrix4fv"); + } + if (update_mask & WINED3D_SHADER_CONST_PS_F) shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); @@ -4976,7 +4987,10 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe shader_addline(buffer, "#version 120\n"); shader_addline(buffer, "\n"); - shader_addline(buffer, "void main()\n{\n"); + + shader_addline(buffer, "uniform mat4 ffp_modelview_matrix;\n"); + + shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); @@ -4988,7 +5002,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe } else { - shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); + shader_addline(buffer, "vec4 ec_pos = ffp_modelview_matrix * gl_Vertex;\n"); shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); if (settings->clipping) shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); @@ -5755,6 +5769,8 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "posFixup")); + + vs->modelview_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_modelview_matrix")); } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, @@ -6055,6 +6071,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const shader_glsl_init_uniform_block_bindings(gl_info, program_id, &vshader->reg_maps, 0, gl_info->limits.vertex_uniform_blocks); } + else + { + entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; + } if (gshader) shader_glsl_init_uniform_block_bindings(gl_info, program_id, &gshader->reg_maps, @@ -6971,9 +6991,6 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, if (transformed != wasrhw) { - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))) - && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) - transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)) && !isStateDirty(context, STATE_VIEWPORT)) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); @@ -7026,14 +7043,19 @@ static void glsl_vertex_pipe_vs(struct wined3d_context *context, context_apply_state(context, state, STATE_VDECL); } +static void glsl_vertex_pipe_world(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; +} + void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_light_info *light = NULL; unsigned int k; - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)))) - transform_world(context, state, state_id); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; for (k = 0; k < gl_info->limits.lights; ++k) { @@ -7132,7 +7154,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_TRANSFORM(WINED3D_TS_TEXTURE5), {STATE_TEXTURESTAGE(5, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE6), {STATE_TEXTURESTAGE(6, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE7), {STATE_TEXTURESTAGE(7, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)), {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)), transform_world }, WINED3D_GL_EXT_NONE }, + {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)), {STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)), glsl_vertex_pipe_world }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), transform_texture }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), transform_texture }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), transform_texture }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8bbe59d..65f43a2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3841,7 +3841,7 @@ static void shader_bumpenv(struct wined3d_context *context, const struct wined3d context->constant_update_mask |= WINED3D_SHADER_CONST_PS_BUMP_ENV; } -void transform_world(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void transform_world(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_matrix mat; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a6c141c..f05e72f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -306,7 +306,8 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_PS_BUMP_ENV 0x00000080 #define WINED3D_SHADER_CONST_PS_Y_CORR 0x00000100 #define WINED3D_SHADER_CONST_PS_NP2_FIXUP 0x00000200 -#define WINED3D_SHADER_CONST_FFP_PS 0x00000400 +#define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00000400 +#define WINED3D_SHADER_CONST_FFP_PS 0x00000800 enum wined3d_shader_register_type { @@ -2807,8 +2808,6 @@ void sampler_texmatrix(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void transform_world(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_texture(struct wined3d_context *context,

1 0

YongHao Hu : msvcp90: Add istream::operator>> complex implementation and tests.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: ff6231d173ca0ec4cc162d6ffa8717e0eb8362f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6231d173ca0ec4cc162d6ff… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Thu Mar 19 19:06:46 2015 +0800 msvcp90: Add istream::operator>>complex implementation and tests. --- dlls/msvcp71/msvcp71.spec | 12 ++-- dlls/msvcp80/msvcp80.spec | 12 ++-- dlls/msvcp90/ios.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++-- dlls/msvcp90/tests/ios.c | 104 +++++++++++++++++++++++++++ 5 files changed, 299 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff6231d173ca0ec4cc162…

1 0

Matteo Bruni : wined3d: Use a separate STATE_TRANSFORM(WINED3D_TS_VIEW) state handler in the GLSL pipeline.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 425dc69fef85f1fadd3b0a7c51c35f700c1b2598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425dc69fef85f1fadd3b0a7c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:37 2015 +0100 wined3d: Use a separate STATE_TRANSFORM(WINED3D_TS_VIEW) state handler in the GLSL pipeline. --- dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 00c7318..6a4f233 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7026,6 +7026,40 @@ static void glsl_vertex_pipe_vs(struct wined3d_context *context, context_apply_state(context, state, STATE_VDECL); } +void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_light_info *light = NULL; + unsigned int k; + + if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)))) + transform_world(context, state, state_id); + + for (k = 0; k < gl_info->limits.lights; ++k) + { + if (!(light = state->lights[k])) + continue; + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); + checkGLcall("glLightfv posn"); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn); + checkGLcall("glLightfv dirn"); + } + + for (k = 0; k < gl_info->limits.clipplanes; ++k) + { + if (!isStateDirty(context, STATE_CLIPPLANE(k))) + clipplane(context, state, STATE_CLIPPLANE(k)); + } + + if (context->swapchain->device->vertexBlendUsed) + { + static int warned; + + if (!warned++) + FIXME("Vertex blending emulation.\n"); + } +} + static void glsl_vertex_pipe_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -7088,7 +7122,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = /* Viewport */ {STATE_VIEWPORT, {STATE_VIEWPORT, viewport_vertexpart }, WINED3D_GL_EXT_NONE }, /* Transform states */ - {STATE_TRANSFORM(WINED3D_TS_VIEW), {STATE_TRANSFORM(WINED3D_TS_VIEW), transform_view }, WINED3D_GL_EXT_NONE }, + {STATE_TRANSFORM(WINED3D_TS_VIEW), {STATE_TRANSFORM(WINED3D_TS_VIEW), glsl_vertex_pipe_view }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), glsl_vertex_pipe_projection}, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE0), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE1), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e5d6ca9..8bbe59d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3990,7 +3990,7 @@ static void state_vertexblend(struct wined3d_context *context, const struct wine } } -void transform_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void transform_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_light_info *light = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6c83a5..a6c141c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2809,8 +2809,6 @@ void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_world(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void transform_view(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_texture(struct wined3d_context *context,

1 0

Austin English : setupx.dll16: Add a DiOpenClassRegKey stub.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 1e66b33d8b61b1c245ae10b7c23497e680ef950c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e66b33d8b61b1c245ae10b7c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 23 00:28:12 2015 -0600 setupx.dll16: Add a DiOpenClassRegKey stub. --- dlls/setupx.dll16/devinst16.c | 9 +++++++++ dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx16.h | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c index fb98f42..55f38b0 100644 --- a/dlls/setupx.dll16/devinst16.c +++ b/dlls/setupx.dll16/devinst16.c @@ -133,3 +133,12 @@ RETERR16 WINAPI DiOpenDevRegKey16(LPDEVICE_INFO16 lpdi, FIXME("(%p %p %d): stub\n", lpdi, lphk, iFlags); return FALSE; } + +/*********************************************************************** + * DiOpenClassRegKey (SETUPX.319) + */ +RETERR16 WINAPI DiOpenClassRegKey16(LPHKEY16 hkey, const char *class) +{ + FIXME("(%p %s): stub\n", hkey, debugstr_a(class)); + return ERR_DI_REG_API; +} diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index e5bdf23..615e92f 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -155,7 +155,7 @@ 319 pascal -ret16 DiOpenDevRegKey (ptr ptr word) DiOpenDevRegKey16 320 stub DiInstallDrvSection #(str str str str long) 321 pascal -ret16 DiInstallClass (str long) DiInstallClass16 -322 stub DiOpenClassRegKey #(ptr str) +322 pascal -ret16 DiOpenClassRegKey (ptr str) DiOpenClassRegKey16 323 stub Display_SetFontSize #(str) 324 stub Display_OpenFontSizeKey #(ptr) 325 stub DiBuildClassDrvListFromOldInf #(ptr str ptr long) diff --git a/dlls/setupx.dll16/setupx16.h b/dlls/setupx.dll16/setupx16.h index f348340..4358fb3 100644 --- a/dlls/setupx.dll16/setupx16.h +++ b/dlls/setupx.dll16/setupx16.h @@ -559,4 +559,29 @@ typedef struct tagLDD_LIST { ldd.ldid = LDID; \ } while(0) +/* Error codes */ +enum _ERR_DEVICE_INSTALL +{ + ERR_DI_INVALID_DEVICE_ID = DI_ERROR, + ERR_DI_INVALID_COMPATIBLE_DEVICE_LIST, + ERR_DI_REG_API, + ERR_DI_LOW_MEM, + ERR_DI_BAD_DEV_INFO, + ERR_DI_INVALID_CLASS_INSTALLER, + ERR_DI_DO_DEFAULT, + ERR_DI_USER_CANCEL, + ERR_DI_NOFILECOPY, + ERR_DI_BAD_CLASS_INFO, + ERR_DI_BAD_INF, + ERR_DI_BAD_MOVEDEV_PARAMS, + ERR_DI_NO_INF, + ERR_DI_BAD_PROPCHANGE_PARAMS, + ERR_DI_BAD_SELECTDEVICE_PARAMS, + ERR_DI_BAD_REMOVEDEVICE_PARAMS, + ERR_DI_BAD_ENABLECLASS_PARAMS, + ERR_DI_FAIL_QUERY, + ERR_DI_API_ERROR, + ERR_DI_BAD_PATH, +}; + #endif /* __SETUPX16_H */

1 0

Francois Gouget : mmsystem.dll16: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 40d806dc95cc9e6c5921863b3d6ae69f7445068c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d806dc95cc9e6c5921863b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:05:47 2015 +0100 mmsystem.dll16: Mark internal symbols with hidden visibility. --- dlls/mmsystem.dll16/winemm16.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mmsystem.dll16/winemm16.h b/dlls/mmsystem.dll16/winemm16.h index e76ee34..3d8e566 100644 --- a/dlls/mmsystem.dll16/winemm16.h +++ b/dlls/mmsystem.dll16/winemm16.h @@ -24,7 +24,7 @@ /* mmsystem (16 bit files) only functions */ void MMDRV_Init16(void); -void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32); +void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32) DECLSPEC_HIDDEN; typedef LONG (*MCIPROC16)(DWORD, HDRVR16, WORD, DWORD, DWORD); @@ -61,7 +61,7 @@ typedef enum { MMSYSTEM_MAP_OKMEM, /* ok, some memory allocated, need to call UnMapMsg. to be sent to the proc. */ } MMSYSTEM_MapType; -extern CRITICAL_SECTION mmdrv_cs; +extern CRITICAL_SECTION mmdrv_cs DECLSPEC_HIDDEN; enum MMSYSTEM_DriverType { @@ -73,11 +73,11 @@ enum MMSYSTEM_DriverType MMSYSTDRV_MAX }; -extern struct mmsystdrv_thunk* MMSYSTDRV_AddThunk(DWORD callback, DWORD flags, enum MMSYSTEM_DriverType kind); -extern void MMSYSTDRV_DeleteThunk(struct mmsystdrv_thunk* thunk); -extern void MMSYSTDRV_SetHandle(struct mmsystdrv_thunk* thunk, void* h); -extern void MMSYSTDRV_CloseHandle(void* h); -extern DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2); +extern struct mmsystdrv_thunk* MMSYSTDRV_AddThunk(DWORD callback, DWORD flags, enum MMSYSTEM_DriverType kind) DECLSPEC_HIDDEN; +extern void MMSYSTDRV_DeleteThunk(struct mmsystdrv_thunk* thunk) DECLSPEC_HIDDEN; +extern void MMSYSTDRV_SetHandle(struct mmsystdrv_thunk* thunk, void* h) DECLSPEC_HIDDEN; +extern void MMSYSTDRV_CloseHandle(void* h) DECLSPEC_HIDDEN; +extern DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2) DECLSPEC_HIDDEN; #define WINE_MMTHREAD_CREATED 0x4153494C /* "BSIL" */ #define WINE_MMTHREAD_DELETED 0xDEADDEAD

1 0