Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32572: some more syncing
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 17:15:10 2008 New Revision: 32572 URL: http://svn.reactos.org/svn/reactos?rev=3D32572&view=3Drev Log: some more syncing Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/cont= rols/combo.c?rev=3D32572&r1=3D32571&r2=3D32572&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Wed Mar 5 17:15:10 2008 @@ -15,17 +15,17 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U= SA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, U= SA * * NOTES * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * + * = * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * + * = * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE @@ -107,7 +107,7 @@ * * Load combo button bitmap. */ -static BOOL COMBO_Init() +static BOOL COMBO_Init(void) { HDC hDC; = @@ -260,7 +260,7 @@ MEASUREITEMSTRUCT measureItem; RECT clientRect; INT originalItemHeight =3D iTextItemHeight; - UINT id =3D GetWindowLongPtrW( lphc->self, GWLP_ID ); + UINT id =3D (UINT)GetWindowLongPtrW( lphc->self, GWLP_ID ); = /* * We use the client rect for the width of the item. @@ -441,8 +441,8 @@ } = /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right =3D lprEdit->left; + if (lprEdit->right < lprEdit->left) + lprEdit->right =3D lprEdit->left; = TRACE("\ttext\t=3D (%ld,%ld-%ld,%ld)\n", lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); @@ -846,9 +846,9 @@ * CBPaintBorder */ static void CBPaintBorder( - HWND hwnd, - LPHEADCOMBO lphc, - HDC hdc) + HWND hwnd, + const HEADCOMBO *lphc, + HDC hdc) { RECT clientRect; = @@ -1041,9 +1041,12 @@ } } = - lphc->wState |=3D (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LP= ARAM)empty_stringW); - lphc->wState &=3D ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + if( CB_HASSTRINGS(lphc) ) + { + lphc->wState |=3D (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : = (LPARAM)empty_stringW); + lphc->wState &=3D ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + } = if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); @@ -1121,7 +1124,7 @@ if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight =3D nHeight + COMBO_YBORDERSIZE(); = - if (nDroppedHeight < nIHeight) + if (nDroppedHeight < nHeight) { if (nItems < 5) nDroppedHeight =3D (nItems+1)*nIHeight; @@ -1135,7 +1138,7 @@ mon_info.cbSize =3D sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); = - if( (rect.bottom + nDroppedHeight) >=3D GetSystemMetrics( SM_CYSCREEN )= ) + if( (rect.bottom + nDroppedHeight) >=3D mon_info.rcWork.bottom ) rect.bottom =3D rect.top - nDroppedHeight; = SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, @@ -1163,7 +1166,7 @@ HWND hWnd =3D lphc->self; = TRACE("[%p]: sel ok? [%i] dropped? [%i]\n", - lphc->self, (INT)ok, (INT)(lphc->wState & CBF_DROPPED)); + lphc->self, ok, (INT)(lphc->wState & CBF_DROPPED)); = CB_NOTIFY( lphc, (ok) ? CBN_SELENDOK : CBN_SELENDCANCEL ); = @@ -1319,7 +1322,7 @@ case (EN_CHANGE >> 8): /* * In some circumstances (when the selection of the combobox - * is changed for example) we don't wans the EN_CHANGE notification + * is changed for example) we don't want the EN_CHANGE notification * to be forwarded to the parent of the combobox. This code * checks a flag that is set in these occasions and ignores the * notification. @@ -1361,7 +1364,7 @@ case LBN_SELCHANGE: case LBN_SELCANCEL: = - TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lph= c->wState ); + TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lp= hc->wState ); = CB_NOTIFY( lphc, CBN_SELCHANGE ); = @@ -1554,8 +1557,8 @@ */ static void CBResetPos( LPHEADCOMBO lphc, - LPRECT rectEdit, - LPRECT rectLB, + const RECT *rectEdit, + const RECT *rectLB, BOOL bRedraw) { BOOL bDrop =3D (CB_GETTYPE(lphc) !=3D CBS_SIMPLE); @@ -1711,8 +1714,8 @@ BOOL bButton; HWND hWnd =3D lphc->self; = - pt.x =3D LOWORD(lParam); - pt.y =3D HIWORD(lParam); + pt.x =3D (short)LOWORD(lParam); + pt.y =3D (short)HIWORD(lParam); bButton =3D PtInRect(&lphc->buttonRect, pt); = if( (CB_GETTYPE(lphc) =3D=3D CBS_DROPDOWNLIST) || @@ -1788,8 +1791,8 @@ POINT pt; RECT lbRect; = - pt.x =3D LOWORD(lParam); - pt.y =3D HIWORD(lParam); + pt.x =3D (short)LOWORD(lParam); + pt.y =3D (short)HIWORD(lParam); = if( lphc->wState & CBF_BUTTONDOWN ) { @@ -1817,7 +1820,7 @@ } } = -static LRESULT COMBO_GetComboBoxInfo(LPHEADCOMBO lphc, COMBOBOXINFO *pcbi) +static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *= pcbi) { if (!pcbi || (pcbi->cbSize < sizeof(COMBOBOXINFO))) return FALSE; @@ -1851,14 +1854,14 @@ /*********************************************************************** * ComboWndProc_common * - * http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/ctrl/src/comb= obox_15.htm + * http://msdn.microsoft.com/library/default.asp?url=3D/library/en-us/shel= lcc/platform/commctls/comboboxes/comboboxes.asp */ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL uni= code ) { LPHEADCOMBO lphc =3D (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); = - TRACE("[%p]: msg %s wp %08x lp %08lx\n", + TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); = if( lphc || message =3D=3D WM_NCCREATE ) @@ -2128,6 +2131,7 @@ CharLowerA((LPSTR)lParam); else if( lphc->dwStyle & CBS_UPPERCASE ) CharUpperA((LPSTR)lParam); + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, w= Param, lParam); } #ifndef __REACTOS__ @@ -2368,7 +2372,7 @@ = default: if (message >=3D WM_USER) - WARN("unknown msg WM_USER+%04x wp=3D%04x lp=3D%08lx\n", + WARN("unknown msg WM_USER+%04x wp=3D%04lx lp=3D%08lx\n", message - WM_USER, wParam, lParam ); break; } Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/cont= rols/listbox.c?rev=3D32572&r1=3D32571&r2=3D32572&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Mar 5 17:15:10 2= 008 @@ -629,12 +629,12 @@ dis.hDC =3D hdc; dis.itemID =3D index; dis.itemState =3D 0; - if (item && item->selected) dis.itemState |=3D ODS_SELECTED; + if (item->selected) dis.itemState |=3D ODS_SELECTED; if (!ignoreFocus && (descr->focus_item =3D=3D index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |=3D ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |=3D ODS_DISABLED; - dis.itemData =3D item ? item->data : 0; + dis.itemData =3D item->data; dis.rcItem =3D *rect; TRACE("[%p]: drawitem %d (%s) action=3D%02x state=3D%02x rect=3D%l= d,%ld-%ld,%ld\n", descr->self, index, item ? debugstr_w(item->str) : "", actio= n, @@ -827,7 +827,7 @@ return TRUE; } if (!(descr->tabs =3D HeapAlloc( GetProcessHeap(), 0, - descr->nb_tabs * sizeof(INT) ))) + descr->nb_tabs * sizeof(INT) )= )) return FALSE; #ifndef __REACTOS__ if (short_ints) @@ -838,9 +838,9 @@ TRACE("[%p]: settabstops ", hwnd ); for (i =3D 0; i < descr->nb_tabs; i++) { descr->tabs[i] =3D *p++<<1; /* FIXME */ - if (TRACE_ON(listbox)) TRACE("%hd ", descr->tabs[i]); + TRACE("%hd ", descr->tabs[i]); } - if (TRACE_ON(listbox)) TRACE("\n"); + TRACE("\n"); } else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) ); #else

1 0

[fireball] 32571: - intrin.h should not be included. Fixes MSVC compiling.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Wed Mar 5 17:13:16 2008 New Revision: 32571 URL: http://svn.reactos.org/svn/reactos?rev=3D32571&view=3Drev Log: - intrin.h should not be included. Fixes MSVC compiling. Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/ha= l.h?rev=3D32571&r1=3D32570&r2=3D32571&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/hal/halx86/include/hal.h (original) +++ trunk/reactos/hal/halx86/include/hal.h Wed Mar 5 17:13:16 2008 @@ -28,7 +28,6 @@ #include <arc/arc.h> #include <iotypes.h> #include <kefuncs.h> -#include <intrin.h> #include <halfuncs.h> #include <iofuncs.h> #include <ldrtypes.h>

1 0

[cwittich] 32570: partial sync to wine
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 16:45:09 2008 New Revision: 32570 URL: http://svn.reactos.org/svn/reactos?rev=3D32570&view=3Drev Log: partial sync to wine Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/cont= rols/listbox.c?rev=3D32570&r1=3D32569&r2=3D32570&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Mar 5 16:45:09 2= 008 @@ -15,13 +15,13 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U= SA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, U= SA * * NOTES * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Oct. 9, 2004, by Dimitrie O. Paun. - * + * = * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. @@ -86,7 +86,7 @@ UINT style; /* Window style */ INT width; /* Window width */ INT height; /* Window height */ - LB_ITEMDATA *items; /* Array of items */ + LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ @@ -104,8 +104,8 @@ BOOL captured; /* Is mouse captured? */ BOOL in_focus; HFONT font; /* Current font */ - LCID locale; /* Current locale for string comparisons= */ - LPHEADCOMBO lphc; /* ComboLBox */ + LCID locale; /* Current locale for string comparisons */ + LPHEADCOMBO lphc; /* ComboLBox */ LONG UIState; } LB_DESCR; = @@ -142,7 +142,7 @@ static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam,= LPARAM lParam ); static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam,= LPARAM lParam ); = -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect= ); +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT= *rect ); = /********************************************************************* * listbox class descriptor @@ -227,7 +227,7 @@ * * Return the current page size */ -static INT LISTBOX_GetCurrentPageSize( LB_DESCR *descr ) +static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) { INT i, height; if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; @@ -245,7 +245,7 @@ * * Return the maximum possible index for the top of the listbox. */ -static INT LISTBOX_GetMaxTopIndex( LB_DESCR *descr ) +static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { INT max, page; = @@ -392,7 +392,7 @@ = if (abs(diff) < descr->height) ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, - SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN= ); + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); else scroll =3D FALSE; } @@ -461,8 +461,8 @@ TRACE("[%p]: changing height %d -> %d\n", descr->self, descr->height, descr->height - remaining ); SetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, - rect.bottom - rect.top - remaining, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); + rect.bottom - rect.top - remaining, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); return; } } @@ -484,7 +484,7 @@ * Get the rectangle enclosing an item, in listbox client coordinates. * Return 1 if the rectangle is (partially) visible, 0 if hidden, -1 on er= ror. */ -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect= ) +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT= *rect ) { /* Index <=3D 0 is legal even on empty listboxes */ if (index && (index >=3D descr->nb_items)) @@ -542,7 +542,7 @@ * * Return the item nearest from point (x,y) (in client coordinates). */ -static INT LISTBOX_GetItemFromPoint( LB_DESCR *descr, INT x, INT y ) +static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { INT index =3D descr->top_item; = @@ -732,8 +732,8 @@ if (!IsWindowVisible(descr->self)) return; if (descr->style & LBS_NOREDRAW) { - descr->style |=3D LBS_DISPLAYCHANGED; - return; + descr->style |=3D LBS_DISPLAYCHANGED; + return; } if (LISTBOX_GetItemRect( descr, index, &rect ) !=3D 1) return; if (!(hdc =3D GetDCEx( descr->self, 0, DCX_CACHE ))) return; @@ -948,6 +948,7 @@ return exact ? -1 : max; } = + /*********************************************************************** * LISTBOX_FindFileStrPos * @@ -1059,10 +1060,10 @@ /*********************************************************************** * LISTBOX_GetSelCount */ -static LRESULT LISTBOX_GetSelCount( LB_DESCR *descr ) +static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - LB_ITEMDATA *item =3D descr->items; + const LB_ITEMDATA *item =3D descr->items; = if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) @@ -1077,10 +1078,10 @@ /*********************************************************************** * LISTBOX_GetSelItems16 */ -static LRESULT LISTBOX_GetSelItems16( LB_DESCR *descr, INT16 max, LPINT16 = array ) +static LRESULT LISTBOX_GetSelItems16( const LB_DESCR *descr, INT16 max, LP= INT16 array ) { INT i, count; - LB_ITEMDATA *item =3D descr->items; + const LB_ITEMDATA *item =3D descr->items; = if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i =3D count =3D 0; (i < descr->nb_items) && (count < max); i++, i= tem++) @@ -1093,10 +1094,10 @@ /*********************************************************************** * LISTBOX_GetSelItems */ -static LRESULT LISTBOX_GetSelItems( LB_DESCR *descr, INT max, LPINT array ) +static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT = array ) { INT i, count; - LB_ITEMDATA *item =3D descr->items; + const LB_ITEMDATA *item =3D descr->items; = if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i =3D count =3D 0; (i < descr->nb_items) && (count < max); i++, i= tem++) @@ -1140,8 +1141,7 @@ rect.bottom =3D rect.top + descr->item_height; ExtTextOutW( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED, &rect, NULL, 0, NULL ); - LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, - ODA_FOCUS, FALSE ); + LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS= , FALSE ); rect.top =3D rect.bottom; } = @@ -1263,9 +1263,9 @@ /*********************************************************************** * LISTBOX_GetItemHeight */ -static LRESULT LISTBOX_GetItemHeight( LB_DESCR *descr, INT index ) -{ - if (descr->style & LBS_OWNERDRAWVARIABLE) +static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) +{ + if (descr->style & LBS_OWNERDRAWVARIABLE && descr->nb_items > 0) { if ((index < 0) || (index >=3D descr->nb_items)) { @@ -1281,11 +1281,10 @@ /*********************************************************************** * LISTBOX_SetItemHeight */ -static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, - INT height, BOOL repaint ) +static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT heig= ht, BOOL repaint ) { if (height > MAXBYTE) - return -1; + return -1; = if (!height) height =3D 1; = @@ -1346,8 +1345,7 @@ /*********************************************************************** * LISTBOX_SetHorizontalExtent */ -static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, - INT extent ) +static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) { if (!descr->horz_extent || (descr->style & LBS_MULTICOLUMN)) return LB_OKAY; @@ -1412,8 +1410,7 @@ * * Make sure that a given item is partially or fully visible. */ -static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, - BOOL fully ) +static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL full= y ) { INT top; = @@ -1452,8 +1449,7 @@ * index must be between 0 and descr->nb_items-1, or LB_ERR is returned. * */ -static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, - BOOL fully_visible ) +static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL ful= ly_visible ) { INT oldfocus =3D descr->focus_item; = @@ -1561,8 +1557,7 @@ * * Change the caret position and extend the selection to the new caret. */ -static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, - BOOL fully_visible ) +static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visi= ble ) { TRACE("old focus %d, index %d\n", descr->focus_item, index); = @@ -1810,11 +1805,11 @@ if (index =3D=3D descr->selected_item) descr->selected_item =3D -1; else if (index < descr->selected_item) - { + { descr->selected_item--; if (ISWIN31) /* win 31 do not change the selected item number = */ LISTBOX_SetSelection( descr, descr->selected_item + 1, TRUE= , FALSE); - } + } } = if (descr->focus_item >=3D descr->nb_items) @@ -2105,8 +2100,7 @@ /*********************************************************************** * LISTBOX_HandleLButtonDown */ -static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, - DWORD keys, INT x, INT y ) +static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT= x, INT y ) { INT index =3D LISTBOX_GetItemFromPoint( descr, x, y ); = @@ -2200,7 +2194,7 @@ * PARAMS * pWnd [I] The windows internal structure * pDescr [I] The ListBox internal structure - * wParam [I] Key Flag (WM_LBUTTONDOWN doc for more info) + * keys [I] Key Flag (WM_LBUTTONDOWN doc for more info) * x [I] X Mouse Coordinate * y [I] Y Mouse Coordinate * @@ -2211,8 +2205,7 @@ * This function is only to be used when a ListBox is a ComboListBox */ = -static LRESULT LISTBOX_HandleLButtonDownCombo( LB_DESCR *pDescr, - UINT msg, DWORD keys, INT x= , INT y) +static LRESULT LISTBOX_HandleLButtonDownCombo( LB_DESCR *descr, UINT msg, = DWORD keys, INT x, INT y) { RECT clientRect, screenRect; POINT mousePos; @@ -2220,18 +2213,18 @@ mousePos.x =3D x; mousePos.y =3D y; = - GetClientRect(pDescr->self, &clientRect); + GetClientRect(descr->self, &clientRect); = if(PtInRect(&clientRect, mousePos)) { /* MousePos is in client, resume normal processing */ if (msg =3D=3D WM_LBUTTONDOWN) { - pDescr->lphc->droppedIndex =3D pDescr->nb_items ? pDescr->selec= ted_item : -1; - return LISTBOX_HandleLButtonDown( pDescr, keys, x, y); - } - else if (pDescr->style & LBS_NOTIFY) - SEND_NOTIFICATION( pDescr, LBN_DBLCLK ); + descr->lphc->droppedIndex =3D descr->nb_items ? descr->selected= _item : -1; + return LISTBOX_HandleLButtonDown( descr, keys, x, y); + } + else if (descr->style & LBS_NOTIFY) + SEND_NOTIFICATION( descr, LBN_DBLCLK ); } else { @@ -2242,20 +2235,20 @@ screenMousePos =3D mousePos; hWndOldCapture =3D GetCapture(); ReleaseCapture(); - GetWindowRect(pDescr->self, &screenRect); - ClientToScreen(pDescr->self, &screenMousePos); + GetWindowRect(descr->self, &screenRect); + ClientToScreen(descr->self, &screenMousePos); = if(!PtInRect(&screenRect, screenMousePos)) { - LISTBOX_SetCaretIndex( pDescr, pDescr->lphc->droppedIndex, FAL= SE ); - LISTBOX_SetSelection( pDescr, pDescr->lphc->droppedIndex, FALS= E, FALSE ); - COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE ); + LISTBOX_SetCaretIndex( descr, descr->lphc->droppedIndex, FALSE= ); + LISTBOX_SetSelection( descr, descr->lphc->droppedIndex, FALSE,= FALSE ); + COMBO_FlipListbox( descr->lphc, FALSE, FALSE ); } else { /* Check to see the NC is a scrollbar */ INT nHitTestType=3D0; - LONG style =3D GetWindowLongW( pDescr->self, GWL_STYLE ); + LONG style =3D GetWindowLongW( descr->self, GWL_STYLE ); /* Check Vertical scroll bar */ if (style & WS_VSCROLL) { @@ -2275,8 +2268,8 @@ = if(nHitTestType !=3D 0) { - SendMessageW(pDescr->self, WM_NCLBUTTONDOWN, nHitTestType, - MAKELONG(screenMousePos.x, screenMousePos.y)); + SendMessageW(descr->self, WM_NCLBUTTONDOWN, nHitTestType, + MAKELONG(screenMousePos.x, screenMousePos.y)); } /* Resume the Capture after scrolling is complete */ @@ -2312,8 +2305,7 @@ * Handle scrolling upon a timer event. * Return TRUE if scrolling should continue. */ -static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, - INT index, TIMER_DIRECTION dir ) +static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRE= CTION dir ) { switch(dir) { @@ -2416,7 +2408,7 @@ INT caret =3D -1; BOOL bForceSelection =3D TRUE; /* select item pointed to by focus_item= */ if ((IS_MULTISELECT(descr)) || (descr->selected_item =3D=3D descr->foc= us_item)) - bForceSelection =3D FALSE; /* only for single select list */ + bForceSelection =3D FALSE; /* only for single select list */ = if (descr->style & LBS_WANTKEYBOARDINPUT) { @@ -2577,7 +2569,7 @@ GetClientRect( hwnd, &rect ); descr->self =3D hwnd; descr->owner =3D GetParent( descr->self ); - descr->style =3D GetWindowLongA( descr->self, GWL_STYLE ); + descr->style =3D GetWindowLongW( descr->self, GWL_STYLE ); descr->width =3D rect.right - rect.left; descr->height =3D rect.bottom - rect.top; descr->items =3D NULL; @@ -2806,11 +2798,11 @@ #endif case LB_DELETESTRING: if (LISTBOX_RemoveItem( descr, wParam) !=3D LB_ERR) - return descr->nb_items; + return descr->nb_items; else { - SetLastError(ERROR_INVALID_INDEX); - return LB_ERR; + SetLastError(ERROR_INVALID_INDEX); + return LB_ERR; } = #ifndef __REACTOS__ @@ -2870,15 +2862,13 @@ case LB_GETCURSEL16: #endif case LB_GETCURSEL: - if (descr->nb_items=3D=3D0) - return LB_ERR; + if (descr->nb_items =3D=3D 0) + return LB_ERR; if (!IS_MULTISELECT(descr)) - return descr->selected_item; - /* else */ - if (descr->selected_item!=3D-1) - return descr->selected_item; - /* else */ - return descr->focus_item; + return descr->selected_item; + if (descr->selected_item !=3D -1) + return descr->selected_item; + return descr->focus_item; /* otherwise, if the user tries to move the selection with the = */ /* arrow keys, we will give the application something to choke on = */ #ifndef __REACTOS__ @@ -3167,7 +3157,7 @@ /* according to Win16 docs, DDL_DRIVES should make DDL_EXCLUSIVE * be set automatically (this is different in Win32) */ if (wParam & DDL_DRIVES) wParam |=3D DDL_EXCLUSIVE; - lParam =3D (LPARAM)MapSL(lParam); + lParam =3D (LPARAM)MapSL(lParam); /* fall through */ #endif case LB_DIR: @@ -3300,7 +3290,7 @@ return LISTBOX_HandleLButtonDownCombo(descr, msg, wParam, (INT16)LOWORD(lParam), (INT16)HIWORD(lParam) ); - return LISTBOX_HandleLButtonDown(descr, wParam, + return LISTBOX_HandleLButtonDown( descr, wParam, (INT16)LOWORD(lParam), (INT16)HIWORD(lParam) ); case WM_LBUTTONDBLCLK: @@ -3331,7 +3321,7 @@ LISTBOX_HandleMouseMove( descr, mousePos.x, mousePos.y); = descr->captured =3D captured; - } + } = else if (GetCapture() =3D=3D descr->self) { LISTBOX_HandleMouseMove( descr, (INT16)LOWORD(lParam), @@ -3439,7 +3429,7 @@ = default: if ((msg >=3D WM_USER) && (msg < 0xc000)) - WARN("[%p]: unknown msg %04x wp %08x lp %08lx\n", + WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", hwnd, msg, wParam, lParam ); } =

1 0

[dreimer] 32569: Bug 3119: Italian translation to JOY.CPL by Carlo Bramini (carlo.bramix@libero.it)
by dreimer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: dreimer Date: Wed Mar 5 14:41:58 2008 New Revision: 32569 URL: http://svn.reactos.org/svn/reactos?rev=3D32569&view=3Drev Log: Bug 3119: Italian translation to JOY.CPL by Carlo Bramini (carlo.bramix@lib= ero.it) Added: trunk/reactos/dll/cpl/joy/lang/it-IT.rc (with props) Modified: trunk/reactos/dll/cpl/joy/rsrc.rc Added: trunk/reactos/dll/cpl/joy/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/it-I= T.rc?rev=3D32569&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/joy/lang/it-IT.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/it-IT.rc Wed Mar 5 14:41:58 2008 @@ -1,0 +1,84 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Periferiche di gioco" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Queste impostazioni permettono di configurare le periferiche di= gioco installate sul vostro computer.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Periferi&che di gioco installate", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_= GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Aggiungi...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Rimuovi", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Propriet=C3=A0", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14,= WS_DISABLED + PUSHBUTTON "A&vanzate...", IDC_ADVANCED_BUTTON, 79, 157, 65, 14 + PUSHBUTTON "&Risoluzione dei problemi...", IDC_TROUBLESHOOT_BUTTON, 14= 8, 157, 97, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | W= S_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Aggiungi periferica di gioco" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Selezionare una periferica di gioco dall'elenco seguente e prem= ere il pulsante OK. Se la periferica non =C3=A9 presente nella lista, prem= ere il pulsante Personalizza.", -1, 35, 7, 210, 33 + LTEXT "Periferi&che di gioco:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_= NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "Attiva &timone e pedali", IDC_ENABLE_RUDDERS_CHECKBOX, 7= , 114, 100, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_= SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Personalizza...", IDC_CUSTOM_BUTTON, 192, 147, 66, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | W= S_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Periferica di gioco personalizzata" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Caratteristiche speciali", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Cloche o joystick di volo", IDC_FLIGHT_YOKE_RADIO, 1= 27, 23, 89, 10 + AUTORADIOBUTTON "&Game pad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Volante per macchine da corsa", IDC_RACE_CAR_RADIO, = 127, 40, 113, 10 + GROUPBOX "&Assi", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT |= WS_VSCROLL + AUTORADIOBUTTON "Timone/Pedali", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, = 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Asse Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VIS= IBLE + GROUPBOX "&Pulsanti", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AU= TOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Include una periferica per la regolazione del punto di v= ista", IDC_INC_POINT_CHECKBOX, 7, 123, 205, 10 + LTEXT "&Nome della periferica:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS= _EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Impostazioni avanzate" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 163, 65, 50, 14 + LTEXT "Selezionare una periferica da usare con vecchi programmi.", -1,= 7, 7, 208, 10 + LTEXT "Dispositivo predefinito:", -1, 34, 24, 100, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | = CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Periferiche di gioco" + IDS_CPLSYSTEMDESCRIPTION "Aggiunge, rimuove e configura periferiche di= gioco come joystick e gamepad." + IDS_CONTROLLER "Dispositivo" + IDS_STATUS "Stato" +END Propchange: trunk/reactos/dll/cpl/joy/lang/it-IT.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?r= ev=3D32569&r1=3D32568&r2=3D32569&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/joy/rsrc.rc (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc Wed Mar 5 14:41:58 2008 @@ -6,6 +6,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[cwittich] 32568: remove unneeded definitions define cmp_name as __cdecl
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 09:12:11 2008 New Revision: 32568 URL: http://svn.reactos.org/svn/reactos?rev=3D32568&view=3Drev Log: remove unneeded definitions define cmp_name as __cdecl Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/= debug.c?rev=3D32568&r1=3D32567&r2=3D32568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/3rdparty/libwine/debug.c (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c Wed Mar 5 09:12:11 2008 @@ -35,9 +35,6 @@ #include <rtlfuncs.h> #include <cmfuncs.h> = -#define KEY_QUERY_VALUE 1 -#define REG_SZ 1 - ULONG __cdecl DbgPrint( @@ -57,7 +54,7 @@ = static void debug_init(void); = -static int cmp_name( const void *p1, const void *p2 ) +static int __cdecl cmp_name( const void *p1, const void *p2 ) { const char *name =3D p1; const struct __wine_debug_channel *chan =3D p2;

1 0

[cwittich] 32567: #define inline __inline for msvc
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 09:09:56 2008 New Revision: 32567 URL: http://svn.reactos.org/svn/reactos?rev=3D32567&view=3Drev Log: #define inline __inline for msvc Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32567&r1=3D32566&r2=3D32567&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:09:56 2008 @@ -986,3 +986,7 @@ #ifndef __cplusplus /* #undef inline */ #endif + +#if defined(_MSC_VER) +#define inline __inline +#endif

1 0

[cwittich] 32566: don't include unistd.h in msvc builds add some x64 declarations from wine to port.h
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 09:06:17 2008 New Revision: 32566 URL: http://svn.reactos.org/svn/reactos?rev=3D32566&view=3Drev Log: don't include unistd.h in msvc builds add some x64 declarations from wine to port.h Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:06:17 2008 @@ -780,7 +780,9 @@ /* #undef HAVE_UNICODE_UBIDI_H */ = /* Define to 1 if you have the <unistd.h> header file. */ +#if !defined(_MSC_VER) #define HAVE_UNISTD_H 1 +#endif = /* Define to 1 if you have the `usleep' function. */ /* #undef HAVE_USLEEP */ Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= port.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/port.h (original) +++ trunk/reactos/include/reactos/wine/port.h Wed Mar 5 09:06:17 2008 @@ -48,6 +48,14 @@ /**************************************************************** * Type definitions */ + +#if !defined(_MSC_VER) && !defined(__int64) +# if defined(__x86_64__) || defined(_WIN64) +# define __int64 long +# else +# define __int64 long long +# endif +#endif = #ifndef HAVE_MODE_T typedef int mode_t;

1 0

[cwittich] 32565: msvc compat fix
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Wed Mar 5 09:02:02 2008 New Revision: 32565 URL: http://svn.reactos.org/svn/reactos?rev=3D32565&view=3Drev Log: msvc compat fix Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32565&r1=3D32564&r2=3D32565&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:02:02 2008 @@ -441,7 +441,9 @@ #define HAVE_PCLOSE 1 = /* Define to 1 if the system has the type `pid_t'. */ +#if !defined(_MSC_VER) #define HAVE_PID_T 1 +#endif = /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */

1 0

[greatlrd] 32564: Implemented : DxEngLockHdev, DxEngUnlockHdev Thanks jimtabor for the help with these two.
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Wed Mar 5 00:35:01 2008 New Revision: 32564 URL: http://svn.reactos.org/svn/reactos?rev=3D32564&view=3Drev Log: Implemented : DxEngLockHdev, DxEngUnlockHdev = Thanks jimtabor for the help with these two. = Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drive= rs/directx/dxeng.h?rev=3D32564&r1=3D32563&r2=3D32564&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Mar 5 00:35:= 01 2008 @@ -87,14 +87,15 @@ DWORD DxEngGetHdevData(HDEV, DXEGSHDEVDATA); BOOLEAN DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); +BOOLEAN DxEngLockHdev(HDEV hdev); +BOOLEAN DxEngUnlockHdev(HDEV hdev); = /* prototypes are not done yet, I need gather all my notes * to make them correct */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); -DWORD DxEngLockHdev(DWORD x1); -DWORD DxEngUnlockHdev(DWORD x1); + DWORD DxEngReferenceHdev(DWORD x1); DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD DxEngUnreferenceHdev(DWORD x1); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/dxeng.c?rev=3D32564&r1=3D32563&r2=3D32564&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Mar 5 00:35:= 01 2008 @@ -465,6 +465,67 @@ return TRUE; } = +/*++ +* @name DxEngLockHdev +* @implemented +* +* The function DxEngLockHdev lock the internal PDEV +* +* @param HDEV type +* it is a pointer to win32k internal pdev struct known as PGDIDEVICE + +* @return +* This function returns TRUE no matter what. +* +* @remarks. +* none +* +*--*/ +BOOLEAN = +DxEngLockHdev(HDEV hDev) +{ + PGDIDEVICE pPDev =3D (PGDIDEVICE)hDev; + PERESOURCE Resource =3D pPDev->hsemDevLock; + + if (Resource) + { + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite( Resource , TRUE); // Lock monitor. + } + return TRUE; +} + +/*++ +* @name DxEngUnlockHdev +* @implemented +* +* The function DxEngUnlockHdev unlock the internal PDEV +* +* @param HDEV type +* it is a pointer to win32k internal pdev struct known as PGDIDEVICE + +* @return +* This function returns TRUE no matter what. +* +* @remarks. +* none +* +*--*/ +BOOLEAN = +DxEngUnlockHdev(HDEV hDev) +{ + PGDIDEVICE pPDev =3D (PGDIDEVICE)hDev; + PERESOURCE Resource =3D pPDev->hsemDevLock; + + if (Resource) + { + ExReleaseResourceLite( Resource ); + KeLeaveCriticalRegion(); + } + return TRUE; +} + + /************************************************************************/ /* DxEngNUIsTermSrv */ /************************************************************************/ @@ -532,23 +593,7 @@ return FALSE; } = -/************************************************************************/ -/* DxEngLockHdev */ -/************************************************************************/ -DWORD DxEngLockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUnlockHdev */ -/************************************************************************/ -DWORD DxEngUnlockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} + = /************************************************************************/ /* DxEngReferenceHdev */

1 0

[cwittich] 32563: only destroy objects which are valid
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Tue Mar 4 21:41:59 2008 New Revision: 32563 URL: http://svn.reactos.org/svn/reactos?rev=3D32563&view=3Drev Log: only destroy objects which are valid Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msc= onfig/msconfig.c?rev=3D32563&r1=3D32562&r2=3D32563&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Tue Mar 4 21:41:59= 2008 @@ -184,13 +184,20 @@ break; = case WM_DESTROY: - DestroyWindow(hToolsPage); - DestroyWindow(hGeneralPage); - DestroyWindow(hServicesPage); - DestroyWindow(hStartupPage); - DestroyWindow(hFreeLdrPage); - DestroyWindow(hSystemPage); - DestroyIcon(hIcon); + if (hToolsPage) + DestroyWindow(hToolsPage); + if (hGeneralPage) + DestroyWindow(hGeneralPage); + if (hServicesPage) + DestroyWindow(hServicesPage); + if (hStartupPage) + DestroyWindow(hStartupPage); + if (hFreeLdrPage) + DestroyWindow(hFreeLdrPage); + if (hSystemPage) + DestroyWindow(hSystemPage); + if (hIcon) + DestroyIcon(hIcon); return DefWindowProc(hDlg, message, wParam, lParam); } =

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs