Shlwapi UNC problems with IE6

[lawson_whitney at juno.com]

On Thu, 21 Feb 2002, Sylvain Petreolle wrote:

> I forgot the debugger output (same as before but
> source line changed)

I hate when that happens.  Squash a bug and it gets up and bites you.
Could you try this one?  This is against the current CVS, which contains
an extended version of my last try, because I got overconfident and now
I have to patch over my own patches.

diff -ur was/dlls/shlwapi/path.c is/dlls/shlwapi/path.c
--- was/dlls/shlwapi/path.c	Wed Feb 20 17:49:34 2002
+++ is/dlls/shlwapi/path.c	Thu Feb 21 10:40:38 2002
@@ -1305,7 +1305,7 @@
 	LPCSTR lpszPath)
 {
 	TRACE("%s\n", debugstr_a(lpszPath));
-	if (!lpszPath) return FALSE;
+	if (IsBadStringPtrA(lpszPath, -1)) return FALSE;
 	if (lpszPath[0]=='\\' && lpszPath[1]=='\\')		
 	{
 	  int foundbackslash = 0;
@@ -1328,7 +1328,7 @@
 	LPCWSTR lpszPath)
 {
 	TRACE("%s\n", debugstr_w(lpszPath));
-	if (!lpszPath) return FALSE;
+	if (IsBadStringPtrW(lpszPath, -1)) return FALSE;
 	if (lpszPath[0]=='\\' && lpszPath[1]=='\\')		
 	{
 	  int foundbackslash = 0;


Lawson

Constants aren't, and variables won't.


-------------- next part --------------
diff -ur was/dlls/shlwapi/path.c is/dlls/shlwapi/path.c
--- was/dlls/shlwapi/path.c	Wed Feb 20 17:49:34 2002
+++ is/dlls/shlwapi/path.c	Thu Feb 21 10:40:38 2002
@@ -1305,7 +1305,7 @@
 	LPCSTR lpszPath)
 {
 	TRACE("%s\n", debugstr_a(lpszPath));
-	if (!lpszPath) return FALSE;
+	if (IsBadStringPtrA(lpszPath, -1)) return FALSE;
 	if (lpszPath[0]=='\\' && lpszPath[1]=='\\')		
 	{
 	  int foundbackslash = 0;
@@ -1328,7 +1328,7 @@
 	LPCWSTR lpszPath)
 {
 	TRACE("%s\n", debugstr_w(lpszPath));
-	if (!lpszPath) return FALSE;
+	if (IsBadStringPtrW(lpszPath, -1)) return FALSE;
 	if (lpszPath[0]=='\\' && lpszPath[1]=='\\')		
 	{
 	  int foundbackslash = 0;