Changeset 2523 for trunk/src/comctl32/comctl32.c

Timestamp:

Jan 26, 2000, 7:04:30 PM (26 years ago)

Author:

cbratschi

Message:

added API logging, removed progress frame

File:

• trunk/src/comctl32/comctl32.c (modified) (17 diffs)

trunk/src/comctl32/comctl32.c

@@ -1 @@
-/* $Id: comctl32.c,v 1.11 1999-11-14 10:58:37 achimha Exp $ */
+/* $Id: comctl32.c,v 1.12 2000-01-26 18:04:29 cbratschi Exp $ */
 /*
  * Win32 common controls implementation
@@ -135 +135 @@
     UINT uMenuID = 0;
 
+    dprintf(("COMCTL32: MenuHelp"));
+
     if (!IsWindow (hwndStatus))
         return;
@@ -170 +172 @@
 
         case WM_COMMAND :
-//          TRACE("WM_COMMAND wParam=0x%X lParam=0x%lX\n",
-//                 wParam, lParam);
-            /* WM_COMMAND is not invalid since it is documented
-             * in the windows api reference. So don't output
+//          TRACE("WM_COMMAND wParam=0x%X lParam=0x%lX\n",
+//                 wParam, lParam);
+            /* WM_COMMAND is not invalid since it is documented
+             * in the windows api reference. So don't output
              * any FIXME for WM_COMMAND
              */
-//          WARN("We don't care about the WM_COMMAND\n");
-            break;
+//          WARN("We don't care about the WM_COMMAND\n");
+            break;
 
         default:
@@ -222 +224 @@
 //    TRACE (commctrl, "%x, %x, %p\n", hwnd, uFlags, lpInfo);
 
+    dprintf(("COMCTL32: ShowHideMenuCtl"));
+
     if (lpInfo == NULL)
         return FALSE;
@@ -283 +287 @@
 //    TRACE (commctrl, "(0x%08lx 0x%08lx 0x%08lx)\n",
 //         (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
+
+    dprintf(("COMCTL32: GetEffectiveClientRect"));
 
     GetClientRect (hwnd, lpRect);
@@ -328 +334 @@
     UINT border = BDR_SUNKENOUTER;
 
+    dprintf(("COMCTL32: DrawStatusTextA"));
+
     if (style & SBT_POPOUT)
       border = BDR_RAISEDOUTER;
@@ -366 +374 @@
 {
     LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, text);
+
+    dprintf(("COMCTL32: DrawStatusTextW"));
+
     DrawStatusTextA (hdc, lprc, p, style);
     HeapFree (GetProcessHeap (), 0, p );
@@ -390 +401 @@
 CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
 {
+    dprintf(("COMCTL32: CreateStatusWindowA"));
+
     return CreateWindowA(STATUSCLASSNAMEA, text, style,
                            CW_USEDEFAULT, CW_USEDEFAULT,
@@ -414 +427 @@
 CreateStatusWindowW (INT style, LPCWSTR text, HWND parent, UINT wid)
 {
+    dprintf(("COMCTL32: CreateStatusWindowW"));
+
     return CreateWindowW(STATUSCLASSNAMEW, text, style,
                            CW_USEDEFAULT, CW_USEDEFAULT,
@@ -448 +463 @@
                      HWND buddy, INT maxVal, INT minVal, INT curVal)
 {
-    HWND hUD =
-        CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
+    HWND hUD;
+
+    dprintf(("COMCTL32: CreateUpDownControl"));
+
+    hUD = CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
                          parent, id, inst, 0);
     if (hUD) {
@@ -479 +497 @@
 VOID WINAPI InitCommonControls(VOID)
 {
+  dprintf(("COMCTL32: InitCommonControls"));
 }
 
@@ -503 +522 @@
     INT cCount;
     DWORD dwMask;
+
+    dprintf(("COMCTL32: InitCommonControlsEx"));
 
     if (!lpInitCtrls)
@@ -592 +613 @@
                  INT dxBitmap, INT dyBitmap, UINT uStructSize)
 {
-    HWND hwndTB =
-        CreateWindowExA (0, TOOLBARCLASSNAMEA, "", style, 0, 0, 0, 0,
-                           hwnd, (HMENU)wID, 0, NULL);
+    HWND hwndTB;
+
+    dprintf(("COMCTL32: CreateToolbarEx"));
+
+    hwndTB = CreateWindowExA (0, TOOLBARCLASSNAMEA, "", style, 0, 0, 0, 0,
+                              hwnd, (HMENU)wID, 0, NULL);
     if(hwndTB) {
         TBADDBITMAP tbab;
@@ -603 +627 @@
         /* set bitmap and button size */
         /*If CreateToolbarEx receive 0, windows set default values*/
-        if (dyBitmap < 0)
+        if (dyBitmap <= 0)
             dyBitmap = 16;
-        if (dxBitmap < 0)
+        if (dxBitmap <= 0)
             dxBitmap = 16;
 
@@ -665 +689 @@
         {{0x000000, 0}, {0x808080, 0}, {0xC0C0C0, 0}, {0xFFFFFF, 0}};
 
+    dprintf(("COMCTL32: CreateMappedBitmap"));
+
     /* initialize pointer to colortable and default color table */
     if (lpColorMap) {
@@ -703 +729 @@
                        pColorTable[iColor].rgbGreen,
                        pColorTable[iColor].rgbBlue);
-            if ( cRef  == sysColorMap[i].from) {
+            if ( cRef  == sysColorMap[i].from) {
 #if 0
                 if (wFlags & CBS_MASKED) {
@@ -767 +793 @@
                LPCOLDTBBUTTON lpButtons,INT iNumButtons)
 {
+    dprintf(("COMCTL32: CreateToolbar"));
+
     return CreateToolbarEx (hwnd, style | CCS_NODIVIDER, wID, nBitmaps,
                             hBMInst, wBMID, (LPCTBBUTTON)lpButtons,