From 23739a339a588a977efb1d956ebc32ed271fda26 Mon Sep 17 00:00:00 2001 From: "Guy L. Albertelli" Date: Tue, 16 Jul 2002 01:23:59 +0000 Subject: [PATCH] Don't issue error message if message number in application range. --- dlls/comctl32/animate.c | 3 +-- dlls/comctl32/comboex.c | 3 +-- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/flatsb.c | 3 +-- dlls/comctl32/hotkey.c | 3 +-- dlls/comctl32/ipaddress.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/progress.c | 3 +-- dlls/comctl32/rebar.c | 3 +-- dlls/comctl32/status.c | 3 +-- dlls/comctl32/tab.c | 10 +++++----- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/tooltips.c | 3 +-- dlls/comctl32/trackbar.c | 3 +-- dlls/comctl32/treeview.c | 2 +- 15 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 74e0458bd95..a971d718082 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -917,7 +917,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP return DefWindowProcA(hWnd, uMsg, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam); @@ -946,4 +946,3 @@ void ANIMATE_Unregister(void) { UnregisterClassA(ANIMATE_CLASSA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 9e1fd6e4991..00cff820d5c 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -2174,7 +2174,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return COMBOEX_WindowPosChanging (infoPtr, (WINDOWPOS *)lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } @@ -2203,4 +2203,3 @@ void COMBOEX_Unregister (void) { UnregisterClassW (WC_COMBOBOXEXW, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 7d08b2d53f2..873c12c8bd0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1284,7 +1284,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_Destroy (hwnd, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 12bfb01422e..a8ab87d2f63 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -221,7 +221,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return FlatSB_Destroy (hwnd, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); @@ -253,4 +253,3 @@ FLATSB_Unregister (void) { UnregisterClassA (FLATSB_CLASSA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 6f0c43a54ef..e5ddb6f16b8 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -343,7 +343,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case WM_SYSCHAR: */ default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); @@ -375,4 +375,3 @@ HOTKEY_Unregister (void) { UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 00431730036..27f1eec5af6 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -533,7 +533,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return IPADDRESS_IsBlank (infoPtr); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 649044cfcb4..81ecdff6cbe 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2033,7 +2033,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_Destroy(hwnd, wParam, lParam); default: - if(uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR( "unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA(hwnd, uMsg, wParam, lParam); } diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index cd0d4a46ca4..21d886f150d 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -360,7 +360,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return 0; default: - if (message >= WM_USER) + if ((message >= WM_USER) && (message < WM_APP)) ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); return DefWindowProcW( hwnd, message, wParam, lParam ); } @@ -397,4 +397,3 @@ VOID PROGRESS_Unregister (void) { UnregisterClassW (PROGRESS_CLASSW, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index afe943138e1..4d3ac754f17 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -4472,7 +4472,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return REBAR_WindowPosChanged (infoPtr, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); @@ -4511,4 +4511,3 @@ REBAR_Unregister (void) { UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 5f122177543..2c8f1f58d58 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1223,7 +1223,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return DefWindowProcW (hwnd, msg, wParam, lParam); default: - if (msg >= WM_USER) + if ((msg >= WM_USER) && (msg < WM_APP)) ERR("unknown msg %04x wp=%04x lp=%08lx\n", msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam); @@ -1267,4 +1267,3 @@ STATUS_Unregister (void) { UnregisterClassW (STATUSCLASSNAMEW, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c7d4e0998c7..e3a8ecfe9cc 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1262,7 +1262,7 @@ static void TAB_SetItemBounds (HWND hwnd) /* ************ FIXME FIXME FIXME *************** */ /* */ /* FIXME: */ - /* if vertical, */ + /* if vertical, */ /* if item n and n+1 are in the same row, */ /* then the display has n+1 lower (toward the */ /* bottom) than n. We do it just the */ @@ -1284,7 +1284,7 @@ static void TAB_SetItemBounds (HWND hwnd) curItemLeftPos = 0; iCount = 0; } - } + } /* shift the item to the right to place it as the next item in this row */ infoPtr->items[iItm].rect.left += curItemLeftPos; @@ -1587,14 +1587,14 @@ TAB_DrawItemInterior else if(lStyle & TCS_VERTICAL) { rcImage.top = drawRect->bottom - cy - center_offset; - rcImage.left--; + rcImage.left--; drawRect->bottom = rcImage.top - HORIZONTAL_ITEM_PADDING; } else /* normal style, whether TCS_BOTTOM or not */ { rcImage.left = drawRect->left + center_offset + 3; drawRect->left = rcImage.left + cx + HORIZONTAL_ITEM_PADDING; - rcImage.top -= (lStyle & TCS_BOTTOM) ? 2 : 1; + rcImage.top -= (lStyle & TCS_BOTTOM) ? 2 : 1; } TRACE("drawing image=%d, left=%d, top=%d\n", @@ -3175,7 +3175,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_NCHitTest(hwnd, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) WARN("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA(hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2785c2721b1..5e955b5f7f1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5842,7 +5842,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DefWindowProcA (hwnd, uMsg, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 47428f3a724..b437800ab8b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2506,7 +2506,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_WinIniChange (hwnd, wParam, lParam); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); @@ -2538,4 +2538,3 @@ TOOLTIPS_Unregister (void) { UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6701053a8d5..5dc431dc850 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1767,7 +1767,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRACKBAR_InitializeThumb (hwnd); default: - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); @@ -1799,4 +1799,3 @@ TRACKBAR_Unregister (void) { UnregisterClassA (TRACKBAR_CLASSA, (HINSTANCE)NULL); } - diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d7533fa5945..2197f85bef2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5374,7 +5374,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: /* This mostly catches MFC and Delphi messages. :( */ - if (uMsg >= WM_USER) + if ((uMsg >= WM_USER) && (uMsg < WM_APP)) TRACE("Unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); def: return DefWindowProcA(hwnd, uMsg, wParam, lParam);