November 2019 - Wine-commits

Alistair Leslie-Hughes : dmloader: Rewrite cache object lookup.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: d66b3ae922a864b74e0650ed96d86eeed0760424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66b3ae922a864b74e0650ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 25 21:22:06 2019 +0100 dmloader: Rewrite cache object lookup. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 174 ++++++++++++++++++++++++++++--------------------- 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 69a438765d..56d241dd1e 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -163,6 +163,85 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) return ref; } +static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_OBJECTDESC *desc) +{ + struct cache_entry *existing; + + /* + * The Object is looked for the the following order. + * 1. DMUS_OBJ_OBJECT + * 2. DMUS_OBJ_STREAM + * 3. DMUS_OBJ_MEMORY + * 4. DMUS_OBJ_FILENAME and DMUS_OBJ_FULLPATH + * 5. DMUS_OBJ_NAME and DMUS_OBJ_CATEGORY + * 6. DMUS_OBJ_NAME + * 7. DMUS_OBJ_FILENAME + */ + + if (desc->dwValidData & DMUS_OBJ_OBJECT) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_OBJECT && + IsEqualGUID(&desc->guidObject, &existing->Desc.guidObject) ) { + TRACE("Found by DMUS_OBJ_OBJECT\n"); + return existing; + } + } + } + + if (desc->dwValidData & DMUS_OBJ_STREAM) + FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); + + if (desc->dwValidData & DMUS_OBJ_MEMORY) + FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + + if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH) && + !wcsncmp(desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH\n"); + return existing; + } + } + } + + if ((desc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY) && + !wcsncmp(desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME) && + !wcsncmp(desc->wszCategory, existing->Desc.wszCategory, DMUS_MAX_CATEGORY)) { + TRACE("Found by DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME && + !wcsncmp(desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME)) { + TRACE("Found by DMUS_OBJ_NAME\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (((existing->Desc.dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) && + !wcsncmp(desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME\n"); + return existing; + } + } + } + + return NULL; +} + static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDESC *pDesc, REFIID riid, void **ppv) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); @@ -187,80 +266,27 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac *ppv = NULL; return DMUS_E_LOADER_NOCLASSID; } - - /* OK, first we iterate through the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile) - or set via SetObject; */ - TRACE(": looking if we have object in the cache or if it can be found via alias\n"); - LIST_FOR_EACH_ENTRY(pExistingEntry, &This->cache, struct cache_entry, entry) { - if ((pDesc->dwValidData & DMUS_OBJ_OBJECT) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&pDesc->guidObject, &pExistingEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - /* I suppose such stuff can happen only when GUID for object is given (GUID_DefaultGMCollection) */ - if (pExistingEntry->bInvalidDefaultDLS) { - TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); - return DMUS_E_LOADER_NOFILENAME; - } - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - break; - } - else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (pDesc->wszCategory, pExistingEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_NAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_FILENAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - } - + + /* Iterate through the list of objects we know about; these are either loaded + * (GetObject, LoadObjectFromFile) or set via SetObject; */ + TRACE(": looking if we have object in the cache or if it can be found via alias\n"); + pExistingEntry = find_cache_object(This, pDesc); + if (pExistingEntry) { + + if (pExistingEntry->bInvalidDefaultDLS) { + TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); + return DMUS_E_LOADER_NOFILENAME; + } + + if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { + TRACE(": already loaded\n"); + return IDirectMusicObject_QueryInterface(pExistingEntry->pObject, riid, ppv); + } + + TRACE(": not loaded yet\n"); + pObjectEntry = pExistingEntry; + } + /* basically, if we found alias, we use its descriptor to load... else we use info we were given */ if (pObjectEntry) {

1 0

Alistair Leslie-Hughes : dmloader: Rewrite IDirectMusicLoader8 CacheObject using find_cache_object.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: cc67ea6dfa83bb5e41d1fd4a7519714aa48c6a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc67ea6dfa83bb5e41d1fd4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 25 21:22:07 2019 +0100 dmloader: Rewrite IDirectMusicLoader8 CacheObject using find_cache_object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 101 +++++++++++++------------------------------------ 1 file changed, 26 insertions(+), 75 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 56d241dd1e..c8d04927fd 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -655,83 +655,34 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * } while (1); } -static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; - struct cache_entry *pObjectEntry; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; - TRACE("(%p, %p)\n", This, pObject); - - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* now iterate through the list and check if we have an alias (without object), corresponding - to the descriptor of the input object */ - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - } - - /* if we found such alias, then set everything */ - if (result == S_OK) { - pObjectEntry->Desc.dwValidData &= DMUS_OBJ_LOADED; - pObjectEntry->pObject = pObject; - IDirectMusicObject_AddRef (pObjectEntry->pObject); - } - - return result; + TRACE("(%p, %p)\n", This, object); + + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor(object, &desc); + + /* Iterate through the list and check if we have an alias (without object), corresponding + to the descriptor of the input object */ + entry = find_cache_object(This, &desc); + if (entry) { + if ((entry->Desc.dwValidData & DMUS_OBJ_LOADED) && entry->pObject) { + TRACE("Object already laoded.\n"); + return S_FALSE; + } + + entry->Desc.dwValidData |= DMUS_OBJ_LOADED; + entry->pObject = object; + IDirectMusicObject_AddRef(entry->pObject); + return S_OK; + } + + return DMUS_E_LOADER_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject)

1 0

Alistair Leslie-Hughes : dmloader: Rewrite IDirectMusicLoader8 ReleaseObject using find_cache_object.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8388ea840fedbb9b646213a26cd59ceb3a48680b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8388ea840fedbb9b646213a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 25 21:22:08 2019 +0100 dmloader: Rewrite IDirectMusicLoader8 ReleaseObject using find_cache_object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 87 +++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index c8d04927fd..42209def94 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -685,70 +685,35 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if return DMUS_E_LOADER_OBJECTNOTFOUND; } -static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - struct cache_entry *pObjectEntry; - HRESULT result = S_FALSE; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; - TRACE("(%p, %p)\n", This, pObject); - - if(!pObject) return E_POINTER; + TRACE("(%p, %p)\n", This, object); - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* iterate through the list of objects we know about; check only those with DMUS_OBJ_LOADED */ - TRACE(": looking for the object in cache\n"); - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if (TRACE_ON(dmloader)) - dump_DMUS_OBJECTDESC(&pObjectEntry->Desc); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - result = S_OK; - break; - } - } - if (result == S_OK) { - /*TRACE(": releasing:\n%s - bInvalidDefaultDLS = %i\n - pObject = %p\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); */ - IDirectMusicObject_Release (pObjectEntry->pObject); - pObjectEntry->pObject = NULL; - pObjectEntry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; - } - return result; + if (!object) + return E_POINTER; + + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor(object, &desc); + + TRACE("Looking for the object in cache\n"); + entry = find_cache_object(This, &desc); + if (entry) { + dump_DMUS_OBJECTDESC(&entry->Desc); + + if (entry->pObject && entry->Desc.dwValidData & DMUS_OBJ_LOADED) { + IDirectMusicObject_Release(entry->pObject); + entry->pObject = NULL; + entry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class)

1 0

Chip Davis : mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 19549d11a72f63efe0d689374446a56a68264a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=19549d11a72f63efe0d68937… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Nov 25 11:40:34 2019 -0600 mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/oldconfig.c | 407 ------------------------------------------- dlls/kernel32/process.c | 1 - dlls/mountmgr.sys/dbus.c | 185 +++++++++++++++++++- dlls/mountmgr.sys/device.c | 153 +++++++++++++++- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 8 +- dlls/mountmgr.sys/mountmgr.h | 36 +++- 8 files changed, 377 insertions(+), 416 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19549d11a72f63efe0d6…

1 0

Chip Davis : mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi on Mac OS.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: d61e293924b076392bcf14bfa04e8b00fd305f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61e293924b076392bcf14bf… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Nov 25 11:40:35 2019 -0600 mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi on Mac OS. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 77 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 91d2f851e8..8bbf43579c 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,9 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif @@ -46,14 +49,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) + static void appeared_callback( DADiskRef disk, void *context ) { CFDictionaryRef dict = DADiskCopyDescription( disk ); const void *ref; char device[64]; char mount_point[PATH_MAX]; + char model[64]; + size_t model_len = 0; GUID guid, *guid_ptr = NULL; enum device_type type = DEVICE_UNKNOWN; + UINT pdtype = 0; + SCSI_ADDRESS scsi_addr; + UNICODE_STRING devname; + int fd; if (!dict) return; @@ -77,22 +96,78 @@ static void appeared_callback( DADiskRef disk, void *context ) if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaKind") ))) { if (!CFStringCompare( ref, CFSTR("IOCDMedia"), 0 )) + { type = DEVICE_CDROM; + pdtype = 5; + } if (!CFStringCompare( ref, CFSTR("IODVDMedia"), 0 ) || !CFStringCompare( ref, CFSTR("IOBDMedia"), 0 )) + { type = DEVICE_DVD; + pdtype = 5; + } if (!CFStringCompare( ref, CFSTR("IOMedia"), 0 )) type = DEVICE_HARDDISK; } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceVendor") ))) + { + CFIndex i; + + CFStringGetCString( ref, model, sizeof(model), kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 8 characters */ + for (i = 0; i < (CFIndex)8 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceModel") ))) + { + CFIndex i; + + CFStringGetCString( ref, model+model_len, sizeof(model)-model_len, kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 16 characters */ + for (i = 0; i < (CFIndex)16 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceRevision") ))) + { + CFIndex i; + + CFStringGetCString( ref, model+model_len, sizeof(model)-model_len, kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 4 characters */ + for (i = 0; i < (CFIndex)4 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + TRACE( "got mount notification for '%s' on '%s' uuid %s\n", device, mount_point, wine_dbgstr_guid(guid_ptr) ); + devname.Buffer = NULL; if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - add_dos_device( -1, device, device, mount_point, type, guid_ptr, NULL ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr, &devname ); else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + if ((fd = open( device, O_RDONLY )) >= 0) + { + dk_scsi_identify_t dsi; + + if (ioctl( fd, DKIOCSCSIIDENTIFY, &dsi ) >= 0) + { + scsi_addr.PortNumber = dsi.bus; + scsi_addr.PathId = dsi.port; + scsi_addr.TargetId = dsi.target; + scsi_addr.Lun = dsi.lun; + + /* FIXME: get real controller Id for SCSI */ + /* FIXME: get real driver name */ + create_scsi_entry( &scsi_addr, 255, "WINE SCSI", pdtype, model, &devname ); + } + close( fd ); + } + done: CFRelease( dict ); }

1 0

Zebediah Figura : ddraw: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: ddec23013e39b563a3a50c0fe42c2ae8b518d538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddec23013e39b563a3a50c0f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 20 10:30:11 2019 -0600 ddraw: Track the viewport and scissor rect in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ad1fdb7f5..ffa029321c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6961,6 +6961,17 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device return WINED3D_ZB_TRUE; } +static void ddraw_reset_viewport_state(struct ddraw *ddraw) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(ddraw->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(ddraw->state, &vp); + wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); +} + static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { @@ -7039,6 +7050,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); } + ddraw_reset_viewport_state(ddraw); return D3D_OK; }

1 0

Alexandre Julliard : msvcrt: Fix range check in wsctoul().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: ad96d9195e4b524a7bf8ea7250aa384ee07bca0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad96d9195e4b524a7bf8ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 24 12:42:03 2019 +0100 msvcrt: Fix range check in wsctoul(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3e5bb512ff..1ae292423c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2487,7 +2487,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) { - __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + unsigned __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); if(ret > MSVCRT_ULONG_MAX) { ret = MSVCRT_ULONG_MAX;

1 0

Zebediah Figura : strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: bd83b11a238addcf5605d8be4aad20ad4a884f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd83b11a238addcf5605d8be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:13:59 2019 -0600 strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 6 +++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/enumpins.c | 10 ++++------ dlls/strmbase/filter.c | 14 +++----------- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/wineqtdecoder/qtsplitter.c | 10 +++++----- include/wine/strmbase.h | 2 +- 17 files changed, 45 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd83b11a238addcf5605…

1 0

Zebediah Figura : strmbase: Simplify SendFurther().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: b0b56001fe89188b6b14ce62860a6a0a1cd58e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b56001fe89188b6b14ce62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:00 2019 -0600 strmbase: Simplify SendFurther(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 87 ++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 75 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 92a2fe55b9..4606c25a78 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -56,82 +56,18 @@ static HRESULT updatehres( HRESULT original, HRESULT new ) * If the pin given is an input pin, the message will be sent downstream to other input pins * If the pin given is an output pin, the message will be sent upstream to other output pins */ -static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPinFunc fnEnd ) +static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *arg) { - PIN_INFO pin_info; - ULONG amount = 0; + struct strmbase_pin *pin; HRESULT hr = S_OK; - HRESULT hr_return = S_OK; - IEnumPins *enumpins = NULL; - BOOL foundend = TRUE; - PIN_DIRECTION from_dir; + unsigned int i; - IPin_QueryDirection( from, &from_dir ); - - hr = IPin_QueryInternalConnections( from, NULL, &amount ); - if (hr != E_NOTIMPL && amount) - FIXME("Use QueryInternalConnections!\n"); - - pin_info.pFilter = NULL; - hr = IPin_QueryPinInfo( from, &pin_info ); - if (FAILED(hr)) - goto out; - - hr = IBaseFilter_EnumPins( pin_info.pFilter, &enumpins ); - if (FAILED(hr)) - goto out; - - hr = IEnumPins_Reset( enumpins ); - while (hr == S_OK) { - IPin *pin = NULL; - hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); - if (hr == VFW_E_ENUM_OUT_OF_SYNC) - { - hr = IEnumPins_Reset( enumpins ); - continue; - } - if (pin) - { - PIN_DIRECTION dir; - - IPin_QueryDirection( pin, &dir ); - if (dir != from_dir) - { - IPin *connected = NULL; - - foundend = FALSE; - IPin_ConnectedTo( pin, &connected ); - if (connected) - { - HRESULT hr_local; - - hr_local = fnMiddle( connected, arg ); - hr_return = updatehres( hr_return, hr_local ); - IPin_Release(connected); - } - } - IPin_Release( pin ); - } - else - { - hr = S_OK; - break; - } - } - - if (!foundend) - hr = hr_return; - else if (fnEnd) { - HRESULT hr_local; - - hr_local = fnEnd( from, arg ); - hr_return = updatehres( hr_return, hr_local ); + for (i = 0; (pin = sink->pin.filter->ops->filter_get_pin(sink->pin.filter, i)); ++i) + { + if (pin->dir == PINDIR_OUTPUT && pin->peer) + hr = updatehres(hr, func(pin->peer, arg)); } - IEnumPins_Release(enumpins); -out: - if (pin_info.pFilter) - IBaseFilter_Release( pin_info.pFilter ); return hr; } @@ -799,7 +735,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) LeaveCriticalSection(&This->pin.filter->csFilter); if (hr == S_OK) - hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + hr = SendFurther(This, deliver_endofstream, NULL); return hr; } @@ -817,7 +753,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = TRUE; - hr = SendFurther( iface, deliver_beginflush, NULL, NULL ); + hr = SendFurther(This, deliver_beginflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -837,7 +773,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = This->end_of_stream = FALSE; - hr = SendFurther( iface, deliver_endflush, NULL, NULL ); + hr = SendFurther(This, deliver_endflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -857,6 +793,7 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { + struct strmbase_sink *pin = impl_sink_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", @@ -866,7 +803,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, R args.tStop = stop; args.rate = rate; - return SendFurther( iface, deliver_newsegment, &args, NULL ); + return SendFurther(pin, deliver_newsegment, &args); } /*** IMemInputPin implementation ***/

1 0

Zebediah Figura : strmbase/transform: Check whether the source is connected in TransformFilter_Input_Receive().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8bfd6d3285d9c4e91f79445070ecfdbf792ffb9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfd6d3285d9c4e91f794450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:01 2019 -0600 strmbase/transform: Check whether the source is connected in TransformFilter_Input_Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e7d4d66164..29c385793a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -59,6 +59,16 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, TRACE("%p\n", This); + /* We do not expect pin connection state to change while the filter is + * running. This guarantee is necessary, since otherwise we would have to + * take the filter lock, and we can't take the filter lock from a streaming + * thread. */ + if (!pTransform->source.pMemInputPin) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + EnterCriticalSection(&pTransform->csReceive); if (pTransform->filter.state == State_Stopped) {

1 0