diff --git a/reactos/dll/win32/user32/controls/combo.c b/reactos/dll/win32/user32/controls/combo.c index 6aabfc3926d..5594858c183 100644 --- a/reactos/dll/win32/user32/controls/combo.c +++ b/reactos/dll/win32/user32/controls/combo.c @@ -482,20 +482,20 @@ static LRESULT COMBO_WindowPosChanging( /* * Resizing a combobox has another side effect, it resizes the dropped * rectangle as well. However, it does it only if the new height for the - * combobox is different from the height it should have. In other words, + * combobox is more than the height it should have. In other words, * if the application resizing the combobox only had the intention to resize * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if (posChanging->cy != newComboHeight) + if (posChanging->cy > newComboHeight) { TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", posChanging->cy, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; - posChanging->cy = newComboHeight; } + posChanging->cy = newComboHeight; } return 0; diff --git a/reactos/dll/win32/user32/controls/listbox.c b/reactos/dll/win32/user32/controls/listbox.c index a76d7202b40..f332f40fa21 100644 --- a/reactos/dll/win32/user32/controls/listbox.c +++ b/reactos/dll/win32/user32/controls/listbox.c @@ -1900,8 +1900,7 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib, else /* not a directory */ { #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \ - FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \ - FILE_ATTRIBUTE_DIRECTORY) + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE) if ((attrib & DDL_EXCLUSIVE) && ((attrib & ATTRIBS) != (entry.dwFileAttributes & ATTRIBS))) @@ -2674,7 +2673,7 @@ static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, if (msg == WM_CREATE) { CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; - if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; + if (lpcs->style & LBS_COMBOBOX) lphc = lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); return 0; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3a80d7b1b27..24f54a9caf3 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -222,10 +222,10 @@ snmpapi - User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13 - reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22