PATCH: unix shellfolder crash

Marcus Meissner marcus at jet.franken.de
Tue Nov 1 07:12:36 CST 2005


Hi,

Winamp 5.1 crashes when adding Directories of MP3s to the
playlist in the unixfs shellfolder handling.

This workaround cures the problem and the unixfs handling
is still there.

Ciao, Marcus

Changelog:
	Michael Jung <mjung at iss.tu-darmstadt.de>
	Fixed crash in unixfs shellfolder handling with winamp.

Index: dlls/shell32/shfldr_unixfs.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_unixfs.c,v
retrieving revision 1.55
diff -u -r1.55 shfldr_unixfs.c
--- dlls/shell32/shfldr_unixfs.c	27 Oct 2005 12:10:00 -0000	1.55
+++ dlls/shell32/shfldr_unixfs.c	1 Nov 2005 13:10:58 -0000
@@ -583,6 +583,11 @@
     TRACE("(iface=%p, hwndOwner=%p, grfFlags=%08lx, ppEnumIDList=%p)\n", 
             iface, hwndOwner, grfFlags, ppEnumIDList);
 
+    if (!This->m_pszPath) {
+	WARN("EnumObjects called on uninitialized UnixFolder-object!\n");
+	return E_UNEXPECTED;
+    }
+
     newIterator = UnixSubFolderIterator_Constructor(This, grfFlags);
     hr = IUnknown_QueryInterface(newIterator, &IID_IEnumIDList, (void**)ppEnumIDList);
     IUnknown_Release(newIterator);



More information about the wine-patches mailing list