wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 6333fa753a196c14acc18c42c1a32b601d5eca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6333fa753a196c14acc18c42c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:13:55 2012 +0200 Assorted spelling fixes. --- dlls/dinput/device.c | 6 +++--- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 4 ++-- dlls/wbemprox/query.c | 2 +- dlls/ws2_32/socket.c | 2 +- programs/wineconsole/curses.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f5b7b4b..bf5fd1b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -605,7 +605,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, for (i=0; i < lpdiaf->dwNumActions; i++) { - /* Don't touch an user configured action */ + /* Don't touch a user configured action */ if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) @@ -619,7 +619,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; - /* Assure that the object exists */ + /* Make sure the object exists */ odf = dataformat_to_odf_by_type(df, inst, type); if (odf != NULL) @@ -632,7 +632,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, } else if (!(dwFlags & DIDBAM_PRESERVE)) { - /* we must clear action data belonging to other devices */ + /* We must clear action data belonging to other devices */ memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a39d065..c5ecf9e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2494,7 +2494,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) } } - FIXME("buffer is to small\n"); + FIXME("buffer is too small\n"); return EOF; } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c8d4aca..d3b0262 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5530,7 +5530,7 @@ num_get* num_get_char_use_facet(const locale *loc) /* Copies number to dest buffer, validates grouping and skips separators. * Updates first so it points past the number, all digits are skipped. * Returns how exponent needs to changed. - * Size of dest buffer is not specified, assuming it's not smaller then 32: + * Size of dest buffer is not specified, assuming it's not smaller than 32: * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) */ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, @@ -5685,7 +5685,7 @@ int __cdecl num_get_char__Getffldx(const num_get *this, char *dest, istreambuf_i /* Copies number to dest buffer, validates grouping and skips separators. * Updates first so it points past the number, all digits are skipped. * Returns number base (8, 10 or 16). - * Size of dest buffer is not specified, assuming it's not smaller then 25: + * Size of dest buffer is not specified, assuming it's not smaller than 25: * 22(8^22>2^64)+1(detect overflows)+1(sign)+1(nullbyte) = 25 */ int __cdecl num_get_char__Getifld(const num_get *this, char *dest, istreambuf_iterator_char *first, diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 2a7c088..798fda3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -63,7 +63,7 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_STRING: return sizeof(WCHAR *); default: - ERR("unkown column type %u\n", table->columns[column].type & COL_TYPE_MASK); + ERR("unknown column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; } return sizeof(INT32); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 51016b7..212733b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5605,7 +5605,7 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size memset(p_to, 0, size); /* Use the memory in the same way winsock does. - * First set the pointer for aliases, second set the pointers for addressess. + * First set the pointer for aliases, second set the pointers for addresses. * Third fill the addresses indexes, fourth jump aliases names size. * Fifth fill the hostname. * NOTE: This method is valid for OS version's >= XP. diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 4461c73..4c75a6f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -670,7 +670,7 @@ static unsigned WCCURSES_FillMouse(INPUT_RECORD* ir) WINE_TRACE("[%u]: (%d, %d) %08lx\n", mevt.id, mevt.x, mevt.y, (unsigned long)mevt.bstate); - /* macros to ease mapping ncurse button numbering to windows' one */ + /* macros to ease mapping ncurses button numbering to windows' one */ #define BTN1_BIT FROM_LEFT_1ST_BUTTON_PRESSED #define BTN2_BIT RIGHTMOST_BUTTON_PRESSED #define BTN3_BIT FROM_LEFT_2ND_BUTTON_PRESSED

1 0

Nikolay Sivov : msxml3: Added _newEnum() support for IXMLDOMNamedNodeMap.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1625dae7e3bc5de76e0445b3e5f91e33ad78f4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1625dae7e3bc5de76e0445b3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 3 10:06:59 2012 +0400 msxml3: Added _newEnum() support for IXMLDOMNamedNodeMap. --- dlls/msxml3/nodemap.c | 32 +++++++++++-- dlls/msxml3/tests/domdoc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 6fac505..c6be169 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _xmlnodemap +typedef struct { DispatchEx dispex; IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap_iface; @@ -53,10 +53,22 @@ typedef struct _xmlnodemap xmlNodePtr node; LONG iterator; + IEnumVARIANT *enumvariant; const struct nodemap_funcs *funcs; } xmlnodemap; +static HRESULT nodemap_get_item(IUnknown *iface, LONG index, VARIANT *item) +{ + V_VT(item) = VT_DISPATCH; + return IXMLDOMNamedNodeMap_get_item((IXMLDOMNamedNodeMap*)iface, index, (IXMLDOMNode**)&V_DISPATCH(item)); +} + +static const struct enumvariant_funcs nodemap_enumvariant = { + nodemap_get_item, + NULL +}; + static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) { return CONTAINING_RECORD(iface, xmlnodemap, IXMLDOMNamedNodeMap_iface); @@ -80,6 +92,16 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( { *ppvObject = iface; } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) + { + if (!This->enumvariant) + { + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &nodemap_enumvariant, &This->enumvariant); + if (FAILED(hr)) return hr; + } + + return IEnumVARIANT_QueryInterface(This->enumvariant, &IID_IEnumVARIANT, ppvObject); + } else if (dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -119,6 +141,7 @@ static ULONG WINAPI xmlnodemap_Release( if ( ref == 0 ) { xmldoc_release( This->node->doc ); + if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); release_dispex(&This->dispex); heap_free( This ); } @@ -275,11 +298,11 @@ static HRESULT WINAPI xmlnodemap_reset( static HRESULT WINAPI xmlnodemap__newEnum( IXMLDOMNamedNodeMap *iface, - IUnknown** ppUnk) + IUnknown** enumv) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%p)\n", This, ppUnk); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, enumv); + return create_enumvariant((IUnknown*)iface, TRUE, &nodemap_enumvariant, (IEnumVARIANT**)enumv); } static const struct IXMLDOMNamedNodeMapVtbl XMLDOMNamedNodeMapVtbl = @@ -423,6 +446,7 @@ IXMLDOMNamedNodeMap *create_nodemap(xmlNodePtr node, const struct nodemap_funcs This->node = node; This->ref = 1; This->iterator = 0; + This->enumvariant = NULL; This->funcs = funcs; init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNamedNodeMap_iface, &xmlnodemap_dispex); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b68e74..9919f4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1749,6 +1749,11 @@ static const char default_ns_doc[] = { " d=\"d attr\" />" }; +static const char attributes_map[] = { + "<?xml version=\"1.0\"?>" + "<a attr1=\"value1\" attr2=\"value2\" attr3=\"value3\" attr4=\"value4\" />" +}; + static const WCHAR nonexistent_fileW[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -12176,6 +12181,114 @@ static void test_putref_schemas(void) IXMLDOMDocument2_Release(doc); } +static void test_namedmap_newenum(void) +{ + IEnumVARIANT *enum1, *enum2, *enum3; + IXMLDOMNamedNodeMap *map; + IUnknown *unk1, *unk2; + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT hr; + VARIANT v; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(attributes_map), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_attributes(elem, &map); + EXPECT_HR(hr, S_OK); + IXMLDOMElement_Release(elem); + + enum1 = NULL; + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + EXPECT_REF(map, 1); + EXPECT_REF(enum1, 2); + + enum2 = NULL; + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, S_OK); + ok(enum2 == enum1, "got %p\n", enum2); + + IEnumVARIANT_Release(enum2); + + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(map, 2); + EXPECT_REF(enum2, 1); + ok(enum2 != enum1, "got %p, %p\n", enum2, enum1); + + IEnumVARIANT_Release(enum1); + + /* enumerator created with _newEnum() doesn't share IUnknown* with main object */ + hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(map, 3); + EXPECT_REF(enum2, 2); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum3); + EXPECT_HR(hr, S_OK); + ok(enum2 != enum3, "got %p, %p\n", enum2, enum3); + IEnumVARIANT_Release(enum3); + + /* iteration tests */ + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + hr = IXMLDOMNamedNodeMap_nextNode(map, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + V_VT(&v) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum2, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr1")), "got node name %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + VariantClear(&v); + + hr = IXMLDOMNamedNodeMap_nextNode(map, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("attr2")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(node); + + IEnumVARIANT_Release(enum2); + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12256,6 +12369,7 @@ START_TEST(domdoc) test_get_namespaces(); test_put_data(); test_putref_schemas(); + test_namedmap_newenum(); test_xsltemplate();

1 0

Michael Stefaniuc : quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 56e3b22f6cef4a3874a80c2ddfaae0bfb4c14fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e3b22f6cef4a3874a80c2dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:21:28 2012 +0200 quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts. --- dlls/quartz/memallocator.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc700c2..f1903f9 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -809,9 +809,14 @@ typedef struct StdMemAllocator LPVOID pMemory; } StdMemAllocator; +static inline StdMemAllocator *StdMemAllocator_from_IMemAllocator(IMemAllocator * iface) +{ + return CONTAINING_RECORD(iface, StdMemAllocator, base.IMemAllocator_iface); +} + static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; LONG i; @@ -849,7 +854,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) static HRESULT StdMemAllocator_Free(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); struct list * cursor; if (!list_empty(&This->base.used_list)) @@ -882,7 +887,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface) static void StdMemAllocator_Destroy(IMemAllocator *iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); This->csState.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csState);

1 0

Michael Stefaniuc : quartz: Use unsafe_impl_from_IMediaSample() instead of a cast.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 9262c55a2ecf834b98ccd5b8f2794e74d5b39e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9262c55a2ecf834b98ccd5b8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:19:52 2012 +0200 quartz: Use unsafe_impl_from_IMediaSample() instead of a cast. --- dlls/quartz/memallocator.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index df4cf63..cc700c2 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -70,6 +70,7 @@ static inline BaseMemAllocator *impl_from_IMemAllocator(IMemAllocator *iface) static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface); #define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) @@ -356,9 +357,9 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; + StdMediaSample2 * pStdSample = unsafe_impl_from_IMediaSample(pSample); HRESULT hr = S_OK; - + TRACE("(%p)->(%p)\n", This, pSample); /* FIXME: make sure that sample is currently on the used list */ @@ -791,6 +792,16 @@ static const IMediaSample2Vtbl StdMediaSample2_VTable = StdMediaSample2_SetProperties }; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface) +{ + IMediaSample2 *iface2 = (IMediaSample2 *)iface; + + if (!iface) + return NULL; + assert(iface2->lpVtbl == &StdMediaSample2_VTable); + return impl_from_IMediaSample2(iface2); +} + typedef struct StdMemAllocator { BaseMemAllocator base;

1 0

Michael Stefaniuc : quartz: Avoid a COM object => iface => object round trip.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: f557ed6f944226f0f8b6ef03ee3d66bcb3abc07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f557ed6f944226f0f8b6ef03e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:17:23 2012 +0200 quartz: Avoid a COM object => iface => object round trip. --- dlls/quartz/memallocator.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f74a2fd..df4cf63 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -335,14 +335,14 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa hr = VFW_E_TIMEOUT; else { + StdMediaSample2 *ms; struct list * free = list_head(&This->free_list); list_remove(free); list_add_head(&This->used_list, free); - *pSample = (IMediaSample *)LIST_ENTRY(free, StdMediaSample2, listentry); - - assert(((StdMediaSample2 *)*pSample)->ref == 0); - + ms = LIST_ENTRY(free, StdMediaSample2, listentry); + assert(ms->ref == 0); + *pSample = (IMediaSample *)&ms->IMediaSample2_iface; IMediaSample_AddRef(*pSample); } }

1 0

Michael Stefaniuc : quartz: COM cleanup for IMediaSample2.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b904b6949ebff5449273e15403025d5ab25650ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b904b6949ebff5449273e1540… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:15:01 2012 +0200 quartz: COM cleanup for IMediaSample2. --- dlls/quartz/memallocator.c | 80 +++++++++++++++++++++++------------------- dlls/quartz/quartz_private.h | 12 ------ 2 files changed, 44 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b904b6949ebff5449273e…

1 0

Detlef Riekenberg : shell32/tests: Fix a failure on w2k.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: bb684aaba74dfb252138dea4eac4be28983e7517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb684aaba74dfb252138dea4e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 2 21:22:10 2012 +0200 shell32/tests: Fix a failure on w2k. --- dlls/shell32/tests/shlfolder.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bee6cb5..f34bb70 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -73,6 +73,18 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static WCHAR *make_wstr(const char *str) { WCHAR *ret; @@ -566,7 +578,9 @@ if (0) CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid\n"); + /* CLSID_ShellFSFolder on some w2k systems */ + ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), + "Unexpected classid %s\n", debugstr_guid(&id)); IPersist_Release(pp); }

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo:: GetPixelFormats.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 5c4ed986c0933945295dc45e56876cdb81168d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4ed986c0933945295dc45e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 2 13:48:05 2012 -0500 windowscodecs: Implement IWICBitmapCodecInfo::GetPixelFormats. --- dlls/windowscodecs/info.c | 73 ++++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/info.c | 54 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 9921efc..f1eaf4c 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -42,6 +42,7 @@ static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s', static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; +static const WCHAR formats_keyname[] = {'F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; @@ -135,6 +136,68 @@ static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, return HRESULT_FROM_WIN32(ret); } +static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, + UINT buffersize, GUID *buffer, UINT *actual_size) +{ + LONG ret; + HKEY subkey; + UINT items_returned; + WCHAR guid_string[39]; + DWORD guid_string_size; + HRESULT hr=S_OK; + + if (!actual_size) + return E_INVALIDARG; + + ret = RegOpenKeyExW(classkey, subkeyname, 0, KEY_READ, &subkey); + if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); + + if (buffer) + { + items_returned = 0; + guid_string_size = 39; + while (items_returned < buffersize) + { + ret = RegEnumKeyExW(subkey, items_returned, guid_string, + &guid_string_size, NULL, NULL, NULL, NULL); + + if (ret != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(ret); + break; + } + + if (guid_string_size != 38) + { + hr = E_FAIL; + break; + } + + hr = CLSIDFromString(guid_string, &buffer[items_returned]); + if (FAILED(hr)) + break; + + items_returned++; + guid_string_size = 39; + } + + if (ret == ERROR_NO_MORE_ITEMS) + hr = S_OK; + + *actual_size = items_returned; + } + else + { + ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, actual_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + } + + RegCloseKey(subkey); + + return hr; +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -290,8 +353,9 @@ static HRESULT WINAPI BitmapDecoderInfo_GetContainerFormat(IWICBitmapDecoderInfo static HRESULT WINAPI BitmapDecoderInfo_GetPixelFormats(IWICBitmapDecoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapDecoderInfo_GetColorManagementVersion(IWICBitmapDecoderInfo *iface, @@ -755,8 +819,9 @@ static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo static HRESULT WINAPI BitmapEncoderInfo_GetPixelFormats(IWICBitmapEncoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapEncoderInfo_GetColorManagementVersion(IWICBitmapEncoderInfo *iface, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index cae64ff..6eb20cb 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -63,6 +63,23 @@ static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) return hr; } +static int is_pixelformat(GUID *format) +{ + IWICComponentInfo *info; + HRESULT hr; + WICComponentType componenttype; + + hr = get_component_info(format, &info); + if (FAILED(hr)) + return FALSE; + + hr = IWICComponentInfo_GetComponentType(info, &componenttype); + + IWICComponentInfo_Release(info); + + return SUCCEEDED(hr) && componenttype == WICPixelFormat; +} + static void test_decoder_info(void) { IWICComponentInfo *info; @@ -72,6 +89,9 @@ static void test_decoder_info(void) WCHAR value[256]; const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; CLSID clsid; + GUID pixelformats[20]; + UINT num_formats, count; + int i; hr = get_component_info(&CLSID_WICBmpDecoder, &info); @@ -114,6 +134,40 @@ static void test_decoder_info(void) ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + num_formats = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(num_formats < 20 && num_formats > 1, "got %d formats\n", num_formats); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 0, "got %d formats\n", count); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 1, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 1, "got %d formats\n", count); + ok(is_pixelformat(&pixelformats[0]), "got invalid pixel format\n"); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + for (i=0; i<num_formats; i++) + ok(is_pixelformat(&pixelformats[i]), "got invalid pixel format\n"); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 20, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + IWICBitmapDecoderInfo_Release(decoder_info); IWICComponentInfo_Release(info);

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 8dad0435060cc492e4b29ea9850ef2971ed80a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dad0435060cc492e4b29ea98… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:15:26 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b45a1af..9921efc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -53,6 +53,7 @@ static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a' static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; +static const WCHAR supportspadding_valuename[] = {'S','u','p','p','o','r','t','s','P','a','d','d','i','n','g',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1589,8 +1590,9 @@ static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReade static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, supportspadding_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesRequireFixedSize(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 10f897894989e6b16e7b7586a1330b5ecf7ba459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f897894989e6b16e7b7586a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:14:51 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 36d2e87..b45a1af 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -52,6 +52,7 @@ static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C',' static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; +static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1580,8 +1581,9 @@ static HRESULT WINAPI MetadataReaderInfo_GetDeviceModels(IWICMetadataReaderInfo static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, requiresfullstream_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface,

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
72
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 July 2012