Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[arty] 29841: React to changes in rbuild with regard to definitions. These are now conditionally done in rosbe-ppc's gcc wrapper.
by arty＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: arty Date: Wed Oct 24 06:23:54 2007 New Revision: 29841 URL: http://svn.reactos.org/svn/reactos?rev=29841&view=rev Log: React to changes in rbuild with regard to definitions. These are now conditionally done in rosbe-ppc's gcc wrapper. Modified: trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=298… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Wed Oct 24 06:23:54 2007 @@ -13,22 +13,7 @@ <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="stdcall"/> - <define name="__stdcall__"/> - <define name="fastcall"/> - <define name="cdecl"/> - <define name="__cdecl__"/> - <define name="dllimport"/> - <define name="WORDS_BIGENDIAN"/> <define name="__MSVCRT__"/> - <define name="__NO_CTYPE_INLINES" /> -  - <define name="__MINGW_IMPORT">extern</define> - <define name="_CRTIMP"/> - <define name="'__declspec(x)'"/> <compilerflag>-fshort-wchar</compilerflag> <compilerflag>-fsigned-char</compilerflag> <compilerflag>-mfull-toc</compilerflag>

1 0

[jimtabor] 29840: Update NtUserGetComboBoxInfo header info.
by jimtabor＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: jimtabor Date: Wed Oct 24 06:03:56 2007 New Revision: 29840 URL: http://svn.reactos.org/svn/reactos?rev=29840&view=rev Log: Update NtUserGetComboBoxInfo header info. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Oct 24 06:03:56 2007 @@ -991,11 +991,11 @@ NtUserGetClipCursor( RECT *lpRect); -DWORD +BOOL NTAPI NtUserGetComboBoxInfo( - DWORD Unknown0, - DWORD Unknown1); + HWND hWnd, + PCOMBOBOXINFO pcbi); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Oct 24 06:03:56 2007 @@ -272,11 +272,11 @@ return 0; } -DWORD +BOOL STDCALL NtUserGetComboBoxInfo( - DWORD Unknown0, - DWORD Unknown1) + HWND hWnd, + PCOMBOBOXINFO pcbi) { UNIMPLEMENTED

1 0

[jimtabor] 29839: - Sync to Wine: Listbox controls - Implement NtUserGetListBoxInfo and GetListBoxInfo. Fix header entry. - Add LB_GETLISTBOXINFO to psdk.
by jimtabor＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: jimtabor Date: Wed Oct 24 05:04:06 2007 New Revision: 29839 URL: http://svn.reactos.org/svn/reactos?rev=29839&view=rev Log: - Sync to Wine: Listbox controls - Implement NtUserGetListBoxInfo and GetListBoxInfo. Fix header entry. - Add LB_GETLISTBOXINFO to psdk. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/media/doc/README.WINE trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Oct 24 05:04:06 2007 @@ -16,12 +16,26 @@ * 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 USA + * + * 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. + * + * TODO: + * - GetListBoxInfo() + * - LB_GETLISTBOXINFO + * - LBS_NODATA */ #include <user32.h> #include <wine/debug.h> -WINE_DECLARE_DEBUG_CHANNEL(combo); + WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Start of hack section -------------------------------- */ @@ -41,14 +55,6 @@ BOOL STDCALL KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ - -/* Unimplemented yet: - * - LBS_USETABSTOPS - * - Locale handling - * - * Probably needs improvement: - * - LBS_NOSEL - */ /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16 @@ -341,10 +347,12 @@ * * Set the top item of the listbox, scrolling up or down if necessary. */ -static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, - BOOL scroll ) +static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) { INT max = LISTBOX_GetMaxTopIndex( descr ); + + TRACE("setting top item %d, scroll %d\n", index, scroll); + if (index > max) index = max; if (index < 0) index = 0; if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size; @@ -519,6 +527,8 @@ rect->bottom = rect->top + descr->item_height; rect->right += descr->horz_pos; } + + TRACE("item %d, rect %s\n", index, wine_dbgstr_rect(rect)); return ((rect->left < descr->width) && (rect->right > 0) && (rect->top < descr->height) && (rect->bottom > 0)); @@ -704,8 +714,7 @@ * * Repaint a single item synchronously. */ -static void LISTBOX_RepaintItem( LB_DESCR *descr, INT index, - UINT action ) +static void LISTBOX_RepaintItem( LB_DESCR *descr, INT index, UINT action ) { HDC hdc; RECT rect; @@ -736,6 +745,33 @@ /*********************************************************************** + * LISTBOX_DrawFocusRect + */ +static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) +{ + HDC hdc; + RECT rect; + HFONT oldFont = 0; + + /* Do not repaint the item if the item is not visible */ + if (!IsWindowVisible(descr->self)) return; + + if (descr->focus_item == -1) return; + if (!descr->caret_on || !descr->in_focus) return; + + if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) != 1) return; + if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (descr->font) oldFont = SelectObject( hdc, descr->font ); + if (!IsWindowEnabled(descr->self)) + SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); + SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL ); + LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, on ? FALSE : TRUE ); + if (oldFont) SelectObject( hdc, oldFont ); + ReleaseDC( descr->self, hdc ); +} + + +/*********************************************************************** * LISTBOX_InitStorage */ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) @@ -767,8 +803,7 @@ /*********************************************************************** * LISTBOX_SetTabStops */ -static BOOL LISTBOX_SetTabStops( LB_DESCR *descr, INT count, - LPINT tabs, BOOL short_ints ) +static BOOL LISTBOX_SetTabStops( LB_DESCR *descr, INT count, LPINT tabs, BOOL short_ints ) { INT i; @@ -1375,6 +1410,8 @@ { INT top; + TRACE("current top item %d, index %d, fully %d\n", descr->top_item, index, fully); + if (index <= descr->top_item) top = index; else if (descr->style & LBS_MULTICOLUMN) { @@ -1413,16 +1450,17 @@ { INT oldfocus = descr->focus_item; + TRACE("old focus %d, index %d\n", oldfocus, index); + if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; if (index == oldfocus) return LB_OKAY; + + LISTBOX_DrawFocusRect( descr, FALSE ); descr->focus_item = index; - if ((oldfocus != -1) && descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, oldfocus, ODA_FOCUS ); LISTBOX_MakeItemVisible( descr, index, fully_visible ); - if (descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, index, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; } @@ -1476,7 +1514,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, BOOL on, BOOL send_notify ) { - TRACE( "index=%d notify=%s\n", index, send_notify ? "YES" : "NO" ); + TRACE( "cur_sel=%d index=%d notify=%s\n", + descr->selected_item, index, send_notify ? "YES" : "NO" ); if (descr->style & LBS_NOSEL) { @@ -1497,8 +1536,8 @@ if (index == oldsel) return LB_OKAY; if (oldsel != -1) descr->items[oldsel].selected = FALSE; if (index != -1) descr->items[index].selected = TRUE; + if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); descr->selected_item = index; - if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT ); if (send_notify && descr->nb_items) SEND_NOTIFICATION( descr, (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL ); @@ -1518,7 +1557,7 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + TRACE("old focus %d, index %d\n", descr->focus_item, index); if ((index < 0) || (index >= descr->nb_items)) return; @@ -1531,9 +1570,7 @@ 4. Set the focus to 'index' and repaint the item */ /* 1. remove the focus and repaint the item */ - descr->focus_item = -1; - if ((oldfocus != -1) && descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, oldfocus, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, FALSE ); /* 2. then turn off the previous selection */ /* 3. repaint the new selected item */ @@ -1558,8 +1595,7 @@ /* 4. repaint the new item with the focus */ descr->focus_item = index; LISTBOX_MakeItemVisible( descr, index, fully_visible ); - if (descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, index, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); } @@ -1712,7 +1748,7 @@ dis.itemData = descr->items[index].data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - if (HAS_STRINGS(descr) && descr->items[index].str) + if (HAS_STRINGS(descr)) HeapFree( GetProcessHeap(), 0, descr->items[index].str ); } @@ -2066,7 +2102,10 @@ DWORD keys, INT x, INT y ) { INT index = LISTBOX_GetItemFromPoint( descr, x, y ); - TRACE("[%p]: lbuttondown %d,%d item %d\n", descr->self, x, y, index ); + + TRACE("[%p]: lbuttondown %d,%d item %d, focus item %d\n", + descr->self, x, y, index, descr->focus_item); + if (!descr->caret_on && (descr->in_focus)) return 0; if (!descr->in_focus) @@ -2076,6 +2115,16 @@ } if (index == -1) return 0; + + if (!descr->lphc) + { + if (descr->style & LBS_NOTIFY ) + SendMessageW( descr->owner, WM_LBTRACKPOINT, index, + MAKELPARAM( x, y ) ); + } + + descr->captured = TRUE; + SetCapture( descr->self ); if (descr->style & (LBS_EXTENDEDSEL | LBS_MULTIPLESEL)) { @@ -2119,14 +2168,8 @@ TRUE, (descr->style & LBS_NOTIFY) != 0 ); } - descr->captured = TRUE; - SetCapture( descr->self ); - if (!descr->lphc) { - if (descr->style & LBS_NOTIFY ) - SendMessageW( descr->owner, WM_LBTRACKPOINT, index, - MAKELPARAM( x, y ) ); if (GetWindowLongW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT) { POINT pt; @@ -2147,7 +2190,7 @@ * * Process LButtonDown message for the ComboListBox * -nn * PARAMS + * PARAMS * pWnd [I] The windows internal structure * pDescr [I] The ListBox internal structure * wParam [I] Key Flag (WM_LBUTTONDOWN doc for more info) @@ -2467,7 +2510,6 @@ } } return 0; - } @@ -2614,8 +2656,8 @@ WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); + LPHEADCOMBO lphc = 0; LRESULT ret; - LPHEADCOMBO lphc = 0; if (!descr) { @@ -2625,8 +2667,7 @@ { CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; - if (!LISTBOX_Create( hwnd, lphc )) - return -1; + if (!LISTBOX_Create( hwnd, lphc )) return -1; TRACE("creating wnd=%p descr=%lx\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); return 0; } @@ -2638,6 +2679,7 @@ TRACE("[%p]: msg %s wp %08x lp %08lx\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); + switch(msg) { #ifndef __REACTOS__ @@ -2843,16 +2885,38 @@ { POINT pt; RECT rect; - - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - rect.left = 0; - rect.top = 0; - rect.right = descr->width; - rect.bottom = descr->height; - - return MAKELONG( LISTBOX_GetItemFromPoint(descr, pt.x, pt.y), - !PtInRect( &rect, pt ) ); + int index; + BOOL hit = TRUE; + + /* The hiword of the return value is not a client area + hittest as suggested by MSDN, but rather a hittest on + the returned listbox item. */ + + if(descr->nb_items == 0) + return 0x1ffff; /* win9x returns 0x10000, we copy winnt */ + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + + SetRect(&rect, 0, 0, descr->width, descr->height); + + if(!PtInRect(&rect, pt)) + { + pt.x = min(pt.x, rect.right - 1); + pt.x = max(pt.x, 0); + pt.y = min(pt.y, rect.bottom - 1); + pt.y = max(pt.y, 0); + hit = FALSE; + } + + index = LISTBOX_GetItemFromPoint(descr, pt.x, pt.y); + + if(index == -1) + { + index = descr->nb_items - 1; + hit = FALSE; + } + return MAKELONG(index, hit ? 0 : 1); } #ifndef __REACTOS__ @@ -3153,6 +3217,10 @@ if ((descr->focus_item != -1) && (descr->in_focus)) LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); return LB_OKAY; + + case LB_GETLISTBOXINFO: + FIXME("LB_GETLISTBOXINFO: stub!\n"); + return 0; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3190,7 +3258,7 @@ descr->in_focus = TRUE; descr->caret_on = TRUE; if (descr->focus_item != -1) - LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); SEND_NOTIFICATION( descr, LBN_SETFOCUS ); return 0; case WM_KILLFOCUS: @@ -3325,6 +3393,7 @@ if( lphc ) return 0; return unicode ? SendMessageW( descr->owner, msg, wParam, lParam ) : SendMessageA( descr->owner, msg, wParam, lParam ); + case WM_NCDESTROY: if( lphc && (lphc->dwStyle & CBS_DROPDOWNLIST) != CBS_SIMPLE ) lphc->hWndLBox = 0; @@ -3364,12 +3433,11 @@ } /*********************************************************************** - * GetListBoxInfo + * GetListBoxInfo !REACTOS! */ DWORD STDCALL GetListBoxInfo(HWND hwnd) { - UNIMPLEMENTED; - return 0; -} - + return NtUserGetListBoxInfo(hwnd); // Do it right! Have the message org from kmode! +} + Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Wed Oct 24 05:04:06 2007 @@ -1847,6 +1847,7 @@ #define LB_GETITEMDATA 409 #define LB_GETITEMHEIGHT 417 #define LB_GETITEMRECT 408 +#define LB_GETLISTBOXINFO 434 #define LB_GETLOCALE 422 #define LB_GETSEL 391 #define LB_GETSELCOUNT 400 Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Oct 24 05:04:06 2007 @@ -1161,7 +1161,7 @@ DWORD NTAPI NtUserGetListBoxInfo( - DWORD Unknown0); + HWND hWnd); typedef struct tagNTUSERGETMESSAGEINFO { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Oct 24 05:04:06 2007 @@ -125,7 +125,7 @@ reactos/dll/win32/user32/controls/combo.c # Synced at 20071022 reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 - reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 + reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced at 20060908 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Oct 24 05:04:06 2007 @@ -336,16 +336,6 @@ DWORD STDCALL -NtUserGetListBoxInfo( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserGetMouseMovePointsEx( UINT cbSize, LPMOUSEMOVEPOINT lppt, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Oct 24 05:04:06 2007 @@ -2871,6 +2871,32 @@ return NULL; #endif } + + +DWORD +STDCALL +NtUserGetListBoxInfo( + HWND hWnd) +{ + PWINDOW_OBJECT Wnd; + DECLARE_RETURN(DWORD); + + DPRINT("Enter NtUserGetListBoxInfo\n"); + UserEnterExclusive(); + + if (!(Wnd = UserGetWindowObject(hWnd))) + { + RETURN( 0 ); + } + + RETURN( (DWORD) co_IntSendMessage( Wnd->hSelf, LB_GETLISTBOXINFO, 0, 0 )); + +CLEANUP: + DPRINT("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + /* * NtUserGetParent

1 0

[gbrunmar] 29838: Made r29837 readable
by gbrunmar＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: gbrunmar Date: Wed Oct 24 01:47:18 2007 New Revision: 29838 URL: http://svn.reactos.org/svn/reactos?rev=29838&view=rev Log: Made r29837 readable Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=29838&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Wed Oct 24 01:47:18 2007 @@ -169,25 +169,25 @@ destSD->Group = srcSD->Group; RtlCopySid(GroupLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Group, Group); - if (srcSD->Control & SE_DACL_PRESENT) - { - destSD->Dacl = srcSD->Dacl; + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = srcSD->Dacl; if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { + { RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Dacl), Dacl, Dacl->AclSize); - } - } - - if (srcSD->Control & SE_SACL_PRESENT) + } + } + + if (srcSD->Control & SE_SACL_PRESENT) { destSD->Sacl = srcSD->Sacl; if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { + { RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Sacl), Sacl, Sacl->AclSize); - } - } + } + } } else { @@ -199,20 +199,20 @@ destSD->Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Dacl->AclSize); if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { + { RtlCopyMemory(destSD->Dacl, Dacl, Dacl->AclSize); - } - } + } + } if (srcSD->Control & SE_SACL_PRESENT) { destSD->Sacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Sacl->AclSize); if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { + { RtlCopyMemory(destSD->Sacl, Sacl, Sacl->AclSize); - } - } + } + } } return STATUS_SUCCESS;

1 0

[gbrunmar] 29837: Added RtlCopySecurityDescriptor
by gbrunmar＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: gbrunmar Date: Wed Oct 24 01:42:03 2007 New Revision: 29837 URL: http://svn.reactos.org/svn/reactos?rev=29837&view=rev Log: Added RtlCopySecurityDescriptor Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Oct 24 01:42:03 2007 @@ -361,7 +361,7 @@ RtlCopyLuid@8 RtlCopyLuidAndAttributesArray@12 RtlCopyRangeList@8 -;RtlCopySecurityDescriptor +RtlCopySecurityDescriptor@8 RtlCopySid@12 RtlCopySidAndAttributesArray@28 RtlCopyString@8 Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Wed Oct 24 01:42:03 2007 @@ -911,6 +911,14 @@ NTSYSAPI NTSTATUS NTAPI +RtlCopySecurityDescriptor( + IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor +); + +NTSYSAPI +NTSTATUS +NTAPI RtlDeleteAce( PACL Acl, ULONG AceIndex Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=29837&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Wed Oct 24 01:42:03 2007 @@ -129,6 +129,93 @@ pSD->Dacl = NULL; return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlCopySecurityDescriptor(IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor) +{ + PSID Owner, Group; + PACL Dacl, Sacl; + BOOLEAN Defaulted, Present; + DWORD OwnerLength, GroupLength; + PSECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor; + PSECURITY_DESCRIPTOR destSD = pDestinationSecurityDescriptor; + + if (srcSD->Revision != SECURITY_DESCRIPTOR_REVISION) + return STATUS_UNKNOWN_REVISION; + + /* Copy non relative dependent data */ + destSD->Revision = srcSD->Revision; + destSD->Sbz1 = srcSD->Sbz1; + destSD->Control = srcSD->Control; + + /* Read relative data */ + RtlGetOwnerSecurityDescriptor(srcSD, &Owner, &Defaulted); + OwnerLength = RtlLengthSid(Owner); + RtlGetGroupSecurityDescriptor(srcSD, &Group, &Defaulted); + GroupLength = RtlLengthSid(Group); + RtlGetDaclSecurityDescriptor(srcSD, &Present, &Dacl, &Defaulted); + RtlGetSaclSecurityDescriptor(srcSD, &Present, &Sacl, &Defaulted); + + if (srcSD->Control & SE_SELF_RELATIVE) + { + destSD->Owner = srcSD->Owner; + RtlCopySid(OwnerLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Owner, Owner); + + destSD->Group = srcSD->Group; + RtlCopySid(GroupLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Group, Group); + + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = srcSD->Dacl; + + if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) + { + RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Dacl), Dacl, Dacl->AclSize); + } + } + + if (srcSD->Control & SE_SACL_PRESENT) + { + destSD->Sacl = srcSD->Sacl; + + if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) + { + RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Sacl), Sacl, Sacl->AclSize); + } + } + } + else + { + RtlCopySid(OwnerLength, destSD->Owner, Owner); + RtlCopySid(GroupLength, destSD->Group, Group); + + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Dacl->AclSize); + + if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) + { + RtlCopyMemory(destSD->Dacl, Dacl, Dacl->AclSize); + } + } + + if (srcSD->Control & SE_SACL_PRESENT) + { + destSD->Sacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Sacl->AclSize); + + if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) + { + RtlCopyMemory(destSD->Sacl, Sacl, Sacl->AclSize); + } + } + } + + return STATUS_SUCCESS; }

1 0

[peterw] 29836: - My little friend, whatever are you doing here?
by peterw＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: peterw Date: Wed Oct 24 01:15:08 2007 New Revision: 29836 URL: http://svn.reactos.org/svn/reactos?rev=29836&view=rev Log: - My little friend, whatever are you doing here? Modified: trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 01:15:08 2007 @@ -24,5 +24,5 @@ getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c -clean: getdate.c +clean: del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[peterw] 29835: - Make the makefile work again, and add 'clean' to it.
by peterw＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: peterw Date: Wed Oct 24 01:06:47 2007 New Revision: 29835 URL: http://svn.reactos.org/svn/reactos?rev=29835&view=rev Log: - Make the makefile work again, and add 'clean' to it. Modified: trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 01:06:47 2007 @@ -1,28 +1,28 @@ # makefile - Simple makefile to build the various RosBE tools. -CC = gcc -CFLAGS := $(HOST_CFLAGS) -Wall -O2 -o +.PHONY: all clean + +CC := gcc +CFLAGS := ${HOST_CFLAGS} -Wall -O2 -o LFLAGS := -s WINVER := 0x502 +all: buildtime cpucount echoh flash getdate + buildtime: buildtime.c - $(CC) $(CFLAGS) buildtime buildtime.c + ${CC} ${CFLAGS} buildtime buildtime.c cpucount: cpucount.c - $(CC) $(CFLAGS) cpucount cpucount.c + ${CC} ${CFLAGS} cpucount cpucount.c echoh: echoh.c - $(CC) $(CFLAGS) echoh echoh.c + ${CC} ${CFLAGS} echoh echoh.c flash: flash.c - $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=0x$(WINVER) $(CFLAGS) flash flash.c + ${CC} -DWINVER=${WINVER} -D_WIN32_WINNT=${WINVER} ${CFLAGS} flash flash.c getdate: getdate.c - $(CC) $(CFLAGS) getdate getdate.c + ${CC} ${CFLAGS} getdate getdate.c -all: buildtime.c cpucount.c echoh.c flash.c getdate.c - $(CC) $(CFLAGS) buildtime buildtime.c - $(CC) $(CFLAGS) cpucount cpucount.c - $(CC) $(CFLAGS) echoh echoh.c - $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS) flash flash.c - $(CC) $(CFLAGS) getdate getdate.c +clean: getdate.c + del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[fireball] 29834: - Revert 29702 (IopParseDeviceHack is still required in 1st stage, and the Real Bug is at some other place, so no need in masking it away by doing calls which avoid buggy operation).
by fireball＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: fireball Date: Tue Oct 23 23:19:06 2007 New Revision: 29834 URL: http://svn.reactos.org/svn/reactos?rev=29834&view=rev Log: - Revert 29702 (IopParseDeviceHack is still required in 1st stage, and the Real Bug is at some other place, so no need in masking it away by doing calls which avoid buggy operation). Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Tue Oct 23 23:19:06 2007 @@ -481,7 +481,7 @@ NULL); Status = ZwOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, + FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, FILE_SHARE_READ, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Tue Oct 23 23:19:06 2007 @@ -404,9 +404,6 @@ /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. - * TMN: NOTE: It might have been fixed now, by changing the requested - * openmode in xHalIoAssignDriveLetters from FILE_READ_DATA to - * FILE_READ_ATTRIBUTES. If verified, this hack should be removed. */ if (!(DirectOpen) && !(RemainingName->Length) &&

1 0

[dreimer] 29833: Clean up Readme.txt, Readme.pdf, info.txt, License.txt Try to clean up and simplify the makefiles.
by dreimer＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: dreimer Date: Tue Oct 23 23:09:38 2007 New Revision: 29833 URL: http://svn.reactos.org/svn/reactos?rev=29833&view=rev Log: Clean up Readme.txt, Readme.pdf, info.txt, License.txt Try to clean up and simplify the makefiles. Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/readme.pdf trunk/tools/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE-Windows/Tools/info.txt trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Tue Oct 23 23:09:38 2007 @@ -1,4 +1,4 @@ -ReactOS Build Environment v0.X.X.X +ReactOS Build Environment v1.0 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Tue Oct 23 23:09:38 2007 @@ -1,7 +1,7 @@ -ReactOS Build Environment 0.X.X.X +ReactOS Build Environment 1.0 -The ReactOS Build Environment v0.X.X.X contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v1.0 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. @@ -9,42 +9,45 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.X.X.X contains the following packages: +The ReactOS Build Environment v1.0 contains the following packages: binutils-2.18.50-20071015 + patched with: + - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 nasm-0.99.05-win32 mingw-4.1.3-20071015-prerelease - - Patched to fix a GCC bug concerning - decorating virtual methods with stdcall - in C++, see GCC issue: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27067 - - Patched to run on Vista under UAC, see GCC issue: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30335 + patched with: + - GCC-v4.1-r129382-prerelease-w3seek.patch + - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch + - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch Websites: MinGW - Minimalist GNU for Windows -http://www.mingw.org/ +http://www.mingw.org GCC, the GNU Compiler Collection -http://www.gcc.org/ +http://www.gcc.org NASM, the Netwide Assembler -http://www.kernel.org/pub/software/devel/nasm/ -http://nasm.sourceforge.net/ +http://www.kernel.org/pub/software/devel/nasm +http://nasm.sourceforge.net NSIS (Nullsoft Scriptable Install System) -http://nsis.sourceforge.net/ +http://nsis.sourceforge.net -The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here) -http://gnuwin32.sourceforge.net/ +The GnuWin32 Project (tee/test/sed/grep and their dependencies were obtained here) +http://gnuwin32.sourceforge.net + +Olof's Tools (cut) +http://www.ltr-data.se Subversion Client -http://subversion.tigris.org/ +http://subversion.tigris.org Inspired by blight's ReactOS Build Environment v0.2-3.4.5 -Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org/) +Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org) Icon made by ROSFan Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/config/makefile Tue Oct 23 23:09:38 2007 @@ -4,7 +4,7 @@ all: $(TARGET) -CPP=mingw32-gcc +CC=gcc CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99 LFLAGS := -mwindows -s LIBS := @@ -15,10 +15,10 @@ OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff) $(TARGET): $(OBJS) - $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS) + $(CC) $(LFLAGS) -o $@ $(OBJS) $(LIBS) .c.o: $< - $(CPP) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(RC:.rc=.coff): windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC) Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Tue Oct 23 23:09:38 2007 @@ -1,7 +1,7 @@ Additional Tools needed: tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm test: http://gnuwin32.sourceforge.net/packages/coreutils.htm -cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm +cut: http://www.ltr-data.se/files/cut.zip sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Tue Oct 23 23:09:38 2007 @@ -1,26 +1,28 @@ # makefile - Simple makefile to build the various RosBE tools. CC = gcc -OFLAGS = -Wall -O2 -o +CFLAGS := $(HOST_CFLAGS) -Wall -O2 -o +LFLAGS := -s +WINVER := 0x502 buildtime: buildtime.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c + $(CC) $(CFLAGS) buildtime buildtime.c cpucount: cpucount.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c + $(CC) $(CFLAGS) cpucount cpucount.c echoh: echoh.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c + $(CC) $(CFLAGS) echoh echoh.c flash: flash.c - $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c + $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=0x$(WINVER) $(CFLAGS) flash flash.c getdate: getdate.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c + $(CC) $(CFLAGS) getdate getdate.c all: buildtime.c cpucount.c echoh.c flash.c getdate.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c - $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c + $(CC) $(CFLAGS) buildtime buildtime.c + $(CC) $(CFLAGS) cpucount cpucount.c + $(CC) $(CFLAGS) echoh echoh.c + $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS) flash flash.c + $(CC) $(CFLAGS) getdate getdate.c

1 0

[greatlrd] 29832: adding driver export list for dxg.sys, thuse api that being export as driver adding private include file for dxg.sys
by greatlrd＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: greatlrd Date: Tue Oct 23 23:06:11 2007 New Revision: 29832 URL: http://svn.reactos.org/svn/reactos?rev=29832&view=rev Log: adding driver export list for dxg.sys, thuse api that being export as driver adding private include file for dxg.sys Added: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (with props) branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/main.c Added: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h Tue Oct 23 23:06:11 2007 @@ -1,0 +1,97 @@ + + +DRVFN gaDxgFuncs [] = +{ + {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, + {DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, + {DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, + {DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, + {DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, + {DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, + {DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, + {DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, + {DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, + {DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, + {DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, + {DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, + {DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, + {DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, + {DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, + {DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, + {DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateD3DBuffer2, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, + {DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, + {DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, + {DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, + {DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, + {DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, + {DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, + {DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, + {DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, + {DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, + {DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, + {DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, + {DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, + {DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, + {DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, + {DXG_INDEX_DxDdGetFlipStatus, (PFN)}, + {DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)}, + {DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)}, + {DXG_INDEX_DxDdGetMoCompGuids, (PFN)}, + {DXG_INDEX_DxDdGetMoCompFormats, (PFN)}, + {DXG_INDEX_DxDdGetScanLine, (PFN)}, + {DXG_INDEX_DxDdLock, (PFN)}, + {DXG_INDEX_DxDdLockD3D, (PFN)}, + {DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)}, + {DXG_INDEX_DxDdQueryMoCompStatus, (PFN)}, + {DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)}, + {DXG_INDEX_DxDdReleaseDC, (PFN)}, + {DXG_INDEX_DxDdRenderMoComp, (PFN)}, + {DXG_INDEX_DxDdResetVisrgn, (PFN)}, + {DXG_INDEX_DxDdSetColorKey, (PFN)}, + {DXG_INDEX_DxDdSetExclusiveMode, (PFN)}, + {DXG_INDEX_DxDdSetGammaRamp, (PFN)}, + {DXG_INDEX_DxDdCreateSurfaceEx, (PFN)}, + {DXG_INDEX_DxDdSetOverlayPosition, (PFN)}, + {DXG_INDEX_DxDdUnattachSurface, (PFN)}, + {DXG_INDEX_DxDdUnlockD3D, (PFN)DxDdUnlockD3D}, + {DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, + {DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, + {DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, + {DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, + {DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, + {DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, + {DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, + {DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, + {DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, + {DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, + {DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, + {DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, + {DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, + {DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, + {DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, + {DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, + {DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, + {DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, + {DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, + {DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, + {DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, + {DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, + {DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, + {DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, + {DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, + {DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, + {DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, + {DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, + {DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, + {DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, + {DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, + {DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, + {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, + {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, + {DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, + {DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, + {DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, + {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} +}; Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Tue Oct 23 23:06:11 2007 @@ -1,0 +1,41 @@ + +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> +#include <ddk/ntddmou.h> +#include <ddk/ntifs.h> +#include <ddk/tvout.h> +#include <ndk/ntndk.h> + +#define WINBASEAPI +#define STARTF_USESIZE 2 +#define STARTF_USEPOSITION 4 +#define INTERNAL_CALL NTAPI + +#include <stdarg.h> +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <prntfont.h> +#include <dde.h> +#include <wincon.h> + +#include <reactos/win32k/ntgdityp.h> +#include <reactos/win32k/ntgdihdl.h> +#include <reactos/win32k/win32kdc.h> +#include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> + + +/* exported functions */ +NTSTATUS DriverEntry(IN PVOID Context1, IN PVOID Context2); +NTSTATUS GsDriverEntry(IN PVOID Context1, IN PVOID Context2); +NTSTATUS DxDdCleanupDxGraphics(); + + +/* Driver list export functions */ + +/* Internel functions */ +BOOL DdHmgDestroy(); + Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Tue Oct 23 23:06:11 2007 @@ -11,7 +11,7 @@ #include <dxg_int.h> - +#include "dxg_driver.h" ULONG gcMaxDdHmgr = 0; ULONG gcSizeDdHmgr = 0; @@ -22,13 +22,7 @@ PEPROCESS gpepSession = NULL; PDRVFN gpEngFuncs; - const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; -DRVFN gaDxgFuncs [] = -{ - {0, (PFN) NULL} -}; -

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007