Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 12:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync user32 listbox and combobox to wine 1.1.22

Browse source 
svn path=/trunk/; revision=41300
This commit is contained in:
Christoph von Wittich 2009-06-06 14:15:43 +00:00
parent 0d76b6fd0f
commit 06b07ed556
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/user32/controls/combo.c
View file

@ -482,20 +482,20 @@ static LRESULT COMBO_WindowPosChanging(
/* /*
* Resizing a combobox has another side effect, it resizes the dropped * 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 * 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 * 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 * the actual control, for example, to do the layout of a dialog that is
* resized, the height of the dropdown is not changed. * 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", TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n",
posChanging->cy, newComboHeight, lphc->droppedRect.bottom, posChanging->cy, newComboHeight, lphc->droppedRect.bottom,
lphc->droppedRect.top); lphc->droppedRect.top);
lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight;
posChanging->cy = newComboHeight;
} }
posChanging->cy = newComboHeight;
} }
return 0; return 0;

5
reactos/dll/win32/user32/controls/listbox.c
View file

@ -1900,8 +1900,7 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib,
else /* not a directory */ else /* not a directory */
{ {
#define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \ #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \ FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE)
FILE_ATTRIBUTE_DIRECTORY)
if ((attrib & DDL_EXCLUSIVE) && if ((attrib & DDL_EXCLUSIVE) &&
((attrib & ATTRIBS) != (entry.dwFileAttributes & ATTRIBS))) ((attrib & ATTRIBS) != (entry.dwFileAttributes & ATTRIBS)))
@ -2674,7 +2673,7 @@ static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg,
if (msg == WM_CREATE) if (msg == WM_CREATE)
{ {
CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; 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; if (!LISTBOX_Create( hwnd, lphc )) return -1;
TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) );
return 0; return 0;

4
reactos/media/doc/README.WINE
View file

@ -222,10 +222,10 @@ snmpapi -
User32 - User32 -
reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_22 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/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/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/scrollbar.c # Forked
reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22