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

Nikolay Sivov : ole32/datacache: Handle stream Stat() failure (PVS-Studio) .
by Alexandre Julliard March 19, 2015

March 19, 2015

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

Francois Gouget : scsiport.sys: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: e0483c2355d770d108841a3a5feba80f8b3b17d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0483c2355d770d108841a3a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:01:14 2015 +0100 scsiport.sys: Remove unneeded NONAMELESSXXX directives. --- dlls/scsiport.sys/scsiport.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/scsiport.sys/scsiport.c b/dlls/scsiport.sys/scsiport.c index f689153..baafaec 100644 --- a/dlls/scsiport.sys/scsiport.c +++ b/dlls/scsiport.sys/scsiport.c @@ -18,9 +18,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Francois Gouget : rpcrt4: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 13ad265b23db14151b60c6e056312c32e4c94714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ad265b23db14151b60c6e05… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:01:32 2015 +0100 rpcrt4: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/rpcrt4/ndr_ole.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 143bba7..0f0b7e7 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -27,7 +27,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

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

March 19, 2015

Module: wine Branch: master Commit: 40d213a297031f9ad546781f33665fea88a2338e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d213a297031f9ad546781f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:05:17 2015 +0100 krnl386.exe16: Mark internal symbols with hidden visibility. --- dlls/krnl386.exe16/dosexe.h | 178 +++++++++++++++++----------------- dlls/krnl386.exe16/kernel16_private.h | 111 ++++++++++----------- dlls/krnl386.exe16/vga.h | 62 ++++++------ dlls/krnl386.exe16/wowthunk.c | 2 - 4 files changed, 176 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40d213a297031f9ad5467…

1 0

Nikolay Sivov : scrrun: Implement IEnumVARIANT support for dictionary.
by Alexandre Julliard March 19, 2015

March 19, 2015

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

Nikolay Sivov : wmvcore: Return S_OK from WMCreateReader.
by Alexandre Julliard March 19, 2015

March 19, 2015

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

André Hentschel : server: Add header guarding for security.h.
by Alexandre Julliard March 19, 2015

March 19, 2015

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

Francois Gouget : hh: Use the hh.exe icon as the default for .chm files.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 20938661dff0f5be3577f2749ac87324cf11918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20938661dff0f5be3577f2749… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 18 17:10:01 2015 +0100 hh: Use the hh.exe icon as the default for .chm files. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c401b1..d901251 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -176,6 +176,7 @@ HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,chm.file,,2,"Compiled HTML Help File" +HKCR,chm.file\DefaultIcon,,2,"%10%\hh.exe,0" HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel"

1 0

Francois Gouget : hh: Add an icon.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: ab99567fe159fdb5e12f627bb06fa1b530a828d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab99567fe159fdb5e12f627bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 18 17:09:44 2015 +0100 hh: Add an icon. --- programs/hh/Makefile.in | 4 + programs/hh/hh.rc | 23 + programs/hh/winhelp.ico | Bin 0 -> 68621 bytes programs/hh/winhelp.svg | 1846 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1873 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab99567fe159fdb5e12f6…

1 0

Francois Gouget : sane.ds: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 305f63a22b1492cd6121693cae04090817724a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305f63a22b1492cd6121693ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:01:07 2015 +0100 sane.ds: Remove unneeded NONAMELESSXXX directives. --- dlls/sane.ds/capability.c | 3 --- dlls/sane.ds/ui.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 7bb64b3..7d3376f 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdarg.h> diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 07d5a59..5574c5a 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -25,7 +25,7 @@ #include <stdio.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "sane_i.h" #include "winuser.h" #include "winnls.h"

1 0