wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Jacek Caban : mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: b095b1f67e0d2f1729320e2b9d8e9c3d9bf0047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b095b1f67e0d2f1729320e2b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 15:58:47 2013 +0200 mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub. --- dlls/mshtml/htmlcurstyle.c | 7 +++++-- dlls/mshtml/tests/style.c | 26 +++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f773605..71d57a1 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -979,8 +979,11 @@ static HRESULT WINAPI HTMLCurrentStyle2_get_textUnderlinePosition(IHTMLCurrentSt static HRESULT WINAPI HTMLCurrentStyle2_get_hasLayout(IHTMLCurrentStyle2 *iface, VARIANT_BOOL *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLCurrentStyle2_get_scrollbarBaseColor(IHTMLCurrentStyle2 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 3e2ef89..a32991b 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -73,6 +73,17 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) return elem; } +#define get_current_style2_iface(u) _get_current_style2_iface(__LINE__,u) +static IHTMLCurrentStyle2 *_get_current_style2_iface(unsigned line, IUnknown *unk) +{ + IHTMLCurrentStyle2 *current_style2; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return current_style2; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -2100,9 +2111,7 @@ static void test_style_filters(IHTMLElement *elem) hres = IHTMLElement2_get_currentStyle(elem2, &current_style); ok(hres == S_OK, "get_style failed: %08x\n", hres); - hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); - IHTMLCurrentStyle_Release(current_style); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + current_style2 = get_current_style2_iface((IUnknown*)current_style); test_style_filter(style, NULL); test_current_style_filter(current_style2, NULL); @@ -2131,6 +2140,8 @@ static void test_style_filters(IHTMLElement *elem) static void test_current_style(IHTMLCurrentStyle *current_style) { + IHTMLCurrentStyle2 *current_style2; + VARIANT_BOOL b; BSTR str; HRESULT hres; VARIANT v; @@ -2390,6 +2401,15 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + current_style2 = get_current_style2_iface((IUnknown*)current_style); + + b = 100; + hres = IHTMLCurrentStyle2_get_hasLayout(current_style2, &b); + ok(hres == S_OK, "get_hasLayout failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); + + IHTMLCurrentStyle2_Release(current_style2); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Michael Stefaniuc : windowscodecs: Silence a warning due to an API change in libpng 1.5.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 4a5bc1375ee446a9aec04cc3f39ee6ac2ee7f39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5bc1375ee446a9aec04cc3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 22 14:35:34 2013 +0200 windowscodecs: Silence a warning due to an API change in libpng 1.5. --- dlls/windowscodecs/pngformat.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 065b5b8..b79d839 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -866,7 +866,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name, profile; + png_charp name; + BYTE *profile; png_uint_32 len; int compression_type; HRESULT hr; @@ -877,11 +878,11 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i EnterCriticalSection(&This->lock); - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) + if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) { if (cCount && ppIColorContexts) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len); + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Nikolay Sivov : oledb32/tests: A basic test for IRowPosition_Initialize().
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: b5a73035048e193120c594397a7f98c4b2b2b446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a73035048e193120c594397… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:44:17 2013 +0400 oledb32/tests: A basic test for IRowPosition_Initialize(). --- dlls/oledb32/tests/database.c | 138 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f41fd6c..585196c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -20,6 +20,7 @@ #include <stdio.h> #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -277,6 +278,142 @@ if (hr == S_OK) { IRowPosition_Release(rowpos); } +typedef struct +{ + IRowset IRowset_iface; + IChapteredRowset IChapteredRowset_iface; +} test_rset_t; + +static test_rset_t test_rset; + +static HRESULT WINAPI rset_QI(IRowset *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRowset)) + { + *obj = &test_rset.IRowset_iface; + return S_OK; + } + else if (IsEqualIID(riid, &IID_IChapteredRowset)) + { + *obj = &test_rset.IChapteredRowset_iface; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI rset_AddRef(IRowset *iface) +{ + return 2; +} + +static ULONG WINAPI rset_Release(IRowset *iface) +{ + return 1; +} + +static HRESULT WINAPI rset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, + const HROW rghRows[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], DBROWOPTIONS rgRowOptions[], + DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rset_RestartPosition(IRowset *iface, HCHAPTER hReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IRowsetVtbl rset_vtbl = { + rset_QI, + rset_AddRef, + rset_Release, + rset_AddRefRows, + rset_GetData, + rset_GetNextRows, + rset_ReleaseRows, + rset_RestartPosition +}; + +static HRESULT WINAPI chrset_QI(IChapteredRowset *iface, REFIID riid, void **obj) +{ + return IRowset_QueryInterface(&test_rset.IRowset_iface, riid, obj); +} + +static ULONG WINAPI chrset_AddRef(IChapteredRowset *iface) +{ + return IRowset_AddRef(&test_rset.IRowset_iface); +} + +static ULONG WINAPI chrset_Release(IChapteredRowset *iface) +{ + return IRowset_Release(&test_rset.IRowset_iface); +} + +static HRESULT WINAPI chrset_AddRefChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI chrset_ReleaseChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IChapteredRowsetVtbl chrset_vtbl = { + chrset_QI, + chrset_AddRef, + chrset_Release, + chrset_AddRefChapter, + chrset_ReleaseChapter +}; + +static void init_test_rset(void) +{ + test_rset.IRowset_iface.lpVtbl = &rset_vtbl; + test_rset.IChapteredRowset_iface.lpVtbl = &chrset_vtbl; +} + +static void test_rowpos_initialize(void) +{ + IRowPosition *rowpos; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + init_test_rset(); + hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); + ok(hr == S_OK, "got %08x\n", hr); + + IRowPosition_Release(rowpos); +} + START_TEST(database) { OleInitialize(NULL); @@ -287,6 +424,7 @@ START_TEST(database) /* row position */ test_rowposition(); + test_rowpos_initialize(); OleUninitialize(); }

1 0

Nikolay Sivov : oledb32: Added IChapteredRowset definition.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 8b45127e85e00b1b9f477e961c4bcff084145949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b45127e85e00b1b9f477e961… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:41:02 2013 +0400 oledb32: Added IChapteredRowset definition. --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++++++++++++++ include/Makefile.in | 1 + include/chprst.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index e5be7b6..b70d3f4 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1491,3 +1491,27 @@ HRESULT CALLBACK IRowPositionChange_OnRowPositionChange_Proxy(IRowPositionChange FIXME("(%p)->(0x%x 0x%x %d): stub\n", This, reason, phase, cant_deny); return E_NOTIMPL; } + +HRESULT __RPC_STUB IChapteredRowset_ReleaseChapter_Stub(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %p %p): stub\n", This, chapter, refcount, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IChapteredRowset_AddRefChapter_Stub(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %p %p): stub\n", This, chapter, refcount, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IChapteredRowset_AddRefChapter_Proxy(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); + return E_NOTIMPL; +} + +HRESULT CALLBACK IChapteredRowset_ReleaseChapter_Proxy(IChapteredRowset* This, HCHAPTER chapter, DBREFCOUNT *refcount) +{ + FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8615a99..d6e08e0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -164,6 +164,7 @@ SRCDIR_INCLUDES = \ cderr.h \ cfgmgr32.h \ cguid.h \ + chprst.idl \ cierror.h \ clusapi.h \ cmdbas.idl \ diff --git a/include/chprst.idl b/include/chprst.idl new file mode 100644 index 0000000..90aed71 --- /dev/null +++ b/include/chprst.idl @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2013 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a93-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IChapteredRowset : IUnknown +{ + [local] + HRESULT AddRefChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount); + + [call_as(AddRefChapter)] + HRESULT RemoteAddRefChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT ReleaseChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount); + + [call_as(ReleaseChapter)] + HRESULT RemoteReleaseChapter([in] HCHAPTER chapter, + [out] DBREFCOUNT *refcount, + [out] IErrorInfo **errorinfo); +} diff --git a/include/oledb.idl b/include/oledb.idl index 3f038c7..34cbd34 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -49,6 +49,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "rstbas.idl" #include "rstinf.idl" #include "rstloc.idl" +#include "chprst.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "dbccmd.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 5f89683..567e929 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -140,6 +140,7 @@ my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1, + "chprst.idl" => 1, "cmdbas.idl" => 1, "cmdtxt.idl" => 1, "crtrow.idl" => 1,

1 0

Nikolay Sivov : oledb32: Implement Advise/Unadvise for IRowPositionChange.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: f339c2fa0d6e4df480e9e9a6507a831051f1f657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f339c2fa0d6e4df480e9e9a65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:33:31 2013 +0400 oledb32: Implement Advise/Unadvise for IRowPositionChange. --- dlls/oledb32/oledb_private.h | 10 ++++++ dlls/oledb32/rowpos.c | 72 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 1570529..c232464 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -27,6 +27,16 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void *heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 3461842..d322a9d 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -36,6 +36,8 @@ typedef struct { IConnectionPoint IConnectionPoint_iface; rowpos *container; + IRowPositionChange **sinks; + DWORD sinks_size; } rowpos_cp; struct rowpos @@ -48,6 +50,8 @@ struct rowpos rowpos_cp cp; }; +static void rowposchange_cp_destroy(rowpos_cp*); + static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) { return CONTAINING_RECORD(iface, rowpos, IRowPosition_iface); @@ -108,6 +112,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (ref == 0) { if (This->rowset) IRowset_Release(This->rowset); + rowposchange_cp_destroy(&This->cp); heap_free(This); } @@ -263,18 +268,62 @@ static HRESULT WINAPI rowpos_cp_GetConnectionPointContainer(IConnectionPoint *if return S_OK; } -static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *sink, DWORD *cookie) +static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksink, DWORD *cookie) { rowpos_cp *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p %p): stub\n", This, sink, cookie); - return E_NOTIMPL; + IRowPositionChange *sink; + HRESULT hr; + DWORD i; + + TRACE("(%p)->(%p %p)\n", This, unksink, cookie); + + hr = IUnknown_QueryInterface(unksink, &IID_IRowPositionChange, (void**)&sink); + if (FAILED(hr)) + { + FIXME("sink doesn't support IRowPositionChange\n"); + return CONNECT_E_CANNOTCONNECT; + } + + if (This->sinks) + { + for (i = 0; i < This->sinks_size; i++) + { + if (!This->sinks[i]) + break; + } + + if (i == This->sinks_size) + { + This->sinks_size *= 2; + This->sinks = heap_realloc_zero(This->sinks, This->sinks_size*sizeof(*This->sinks)); + } + } + else + { + This->sinks_size = 10; + This->sinks = heap_alloc_zero(This->sinks_size*sizeof(*This->sinks)); + i = 0; + } + + This->sinks[i] = sink; + if (cookie) *cookie = i + 1; + + return S_OK; } static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie) { rowpos_cp *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%d): stub\n", This, cookie); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, cookie); + + if (!cookie || cookie > This->sinks_size || !This->sinks[cookie-1]) + return CONNECT_E_NOCONNECTION; + + IRowPositionChange_Release(This->sinks[cookie-1]); + This->sinks[cookie-1] = NULL; + + return S_OK; } static HRESULT WINAPI rowpos_cp_EnumConnections(IConnectionPoint *iface, IEnumConnections **enum_c) @@ -300,6 +349,19 @@ static void rowposchange_cp_init(rowpos_cp *cp, rowpos *container) { cp->IConnectionPoint_iface.lpVtbl = &rowpos_cp_vtbl; cp->container = container; + cp->sinks = NULL; + cp->sinks_size = 0; +} + +void rowposchange_cp_destroy(rowpos_cp *cp) +{ + DWORD i; + for (i = 0; i < cp->sinks_size; i++) + { + if (cp->sinks[i]) + IRowPositionChange_Release(cp->sinks[i]); + } + heap_free(cp->sinks); } HRESULT create_oledb_rowpos(IUnknown *outer, void **obj)

1 0

Nikolay Sivov : oledb32: Report IRowPositionChange as supported sink type.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 2139a402c74ad3e338fce343e621c65fc0365152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2139a402c74ad3e338fce343e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 14:23:21 2013 +0400 oledb32: Report IRowPositionChange as supported sink type. --- dlls/oledb32/rowpos.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 96a36a5..3461842 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -21,6 +21,7 @@ #include "windef.h" #include "ole2.h" +#include "olectl.h" #include "oledb.h" #include "oledberr.h" @@ -194,8 +195,20 @@ static HRESULT WINAPI cpc_EnumConnectionPoints(IConnectionPointContainer *iface, static HRESULT WINAPI cpc_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **point) { rowpos *This = impl_from_IConnectionPointContainer(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), point); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), point); + + if (IsEqualIID(riid, &IID_IRowPositionChange)) + { + *point = &This->cp.IConnectionPoint_iface; + IConnectionPoint_AddRef(*point); + return S_OK; + } + else + { + FIXME("unsupported riid %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; + } } static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl =

1 0

Huw Davies : ntdll: Call the correct server request.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 97fd3f3b521252ca0d7f13ca9f09ec2c1cada1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fd3f3b521252ca0d7f13ca9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 22 09:27:46 2013 +0100 ntdll: Call the correct server request. --- dlls/ntdll/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9d14bbb..2f34ee0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1291,7 +1291,7 @@ NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJE if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; - SERVER_START_REQ( open_event ) + SERVER_START_REQ( open_keyed_event ) { req->access = access; req->attributes = attr ? attr->Attributes : 0;

1 0

Nikolay Sivov : ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 43d5d86716e46d438b65446ea5fb799ec9122976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d5d86716e46d438b65446ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 00:00:39 2013 +0400 ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT. --- dlls/ole32/git.c | 8 ++++---- dlls/ole32/tests/marshal.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f5dd00b..f0be9ee 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -311,8 +311,8 @@ static HRESULT WINAPI GITCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) { *ppv = NULL; - if (IsEqualIID(riid,&IID_IUnknown) || - IsEqualIID(riid,&IID_IGlobalInterfaceTable)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; return S_OK; @@ -357,11 +357,11 @@ static const IClassFactoryVtbl GITClassFactoryVtbl = { GITCF_LockServer }; -static const IClassFactoryVtbl *PGITClassFactoryVtbl = &GITClassFactoryVtbl; +static IClassFactory git_classfactory = { &GITClassFactoryVtbl }; HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) { - *ppv = &PGITClassFactoryVtbl; + *ppv = &git_classfactory; TRACE("Returning GIT classfactory\n"); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2baec4b..9566de3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -40,6 +40,7 @@ DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x0 /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); /* helper macros to make tests a bit leaner */ #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -2804,10 +2805,19 @@ static void test_globalinterfacetable(void) struct git_params params; DWORD ret; IUnknown *object; + IClassFactory *cf; trace("test_globalinterfacetable\n"); cLocks = 0; + hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IClassFactory_QueryInterface(cf, &IID_IGlobalInterfaceTable, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IClassFactory_Release(cf); + hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); @@ -3149,6 +3159,7 @@ START_TEST(marshal) } pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); + pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding")))

1 0

Vincent Povirk : msvcrt: _[w]access_s returns an error code.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 5f2e48f737ecfa2e397d1148474824fcb70f4d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e48f737ecfa2e397d11484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 21 15:13:36 2013 -0500 msvcrt: _[w]access_s returns an error code. --- dlls/msvcr90/tests/msvcr90.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/file.c | 16 +++++--- 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index e4eee04..fa2b445 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -111,6 +111,7 @@ static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va static FILE* (__cdecl *p_fopen)(const char*, const char*); static int (__cdecl *p_fclose)(FILE*); static int (__cdecl *p_unlink)(const char*); +static int (__cdecl *p_access_s)(const char*, int); static void (__cdecl *p_lock_file)(FILE*); static void (__cdecl *p_unlock_file)(FILE*); static int (__cdecl *p_fileno)(FILE*); @@ -298,6 +299,7 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_unlink, "_unlink"); + SET(p_access_s, "_access_s"); SET(p_lock_file, "_lock_file"); SET(p_unlock_file, "_unlock_file"); SET(p_fileno, "_fileno"); @@ -1217,6 +1219,85 @@ static void test_byteswap(void) ok(ret == 0, "ret = %lx\n", ret); } +static void test_access_s(void) +{ + FILE *f; + int res; + + f = p_fopen("test_file", "w"); + ok(f != NULL, "unable to create test file\n"); + if(!f) + return; + + p_fclose(f); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_READONLY); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_NORMAL); + + p_unlink("test_file"); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); +} + START_TEST(msvcr90) { if(!init()) @@ -1242,4 +1323,5 @@ START_TEST(msvcr90) test__vswprintf_l(); test_nonblocking_file_access(); test_byteswap(); + test_access_s(); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 871027d..0054222 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -715,10 +715,12 @@ int CDECL MSVCRT__access(const char *filename, int mode) */ int CDECL _access_s(const char *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__access(filename, mode); + if (MSVCRT__access(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /********************************************************************* @@ -748,10 +750,12 @@ int CDECL MSVCRT__waccess(const MSVCRT_wchar_t *filename, int mode) */ int CDECL _waccess_s(const MSVCRT_wchar_t *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__waccess(filename, mode); + if (MSVCRT__waccess(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /*********************************************************************

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 6ea59b91577e230bb529e23567328cdf083e7f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea59b91577e230bb529e2356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:43 2013 +0200 d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration. --- dlls/d3dx9_36/math.c | 68 +++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e0cab9e..f6a43a0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; - struct ID3DXMatrixStackImpl { ID3DXMatrixStack ID3DXMatrixStack_iface; @@ -47,6 +45,7 @@ struct ID3DXMatrixStackImpl D3DXMATRIX *stack; }; +static const unsigned int INITIAL_STACK_SIZE = 32; /*_________________D3DXColor____________________*/ @@ -930,40 +929,6 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm) /*_________________D3DXMatrixStack____________________*/ -static const unsigned int INITIAL_STACK_SIZE = 32; - -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) -{ - struct ID3DXMatrixStackImpl *object; - - TRACE("flags %#x, ppstack %p\n", flags, ppstack); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (object == NULL) - { - *ppstack = NULL; - return E_OUTOFMEMORY; - } - object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; - object->ref = 1; - - object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)); - if (!object->stack) - { - HeapFree(GetProcessHeap(), 0, object); - *ppstack = NULL; - return E_OUTOFMEMORY; - } - - object->current = 0; - object->stack_size = INITIAL_STACK_SIZE; - D3DXMatrixIdentity(&object->stack[0]); - - TRACE("Created matrix stack %p\n", object); - - *ppstack = &object->ID3DXMatrixStack_iface; - return D3D_OK; -} static inline struct ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) { @@ -1243,6 +1208,37 @@ static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl = ID3DXMatrixStackImpl_GetTop }; +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack) +{ + struct ID3DXMatrixStackImpl *object; + + TRACE("flags %#x, stack %p.\n", flags, stack); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + *stack = NULL; + return E_OUTOFMEMORY; + } + object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; + object->ref = 1; + + if (!(object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)))) + { + HeapFree(GetProcessHeap(), 0, object); + *stack = NULL; + return E_OUTOFMEMORY; + } + + object->current = 0; + object->stack_size = INITIAL_STACK_SIZE; + D3DXMatrixIdentity(&object->stack[0]); + + TRACE("Created matrix stack %p.\n", object); + + *stack = &object->ID3DXMatrixStack_iface; + return D3D_OK; +} + /*_________________D3DXPLANE________________*/ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, const D3DXVECTOR3 *pvpoint, const D3DXVECTOR3 *pvnormal)

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013