<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>reactos/lib/user32/controls</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">combo.c</a></tt></td><td align="right" id="added">+67</td><td align="right" id="removed">-164</td><td nowrap="nowrap" align="center"><a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c?rev=1.17&content-type=text/x-cvsweb-markup">1.17</a> <a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&f=h">-></a> <a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c?rev=1.18&content-type=text/x-cvsweb-markup">1.18</a></td></tr>
</table>
<pre class="comment">
Sync with wine-20040724
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32">user32</a>/<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls">controls</a><br /></span>
<div class="fileheader"><big><b>combo.c</b></big> <small id="info"><a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c?rev=1.17&content-type=text/x-cvsweb-markup">1.17</a> <a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&f=h">-></a> <a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/user32/controls/combo.c?rev=1.18&content-type=text/x-cvsweb-markup">1.18</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.17 -r1.18
--- combo.c 16 May 2004 19:31:06 -0000 1.17
+++ combo.c 24 Jul 2004 00:55:39 -0000 1.18
@@ -31,6 +31,7 @@
</small></pre><pre class="diff" id="context"> #include "controls.h"
#include "user32/regcontrol.h"
#include "wine/debug.h"
</pre><pre class="diff" id="added">+#include "wine/unicode.h"
</pre><pre class="diff" id="context">
WINE_DEFAULT_DEBUG_CHANNEL(combo);
</pre><pre class="diff"><small id="info">@@ -62,19 +63,12 @@
</small></pre><pre class="diff" id="context"> /*
* Look and feel dependent "constants"
*/
</pre><pre class="diff" id="removed">-#ifndef __REACTOS__
-#define COMBO_YBORDERGAP 5
-#define COMBO_XBORDERSIZE() ( (TWEAK_WineLook == WIN31_LOOK) ? 0 : 2 )
-#define COMBO_YBORDERSIZE() ( (TWEAK_WineLook == WIN31_LOOK) ? 0 : 2 )
-#define COMBO_EDITBUTTONSPACE() ( (TWEAK_WineLook == WIN31_LOOK) ? 8 : 0 )
-#define EDIT_CONTROL_PADDING() ( (TWEAK_WineLook == WIN31_LOOK) ? 0 : 1 )
-#else /* __REACTOS__ */
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> #define COMBO_YBORDERGAP 5
</pre><pre class="diff" id="removed">-#define COMBO_XBORDERSIZE() ( 2 )
-#define COMBO_YBORDERSIZE() ( 2 )
-#define COMBO_EDITBUTTONSPACE() ( 0 )
-#define EDIT_CONTROL_PADDING() ( 1 )
-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#define COMBO_XBORDERSIZE() 2
+#define COMBO_YBORDERSIZE() 2
+#define COMBO_EDITBUTTONSPACE() 0
+#define EDIT_CONTROL_PADDING() 1
</pre><pre class="diff" id="context">
static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
</pre><pre class="diff"><small id="info">@@ -84,6 +78,7 @@
</small></pre><pre class="diff" id="context"> */
const struct builtin_class_descr COMBO_builtin_class =
{
</pre><pre class="diff" id="added">+#ifdef __REACTOS__
</pre><pre class="diff" id="context"> L"ComboBox", /* name */
CS_PARENTDC | CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS, /* style */
(WNDPROC) ComboWndProcW, /* procW */
</pre><pre class="diff"><small id="info">@@ -91,6 +86,15 @@
</small></pre><pre class="diff" id="context"> sizeof(HEADCOMBO *), /* extra */
(LPCWSTR) IDC_ARROW, /* cursor */
0 /* brush */
</pre><pre class="diff" id="added">+#else
+ "ComboBox", /* name */
+ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */
+ ComboWndProcA, /* procA */
+ ComboWndProcW, /* procW */
+ sizeof(HEADCOMBO *), /* extra */
+ IDC_ARROW, /* cursor */
+ 0 /* brush */
+#endif
</pre><pre class="diff" id="context"> };
</pre><pre class="diff"><small id="info">@@ -491,9 +495,6 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- posChanging->cx = max(posChanging->cx, 0);
- posChanging->cy = max(posChanging->cy, 0);
-
</pre><pre class="diff" id="context"> return 0;
}
</pre><pre class="diff"><small id="info">@@ -576,13 +577,8 @@
</small></pre><pre class="diff" id="context"> * In win 95 look n feel, the listbox in the simple combobox has
* the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
*/
</pre><pre class="diff" id="removed">- #ifndef __REACTOS__
- if (TWEAK_WineLook > WIN31_LOOK)
- #endif /* __REACTOS__ */
- {
- lbeStyle &= ~WS_BORDER;
- lbeExStyle |= WS_EX_CLIENTEDGE;
- }
</pre><pre class="diff" id="added">+ lbeStyle &= ~WS_BORDER;
+ lbeExStyle |= WS_EX_CLIENTEDGE;
</pre><pre class="diff" id="context"> }
else
{
</pre><pre class="diff"><small id="info">@@ -611,14 +607,6 @@
</small></pre><pre class="diff" id="context"> BOOL bEdit = TRUE;
lbeStyle = WS_CHILD | WS_VISIBLE | ES_NOHIDESEL | ES_LEFT | ES_COMBO;
</pre><pre class="diff" id="removed">- /*
- * In Win95 look, the border fo the edit control is
- * provided by the combobox
- */
- #ifndef __REACTOS__
- if (TWEAK_WineLook == WIN31_LOOK)
- lbeStyle |= WS_BORDER;
- #endif /* __REACTOS__ */
</pre><pre class="diff" id="context"> if( lphc->wState & CBF_EDIT )
{
if( lphc->dwStyle & CBS_OEMCONVERT )
</pre><pre class="diff"><small id="info">@@ -683,85 +671,21 @@
</small></pre><pre class="diff" id="context"> *
* Paint combo button (normal, pressed, and disabled states).
*/
</pre><pre class="diff" id="removed">-static void CBPaintButton(
- LPHEADCOMBO lphc,
- HDC hdc,
- RECT rectButton)
</pre><pre class="diff" id="added">+static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="added">+ UINT buttonState = DFCS_SCROLLCOMBOBOX;
+
</pre><pre class="diff" id="context"> if( lphc->wState & CBF_NOREDRAW )
return;
</pre><pre class="diff" id="removed">-#ifndef __REACTOS__
- if (TWEAK_WineLook == WIN31_LOOK)
- {
- UINT x, y;
- BOOL bBool;
- HDC hMemDC;
- HBRUSH hPrevBrush;
- COLORREF oldTextColor, oldBkColor;
-
-
- hPrevBrush = SelectObject(hdc, GetSysColorBrush(COLOR_BTNFACE));
-
- /*
- * Draw the button background
- */
- PatBlt( hdc,
- rectButton.left,
- rectButton.top,
- rectButton.right-rectButton.left,
- rectButton.bottom-rectButton.top,
- PATCOPY );
-
- if( (bBool = lphc->wState & CBF_BUTTONDOWN) )
- {
- DrawEdge( hdc, &rectButton, EDGE_SUNKEN, BF_RECT );
- }
- else
- {
- DrawEdge( hdc, &rectButton, EDGE_RAISED, BF_RECT );
- }
-
- /*
- * Remove the edge of the button from the rectangle
- * and calculate the position of the bitmap.
- */
- InflateRect( &rectButton, -2, -2);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- x = (rectButton.left + rectButton.right - CBitWidth) >> 1;
- y = (rectButton.top + rectButton.bottom - CBitHeight) >> 1;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ if (lphc->wState & CBF_BUTTONDOWN)
+ buttonState |= DFCS_PUSHED;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- hMemDC = CreateCompatibleDC( hdc );
- SelectObject( hMemDC, hComboBmp );
- oldTextColor = SetTextColor( hdc, GetSysColor(COLOR_BTNFACE) );
- oldBkColor = SetBkColor( hdc, CB_DISABLED(lphc) ? RGB(128,128,128) :
- RGB(0,0,0) );
- BitBlt( hdc, x, y, CBitWidth, CBitHeight, hMemDC, 0, 0, SRCCOPY );
- SetBkColor( hdc, oldBkColor );
- SetTextColor( hdc, oldTextColor );
- DeleteDC( hMemDC );
- SelectObject( hdc, hPrevBrush );
- }
- else
- #endif /* __REACTOS__ */
- {
- UINT buttonState = DFCS_SCROLLCOMBOBOX;
</pre><pre class="diff" id="added">+ if (CB_DISABLED(lphc))
+ buttonState |= DFCS_INACTIVE;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- if (lphc->wState & CBF_BUTTONDOWN)
- {
- buttonState |= DFCS_PUSHED;
- }
-
- if (CB_DISABLED(lphc))
- {
- buttonState |= DFCS_INACTIVE;
- }
-
- DrawFrameControl(hdc,
- &rectButton,
- DFC_SCROLL,
- buttonState);
- }
</pre><pre class="diff" id="added">+ DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState);
</pre><pre class="diff" id="context"> }
/***********************************************************************
</pre><pre class="diff"><small id="info">@@ -1033,12 +957,7 @@
</small></pre><pre class="diff" id="context"> /*
* In non 3.1 look, there is a sunken border on the combobox
*/
</pre><pre class="diff" id="removed">- #ifndef __REACTOS__
- if (TWEAK_WineLook != WIN31_LOOK)
- #endif
- {
- CBPaintBorder(lphc->self, lphc, hDC);
- }
</pre><pre class="diff" id="added">+ CBPaintBorder(lphc->self, lphc, hDC);
</pre><pre class="diff" id="context">
if( !IsRectEmpty(&lphc->buttonRect) )
{
</pre><pre class="diff"><small id="info">@@ -1056,25 +975,7 @@
</small></pre><pre class="diff" id="context"> }
if( !(lphc->wState & CBF_EDIT) )
</pre><pre class="diff" id="removed">- {
- /*
- * The text area has a border only in Win 3.1 look.
- */
- #ifndef __REACTOS__
- if (TWEAK_WineLook == WIN31_LOOK)
- {
- HPEN hPrevPen = SelectObject( hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME) );
-
- Rectangle( hDC,
- lphc->textRect.left, lphc->textRect.top,
- lphc->textRect.right - 1, lphc->textRect.bottom - 1);
-
- SelectObject( hDC, hPrevPen );
- }
- #endif /* __REACTOS__ */
-
</pre><pre class="diff" id="context"> CBPaintText( lphc, hDC, lphc->textRect);
</pre><pre class="diff" id="removed">- }
</pre><pre class="diff" id="context">
if( hPrevBrush )
SelectObject( hDC, hPrevBrush );
</pre><pre class="diff"><small id="info">@@ -1448,7 +1349,7 @@
</small></pre><pre class="diff" id="context"> }
else if( lphc->hWndLBox == hWnd )
{
</pre><pre class="diff" id="removed">- switch( HIWORD(wParam) )
</pre><pre class="diff" id="added">+ switch( <span id="addedchars">(short)</span>HIWORD(wParam) )
</pre><pre class="diff" id="context"> {
case LBN_ERRSPACE:
CB_NOTIFY( lphc, CBN_ERRSPACE );
</pre><pre class="diff"><small id="info">@@ -2012,22 +1913,22 @@
</small></pre><pre class="diff" id="context"> return TRUE;
case WM_KILLFOCUS:
{
</pre><pre class="diff" id="removed">- #ifndef __REACTOS__
- HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam );
- #else /* __REACTOS__ */
</pre><pre class="diff" id="added">+#ifdef __REACTOS__
</pre><pre class="diff" id="context"> HWND hwndFocus = (HWND)wParam;
</pre><pre class="diff" id="removed">- #endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#else
+ HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam );
+#endif
</pre><pre class="diff" id="context"> if( !hwndFocus ||
(hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox ))
COMBO_KillFocus( lphc );
return TRUE;
}
case WM_COMMAND:
</pre><pre class="diff" id="removed">-<span id="removedchars"> #ifn</span>def __REACTOS__
</pre><pre class="diff" id="added">+<span id="addedchars">#if</span>def __REACTOS__
+ return COMBO_Command( lphc, wParam, (HWND)lParam);
+#else
</pre><pre class="diff" id="context"> return COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) );
</pre><pre class="diff" id="removed">- #else /* __REACTOS__ */
- return COMBO_Command( lphc, wParam, (HWND)lParam );
- #endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case WM_GETTEXT:
return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam )
: COMBO_GetTextA( lphc, wParam, (LPSTR)lParam );
</pre><pre class="diff"><small id="info">@@ -2133,18 +2034,19 @@
</small></pre><pre class="diff" id="context"> return TRUE;
/* Combo messages */
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> #ifndef __REACTOS__
case CB_ADDSTRING16:
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_ADDSTRING:
if( unicode )
{
if( lphc->dwStyle & CBS_LOWERCASE )
</pre><pre class="diff" id="removed">- <span id="removedchars">_wcslwr</span>((LPWSTR)lParam);
</pre><pre class="diff" id="added">+ <span id="addedchars">strlwrW</span>((LPWSTR)lParam);
</pre><pre class="diff" id="context"> else if( lphc->dwStyle & CBS_UPPERCASE )
</pre><pre class="diff" id="removed">- <span id="removedchars">_wcsupr</span>((LPWSTR)lParam);
</pre><pre class="diff" id="added">+ <span id="addedchars">struprW</span>((LPWSTR)lParam);
</pre><pre class="diff" id="context"> return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
}
else
</pre><pre class="diff"><small id="info">@@ -2160,14 +2062,14 @@
</small></pre><pre class="diff" id="context"> wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_INSERTSTRING:
if( unicode )
{
if( lphc->dwStyle & CBS_LOWERCASE )
</pre><pre class="diff" id="removed">- <span id="removedchars">_wcslwr</span>((LPWSTR)lParam);
</pre><pre class="diff" id="added">+ <span id="addedchars">strlwrW</span>((LPWSTR)lParam);
</pre><pre class="diff" id="context"> else if( lphc->dwStyle & CBS_UPPERCASE )
</pre><pre class="diff" id="removed">- <span id="removedchars">_wcsupr</span>((LPWSTR)lParam);
</pre><pre class="diff" id="added">+ <span id="addedchars">struprW</span>((LPWSTR)lParam);
</pre><pre class="diff" id="context"> return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
}
else
</pre><pre class="diff"><small id="info">@@ -2180,7 +2082,7 @@
</small></pre><pre class="diff" id="context"> }
#ifndef __REACTOS__
case CB_DELETESTRING16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_DELETESTRING:
return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) :
SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
</pre><pre class="diff"><small id="info">@@ -2189,7 +2091,7 @@
</small></pre><pre class="diff" id="context"> wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SELECTSTRING:
return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode);
#ifndef __REACTOS__
</pre><pre class="diff"><small id="info">@@ -2197,7 +2099,7 @@
</small></pre><pre class="diff" id="context"> wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_FINDSTRING:
return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) :
SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
</pre><pre class="diff"><small id="info">@@ -2206,7 +2108,7 @@
</small></pre><pre class="diff" id="context"> wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_FINDSTRINGEXACT:
return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) :
SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam);
</pre><pre class="diff"><small id="info">@@ -2214,21 +2116,21 @@
</small></pre><pre class="diff" id="context"> case CB_SETITEMHEIGHT16:
wParam = (INT)(INT16)wParam; /* signed integer */
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SETITEMHEIGHT:
return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
#ifndef __REACTOS__
case CB_GETITEMHEIGHT16:
wParam = (INT)(INT16)wParam;
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETITEMHEIGHT:
if( (INT)wParam >= 0 ) /* listbox item */
return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0);
return CBGetTextAreaHeight(hwnd, lphc);
#ifndef __REACTOS__
case CB_RESETCONTENT16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_RESETCONTENT:
SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0);
if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) )
</pre><pre class="diff"><small id="info">@@ -2269,25 +2171,26 @@
</small></pre><pre class="diff" id="context"> CONV_RECT32TO16( &r, (LPRECT16)lParam );
}
return CB_OKAY;
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETDROPPEDCONTROLRECT:
if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam );
return CB_OKAY;
#ifndef __REACTOS__
case CB_GETDROPPEDSTATE16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETDROPPEDSTATE:
return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
#ifndef __REACTOS__
case CB_DIR16:
return SendMessageA(lphc->hWndLBox, LB_DIR16, wParam, lParam);
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_DIR:
return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) :
SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam);
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> #ifndef __REACTOS__
case CB_SHOWDROPDOWN16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SHOWDROPDOWN:
if( CB_GETTYPE(lphc) != CBS_SIMPLE )
{
</pre><pre class="diff"><small id="info">@@ -2303,19 +2206,19 @@
</small></pre><pre class="diff" id="context"> return TRUE;
#ifndef __REACTOS__
case CB_GETCOUNT16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETCOUNT:
return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0);
#ifndef __REACTOS__
case CB_GETCURSEL16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETCURSEL:
return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
#ifndef __REACTOS__
case CB_SETCURSEL16:
wParam = (INT)(INT16)wParam;
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SETCURSEL:
lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0);
if( lParam >= 0 )
</pre><pre class="diff"><small id="info">@@ -2333,7 +2236,7 @@
</small></pre><pre class="diff" id="context"> wParam = (INT)(INT16)wParam;
lParam = (LPARAM)MapSL(lParam);
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETLBTEXT:
return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) :
SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
</pre><pre class="diff"><small id="info">@@ -2341,7 +2244,7 @@
</small></pre><pre class="diff" id="context"> case CB_GETLBTEXTLEN16:
wParam = (INT)(INT16)wParam;
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETLBTEXTLEN:
return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) :
SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
</pre><pre class="diff"><small id="info">@@ -2349,21 +2252,21 @@
</small></pre><pre class="diff" id="context"> case CB_GETITEMDATA16:
wParam = (INT)(INT16)wParam;
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETITEMDATA:
return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
#ifndef __REACTOS__
case CB_SETITEMDATA16:
wParam = (INT)(INT16)wParam;
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SETITEMDATA:
return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
#ifndef __REACTOS__
case CB_GETEDITSEL16:
wParam = lParam = 0; /* just in case */
/* fall through */
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETEDITSEL:
/* Edit checks passed parameters itself */
if( lphc->wState & CBF_EDIT )
</pre><pre class="diff"><small id="info">@@ -2371,15 +2274,15 @@
</small></pre><pre class="diff" id="context"> return CB_ERR;
#ifndef __REACTOS__
case CB_SETEDITSEL16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SETEDITSEL:
if( lphc->wState & CBF_EDIT )
return SendMessageW(lphc->hWndEdit, EM_SETSEL,
</pre><pre class="diff" id="removed">- (INT)(USHORT)LOWORD(lParam), (INT)(USHORT)HIWORD(lParam) );
</pre><pre class="diff" id="added">+ (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) );
</pre><pre class="diff" id="context"> return CB_ERR;
#ifndef __REACTOS__
case CB_SETEXTENDEDUI16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_SETEXTENDEDUI:
if( CB_GETTYPE(lphc) == CBS_SIMPLE )
return CB_ERR;
</pre><pre class="diff"><small id="info">@@ -2389,7 +2292,7 @@
</small></pre><pre class="diff" id="context"> return CB_OKAY;
#ifndef __REACTOS__
case CB_GETEXTENDEDUI16:
</pre><pre class="diff" id="removed">-#endif /* __REACTOS__ */
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context"> case CB_GETEXTENDEDUI:
return (lphc->wState & CBF_EUI) ? TRUE : FALSE;
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.8</small></center>
</body></html>