[NTOS][WIN32K]

- Disable some noisy DPRINTs

svn path=/trunk/; revision=71168

diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c
index 7703352..e79feb1 100644 (file)
--- a/reactos/ntoskrnl/config/cmsysini.c
+++ b/reactos/ntoskrnl/config/cmsysini.c
@@ -787,7 +787,7 @@ Cleanup:
     if (ProfileHandle) NtClose(ProfileHandle);
     if (ParentHandle) NtClose(ParentHandle);
 
-    DPRINT1("CmpCreateControlSet() done\n");
+    DPRINT("CmpCreateControlSet() done\n");
 
     /* Return success */
     return STATUS_SUCCESS;

diff --git a/reactos/ntoskrnl/ps/apphelp.c b/reactos/ntoskrnl/ps/apphelp.c
index a1177e0..bc2a307 100644 (file)
--- a/reactos/ntoskrnl/ps/apphelp.c
+++ b/reactos/ntoskrnl/ps/apphelp.c
@@ -274,7 +274,7 @@ ApphelpCacheParse(
     }
 
     NumEntries = Header->NumEntries;
-    DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries);
+    DPRINT("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries);
     for (Cur = 0; Cur < NumEntries; ++Cur)
     {
         Persistent = (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE +
@@ -382,9 +382,9 @@ ApphelpCacheWrite(VOID)
         ++NumEntries;
         ListEntry = ListEntry->Flink;
     }
-    DPRINT1("SHIMS: ApphelpCacheWrite, %d Entries, total size: %d\n", NumEntries, Length);
+    DPRINT("SHIMS: ApphelpCacheWrite, %d Entries, total size: %d\n", NumEntries, Length);
     Length = ROUND_UP(Length, sizeof(ULONGLONG));
-    DPRINT1("SHIMS: ApphelpCacheWrite, Rounded to: %d\n", Length);
+    DPRINT("SHIMS: ApphelpCacheWrite, Rounded to: %d\n", Length);
 
     /* Now we allocate and prepare some helpers */
     Buffer = ApphelpAlloc(Length);
@@ -439,7 +439,7 @@ NTAPI
 INIT_FUNCTION
 ApphelpCacheInitialize(VOID)
 {
-    DPRINT1("SHIMS: ApphelpCacheInitialize\n");
+    DPRINT("SHIMS: ApphelpCacheInitialize\n");
     /* If we are booting in safemode we do not want to use the apphelp cache */
     if (InitSafeBootMode)
     {
@@ -457,7 +457,7 @@ ApphelpCacheInitialize(VOID)
         InitializeListHead(&ApphelpShimCacheAge);
         ApphelpCacheEnabled = ApphelpCacheRead();
     }
-    DPRINT1("SHIMS: ApphelpCacheInitialize: %d\n", ApphelpCacheEnabled);
+    DPRINT("SHIMS: ApphelpCacheInitialize: %d\n", ApphelpCacheEnabled);
     return STATUS_SUCCESS;
 }
 

diff --git a/reactos/win32ss/user/ntuser/class.c b/reactos/win32ss/user/ntuser/class.c
index 29db65c..dd44dba 100644 (file)
--- a/reactos/win32ss/user/ntuser/class.c
+++ b/reactos/win32ss/user/ntuser/class.c
@@ -379,7 +379,7 @@ RegisterControlAtoms(VOID)
        if (IntRegisterClassAtom(&ClassName, &Atom))
        {
           gpsi->atomSysClass[i] = Atom;
-          ERR("Reg Control Atoms 0x%x\n",Atom);
+          TRACE("Reg Control Atom %ls: 0x%x\n", ControlsList[i], Atom);
        }
        i++;
     }
@@ -2299,15 +2299,17 @@ UserRegisterSystemClasses(VOID)
         wc.hIcon = NULL;
 
         //// System Cursors should be initilized!!!
-        if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL &&
-            SYSTEMCUR(ARROW) != NULL)
+        wc.hCursor = NULL;
+        if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL)
         {
-            wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW));
-        }
-        else
-        {
-            ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n");
-            wc.hCursor = NULL;
+            if (SYSTEMCUR(ARROW) == NULL)
+            {
+                ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n");
+            }
+            else
+            {
+                wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW));
+            }
         }
 
         hBrush = DefaultServerClasses[i].hBrush;