[PATCH 0/3] MR10249: Typos
From: Diego Colin <dev@docolta.com> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a5ec0f95205..7aca9ab47aa 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1341,7 +1341,7 @@ static BOOL heap_validate( const struct heap *heap ) if (!validate_used_block( heap, find_subheap( heap, block, FALSE ), block, BLOCK_TYPE_DEAD )) { - ERR( "heap %p: failed to to validate delayed free block %p\n", heap, block ); + ERR( "heap %p: failed to validate delayed free block %p\n", heap, block ); return FALSE; } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10249
From: Diego Colin <dev@docolta.com> --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/tooltips.c | 6 +++--- dlls/comctl32/treeview.c | 2 +- dlls/comctl32_v6/taskdialog.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ab65bca7c07..79c5aae2da3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -180,7 +180,7 @@ static inline int get_dib_image_size( const BITMAPINFO *info ) * imagelist_copy_images() * * Copies a block of count images from offset src in the list to offset dest. - * Images are copied a row at at time. Assumes hdcSrc and hdcDest are different. + * Images are copied a row at time. Assumes hdcSrc and hdcDest are different. */ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDest, UINT src, UINT count, UINT dest ) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 876736b11e4..b882a7013b9 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -79,7 +79,7 @@ * tool. * * - * infoPtr->nTool is the tool the mouse was on on the last relayed MM + * infoPtr->nTool is the tool the mouse was on the last relayed MM * or timer expiry or -1 if the mouse was not on a tool. * * infoPtr->nCurrentTool is the tool for which the tip is currently @@ -136,7 +136,7 @@ typedef struct INT xTrackPos; INT yTrackPos; INT nMaxTipWidth; - INT nTool; /* tool that mouse was on on last relayed mouse move */ + INT nTool; /* tool that mouse was on last relayed mouse move */ INT nCurrentTool; INT nTrackTool; INT nReshowTime; @@ -1231,7 +1231,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) /* update any indices affected by delete */ - /* destroying tool that mouse was on on last relayed mouse move */ + /* destroying tool that mouse was on last relayed mouse move */ if (infoPtr->nTool == nTool) /* -1 means no current tool (0 means first tool) */ infoPtr->nTool = -1; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8b38f098553..6e4ff080bbf 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -445,7 +445,7 @@ TREEVIEW_GetNextListItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *tvIt /*************************************************************************** * This method returns the nth item starting at the given item. It returns - * the last item (or first) we we run out of items. + * the last item (or first) we run out of items. * * Will scroll backward if count is <0. * forward if count is >0. diff --git a/dlls/comctl32_v6/taskdialog.c b/dlls/comctl32_v6/taskdialog.c index 09d2ad718aa..5018eb01ed4 100644 --- a/dlls/comctl32_v6/taskdialog.c +++ b/dlls/comctl32_v6/taskdialog.c @@ -269,7 +269,7 @@ static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_inf GetWindowRect(dialog_info->expanded_info, &info_rect); /* If expanded information starts up not expanded, call taskdialog_layout() - * to to set size for expanded information control at least once */ + * to set size for expanded information control at least once */ if (IsRectEmpty(&info_rect)) { taskdialog_layout(dialog_info); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10249
From: Diego Colin <dev@docolta.com> --- dlls/user32/tests/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 921ce01299a..41cc1397018 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12913,8 +12913,8 @@ static void test_window_placement(void) DestroyWindow(hwnd); /* Test that when forgetting the maximized position for top level windows covering the work - * area, the work area means the monitor work area, not the the work area that a maximized - * window can cover depending on style. For example, a maximized WS_POPUP window can cover the + * area, the work area means the monitor work area, not the work area that a maximized window + * can cover depending on style. For example, a maximized WS_POPUP window can cover the * whole screen when maximized. Also see See win32u/window.c#update_maximized_pos() */ hwnd = CreateWindowA("MainWindowClass", "wp", WS_POPUP, orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10249
Nikolay Sivov (@nsivov) commented about dlls/comctl32/tooltips.c:
* tool. * * - * infoPtr->nTool is the tool the mouse was on on the last relayed MM + * infoPtr->nTool is the tool the mouse was on the last relayed MM * or timer expiry or -1 if the mouse was not on a tool. This is not a typo.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131392
Commit subjects should be formatted better. You can look for examples in our git history. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131394
Nikolay Sivov (@nsivov) commented about dlls/comctl32/imagelist.c:
* imagelist_copy_images() * * Copies a block of count images from offset src in the list to offset dest. - * Images are copied a row at at time. Assumes hdcSrc and hdcDest are different. + * Images are copied a row at time. Assumes hdcSrc and hdcDest are different. */ Should've been "at a time".
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131393
Alfred Agrell (@Alcaro) commented about dlls/comctl32/imagelist.c:
* imagelist_copy_images() * * Copies a block of count images from offset src in the list to offset dest. - * Images are copied a row at at time. Assumes hdcSrc and hdcDest are different. + * Images are copied a row at time. Assumes hdcSrc and hdcDest are different. That is indeed a typo, but your proposal doesn't fix it. Correct grammar would be change the second at to 'a'.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131396
Alfred Agrell (@Alcaro) commented about dlls/comctl32/tooltips.c:
* tool. * * - * infoPtr->nTool is the tool the mouse was on on the last relayed MM + * infoPtr->nTool is the tool the mouse was on the last relayed MM It's supposed to be like that.
infoPtr->nTool is the tool the mouse was on (located on) on (during) the last relayed MM Same for the other two in this file. (Wouldn't mind seeing a comma before 'or' on next line, though.) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131397
Alfred Agrell (@Alcaro) commented about dlls/comctl32/treeview.c:
/*************************************************************************** * This method returns the nth item starting at the given item. It returns - * the last item (or first) we we run out of items. + * the last item (or first) we run out of items.
That is indeed a typo, but your proposal doesn't fix it. Correct grammar would be change the first we to 'if' or 'when'. (Not sure which would be better.) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131398
The other three changes look good to me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_131399
I've fixed up the changes a bit for comctl32 part, submitted as !10325. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10249#note_132158
participants (4)
-
Alfred Agrell (＠Alcaro) -
Diego Colin
-
Diego Colin (＠docolta)
-
Nikolay Sivov (＠nsivov)