wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Matteo Bruni : wined3d: Introduce a get_identity_matrix() function.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: fe4a226bfa405a46a0cf40eb2f6bb5addbf06990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4a226bfa405a46a0cf40eb2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:34 2015 +0100 wined3d: Introduce a get_identity_matrix() function. --- dlls/wined3d/stateblock.c | 9 ++------- dlls/wined3d/utils.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dc146fc..62b1841 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1121,16 +1121,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d DWORD d; } tmpfloat; unsigned int i; - static const struct wined3d_matrix identity = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; + struct wined3d_matrix identity; TRACE("state %p, gl_info %p.\n", state, gl_info); + get_identity_matrix(&identity); state->gl_primitive_type = ~0u; /* Set some of the defaults for lights, transforms etc */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 725318f..551dca8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3117,6 +3117,19 @@ BOOL is_invalid_op(const struct wined3d_state *state, int stage, return FALSE; } +void get_identity_matrix(struct wined3d_matrix *mat) +{ + static const struct wined3d_matrix identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + + *mat = identity; +} + /* Setup this textures matrix according to the texture flags. */ /* Context activation is done by the caller (state handler). */ void set_texture_matrix(const struct wined3d_gl_info *gl_info, const float *smat, DWORD flags, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0c7a53..4f03b1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3037,6 +3037,8 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, return FALSE; } +void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; + /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly: * ARB only knows float4 parameters and GLSL compiler are not really smart

1 0

Austin English : setupx.dll16: Add a DiOpenClassRegKey stub.
by Alexandre Julliard 19 Mar '15

19 Mar '15

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

Stefan Leichter : msctf: Add TF_InitMlngInfo stub.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: e269444f3ae295d6ff0b8f8becc15b96b2113629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e269444f3ae295d6ff0b8f8be… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sun Feb 22 22:42:35 2015 -0600 msctf: Add TF_InitMlngInfo stub. --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 231246a..1ce3b8e 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -660,3 +660,12 @@ HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim) return E_NOTIMPL; } + +/*********************************************************************** + * TF_InitMlngInfo (MSCTF.@) + */ +HRESULT WINAPI TF_InitMlngInfo(void) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index 4dbfb92..c3d909c 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -24,7 +24,7 @@ @ stub TF_GetThreadFlags @ stdcall TF_GetThreadMgr(ptr) @ stub TF_InatExtractIcon -@ stub TF_InitMlngInfo +@ stdcall TF_InitMlngInfo() @ stub TF_InitSystem @ stub TF_InvalidAssemblyListCache @ stdcall TF_InvalidAssemblyListCacheIfExist()

1 0

Sebastian Lackner : ntdll: Handle write watches in virtual_uninterrupted_write_memory.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: 5f49f07d49d0c0c40a577332274b8d6ec85567cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f49f07d49d0c0c40a5773322… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 3 19:11:40 2015 +0100 ntdll: Handle write watches in virtual_uninterrupted_write_memory. --- dlls/ntdll/virtual.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ab6bf9b..9d29c33 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1729,12 +1729,31 @@ SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_ { if (!(view->protect & VPROT_SYSTEM)) { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); - - while (bytes_written < size && (VIRTUAL_GetUnixProt( *p++ ) & PROT_WRITE)) + while (bytes_written < size) { - SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + void *page = ROUND_ADDR( addr, page_mask ); + BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); + SIZE_T block_size; + + /* If the page is not writeable then check for write watches + * before giving up. This can be done without raising a real + * exception. Similar to virtual_handle_fault. */ + if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + { + if (!(view->protect & VPROT_WRITEWATCH)) + break; + + if (*p & VPROT_WRITEWATCH) + { + *p &= ~VPROT_WRITEWATCH; + VIRTUAL_SetProt( view, page, page_size, *p ); + } + /* ignore fault if page is writable now */ + if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + break; + } + + block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( addr, buffer, block_size ); addr = (void *)((char *)addr + block_size);

1 0

Nikolay Sivov : ole32/datacache: Handle stream Stat() failure (PVS-Studio) .
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: 33766482249c17095545155bd08d206a6cbb1cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33766482249c17095545155bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 19 09:37:25 2015 +0300 ole32/datacache: Handle stream Stat() failure (PVS-Studio). --- dlls/ole32/datacache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 6ae9367..2aae536 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -576,6 +576,11 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) hres = IStream_Stat(presStream, &streamInfo, STATFLAG_NONAME); + if (FAILED(hres)) + { + IStream_Release(presStream); + return hres; + } /* * Read the header.

1 0

André Hentschel : server: Add header guarding for security.h.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: 5c6e2032d89df7b46b304c9c1fec393424196835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6e2032d89df7b46b304c9c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 18 23:30:59 2015 +0100 server: Add header guarding for security.h. --- server/security.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/security.h b/server/security.h index ab5f027..855f2e7 100644 --- a/server/security.h +++ b/server/security.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_SERVER_SECURITY_H +#define __WINE_SERVER_SECURITY_H + extern const LUID SeIncreaseQuotaPrivilege; extern const LUID SeSecurityPrivilege; extern const LUID SeTakeOwnershipPrivilege; @@ -144,3 +147,5 @@ static inline void objattr_get_name( const struct object_attributes *objattr, st name->len = ((objattr->name_len) / sizeof(WCHAR)) * sizeof(WCHAR); name->str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); } + +#endif /* __WINE_SERVER_SECURITY_H */

1 0

Vincent Povirk : gdiplus: GdipGetDC doesn' t set the alpha channel for a 32-bit dib.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: e9d9ef591b490a8b4eb173df34b10a6977f45b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d9ef591b490a8b4eb173df3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 18 15:52:18 2015 -0500 gdiplus: GdipGetDC doesn't set the alpha channel for a 32-bit dib. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6d86e3a..5284b99 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5713,7 +5713,7 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } - else if (!graphics->hdc || graphics->alpha_hdc || + else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { /* Create a fake HDC and fill it with a constant color. */ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e0bd615..77de9e4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4445,12 +4445,13 @@ static void test_measured_extra_space(void) static void test_alpha_hdc(void) { GpStatus status; - HDC hdc; + HDC hdc, gp_hdc; HBITMAP hbm, old_hbm; GpGraphics *graphics; ULONG *bits; BITMAPINFO bmi; GpRectF bounds; + COLORREF colorref; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4484,6 +4485,21 @@ static void test_alpha_hdc(void) expect(0xffaaaaaa, bits[0]); + bits[0] = 0xdeadbeef; + + status = GdipGetDC(graphics, &gp_hdc); + expect(Ok, status); + + colorref = GetPixel(gp_hdc, 0, 4); + expect(0xefbead, colorref); + + SetPixel(gp_hdc, 0, 4, 0xffffff); + + expect(0xffffff, bits[0]); + + status = GdipReleaseDC(graphics, gp_hdc); + expect(Ok, status); + SelectObject(hdc, old_hbm); bits[0] = 0xdeadbeef;

1 0

Nikolay Sivov : wmvcore: Return S_OK from WMCreateReader.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: 069406fe94a41752b4f739b24049b395e3c5a7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069406fe94a41752b4f739b24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 22:52:55 2015 +0300 wmvcore: Return S_OK from WMCreateReader. --- dlls/wmvcore/wmvcore_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 4698e62..879c156 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -217,7 +217,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->ref = 1; *ret_reader = &reader->IWMReader_iface; - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader)

1 0

Nikolay Sivov : scrrun: Implement IEnumVARIANT support for dictionary.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: ba482174299ff165c49e4d7d226f9799a2d8c5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba482174299ff165c49e4d7d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 15:11:32 2015 +0300 scrrun: Implement IEnumVARIANT support for dictionary. --- dlls/scrrun/dictionary.c | 78 ++++++++++++++++++++++++--- dlls/scrrun/tests/dictionary.c | 118 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 8 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index b74f2a7..5c770b6 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -71,6 +71,7 @@ typedef struct LONG count; struct list pairs; struct list buckets[BUCKET_COUNT]; + struct list notifier; } dictionary; struct dictionary_enum { @@ -78,6 +79,8 @@ struct dictionary_enum { LONG ref; dictionary *dict; + struct list *cur; + struct list notify; }; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -248,6 +251,7 @@ static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) { + list_remove(&This->notify); IDictionary_Release(&This->dict->IDictionary_iface); heap_free(This); } @@ -258,29 +262,67 @@ static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) static HRESULT WINAPI dict_enum_Next(IEnumVARIANT *iface, ULONG count, VARIANT *keys, ULONG *fetched) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, count, keys, fetched); - return E_NOTIMPL; + struct keyitem_pair *pair; + ULONG i = 0; + + TRACE("(%p)->(%u %p %p)\n", This, count, keys, fetched); + + if (fetched) + *fetched = 0; + + if (!count) + return S_OK; + + while (This->cur && i < count) { + pair = LIST_ENTRY(This->cur, struct keyitem_pair, entry); + VariantCopy(&keys[i], &pair->key); + This->cur = list_next(&This->dict->pairs, This->cur); + i++; + } + + if (fetched) + *fetched = i; + + return i < count ? S_FALSE : S_OK; } static HRESULT WINAPI dict_enum_Skip(IEnumVARIANT *iface, ULONG count) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%u): stub\n", This, count); - return E_NOTIMPL; + + TRACE("(%p)->(%u)\n", This, count); + + if (!count) + return S_OK; + + if (!This->cur) + return S_FALSE; + + while (count--) { + This->cur = list_next(&This->dict->pairs, This->cur); + if (!This->cur) break; + } + + return count == 0 ? S_OK : S_FALSE; } static HRESULT WINAPI dict_enum_Reset(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->cur = list_head(&This->dict->pairs); + return S_OK; } +static HRESULT create_dict_enum(dictionary*, IUnknown**); + static HRESULT WINAPI dict_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **cloned) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, cloned); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, cloned); + return create_dict_enum(This->dict, (IUnknown**)cloned); } static const IEnumVARIANTVtbl dictenumvtbl = { @@ -305,6 +347,8 @@ static HRESULT create_dict_enum(dictionary *dict, IUnknown **ret) This->IEnumVARIANT_iface.lpVtbl = &dictenumvtbl; This->ref = 1; + This->cur = list_head(&dict->pairs); + list_add_tail(&dict->notifier, &This->notify); This->dict = dict; IDictionary_AddRef(&dict->IDictionary_iface); @@ -312,6 +356,21 @@ static HRESULT create_dict_enum(dictionary *dict, IUnknown **ret) return S_OK; } +static void notify_remove_pair(struct list *notifier, struct list *pair) +{ + struct dictionary_enum *dict_enum; + struct list *cur; + + LIST_FOR_EACH(cur, notifier) { + dict_enum = LIST_ENTRY(cur, struct dictionary_enum, notify); + if (!pair) + dict_enum->cur = list_head(&dict_enum->dict->pairs); + else if (dict_enum->cur == pair) { + dict_enum->cur = list_next(&dict_enum->dict->pairs, dict_enum->cur); + } + } +} + static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, void **obj) { dictionary *This = impl_from_IDictionary(iface); @@ -616,6 +675,7 @@ static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) if (!(pair = get_keyitem_pair(This, key))) return CTL_E_ELEMENT_NOT_FOUND; + notify_remove_pair(&This->notifier, &pair->entry); list_remove(&pair->entry); list_remove(&pair->bucket); This->count--; @@ -634,6 +694,7 @@ static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) if (This->count == 0) return S_OK; + notify_remove_pair(&This->notifier, NULL); LIST_FOR_EACH_ENTRY_SAFE(pair, pair2, &This->pairs, struct keyitem_pair, entry) { list_remove(&pair->entry); list_remove(&pair->bucket); @@ -796,6 +857,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->method = BinaryCompare; This->count = 0; list_init(&This->pairs); + list_init(&This->notifier); memset(This->buckets, 0, sizeof(This->buckets)); *obj = &This->IDictionary_iface; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 927ac05..1869861 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -618,6 +618,123 @@ static void test_Add(void) IDictionary_Release(dict); } +static void test_IEnumVARIANT(void) +{ + IUnknown *enum1, *enum2; + IEnumVARIANT *enumvar; + VARIANT key, item; + IDictionary *dict; + ULONG fetched; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDictionary__NewEnum(dict, NULL); + + hr = IDictionary__NewEnum(dict, &enum1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary__NewEnum(dict, &enum2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(enum1 != enum2, "got %p, %p\n", enum2, enum1); + IUnknown_Release(enum2); + + hr = IUnknown_QueryInterface(enum1, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(enum1); + + /* dictionary is empty */ + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 1; + V_VT(&item) = VT_I4; + V_I4(&item) = 100; + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 4000; + V_VT(&item) = VT_I4; + V_I4(&item) = 200; + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + V_VT(&item) = VT_I4; + V_I4(&item) = 300; + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&key); + hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); + ok(V_I2(&key) == 1, "got %d\n", V_I2(&key)); + ok(fetched == 1, "got %u\n", fetched); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Remove(dict, &key); + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&key); + hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); + ok(V_I2(&key) == 4000, "got %d\n", V_I2(&key)); + ok(fetched == 1, "got %u\n", fetched); + + VariantInit(&key); + hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_I2, "got %d\n", V_VT(&key)); + ok(V_I2(&key) == 0, "got %d\n", V_I2(&key)); + ok(fetched == 1, "got %u\n", fetched); + + /* enumeration reached the bottom, add one more pair */ + VariantInit(&key); + hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 13; + V_VT(&item) = VT_I4; + V_I4(&item) = 350; + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* still doesn't work until Reset() */ + VariantInit(&key); + hr = IEnumVARIANT_Next(enumvar, 1, &key, &fetched); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IEnumVARIANT_Release(enumvar); + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -642,6 +759,7 @@ START_TEST(dictionary) test_Remove(); test_Item(); test_Add(); + test_IEnumVARIANT(); CoUninitialize(); }

1 0

Ken Thomases : winejoystick: Fix a crash on accessing a CFArray past its end due to an off-by-one error in the Mac code.
by Alexandre Julliard 19 Mar '15

19 Mar '15

Module: wine Branch: master Commit: 77432ac45db59440af1aa75e36c93cd025e4e5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77432ac45db59440af1aa75e3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 18 14:02:13 2015 -0500 winejoystick: Fix a crash on accessing a CFArray past its end due to an off-by-one error in the Mac code. --- dlls/winejoystick.drv/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index c8850af..cb66c47 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -528,7 +528,7 @@ static BOOL open_joystick(joystick_t* joystick) } index = joystick - joysticks; - if (index > CFArrayGetCount(device_main_elements)) + if (index >= CFArrayGetCount(device_main_elements)) return FALSE; joystick->element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, index);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
78
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 March 2015