[ros-diffs] [spetreolle] 25643: merge 25562

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Sat Jan 27 01:31:55 2007
New Revision: 25643

URL: http://svn.reactos.org/svn/reactos?rev=25643&view=rev
Log:
merge 25562

Modified:
    branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/devclass.c
    branches/ros-branch-0_3_1/reactos/drivers/filesystems/ms/create.c

Modified: branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/devclass.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/devclass.c?rev=25643&r1=25642&r2=25643&view=diff
==============================================================================
--- branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/devclass.c (original)
+++ branches/ros-branch-0_3_1/reactos/dll/win32/setupapi/devclass.c Sat Jan 27 01:31:55 2007
@@ -1515,7 +1515,7 @@
     {
         LPWSTR Buffer = NULL;
         LPCWSTR DllName;
-        INT iconIndex;
+        INT iconIndex = 0;
         HKEY hKey = INVALID_HANDLE_VALUE;
 
         hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE);

Modified: branches/ros-branch-0_3_1/reactos/drivers/filesystems/ms/create.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/drivers/filesystems/ms/create.c?rev=25643&r1=25642&r2=25643&view=diff
==============================================================================
--- branches/ros-branch-0_3_1/reactos/drivers/filesystems/ms/create.c (original)
+++ branches/ros-branch-0_3_1/reactos/drivers/filesystems/ms/create.c Sat Jan 27 01:31:55 2007
@@ -111,7 +111,7 @@
     PMSFS_CCB Ccb;
     KIRQL oldIrql;
     PLIST_ENTRY current_entry;
-    PMSFS_FCB current;
+    PMSFS_FCB current = NULL;
     PMAILSLOT_CREATE_PARAMETERS Buffer;
 
     DPRINT("MsfsCreateMailslot(DeviceObject %p Irp %p)\n", DeviceObject, Irp);