propsheet patch

[Huw D M Davies]

        Huw Davies <huw at codeweavers.com>
	Don't get confused if PSN_SETACTIVE returns a positive number that
	isn't a resource id.        
-- 
Huw Davies
huw at codeweavers.com

Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.90
diff -u -r1.90 propsheet.c
--- dlls/comctl32/propsheet.c	2 Oct 2003 04:26:53 -0000	1.90
+++ dlls/comctl32/propsheet.c	3 Nov 2003 17:00:25 -0000
@@ -2028,19 +2028,25 @@
       index+=skipdir;
       if (index < 0) {
 	index = 0;
-	FIXME("Tried to skip before first property sheet page!\n");
+	WARN("Tried to skip before first property sheet page!\n");
 	break;
       }
       if (index >= psInfo->nPages) {
-	FIXME("Tried to skip after last property sheet page!\n");
+	WARN("Tried to skip after last property sheet page!\n");
 	index = psInfo->nPages-1;
 	break;
       }
     }
     else if (result != 0)
     {
-       index = PROPSHEET_FindPageByResId(psInfo, result);
-       continue;
+      int old_index = index;
+      index = PROPSHEET_FindPageByResId(psInfo, result);
+      if(index >= psInfo->nPages) {
+        index = old_index;
+        WARN("Tried to skip to nonexistant page by res id\n");
+        break;
+      }
+      continue;
     }
   }
   /*