Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 22990: Dmitry Philippov: Fix a bug with firstly overwriting the value, and then trying to use variable for comparation (should be vice-versa: firstly compared what was passed, then overwrite with a new value)
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 12:33:02 2006 New Revision: 22990 URL: http://svn.reactos.org/svn/reactos?rev=22990&view=rev Log: Dmitry Philippov: Fix a bug with firstly overwriting the value, and then trying to use variable for comparation (should be vice-versa: firstly compared what was passed, then overwrite with a new value) Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c Mon Jul 10 12:33:02 2006 @@ -971,7 +971,6 @@ lpCC->wReserved = 0; lpCC->dwProviderSubType = lpComPort->dwProvSubType; lpCC->dwProviderSize = lpComPort->dwProvSpec2; - *lpdwSize = lpCC->dwSize+lpCC->dwProviderSize; if( 0 == lpComPort->dwProvSpec2 ) { lpCC->dwProviderOffset = 0; } else { @@ -985,6 +984,7 @@ RtlCopyMemory(lpCC->wcProviderData, lpComPort->wcProvChar, lpCC->dwProviderSize); ReturnValue = GetCommState(hCommDev, &lpCC->dcb); } + *lpdwSize = lpCC->dwSize+lpCC->dwProviderSize; } }

1 0

[jimtabor] 22989: - User32 menu - Fixed and modified MenuDrawBitmapItem, MenuGetBitmapItemSize and MenuCalcItemSize. Based on Wine ports. - Fixed menu bar drawing and maintained most callback changes (for Miranda). Implemented flat menu support. Some other misc changes. Owner drawing is still broken (Free pascal project Lazarus). Run user32_crosstest from Wine, still more rewriting is needed.
by jimtabor＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: jimtabor Date: Mon Jul 10 09:52:41 2006 New Revision: 22989 URL: http://svn.reactos.org/svn/reactos?rev=22989&view=rev Log: - User32 menu - Fixed and modified MenuDrawBitmapItem, MenuGetBitmapItemSize and MenuCalcItemSize. Based on Wine ports. - Fixed menu bar drawing and maintained most callback changes (for Miranda). Implemented flat menu support. Some other misc changes. Owner drawing is still broken (Free pascal project Lazarus). Run user32_crosstest from Wine, still more rewriting is needed. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jul 10 09:52:41 2006 @@ -331,22 +331,38 @@ * Get the size of a bitmap item. */ static void FASTCALL -MenuGetBitmapItemSize(UINT Id, DWORD Data, SIZE *Size) +MenuGetBitmapItemSize(PROSMENUITEMINFO lpitem, SIZE *Size, HWND WndOwner) { BITMAP Bm; - HBITMAP Bmp = (HBITMAP) Id; + HBITMAP Bmp = lpitem->hbmpItem; Size->cx = Size->cy = 0; /* check if there is a magic menu item associated with this item */ - if (0 != Id && IS_MAGIC_ITEM(Id)) - { - switch((INT_PTR) LOWORD(Id)) - { + if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) + { + switch((INT_PTR) Bmp) + { + case (INT_PTR)HBMMENU_CALLBACK: + { + MEASUREITEMSTRUCT measItem; + measItem.CtlType = ODT_MENU; + measItem.CtlID = 0; + measItem.itemID = lpitem->wID; + measItem.itemWidth = lpitem->Rect.right - lpitem->Rect.left; + measItem.itemHeight = lpitem->Rect.bottom - lpitem->Rect.top; + measItem.itemData = lpitem->dwItemData; + SendMessageW( WndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem); + Size->cx = measItem.itemWidth; + Size->cy = measItem.itemHeight; + return; + } + break; + case (INT_PTR) HBMMENU_SYSTEM: - if (0 != Data) + if (0 != lpitem->dwItemData) { - Bmp = (HBITMAP) Data; + Bmp = (HBITMAP) lpitem->dwItemData; break; } /* fall through */ @@ -359,7 +375,6 @@ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; - case (INT_PTR) HBMMENU_CALLBACK: case (INT_PTR) HBMMENU_POPUP_CLOSE: case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: @@ -383,25 +398,28 @@ * Draw a bitmap item. */ static void FASTCALL -MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect, BOOL MenuBar) +MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect, + HMENU hmenu, HWND WndOwner, UINT odaction, BOOL MenuBar) { BITMAP Bm; DWORD Rop; HDC DcMem; - HBITMAP Bmp = (HBITMAP) Item->hbmpItem; + HBITMAP Bmp; int w = Rect->right - Rect->left; int h = Rect->bottom - Rect->top; int BmpXoffset = 0; int Left, Top; + HBITMAP hbmpToDraw = (HBITMAP) Item->hbmpItem; + Bmp = hbmpToDraw; /* Check if there is a magic menu item associated with this item */ - if (IS_MAGIC_ITEM(Item->hbmpItem)) + if (IS_MAGIC_ITEM(hbmpToDraw)) { UINT Flags = 0; RECT r; r = *Rect; - switch ((int) Item->hbmpItem) + switch ((INT_PTR)hbmpToDraw) { case (INT_PTR) HBMMENU_SYSTEM: if (NULL != Item->hbmpItem) @@ -442,6 +460,31 @@ Flags = DFCS_CAPTIONCLOSE | DFCS_INACTIVE; break; case (INT_PTR) HBMMENU_CALLBACK: + { + DRAWITEMSTRUCT drawItem; + POINT origorg; + drawItem.CtlType = ODT_MENU; + drawItem.CtlID = 0; + drawItem.itemID = Item->wID; + drawItem.itemAction = odaction; + drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0; + drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0; + drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0; + drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0; + drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0; + drawItem.hwndItem = (HWND)hmenu; + drawItem.hDC = Dc; + drawItem.rcItem = *Rect; + drawItem.itemData = Item->dwItemData; + /* some applications make this assumption on the DC's origin */ + SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg); + OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top); + SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem); + SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL); + return; + } + break; + case (INT_PTR) HBMMENU_POPUP_CLOSE: case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: @@ -491,7 +534,9 @@ { RECT Rect; PWCHAR Text; - + BOOL flat_menu = FALSE; + int bkgnd; + if (0 != (Item->fType & MF_SYSMENU)) { if (! IsIconic(Wnd)) @@ -504,11 +549,14 @@ return; } + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + bkgnd = (MenuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU; + /* Setup colors */ if (0 != (Item->fState & MF_HILITE)) { - if (MenuBar) + if (MenuBar && !flat_menu) { SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT)); SetBkColor(Dc, GetSysColor(COLOR_MENU)); @@ -536,7 +584,7 @@ { SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT)); } - SetBkColor(Dc, GetSysColor(COLOR_MENU)); + SetBkColor(Dc, GetSysColor(bkgnd)); } if (0 != (Item->fType & MF_OWNERDRAW)) @@ -579,7 +627,21 @@ dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, dis.rcItem.bottom); SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); - /* Fall through to draw popup-menu arrow */ + /* Draw the popup-menu arrow */ + if (0 != (Item->fType & MF_POPUP)) + { + HDC DcMem = CreateCompatibleDC(Dc); + HBITMAP OrigBitmap; + + OrigBitmap = SelectObject(DcMem, StdMnArrow); + BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, + ((Rect.top + Rect.bottom) - ArrowBitmapHeight) / 2, + ArrowBitmapWidth, ArrowBitmapHeight, + DcMem, 0, 0, SRCCOPY); + SelectObject(DcMem, OrigBitmap); + DeleteDC(DcMem); + } + return; } DPRINT("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top, @@ -596,18 +658,28 @@ { if (Item->fState & MF_HILITE) { - if (MenuBar) - { - DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + if (flat_menu) + { + InflateRect (&Rect, -1, -1); + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); + InflateRect (&Rect, 1, 1); + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); } else { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + if (MenuBar) + { + DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } } } else { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENU)); + FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); } } @@ -618,21 +690,38 @@ /* vertical separator */ if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) { + HPEN oldPen; RECT rc = Rect; rc.top = 3; rc.bottom = Height - 3; - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.left, rc.bottom ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); } /* horizontal separator */ if (0 != (Item->fType & MF_SEPARATOR)) { + HPEN oldPen; RECT rc = Rect; rc.left++; rc.right--; rc.top += SEPARATOR_HEIGHT / 2; - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); - + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.right, rc.top ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); return; } } @@ -646,7 +735,7 @@ #endif if (! MenuBar) - { + { INT y = Rect.top + Rect.bottom; UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); @@ -685,34 +774,7 @@ } if (Item->hbmpItem) { - if (Item->hbmpItem == HBMMENU_CALLBACK) - { - DRAWITEMSTRUCT drawItem; - POINT origorg; - drawItem.CtlType = ODT_MENU; - drawItem.CtlID = 0; - drawItem.itemID = Item->wID; - drawItem.itemAction = Action; - drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0; - drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0; - drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0; - drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0; - drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0; - drawItem.hwndItem = (HWND) MenuInfo->Self; - drawItem.hDC = Dc; - drawItem.rcItem = Item->Rect; - drawItem.itemData = Item->dwItemData; - /* some applications make this assumption on the DC's origin */ - SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg); - OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top); - SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem); - SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL); - } - else - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar); - return; - } + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); } } @@ -731,22 +793,24 @@ DeleteDC(DcMem); } - Rect.left += CheckBitmapWidth; - Rect.right -= ArrowBitmapWidth; - } - else if( Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) - { /* Draw the bitmap */ - MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar); - } + Rect.left += CheckBitmapWidth; + Rect.right -= ArrowBitmapWidth; + } + else + /* Draw the item text or bitmap */ + if (Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) //IS_BITMAP_ITEM(Item->fType)) + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } /* Done for owner-drawn */ if (0 != (Item->fType & MF_OWNERDRAW)) { return; } - - /* process text if present */ - if (!(Item->fType & MF_SYSMENU) && Item->dwTypeData) + + /* No bitmap - process text if present */ + else if ( !(Item->fType & MF_SYSMENU) && IS_STRING_ITEM(Item->fType)) { register int i; HFONT FontOld = NULL; @@ -769,7 +833,6 @@ Rect.left += MenuInfo->maxBmpSize.cx; Rect.right -= MenuInfo->maxBmpSize.cx; } - Text = (PWCHAR) Item->dwTypeData; for (i = 0; L'\0' != Text[i]; i++) { @@ -790,6 +853,7 @@ } SetTextColor(Dc, RGB(0x80, 0x80, 0x80)); } + DrawTextW(Dc, Text, i, &Rect, uFormat); /* paint the shortcut text */ @@ -853,7 +917,13 @@ PrevPen = SelectObject(Dc, GetStockObject(NULL_PEN)); if (NULL != PrevPen) { - DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT); + BOOL flat_menu = FALSE; + + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + if (flat_menu) + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_BTNSHADOW)); + else + DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT); /* draw menu items */ @@ -890,7 +960,7 @@ case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam; - SetWindowLongW(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrW(Wnd, 0, (LONG) cs->lpCreateParams); return 0; } @@ -901,7 +971,7 @@ { PAINTSTRUCT ps; BeginPaint(Wnd, &ps); - MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongW(Wnd, 0)); + MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrW(Wnd, 0)); EndPaint(Wnd, &ps); return 0; } @@ -920,23 +990,23 @@ case WM_SHOWWINDOW: if (0 != wParam) { - if (0 == GetWindowLongW(Wnd, 0)) + if (0 == GetWindowLongPtrW(Wnd, 0)) { OutputDebugStringA("no menu to display\n"); } } else { - SetWindowLongW(Wnd, 0, 0); + SetWindowLongPtrW(Wnd, 0, 0); } break; case MM_SETMENUHANDLE: - SetWindowLongW(Wnd, 0, wParam); + SetWindowLongPtrW(Wnd, 0, wParam); break; case MM_GETMENUHANDLE: - return GetWindowLongW(Wnd, 0); + return GetWindowLongPtrW(Wnd, 0); default: return DefWindowProcW(Wnd, Message, wParam, lParam); @@ -1159,11 +1229,14 @@ mis.CtlID = 0; mis.itemID = ItemInfo->wID; mis.itemData = (DWORD)ItemInfo->dwItemData; - mis.itemHeight = 0; + mis.itemHeight = HIWORD( GetDialogBaseUnits()); mis.itemWidth = 0; SendMessageW(WndOwner, WM_MEASUREITEM, 0, (LPARAM) &mis); - ItemInfo->Rect.right += mis.itemWidth; - + /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average + * width of a menufont character to the width of an owner-drawn menu. + */ + ItemInfo->Rect.right += mis.itemWidth + 2 * + GdiGetCharDimensions( Dc, NULL, NULL ); if (MenuBar) { ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE; @@ -1193,57 +1266,47 @@ return; } - if (! MenuBar) - { - if (ItemInfo->hbmpItem) + if (ItemInfo->hbmpItem) //IS_BITMAP_ITEM(ItemInfo->fType)) + { + SIZE Size; + + if (!MenuBar) { - if (ItemInfo->hbmpItem == HBMMENU_CALLBACK) - { - MEASUREITEMSTRUCT measItem; - measItem.CtlType = ODT_MENU; - measItem.CtlID = 0; - measItem.itemID = ItemInfo->wID; - measItem.itemWidth = ItemInfo->Rect.right - ItemInfo->Rect.left; - measItem.itemHeight = ItemInfo->Rect.bottom - ItemInfo->Rect.top; - measItem.itemData = ItemInfo->dwItemData; - SendMessageW( WndOwner, WM_MEASUREITEM, ItemInfo->wID, (LPARAM)&measItem); - ItemInfo->Rect.right = ItemInfo->Rect.left + measItem.itemWidth; - if (MenuInfo->maxBmpSize.cx < abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE || - MenuInfo->maxBmpSize.cy < abs(measItem.itemHeight)) - { - MenuInfo->maxBmpSize.cx = abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE; - MenuInfo->maxBmpSize.cy = abs(measItem.itemHeight); - MenuSetRosMenuInfo(MenuInfo); - } - } - else - { - SIZE Size; - - MenuGetBitmapItemSize((int) ItemInfo->hbmpItem, (DWORD) ItemInfo->hbmpItem, &Size); - ItemInfo->Rect.right += Size.cx; - ItemInfo->Rect.bottom += Size.cy; - - /* Leave space for the sunken border */ - ItemInfo->Rect.right += 2; - ItemInfo->Rect.bottom += 2; - - /* Special case: Minimize button doesn't have a space behind it. */ - if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || - ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) - ItemInfo->Rect.right -= 1; - } - ItemInfo->Rect.right += 2 * CheckBitmapWidth; + MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); + /* Keep the size of the bitmap in callback mode to be able + * to draw it correctly */ + ItemInfo->Rect.right = ItemInfo->Rect.left + Size.cx; + if (MenuInfo->maxBmpSize.cx < abs(Size.cx) + MENU_ITEM_HBMP_SPACE || + MenuInfo->maxBmpSize.cy < abs(Size.cy)) + { + MenuInfo->maxBmpSize.cx = abs(Size.cx) + MENU_ITEM_HBMP_SPACE; + MenuInfo->maxBmpSize.cy = abs(Size.cy); + } + MenuSetRosMenuInfo(MenuInfo); + + ItemInfo->Rect.right += 2 * CheckBitmapWidth; + if (0 != (ItemInfo->fType & MF_POPUP)) + { + ItemInfo->Rect.right += ArrowBitmapWidth; + } + } else { - ItemInfo->Rect.right += 2 * CheckBitmapWidth; - if (0 != (ItemInfo->fType & MF_POPUP)) - { - ItemInfo->Rect.right += ArrowBitmapWidth; - } + MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); + ItemInfo->Rect.right += Size.cx; + ItemInfo->Rect.bottom += Size.cy; + + /* Leave space for the sunken border */ + ItemInfo->Rect.right += 2; + ItemInfo->Rect.bottom += 2; + + /* Special case: Minimize button doesn't have a space behind it. */ + if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || + ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) + ItemInfo->Rect.right -= 1; } - } + } /* it must be a text item - unless it's the system menu */ if (0 == (ItemInfo->fType & MF_SYSMENU) && IS_STRING_ITEM(ItemInfo->fType)) @@ -1548,7 +1611,10 @@ ROSMENUITEMINFO ItemInfo; UINT i; HFONT FontOld = NULL; - + BOOL flat_menu = FALSE; + + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + if (NULL == Menu) { Menu = GetMenu(Wnd); @@ -1575,7 +1641,7 @@ Rect->bottom = Rect->top + MenuInfo.Height; - FillRect(DC, Rect, GetSysColorBrush(COLOR_MENU)); + FillRect(DC, Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); SelectObject(DC, GetSysColorPen(COLOR_3DFACE)); MoveToEx(DC, Rect->left, Rect->bottom, NULL); @@ -1759,7 +1825,7 @@ /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW(0, POPUPMENU_CLASS_ATOMW, NULL, WS_POPUP, X, Y, Width, Height, - WndOwner, 0, (HINSTANCE) GetWindowLongW(WndOwner, GWL_HINSTANCE), + WndOwner, 0, (HINSTANCE) GetWindowLongPtrW(WndOwner, GWLP_HINSTANCE), (LPVOID) MenuInfo.Self); if (NULL == MenuInfo.Wnd || ! MenuSetRosMenuInfo(&MenuInfo)) { @@ -3458,7 +3524,7 @@ /* The return value is only used by TrackPopupMenu */ if (!(Flags & TPM_RETURNCMD)) return TRUE; if (ExecutedMenuId < 0) ExecutedMenuId = 0; - return ExecutedMenuId; + return ExecutedMenuId; } /*********************************************************************** @@ -4939,3 +5005,5 @@ return InsertMenuA(hMenu, cmd, flags, cmdInsert, lpszNewItem); }; } + +

1 0

[greatlrd] 22988: Implement SPI_GETFLATMENU and SPI_SETFLATMENU after jimtabor request not tested if it work
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 05:48:46 2006 New Revision: 22988 URL: http://svn.reactos.org/svn/reactos?rev=22988&view=rev Log: Implement SPI_GETFLATMENU and SPI_SETFLATMENU after jimtabor request not tested if it work Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Mon Jul 10 05:48:46 2006 @@ -32,7 +32,8 @@ UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; - + + BOOL FlatMenu; /* ScreenSaver */ BOOL ScreenSaverRunning; UINT ScreenSaverTimeOut; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 10 05:48:46 2006 @@ -998,6 +998,8 @@ case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { PSYSTEM_CURSORINFO CurInfo; @@ -1013,6 +1015,12 @@ switch(uiAction) { + case SPI_GETFLATMENU: + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + case SPI_SETFLATMENU: + WinStaObject->FlatMenu = uiParam; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; @@ -1035,7 +1043,7 @@ CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? - break; + return TRUE; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */ @@ -1400,6 +1408,8 @@ case SPI_SETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { BOOL Ret; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jul 10 05:48:46 2006 @@ -490,6 +490,7 @@ */ WindowStationObject->ScreenSaverRunning = FALSE; WindowStationObject->ScreenSaverTimeOut = 30; + WindowStationObject->FlatMenu = FALSE; if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) { @@ -509,6 +510,8 @@ CurInfo->WheelScroLines = 3; CurInfo->WheelScroChars = 3; + + /* FIXME: Obtain the following information from the registry */ CurInfo->SwapButtons = FALSE;

1 0

[greatlrd] 22987: putting back Christoph_vW patch that was revert by me
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 05:45:03 2006 New Revision: 22987 URL: http://svn.reactos.org/svn/reactos?rev=22987&view=rev Log: putting back Christoph_vW patch that was revert by me Modified: trunk/reactos/dll/cpl/access/access.def trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl_new/intl.def trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/powercfg/powercfg.def trunk/reactos/dll/cpl/sysdm/sysdm.def trunk/reactos/dll/cpl/timedate/timedate.def trunk/reactos/dll/keyboard/kbdbe/kbdbe.def trunk/reactos/dll/keyboard/kbdda/kbdda.def trunk/reactos/dll/keyboard/kbddv/kbddv.def trunk/reactos/dll/keyboard/kbdes/kbdes.def trunk/reactos/dll/keyboard/kbdfr/kbdfr.def trunk/reactos/dll/keyboard/kbdgr/kbdgr.def trunk/reactos/dll/keyboard/kbdhe/kbdhe.def trunk/reactos/dll/keyboard/kbdheb/kbdheb.def trunk/reactos/dll/keyboard/kbdhu/kbdhu.def trunk/reactos/dll/keyboard/kbdpo/kbdpo.def trunk/reactos/dll/keyboard/kbdru/kbdru.def trunk/reactos/dll/keyboard/kbdse/kbdse.def trunk/reactos/dll/keyboard/kbdsg/kbdsg.def trunk/reactos/dll/keyboard/kbdsk/kbdsk.def trunk/reactos/dll/keyboard/kbduk/kbduk.def trunk/reactos/dll/keyboard/kbdur/kbdur.def trunk/reactos/dll/keyboard/kbdus/kbdus.def trunk/reactos/dll/win32/cards/cards.def trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/cplsample/cplsample.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cplsample/cplsampl… ============================================================================== --- trunk/reactos/dll/cpl/cplsample/cplsample.def (original) +++ trunk/reactos/dll/cpl/cplsample/cplsample.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (original) +++ trunk/reactos/dll/cpl/intl_new/intl.def Mon Jul 10 05:45:03 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -RegOptsProc@16 -ExtraOptsProc@16 +CPlApplet +RegOptsProc +ExtraOptsProc ; EOF Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/powercfg/powercfg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.def (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.def?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.def (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/timedate/timedate.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.def (original) +++ trunk/reactos/dll/cpl/timedate/timedate.def Mon Jul 10 05:45:03 2006 @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.def (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.def (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.def Mon Jul 10 05:45:03 2006 @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.def (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbddvorak.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.def (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.def Mon Jul 10 05:45:03 2006 @@ -1,3 +1,6 @@ LIBRARY kbdda.dll -EXPORTS -KbdLayerDescriptor@0 + + +EXPORTS + +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.def (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.def (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.def (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.def (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.def (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.def (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.def Mon Jul 10 05:45:03 2006 @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.def (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdse/kbdse.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdse/kbdse.def (original) +++ trunk/reactos/dll/keyboard/kbdse/kbdse.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.def (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.def (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.def (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.def (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.def (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.def Mon Jul 10 05:45:03 2006 @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.def?… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.def (original) +++ trunk/reactos/dll/win32/cards/cards.def Mon Jul 10 05:45:03 2006 @@ -1,8 +1,8 @@ LIBRARY cards.dll EXPORTS -WEP@4 -cdtAnimate@20 -cdtDraw@24 -cdtDrawExt@32 -cdtInit@8 -cdtTerm@0 +WEP +cdtAnimate +cdtDraw +cdtDrawExt +cdtInit +cdtTerm Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Mon Jul 10 05:45:03 2006 @@ -19,47 +19,53 @@ ; LIBRARY CFGMGR32.DLL EXPORTS -CMP_Init_Detection(a)4=SETUPAPI.CMP_Init_Detection +CMP_Init_Detection = SETUPAPI.CMP_Init_Detection ;CMP_RegisterNotification -CMP_Report_LogOn(a)4=SETUPAPI.CMP_Report_LogOn +CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf -CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex -CM_Add_IDA(a)12=SETUPAPI.CM_Add_IDA -CM_Add_IDW(a)12=SETUPAPI.CM_Add_IDW -CM_Add_ID_ExA(a)16=SETUPAPI.CM_Add_ID_ExA -CM_Add_ID_ExW(a)16=SETUPAPI.CM_Add_ID_ExW +;CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf +;CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_IDA=SETUPAPI.CM_Add_IDA +CM_Add_IDW=SETUPAPI.CM_Add_IDW +CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA +CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW +CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_IDA=SETUPAPI.CM_Add_IDA +CM_Add_IDW=SETUPAPI.CM_Add_IDW +CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA +CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW ;CM_Add_Range ;CM_Add_Res_Des ;CM_Add_Res_Des_Ex -CM_Connect_MachineA(a)8=SETUPAPI.CM_Connect_MachineA -CM_Connect_MachineW(a)8=SETUPAPI.CM_Connect_MachineW -CM_Create_DevNodeA(a)16=SETUPAPI.CM_Create_DevNodeA -CM_Create_DevNodeW(a)16=SETUPAPI.CM_Create_DevNodeW -CM_Create_DevNode_ExA(a)20=SETUPAPI.CM_Create_DevNode_ExA -CM_Create_DevNode_ExW(a)20=SETUPAPI.CM_Create_DevNode_ExW +CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA +CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW +CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA +CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW +CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA +CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW ;CM_Create_Range_List -CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key -CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex -CM_Delete_DevNode_Key(a)12=SETUPAPI.CM_Delete_DevNode_Key -CM_Delete_DevNode_Key_Ex(a)16=SETUPAPI.CM_Delete_DevNode_Key_Ex +CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key +CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex +CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key +CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex ;CM_Delete_Range ;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict_Ex -CM_Disable_DevNode(a)8=SETUPAPI.CM_Disable_DevNode -CM_Disable_DevNode_Ex(a)12=SETUPAPI.CM_Disable_DevNode_Ex -CM_Disconnect_Machine(a)4=SETUPAPI.CM_Disconnect_Machine +CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode +CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex +CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine ;CM_Dup_Range_List -CM_Enable_DevNode(a)8=SETUPAPI.CM_Enable_DevNode -CM_Enable_DevNode_Ex(a)12=SETUPAPI.CM_Enable_DevNode_Ex -CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes -CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex -CM_Enumerate_EnumeratorsA(a)16=SETUPAPI.CM_Enumerate_EnumeratorsA -CM_Enumerate_EnumeratorsW(a)16=SETUPAPI.CM_Enumerate_EnumeratorsW -CM_Enumerate_Enumerators_ExA(a)20=SETUPAPI.CM_Enumerate_Enumerators_ExA -CM_Enumerate_Enumerators_ExW(a)20=SETUPAPI.CM_Enumerate_Enumerators_ExW +CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode +CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex +CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes +CM_Enumerate_Classes_Ex=SETUPAPI.CM_Enumerate_Classes_Ex +CM_Enumerate_EnumeratorsA=SETUPAPI.CM_Enumerate_EnumeratorsA +CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW +CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA +CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW ;CM_Find_Range ;CM_First_Range ;CM_Free_Log_Conf @@ -69,38 +75,38 @@ ;CM_Free_Res_Des ;CM_Free_Res_Des_Ex ;CM_Free_Res_Des_Handle -CM_Get_Child(a)12=SETUPAPI.CM_Get_Child -CM_Get_Child_Ex(a)16=SETUPAPI.CM_Get_ChildEx -CM_Get_Class_Key_NameA(a)16=SETUPAPI.CM_Get_Class_Key_NameA -CM_Get_Class_Key_NameW(a)16=SETUPAPI.CM_Get_Class_Key_NameW -CM_Get_Class_Key_Name_ExA(a)20=SETUPAPI.CM_Get_Class_Key_Name_ExA -CM_Get_Class_Key_Name_ExW(a)20=SETUPAPI.CM_Get_Class_Key_Name_ExW -CM_Get_Class_NameA(a)16=SETUPAPI.CM_Get_Class_NameA -CM_Get_Class_NameW(a)16=SETUPAPI.CM_Get_Class_NameW -CM_Get_Class_Name_ExA(a)20=SETUPAPI.CM_Get_Class_Name_ExA -CM_Get_Class_Name_ExW(a)20=SETUPAPI.CM_Get_Class_Name_ExW -CM_Get_Depth(a)12=SETUPAPI.CM_Get_Depth -CM_Get_Depth_Ex(a)16=SETUPAPI.CM_Get_Depth_Ex -CM_Get_DevNode_Registry_PropertyA(a)24=SETUPAPI.CM_Get_DevNode_Registry_PropertyA -CM_Get_DevNode_Registry_PropertyW(a)24=SETUPAPI.CM_Get_DevNode_Registry_PropertyW -CM_Get_DevNode_Registry_Property_ExA(a)28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA -CM_Get_DevNode_Registry_Property_ExW(a)28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW -CM_Get_DevNode_Status(a)16=SETUPAPI.CM_Get_DevNode_Status -CM_Get_DevNode_Status_Ex(a)20=SETUPAPI.CM_Get_DevNode_Status_Ex -CM_Get_Device_IDA(a)16=SETUPAPI.CM_Get_Device_IDA -CM_Get_Device_IDW(a)16=SETUPAPI.CM_Get_Device_IDW -CM_Get_Device_ID_ExA(a)20=SETUPAPI.CM_Get_Device_ID_ExA -CM_Get_Device_ID_ExW(a)20=SETUPAPI.CM_Get_Device_ID_ExW -CM_Get_Device_ID_ListA(a)16=SETUPAPI.CM_Get_Device_ID_ListA -CM_Get_Device_ID_ListW(a)16=SETUPAPI.CM_Get_Device_ID_ListW -CM_Get_Device_ID_List_ExA(a)20=SETUPAPI.CM_Get_Device_ID_List_ExA -CM_Get_Device_ID_List_ExW(a)20=SETUPAPI.CM_Get_Device_ID_List_ExW -CM_Get_Device_ID_List_SizeA(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeA -CM_Get_Device_ID_List_SizeW(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeW -CM_Get_Device_ID_List_Size_ExA(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_List_Size_ExW(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_Size(a)12=SETUPAPI.CM_Get_Device_ID_Size -CM_Get_Device_ID_Size_Ex(a)16=SETUPAPI.CM_Get_Device_ID_Size_Ex +CM_Get_Child = SETUPAPI.CM_Get_Child +CM_Get_Child_Ex = SETUPAPI.CM_Get_Child_Ex +CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA +CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW +CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA +CM_Get_Class_Key_Name_ExW=SETUPAPI.CM_Get_Class_Key_Name_ExW +CM_Get_Class_NameA=SETUPAPI.CM_Get_Class_NameA +CM_Get_Class_NameW=SETUPAPI.CM_Get_Class_NameW +CM_Get_Class_Name_ExA=SETUPAPI.CM_Get_Class_Name_ExA +CM_Get_Class_Name_ExW=SETUPAPI.CM_Get_Class_Name_ExW +CM_Get_Depth=SETUPAPI.CM_Get_Depth +CM_Get_Depth_Ex=SETUPAPI.CM_Get_Depth_Ex +CM_Get_DevNode_Registry_PropertyA=SETUPAPI.CM_Get_DevNode_Registry_PropertyA +CM_Get_DevNode_Registry_PropertyW=SETUPAPI.CM_Get_DevNode_Registry_PropertyW +CM_Get_DevNode_Registry_Property_ExA=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA +CM_Get_DevNode_Registry_Property_ExW=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW +CM_Get_DevNode_Status=SETUPAPI.CM_Get_DevNode_Status +CM_Get_DevNode_Status_Ex=SETUPAPI.CM_Get_DevNode_Status_Ex +CM_Get_Device_IDA=SETUPAPI.CM_Get_Device_IDA +CM_Get_Device_IDW=SETUPAPI.CM_Get_Device_IDW +CM_Get_Device_ID_ExA=SETUPAPI.CM_Get_Device_ID_ExA +CM_Get_Device_ID_ExW=SETUPAPI.CM_Get_Device_ID_ExW +CM_Get_Device_ID_ListA=SETUPAPI.CM_Get_Device_ID_ListA +CM_Get_Device_ID_ListW=SETUPAPI.CM_Get_Device_ID_ListW +CM_Get_Device_ID_List_ExA=SETUPAPI.CM_Get_Device_ID_List_ExA +CM_Get_Device_ID_List_ExW=SETUPAPI.CM_Get_Device_ID_List_ExW +CM_Get_Device_ID_List_SizeA=SETUPAPI.CM_Get_Device_ID_List_SizeA +CM_Get_Device_ID_List_SizeW=SETUPAPI.CM_Get_Device_ID_List_SizeW +CM_Get_Device_ID_List_Size_ExA=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_List_Size_ExW=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size +CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex ;CM_Get_Device_Interface_AliasA ;CM_Get_Device_Interface_AliasW ;CM_Get_Device_Interface_Alias_ExA @@ -115,12 +121,12 @@ ;CM_Get_Device_Interface_List_Size_ExW ;CM_Get_First_Log_Conf ;CM_Get_First_Log_Conf_Ex -CM_Get_Global_State(a)8=SETUPAPI.CM_Get_Global_State -CM_Get_Global_State_Ex(a)12=SETUPAPI.CM_Get_Global_State_Ex -CM_Get_HW_Prof_FlagsA(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsA -CM_Get_HW_Prof_FlagsW(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsW -CM_Get_HW_Prof_Flags_ExA(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExA -CM_Get_HW_Prof_Flags_ExW(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExW +CM_Get_Global_State=SETUPAPI.CM_Get_Global_State +CM_Get_Global_State_Ex=SETUPAPI.CM_Get_Global_State_Ex +CM_Get_HW_Prof_FlagsA=SETUPAPI.CM_Get_HW_Prof_FlagsA +CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW +CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA +CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW ;CM_Get_Hardware_Profile_InfoA ;CM_Get_Hardware_Profile_InfoW ;CM_Get_Hardware_Profile_Info_ExA @@ -131,44 +137,44 @@ ;CM_Get_Next_Log_Conf_Ex ;CM_Get_Next_Res_Des ;CM_Get_Next_Res_Des_Ex -CM_Get_Parent(a)12=SETUPAPI.CM_Get_Parent -CM_Get_Parent_Ex(a)16=SETUPAPI.CM_Get_Parent_Ex +CM_Get_Parent=SETUPAPI.CM_Get_Parent +CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex ;CM_Get_Res_Des_Data ;CM_Get_Res_Des_Data_Ex ;CM_Get_Res_Des_Data_Size ;CM_Get_Res_Des_Data_Size_Ex -CM_Get_Sibling(a)12=SETUPAPI.CM_Get_Sibling -CM_Get_Sibling_Ex(a)16=SETUPAPI.CM_Get_Sibling_Ex -CM_Get_Version(a)0=SETUPAPI.CM_Get_Version -CM_Get_Version_Ex(a)4=SETUPAPI.CM_Get_Version_Ex +CM_Get_Sibling=SETUPAPI.CM_Get_Sibling +CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex +CM_Get_Version=SETUPAPI.CM_Get_Version +CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex ;CM_Intersect_Range_List ;CM_Invert_Range_List -CM_Is_Dock_Station_Present(a)4=SETUPAPI.CM_Is_Dock_Station_Present -CM_Is_Dock_Station_Present_Ex(a)8=SETUPAPI.CM_Is_Dock_Station_Present_Ex -CM_Locate_DevNodeA(a)12=SETUPAPI.CM_Locate_DevNodeA -CM_Locate_DevNodeW(a)12=SETUPAPI.CM_Locate_DevNodeW -CM_Locate_DevNode_ExA(a)16=SETUPAPI.CM_Locate_DevNode_ExA -CM_Locate_DevNode_ExW(a)16=SETUPAPI.CM_Locate_DevNode_ExW +CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present +CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex +CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA +CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW +CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA +CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW ;CM_Merge_Range_List ;CM_Modify_Res_Des ;CM_Modify_Res_Des_Ex -CM_Move_DevNode(a)12=SETUPAPI.CM_Move_DevNode -CM_Move_DevNode_Ex(a)16=SETUPAPI.CM_Move_DevNode_Ex +CM_Move_DevNode=SETUPAPI.CM_Move_DevNode +CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex ;CM_Next_Range -CM_Open_Class_KeyA(a)24=SETUPAPI.CM_Open_Class_KeyA -CM_Open_Class_KeyW(a)24=SETUPAPI.CM_Open_Class_KeyW -CM_Open_Class_Key_ExA(a)28=SETUPAPI.CM_Open_Class_Key_ExA -CM_Open_Class_Key_ExW(a)28=SETUPAPI.CM_Open_Class_Key_ExW -CM_Open_DevNode_Key(a)24=SETUPAPI.CM_Open_DevNode_Key -CM_Open_DevNode_Key_Ex(a)28=SETUPAPI.CM_Open_DevNode_Key_Ex +CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA +CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW +CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA +CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW +CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key +CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex ;CM_Query_Arbitrator_Free_Data ;CM_Query_Arbitrator_Free_Data_Ex ;CM_Query_Arbitrator_Free_Size ;CM_Query_Arbitrator_Free_Size_Ex ;CM_Query_Remove_SubTree ;CM_Query_Remove_SubTree_Ex -CM_Reenumerate_DevNode(a)8=SETUPAPI.CM_Reenumerate_DevNode -CM_Reenumerate_DevNode_Ex(a)12=SETUAPI.CM_Reenumerate_DevNode_Ex +CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode +CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex ;CM_Register_Device_Driver ;CM_Register_Device_Driver_Ex ;CM_Register_Device_InterfaceA @@ -181,29 +187,29 @@ ;CM_Remove_Unmarked_Children_Ex ;CM_Request_Device_EjectA ;CM_Request_Device_EjectW -CM_Request_Eject_PC(a)0=SETUPAPI.CM_Request_Eject_PC -CM_Request_Eject_PC_Ex(a)4=SETUPAPI.CM_Request_Eject_PC_Ex +CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC +CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex ;CM_Reset_Children_Marks ;CM_Reset_Children_Marks_Ex -CM_Run_Detection(a)4=SETUPAPI.CM_Run_Detection -CM_Run_Detection_Ex(a)8=SETUPAPI.CM_Run_Detection_Ex -CM_Set_DevNode_Problem(a)12=SETUPAPI.CM_Set_DevNode_Problem -CM_Set_DevNode_Problem_Ex(a)16=SETUPAPI.CM_Set_DevNode_Problem_Ex -CM_Set_DevNode_Registry_PropertyA(a)20=SETUPAPI.CM_Set_DevNode_Registry_PropertyA -CM_Set_DevNode_Registry_PropertyW(a)20=SETUPAPI.CM_Set_DevNode_Registry_PropertyW -CM_Set_DevNode_Registry_Property_ExA(a)24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA -CM_Set_DevNode_Registry_Property_ExW(a)24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW +CM_Run_Detection=SETUPAPI.CM_Run_Detection +CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex +CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem +CM_Set_DevNode_Problem_Ex=SETUPAPI.CM_Set_DevNode_Problem_Ex +CM_Set_DevNode_Registry_PropertyA=SETUPAPI.CM_Set_DevNode_Registry_PropertyA +CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW +CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA +CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW ;CM_Set_HW_Prof ;CM_Set_HW_Prof_Ex -CM_Set_HW_Prof_FlagsA(a)16=SETUPAPI.CM_Set_HW_Prof_FlagsA -CM_Set_HW_Prof_FlagsW(a)16=SETUPAPI.CM_Set_HW_Prof_FlagsW -CM_Set_HW_Prof_Flags_ExA(a)20=SETUPAPI.CM_Set_HW_Prof_Flags_ExA -CM_Set_HW_Prof_Flags_ExW(a)20=SETUPAPI.CM_Set_HW_Prof_Flags_ExW -CM_Setup_DevNode(a)8=SETUPAPI.CM_Setup_DevNode -CM_Setup_DevNode_Ex(a)12=SETUPAPI.CM_Setup_DevNode_Ex +CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA +CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW +CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA +CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW +CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode +CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex ;CM_Test_Range_Available -CM_Uninstall_DevNode(a)8=SETUPAPI.CM_Uninstall_DevNode -CM_Uninstall_DevNode_Ex(a)12=SETUPAPI.CM_Uninstall_DevNode_Ex +CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode +CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex ;CM_Unregister_Device_InterfaceA ;CM_Unregister_Device_InterfaceW ;CM_Unregister_Device_Interface_ExA

1 0

[greatlrd] 22986: putting back Christoph_vW patch that was revert by me
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 05:33:10 2006 New Revision: 22986 URL: http://svn.reactos.org/svn/reactos?rev=22986&view=rev Log: putting back Christoph_vW patch that was revert by me Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jul 10 05:33:10 2006 @@ -371,6 +371,9 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); + if (module.GetEntryPoint(false) == "0") + fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); + if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); @@ -443,7 +446,10 @@ } else if ( dll ) { - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : module.GetEntryPoint(false).c_str ()); + if (module.GetEntryPoint(false) == "0") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );

1 0

[greatlrd] 22985: Changes for Screen saver And implement 1. Time value can be changes use SPI_SETSCREENSAVETIMEOUT to set the new value, current insate value are set to 30sec 2. SPI_GETSCREENSAVETIMEOUT Get the screen saver timeout value. 3. Dectect if screen saver is running with SPI_GETSCREENSAVERRUNNING 4. Set the state of screen saver with SPI_SETSCREENSAVERRUNNING <- this is internal api see msdn Implement for mouse 1. SPI_GETWHEELSCROLLLINES I am but unsure if win32k need more changes it s
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 04:26:56 2006 New Revision: 22985 URL: http://svn.reactos.org/svn/reactos?rev=22985&view=rev Log: Changes for Screen saver And implement 1. Time value can be changes use SPI_SETSCREENSAVETIMEOUT to set the new value, current insate value are set to 30sec 2. SPI_GETSCREENSAVETIMEOUT Get the screen saver timeout value. 3. Dectect if screen saver is running with SPI_GETSCREENSAVERRUNNING 4. Set the state of screen saver with SPI_SETSCREENSAVERRUNNING <- this is internal api see msdn Implement for mouse 1. SPI_GETWHEELSCROLLLINES I am but unsure if win32k need more changes it seam like it is only a counter that should be set/get a value and user apps take care of the rest. Implement it for jimtabor did request it. 2. SPI_GETWHEELSCROLLCHARS I am but unsure if win32k need more changes it seam like it is only a counter that should be set/get a value and user apps take care of the rest. Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h Mon Jul 10 04:26:56 2006 @@ -38,6 +38,8 @@ UINT ButtonsDown; CURSORCLIP_INFO CursorClipInfo; PCURICON_OBJECT CurrentCursorObject; + UINT WheelScroLines; + UINT WheelScroChars; BYTE ShowingCursor; UINT DblClickSpeed; UINT DblClickWidth; @@ -46,6 +48,7 @@ LONG LastBtnDownX; LONG LastBtnDownY; HANDLE LastClkWnd; + BOOL ScreenSaverRunning; } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Mon Jul 10 04:26:56 2006 @@ -32,6 +32,10 @@ UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; + + /* ScreenSaver */ + BOOL ScreenSaverRunning; + UINT ScreenSaverTimeOut; /* Wallpaper */ HANDLE hbmWallpaper; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Mon Jul 10 04:26:56 2006 @@ -55,6 +55,8 @@ PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue = 0; /* FUNCTIONS *****************************************************************/ +ULONG FASTCALL +IntSystemParametersInfo(UINT uiAction, UINT uiParam,PVOID pvParam, UINT fWinIni); #define ClearMouseInput(mi) \ mi.dx = 0; \ @@ -162,20 +164,18 @@ LARGE_INTEGER CurrentTime; LARGE_INTEGER DiffTimeMouse; LARGE_INTEGER DiffTimeKeyboard; - LARGE_INTEGER OldTimeMouse; - LARGE_INTEGER OldTimeKeyboard; + UINT ScreenSaverTimeOut = 0; + BOOL nPreviousState = FALSE; NTSTATUS Status; + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); KeQuerySystemTime(&MouseInputCurrentTime); KeQuerySystemTime(&KeyboardInputCurrentTime); - - OldTimeMouse.QuadPart = MouseInputCurrentTime.QuadPart; - OldTimeKeyboard.QuadPart = MouseInputCurrentTime.QuadPart; - - DelayTimer.QuadPart = -10000000LL; /* 1 second timeout */ + + DelayTimer.QuadPart = -10000000LL; /* 1 second timeout */ for(;;) { @@ -188,14 +188,12 @@ DPRINT("Screen Saver auto start Thread Starting...\n"); while(InputThreadsRunning) { - /* FIXME - 1. read timeout value from reg - 2. read timeout value from spi msg - */ - - /* 30 second timeout This value should be read from register */ - Timeout.QuadPart = 300000000LL; - + + IntSystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &ScreenSaverTimeOut, 0); + IntSystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &nPreviousState, 0); + + Timeout.QuadPart = ((LONGLONG)ScreenSaverTimeOut) * 10000000LL; + KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DelayTimer); @@ -211,27 +209,33 @@ KeQuerySystemTime(&CurrentTime); DiffTimeMouse.QuadPart = CurrentTime.QuadPart - MouseInputCurrentTime.QuadPart; - DiffTimeKeyboard.QuadPart = CurrentTime.QuadPart - KeyboardInputCurrentTime.QuadPart; - - if ( DiffTimeMouse.QuadPart >= Timeout.QuadPart && - DiffTimeKeyboard.QuadPart >= Timeout.QuadPart && - OldTimeMouse.QuadPart != MouseInputCurrentTime.QuadPart && - OldTimeKeyboard.QuadPart != MouseInputCurrentTime.QuadPart) - { + DiffTimeKeyboard.QuadPart = CurrentTime.QuadPart - KeyboardInputCurrentTime.QuadPart; + + if ( (DiffTimeMouse.QuadPart >= Timeout.QuadPart) && + (DiffTimeKeyboard.QuadPart >= Timeout.QuadPart) && + (nPreviousState == FALSE)) + { + BOOL nPreviousState = FALSE; DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); DPRINT1("Keyboard Timeout counter was %I64d\n",DiffTimeKeyboard.QuadPart); DPRINT1("Mouse Timeout counter was %I64d\n",DiffTimeMouse.QuadPart); - CSR_API_MESSAGE Request; - - OldTimeMouse.QuadPart = MouseInputCurrentTime.QuadPart; - OldTimeKeyboard.QuadPart = MouseInputCurrentTime.QuadPart; - + CSR_API_MESSAGE Request; CsrInit(); Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); Request.Data.StartScreenSaver.Start = TRUE; - co_CsrNotifyScreenSaver(&Request ); - } + co_CsrNotifyScreenSaver(&Request ); + + IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + } + + if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) && + (DiffTimeKeyboard.QuadPart < Timeout.QuadPart) && + (nPreviousState == TRUE)) + { + IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + } + } DPRINT("Screen Saver auto start Thread Stopped...\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 10 04:26:56 2006 @@ -992,6 +992,12 @@ case SPI_SETDOUBLECLICKTIME: case SPI_SETDESKWALLPAPER: case SPI_GETDESKWALLPAPER: + case SPI_GETWHEELSCROLLLINES: + case SPI_GETWHEELSCROLLCHARS: + case SPI_SETSCREENSAVERRUNNING: + case SPI_GETSCREENSAVERRUNNING: + case SPI_GETSCREENSAVETIMEOUT: + case SPI_SETSCREENSAVETIMEOUT: { PSYSTEM_CURSORINFO CurInfo; @@ -1007,6 +1013,29 @@ switch(uiAction) { + case SPI_GETSCREENSAVETIMEOUT: + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; + return TRUE; + case SPI_SETSCREENSAVETIMEOUT: + WinStaObject->ScreenSaverTimeOut = uiParam; + return TRUE; + case SPI_GETSCREENSAVERRUNNING: + if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; + return TRUE; + case SPI_SETSCREENSAVERRUNNING: + if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; + WinStaObject->ScreenSaverRunning = uiParam; + return TRUE; + case SPI_GETWHEELSCROLLLINES: + CurInfo = IntGetSysCursorInfo(WinStaObject); + if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; + /* FIXME add this value to scroll list as scroll value ?? */ + return TRUE; + case SPI_GETWHEELSCROLLCHARS: + CurInfo = IntGetSysCursorInfo(WinStaObject); + if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; + // FIXME add this value to scroll list as scroll value ?? + break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */ @@ -1365,6 +1394,12 @@ case SPI_GETGRADIENTCAPTIONS: case SPI_GETFOCUSBORDERHEIGHT: case SPI_GETFOCUSBORDERWIDTH: + case SPI_GETWHEELSCROLLLINES: + case SPI_GETWHEELSCROLLCHARS: + case SPI_GETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVERRUNNING: + case SPI_GETSCREENSAVETIMEOUT: + case SPI_SETSCREENSAVETIMEOUT: { BOOL Ret; @@ -1458,6 +1493,11 @@ } return( TRUE); } + default : + { + DPRINT1("UserSystemParametersInfo : uiAction = %x \n",uiAction ); + break; + } } return( FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jul 10 04:26:56 2006 @@ -488,6 +488,8 @@ /* * Initialize the new window station object */ + WindowStationObject->ScreenSaverRunning = FALSE; + WindowStationObject->ScreenSaverTimeOut = 30; if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) { @@ -504,8 +506,11 @@ CurInfo->LastBtnDown = 0; CurInfo->CurrentCursorObject = NULL; CurInfo->ShowingCursor = 0; - - /* FIXME: Obtain the following information from the registry */ + + CurInfo->WheelScroLines = 3; + CurInfo->WheelScroChars = 3; + + /* FIXME: Obtain the following information from the registry */ CurInfo->SwapButtons = FALSE; CurInfo->DblClickSpeed = 500; CurInfo->DblClickWidth = 4;

1 0

[greatlrd] 22984: adding #define SPI_GETWHEELSCROLLCHARS thanks alex for the value
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 04:11:12 2006 New Revision: 22984 URL: http://svn.reactos.org/svn/reactos?rev=22984&view=rev Log: adding #define SPI_GETWHEELSCROLLCHARS thanks alex for the value Modified: trunk/reactos/include/psdk/winuser.h 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 Mon Jul 10 04:11:12 2006 @@ -1184,6 +1184,7 @@ #define SPI_GETSTICKYKEYS 58 #define SPI_GETTOGGLEKEYS 52 #define SPI_GETWHEELSCROLLLINES 104 +#define SPI_GETWHEELSCROLLCHARS 108 #define SPI_GETWINDOWSEXTENSION 92 #define SPI_GETWORKAREA 48 #define SPI_ICONHORIZONTALSPACING 13

1 0

[mc] 22983: modified rdesktop/channels.c modified rdesktop/constants.h modified rdesktop/types.h Commented out definitions of standard Windows constants and types modified rdesktop/licence.c modified rdesktop/secure.c TODO annotations modified rdesktop/proto.h Commented out prototypes for rdpdr, rdpsnd, cliprdr, etc. functions that will be rewritten *and* use a new API modified rdesktop/rdesktop.h modified rdesktop/rdp.c modified rdesktop/tcp.c Big big mess, many temporary modifications to have
by mc＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: mc Date: Mon Jul 10 03:57:54 2006 New Revision: 22983 URL: http://svn.reactos.org/svn/reactos?rev=22983&view=rev Log: modified rdesktop/channels.c modified rdesktop/constants.h modified rdesktop/types.h Commented out definitions of standard Windows constants and types modified rdesktop/licence.c modified rdesktop/secure.c TODO annotations modified rdesktop/proto.h Commented out prototypes for rdpdr, rdpsnd, cliprdr, etc. functions that will be rewritten *and* use a new API modified rdesktop/rdesktop.h modified rdesktop/rdp.c modified rdesktop/tcp.c Big big mess, many temporary modifications to have a working prototype ASAP added MissTosca.sln added mstsc/mstsc.cpp added mstsc/mstsc.vcproj added mstsc/stdafx.cpp added mstsc/stdafx.h added mstscax/mstscax.cpp added mstscax/mstscax.vcproj added mstscax/stdafx.cpp added mstscax/stdafx.h Created skeleton project files for Visual C++ 2005 added rdesktop/rdesktop-core.vcproj Isolated the bare core of rdesktop. Required little to no porting added porting-tools/rdesktop-core-tester added porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp added porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj added porting-tools/rdesktop-core-tester/stdafx.cpp added porting-tools/rdesktop-core-tester/stdafx.h Tester application. The screenshots were made with this. Partial (buggy!) implementation of GUI and keyboard input Added: trunk/reactos/base/applications/tsclient/MissTosca.sln trunk/reactos/base/applications/tsclient/mstsc/mstsc.cpp trunk/reactos/base/applications/tsclient/mstsc/mstsc.vcproj trunk/reactos/base/applications/tsclient/mstsc/stdafx.cpp trunk/reactos/base/applications/tsclient/mstsc/stdafx.h trunk/reactos/base/applications/tsclient/mstscax/mstscax.cpp trunk/reactos/base/applications/tsclient/mstscax/mstscax.vcproj trunk/reactos/base/applications/tsclient/mstscax/stdafx.cpp trunk/reactos/base/applications/tsclient/mstscax/stdafx.h trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj Modified: trunk/reactos/base/applications/tsclient/rdesktop/channels.c trunk/reactos/base/applications/tsclient/rdesktop/constants.h trunk/reactos/base/applications/tsclient/rdesktop/licence.c trunk/reactos/base/applications/tsclient/rdesktop/proto.h trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h trunk/reactos/base/applications/tsclient/rdesktop/rdp.c trunk/reactos/base/applications/tsclient/rdesktop/secure.c trunk/reactos/base/applications/tsclient/rdesktop/tcp.c trunk/reactos/base/applications/tsclient/rdesktop/types.h Added: trunk/reactos/base/applications/tsclient/MissTosca.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/MissTosca.sln (added) +++ trunk/reactos/base/applications/tsclient/MissTosca.sln Mon Jul 10 03:57:54 2006 @@ -1,0 +1,38 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdesktop-core", "rdesktop\rdesktop-core.vcproj", "{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstsc", "mstsc\mstsc.vcproj", "{1B415732-1F37-415F-957B-EA436301860D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstscax", "mstscax\mstscax.vcproj", "{2C217E9E-9D77-4D6A-9259-216FD56BA56F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdesktop-core-tester", "porting-tools\rdesktop-core-tester\rdesktop-core-tester.vcproj", "{B172A623-E2BD-4E3F-86E6-620548FE255B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Debug|Win32.ActiveCfg = Debug|Win32 + {8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Debug|Win32.Build.0 = Debug|Win32 + {8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Release|Win32.ActiveCfg = Release|Win32 + {8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Release|Win32.Build.0 = Release|Win32 + {1B415732-1F37-415F-957B-EA436301860D}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B415732-1F37-415F-957B-EA436301860D}.Debug|Win32.Build.0 = Debug|Win32 + {1B415732-1F37-415F-957B-EA436301860D}.Release|Win32.ActiveCfg = Release|Win32 + {1B415732-1F37-415F-957B-EA436301860D}.Release|Win32.Build.0 = Release|Win32 + {2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Debug|Win32.ActiveCfg = Debug|Win32 + {2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Debug|Win32.Build.0 = Debug|Win32 + {2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Release|Win32.ActiveCfg = Release|Win32 + {2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Release|Win32.Build.0 = Release|Win32 + {B172A623-E2BD-4E3F-86E6-620548FE255B}.Debug|Win32.ActiveCfg = Debug|Win32 + {B172A623-E2BD-4E3F-86E6-620548FE255B}.Debug|Win32.Build.0 = Debug|Win32 + {B172A623-E2BD-4E3F-86E6-620548FE255B}.Release|Win32.ActiveCfg = Release|Win32 + {B172A623-E2BD-4E3F-86E6-620548FE255B}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/reactos/base/applications/tsclient/mstsc/mstsc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstsc/mstsc.cpp (added) +++ trunk/reactos/base/applications/tsclient/mstsc/mstsc.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,7 @@ +#include "stdafx.h" + +int _tmain(int argc, _TCHAR* argv[]) +{ + return 0; +} + Added: trunk/reactos/base/applications/tsclient/mstsc/mstsc.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstsc/mstsc.vcproj (added) +++ trunk/reactos/base/applications/tsclient/mstsc/mstsc.vcproj Mon Jul 10 03:57:54 2006 @@ -1,0 +1,223 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="mstsc" + ProjectGUID="{1B415732-1F37-415F-957B-EA436301860D}" + RootNamespace="mstsc" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib $(NoInherit)" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib $(NoInherit)" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\mstsc.cpp" + > + </File> + <File + RelativePath=".\stdafx.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\stdafx.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/reactos/base/applications/tsclient/mstsc/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstsc/stdafx.cpp (added) +++ trunk/reactos/base/applications/tsclient/mstsc/stdafx.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// mstsc.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file Added: trunk/reactos/base/applications/tsclient/mstsc/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstsc/stdafx.h (added) +++ trunk/reactos/base/applications/tsclient/mstsc/stdafx.h Mon Jul 10 03:57:54 2006 @@ -1,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#include <stdio.h> +#include <tchar.h> + + + +// TODO: reference additional headers your program requires here Added: trunk/reactos/base/applications/tsclient/mstscax/mstscax.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstscax/mstscax.cpp (added) +++ trunk/reactos/base/applications/tsclient/mstscax/mstscax.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,7 @@ +#include "stdafx.h" + +int _tmain(int argc, _TCHAR* argv[]) +{ + return 0; +} + Added: trunk/reactos/base/applications/tsclient/mstscax/mstscax.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstscax/mstscax.vcproj (added) +++ trunk/reactos/base/applications/tsclient/mstscax/mstscax.vcproj Mon Jul 10 03:57:54 2006 @@ -1,0 +1,223 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="mstscax" + ProjectGUID="{2C217E9E-9D77-4D6A-9259-216FD56BA56F}" + RootNamespace="mstscax" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib $(NoInherit)" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib $(NoInherit)" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\mstscax.cpp" + > + </File> + <File + RelativePath=".\stdafx.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\stdafx.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/reactos/base/applications/tsclient/mstscax/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstscax/stdafx.cpp (added) +++ trunk/reactos/base/applications/tsclient/mstscax/stdafx.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// mstscax.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file Added: trunk/reactos/base/applications/tsclient/mstscax/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/mstscax/stdafx.h (added) +++ trunk/reactos/base/applications/tsclient/mstscax/stdafx.h Mon Jul 10 03:57:54 2006 @@ -1,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#include <stdio.h> +#include <tchar.h> + + + +// TODO: reference additional headers your program requires here Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp (added) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,998 @@ +#include "stdafx.h" + +#include "rdesktop/rdesktop.h" +#include "rdesktop/proto.h" + +extern "C" +{ + /* ==== BEGIN POOP ==== */ + // Temporary implementations of stuff we totally positively need to make the Real Thing happy + /* produce a hex dump */ + void + hexdump(unsigned char *p, unsigned int len) + { + unsigned char *line = p; + int i, thisline; + unsigned int offset = 0; + + while (offset < len) + { + printf("%04x ", offset); + thisline = len - offset; + if (thisline > 16) + thisline = 16; + + for (i = 0; i < thisline; i++) + printf("%02x ", line[i]); + + for (; i < 16; i++) + printf(" "); + + for (i = 0; i < thisline; i++) + printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); + + printf("\n"); + offset += thisline; + line += thisline; + } + } + + void generate_random(uint8 * random) + { + memcpy(random, "12345678901234567890123456789012", 32); + } + + /* report an error */ + void + error(char *format, ...) + { + va_list ap; + + fprintf(stderr, "ERROR: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + } + + /* report a warning */ + void + warning(char *format, ...) + { + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + } + + /* report an unimplemented protocol feature */ + void + unimpl(char *format, ...) + { + va_list ap; + + fprintf(stderr, "NOT IMPLEMENTED: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + } + + /* malloc; exit if out of memory */ + void * + xmalloc(int size) + { + void *mem = malloc(size); + if (mem == NULL) + { + error("xmalloc %d\n", size); + exit(1); + } + return mem; + } + + /* strdup */ + char * + xstrdup(const char *s) + { + char *mem = strdup(s); + if (mem == NULL) + { + perror("strdup"); + exit(1); + } + return mem; + } + + /* realloc; exit if out of memory */ + void * + xrealloc(void *oldmem, int size) + { + void *mem; + + if (size < 1) + size = 1; + mem = realloc(oldmem, size); + if (mem == NULL) + { + error("xrealloc %d\n", size); + exit(1); + } + return mem; + } + + /* free */ + void + xfree(void *mem) + { + free(mem); + } + + /* Create the bitmap cache directory */ + BOOL + rd_pstcache_mkdir(void) + { + char *home; + char bmpcache_dir[256]; + + home = getenv("HOME"); + + if (home == NULL) + return False; + + sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop"); + + if ((_mkdir(bmpcache_dir) == -1) && errno != EEXIST) + { + perror(bmpcache_dir); + return False; + } + + sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop/cache"); + + if ((_mkdir(bmpcache_dir) == -1) && errno != EEXIST) + { + perror(bmpcache_dir); + return False; + } + + return True; + } + + /* open a file in the .rdesktop directory */ + int + rd_open_file(char *filename) + { + char *home; + char fn[256]; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return -1; + sprintf(fn, "%s/.rdesktop/%s", home, filename); + fd = _open(fn, _O_RDWR | _O_CREAT, 0); + if (fd == -1) + perror(fn); + return fd; + } + + /* close file */ + void + rd_close_file(int fd) + { + _close(fd); + } + + /* read from file*/ + int + rd_read_file(int fd, void *ptr, int len) + { + return _read(fd, ptr, len); + } + + /* write to file */ + int + rd_write_file(int fd, void *ptr, int len) + { + return _write(fd, ptr, len); + } + + /* move file pointer */ + int + rd_lseek_file(int fd, int offset) + { + return _lseek(fd, offset, SEEK_SET); + } + + /* do a write lock on a file */ + BOOL + rd_lock_file(int fd, int start, int len) + { + // TODOOO... + return False; + } + + int + load_licence(RDPCLIENT * This, unsigned char **data) + { + char *home, *path; + struct stat st; + int fd, length; + + home = getenv("HOME"); + if (home == NULL) + return -1; + + path = (char *) xmalloc(strlen(home) + strlen(This->hostname) + sizeof("/.rdesktop/licence.")); + sprintf(path, "%s/.rdesktop/licence.%s", home, This->hostname); + + fd = _open(path, O_RDONLY); + if (fd == -1) + return -1; + + if (fstat(fd, &st)) + return -1; + + *data = (uint8 *) xmalloc(st.st_size); + length = _read(fd, *data, st.st_size); + _close(fd); + xfree(path); + return length; + } + + void + save_licence(RDPCLIENT * This, unsigned char *data, int length) + { + char *home, *path, *tmppath; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return; + + path = (char *) xmalloc(strlen(home) + strlen(This->hostname) + sizeof("/.rdesktop/licence.")); + + sprintf(path, "%s/.rdesktop", home); + if ((_mkdir(path) == -1) && errno != EEXIST) + { + perror(path); + return; + } + + /* write licence to licence.hostname.new, then atomically rename to licence.hostname */ + + sprintf(path, "%s/.rdesktop/licence.%s", home, This->hostname); + tmppath = (char *) xmalloc(strlen(path) + sizeof(".new")); + strcpy(tmppath, path); + strcat(tmppath, ".new"); + + fd = _open(tmppath, O_WRONLY | O_CREAT | O_TRUNC, 0600); + if (fd == -1) + { + perror(tmppath); + return; + } + + if (_write(fd, data, length) != length) + { + perror(tmppath); + _unlink(tmppath); + } + else if (rename(tmppath, path) == -1) + { + perror(path); + _unlink(tmppath); + } + + _close(fd); + xfree(tmppath); + xfree(path); + } + + /* ==== END POOP ==== */ + + /* ==== UI ==== */ + // Globals are totally teh evil, but cut me some slack here + HWND hwnd; + HBITMAP hbmBuffer; + HDC hdcBuffer; + +#if 0 + // NOTE: we don't really need these with rdesktop.c out of the picture + BOOL + ui_init(RDPCLIENT * This) + { + return 0; + } + + void + ui_deinit(RDPCLIENT * This) + { + } + + BOOL + ui_create_window(RDPCLIENT * This) + { + return 0; + } +#endif + + void + ui_resize_window(RDPCLIENT * This) + { + // TODO + } + +#if 0 + void + ui_destroy_window(RDPCLIENT * This) + { + } +#endif + + int + ui_select(RDPCLIENT * This, int rdp_socket) + { + return 1; // TODO: return 0 for user quit. Or just kill this silly function + } + + void + ui_move_pointer(RDPCLIENT * This, int x, int y) + { + // TODO + } + + HBITMAP + ui_create_bitmap(RDPCLIENT * This, int width, int height, uint8 * data) + { + void * pBits; + + BITMAPINFOHEADER bmih; + BITMAPINFO bmi; + + bmih.biSize = sizeof(bmih); + bmih.biWidth = width; + bmih.biHeight = - height; + bmih.biPlanes = 1; + bmih.biBitCount = This->server_depth; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = 0; + bmih.biXPelsPerMeter = 0; + bmih.biYPelsPerMeter = 0; + bmih.biClrUsed = 0; + bmih.biClrImportant = 0; + + bmi.bmiHeader = bmih; + memset(bmi.bmiColors, 0, sizeof(bmi.bmiColors)); + + return CreateDIBitmap(hdcBuffer, &bmih, CBM_INIT, data, &bmi, DIB_RGB_COLORS); + } + + void + ui_destroy_bitmap(RDPCLIENT * This, HBITMAP bmp) + { + DeleteObject(bmp); + } + + HGLYPH + ui_create_glyph(RDPCLIENT * This, int width, int height, const uint8 * data) + { + // TODO: create 2bpp mask + return 0; + } + + void + ui_destroy_glyph(RDPCLIENT * This, HGLYPH glyph) + { + // TODO + } + + HCURSOR + ui_create_cursor(RDPCLIENT * This, unsigned int x, unsigned int y, int width, int height, + uint8 * andmask, uint8 * xormask) + { + return CreateCursor(NULL, x, y, width, height, andmask, xormask); + } + + void + ui_set_cursor(RDPCLIENT * This, HCURSOR cursor) + { + // TODO + } + + void + ui_destroy_cursor(RDPCLIENT * This, HCURSOR cursor) + { + DestroyCursor(cursor); + } + + void + ui_set_null_cursor(RDPCLIENT * This) + { + // TODO + } + + HCOLOURMAP + ui_create_colourmap(RDPCLIENT * This, COLOURMAP * colours) + { + // TODO: kill HCOLOURMAP/COLOURMAP, use HPALETTE/LOGPALETTE + return 0; + } + + void + ui_destroy_colourmap(RDPCLIENT * This, HCOLOURMAP map) + { + // TODO: see above + } + + void + ui_set_colourmap(RDPCLIENT * This, HCOLOURMAP map) + { + // TODO + } + + RECT rcClip; // TODO: initialize + + void + ui_set_clip(RDPCLIENT * This, int x, int y, int cx, int cy) + { + rcClip.left = x; + rcClip.top = y; + rcClip.right = x + cx - 1; + rcClip.bottom = y + cy - 1; + SelectObject(hdcBuffer, CreateRectRgnIndirect(&rcClip)); + } + + void + ui_reset_clip(RDPCLIENT * This) + { + rcClip.left = 0; + rcClip.top = 0; + rcClip.right = This->width; + rcClip.bottom = This->height; + SelectObject(hdcBuffer, CreateRectRgnIndirect(&rcClip)); + } + + void + ui_bell(RDPCLIENT * This) + { + MessageBeep(MB_OK); // TODO? use Beep() on remote sessions? + } + + static + void + win32_repaint_rect(RDPCLIENT * This, const RECT * lprc) + { + RECT rcDamage; + IntersectRect(&rcDamage, lprc, &rcClip); + InvalidateRect(hwnd, &rcDamage, FALSE); + //Sleep(100); + } + + static + void + win32_repaint_area(RDPCLIENT * This, int x, int y, int cx, int cy) + { + RECT rcDamage; + rcDamage.left = x; + rcDamage.top = y; + rcDamage.right = x + cx; + rcDamage.bottom = y + cy; + win32_repaint_rect(This, &rcDamage); + } + + static + void + win32_repaint_poly(RDPCLIENT * This, POINT * point, int npoints, int linewidth) + { + RECT rcDamage; + + rcDamage.left = MAXLONG; + rcDamage.top = MAXLONG; + rcDamage.right = 0; + rcDamage.bottom = 0; + + for(int i = 0; i < npoints; ++ i) + { + if(point[i].x < rcDamage.left) + rcDamage.left = point[i].x; + + if(point[i].y < rcDamage.top) + rcDamage.top = point[i].y; + + if(point[i].x > rcDamage.right) + rcDamage.right = point[i].x; + + if(point[i].y > rcDamage.bottom) + rcDamage.bottom = point[i].y; + } + + InflateRect(&rcDamage, linewidth, linewidth); + win32_repaint_rect(This, &rcDamage); + } + + static + void + win32_repaint_whole(RDPCLIENT * This) + { + InvalidateRgn(hwnd, NULL, FALSE); + } + + /* + TODO: all of the following could probably be implemented this way: + - perform operation on off-screen buffer + - invalidate affected region of the window + */ + void + ui_paint_bitmap(RDPCLIENT * This, int x, int y, int cx, int cy, int width, int height, uint8 * data) + { + BITMAPINFO bmi; + ZeroMemory(&bmi, sizeof(bmi)); + + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = width; + bmi.bmiHeader.biHeight = - height; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = This->server_depth; + + StretchDIBits(hdcBuffer, x, y, cx, cy, 0, 0, width, height, data, &bmi, DIB_RGB_COLORS, SRCCOPY); + + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_destblt(RDPCLIENT * This, uint8 opcode, + /* dest */ int x, int y, int cx, int cy) + { + RECT rc; + rc.left = x; + rc.top = y; + rc.right = x + cx; + rc.bottom = y + cy; + + int prev = SetROP2(hdcBuffer, MAKELONG(0, opcode | opcode << 4)); + + FillRect(hdcBuffer, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); // use Rectangle instead? + + SetROP2(hdcBuffer, prev); + + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_patblt(RDPCLIENT * This, uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) + { + // TODO + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_screenblt(RDPCLIENT * This, uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* src */ int srcx, int srcy) + { + BitBlt(hdcBuffer, x, y, cx, cy, hdcBuffer, srcx, srcy, MAKELONG(0, opcode | opcode << 4)); + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_memblt(RDPCLIENT * This, uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* src */ HBITMAP src, int srcx, int srcy) + { + HDC hdcSrc = CreateCompatibleDC(hdcBuffer); + HGDIOBJ hOld = SelectObject(hdcSrc, src); + + BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode | opcode << 4)); + + DeleteObject(hOld); + DeleteDC(hdcSrc); + + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_triblt(RDPCLIENT * This, uint8 opcode, + /* dest */ int x, int y, int cx, int cy, + /* src */ HBITMAP src, int srcx, int srcy, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) + { + // TODO + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_line(RDPCLIENT * This, uint8 opcode, + /* dest */ int startx, int starty, int endx, int endy, + /* pen */ PEN * pen) + { + HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); + HGDIOBJ hOld = SelectObject(hdcBuffer, hpen); + + int prevROP = SetROP2(hdcBuffer, opcode); + + POINT prevPos; + MoveToEx(hdcBuffer, startx, starty, &prevPos); + + LineTo(hdcBuffer, endx, endy); + + MoveToEx(hdcBuffer, prevPos.x, prevPos.y, NULL); + + SetROP2(hdcBuffer, prevROP); + + SelectObject(hdcBuffer, hOld); + + RECT rcDamage; + + if(startx < endx) + { + rcDamage.left = startx; + rcDamage.right = endx; + } + else + { + rcDamage.left = endx; + rcDamage.right = startx; + } + + if(starty < endy) + { + rcDamage.top = starty; + rcDamage.bottom = endy; + } + else + { + rcDamage.top = endy; + rcDamage.bottom = starty; + } + + InflateRect(&rcDamage, pen->width, pen->width); + win32_repaint_rect(This, &rcDamage); + } + + void + ui_rect(RDPCLIENT * This, + /* dest */ int x, int y, int cx, int cy, + /* brush */ int colour) + { + RECT rc; + rc.left = x; + rc.top = y; + rc.right = x + cx; + rc.bottom = y + cy; + + HBRUSH hbr = CreateSolidBrush(colour); + FillRect(hdcBuffer, &rc, hbr); // use Rectangle instead? + DeleteObject(hbr); + + win32_repaint_rect(This, &rc); + } + + void + ui_polygon(RDPCLIENT * This, uint8 opcode, + /* mode */ uint8 fillmode, + /* dest */ POINT * point, int npoints, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) + { + // TODO: create brush, set fg&bg + + int oldRop = SetROP2(hdcBuffer, opcode); + int oldFillMode = SetPolyFillMode(hdcBuffer, fillmode); + Polygon(hdcBuffer, point, npoints); + SetPolyFillMode(hdcBuffer, oldFillMode); + SetROP2(hdcBuffer, oldRop); + + win32_repaint_poly(This, point, npoints, 0); + } + + void + ui_polyline(RDPCLIENT * This, uint8 opcode, + /* dest */ POINT * points, int npoints, + /* pen */ PEN * pen) + { + HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); + HGDIOBJ hOld = SelectObject(hdcBuffer, hpen); + int oldRop = SetROP2(hdcBuffer, opcode); + Polyline(hdcBuffer, points, npoints); + SetROP2(hdcBuffer, oldRop); + SelectObject(hdcBuffer, hOld); + + win32_repaint_poly(This, points, npoints, pen->width); + } + + void + ui_ellipse(RDPCLIENT * This, uint8 opcode, + /* mode */ uint8 fillmode, + /* dest */ int x, int y, int cx, int cy, + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) + { +#if 0 + switch(fillmode) + { + case 0: // outline // HOW? HOW? WITH WHAT PEN? + case 1: // filled // TODO + } +#endif + win32_repaint_area(This, x, y, cx, cy); + } + + void + ui_draw_glyph(RDPCLIENT * This, int mixmode, + /* dest */ int x, int y, int cx, int cy, + /* src */ HGLYPH glyph, int srcx, int srcy, + int bgcolour, int fgcolour) + { + // TODO!!! + } + + void + ui_draw_text(RDPCLIENT * This, uint8 font, uint8 flags, uint8 opcode, int mixmode, int x, int y, + int clipx, int clipy, int clipcx, int clipcy, + int boxx, int boxy, int boxcx, int boxcy, BRUSH * brush, + int bgcolour, int fgcolour, uint8 * text, uint8 length) + { + // TODO!!! + } + + void + ui_desktop_save(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) + { + // TODO (use GetDIBits) + } + + void + ui_desktop_restore(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) + { + // TODO (use SetDIBitsToDevice) + win32_repaint_whole(This); + } + + void + ui_begin_update(RDPCLIENT * This) + { + // TODO? use a mutex to arbitrate access to the off-screen buffer? + } + + void + ui_end_update(RDPCLIENT * This) + { + // TODO? use a mutex to arbitrate access to the off-screen buffer? + } +}; + +static +LRESULT +CALLBACK +mstsc_WndProc +( + HWND hwnd, + UINT uMsg, + WPARAM wparam, + LPARAM lparam +) +{ + // BUGBUG: LongToPtr & PtrToLong will break on Win64 + + RDPCLIENT * This = reinterpret_cast<RDPCLIENT *>(LongToPtr(GetWindowLongPtr(hwnd, GWLP_USERDATA))); + + switch(uMsg) + { + case WM_CREATE: + This = static_cast<RDPCLIENT *>(reinterpret_cast<LPCREATESTRUCT>(lparam)->lpCreateParams); + SetWindowLongPtr(hwnd, GWLP_USERDATA, PtrToLong(This)); + break; + + case WM_PAINT: + // Obscenely simple code for now... + { + PAINTSTRUCT ps; + HDC hdc = BeginPaint(hwnd, &ps); + + BitBlt + ( + hdc, + ps.rcPaint.left, + ps.rcPaint.top, + ps.rcPaint.right - ps.rcPaint.left, + ps.rcPaint.bottom - ps.rcPaint.top, + hdcBuffer, + ps.rcPaint.left, + ps.rcPaint.top, + SRCCOPY + ); + + EndPaint(hwnd, &ps); + } + + break; + + case WM_SYSKEYDOWN: + case WM_KEYDOWN: + rdp_send_input + ( + This, + GetMessageTime(), + RDP_INPUT_SCANCODE, + RDP_KEYPRESS | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), + LOBYTE(HIWORD(lparam)), + 0 + ); + + break; + + case WM_SYSKEYUP: + case WM_KEYUP: + rdp_send_input + ( + This, + GetMessageTime(), + RDP_INPUT_SCANCODE, + RDP_KEYRELEASE | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), + LOBYTE(HIWORD(lparam)), + 0 + ); + + break; + + default: + return DefWindowProc(hwnd, uMsg, wparam, lparam); + } + + return 0; +} + +static +DWORD +WINAPI +mstsc_ProtocolIOThread +( + LPVOID lpArgument +) +{ + RDPCLIENT * This = static_cast<RDPCLIENT *>(lpArgument); + + strcpy(This->username, "Hyperion"); + + DWORD dw = sizeof(This->hostname); + GetComputerNameA(This->hostname, &dw); + + uint32 flags = RDP_LOGON_NORMAL | RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2; + + rdp_connect(This, "10.0.0.3", flags, "", "", "", ""); + + hdcBuffer = CreateCompatibleDC(NULL); + + BITMAPINFO bmi; + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = This->width; + bmi.bmiHeader.biHeight = This->height; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = This->server_depth; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 0; + bmi.bmiHeader.biYPelsPerMeter = 0; + bmi.bmiHeader.biClrUsed = 0; // TODO! palette displays + bmi.bmiHeader.biClrImportant = 0; // TODO! palette displays + + void * p; + + hbmBuffer = CreateDIBSection(hdcBuffer, &bmi, DIB_RGB_COLORS, &p, NULL, 0); + + SelectObject(hdcBuffer, hbmBuffer); + + rcClip.left = 0; + rcClip.top = 0; + rcClip.right = This->width; + rcClip.bottom = This->height; + + BOOL deactivated; + uint32 ext_disc_reason; + + rdp_main_loop(This, &deactivated, &ext_disc_reason); + + return 0; +} + +int wmain() +{ + WSADATA wsd; + WSAStartup(MAKEWORD(2, 2), &wsd); + + static RDPCLIENT This_; // NOTE: this is HUGE and would overflow the stack! + ZeroMemory(&This_, sizeof(This_)); + + RDPCLIENT * This = &This_; + + /* + Threading model for MissTosca: + - main thread is the GUI thread. Message loop maintained by caller + - protocol I/O is handled in an I/O thread (or thread pool) + - extra threads maintained by virtual channel handlers. Virtual channel writes are thread-neutral + + How we handle drawing: at the moment just an off-screen buffer we dump on-screen when asked to. + Still considering how to draw on-screen directly and *then* buffering off-screen (for example, + when running inside another remote session) + */ + + // FIXME: keyboard mess + This->keylayout = 0x409; + This->keyboard_type = 0x4; + This->keyboard_subtype = 0x0; + This->keyboard_functionkeys = 0xc; + This->width = 1024; + This->height = 768; + This->server_depth = 24; + This->bitmap_compression = True; + This->sendmotion = True; + This->bitmap_cache = True; + This->bitmap_cache_persist_enable = False; + This->bitmap_cache_precache = True; + This->encryption = True; + This->packet_encryption = True; + This->desktop_save = True; + This->polygon_ellipse_orders = True; + This->fullscreen = False; + This->grab_keyboard = True; + This->hide_decorations = False; + This->use_rdp5 = True; + This->rdpclip = True; + This->console_session = False; + This->numlock_sync = False; + This->seamless_rdp = False; + This->rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; + This->tcp_port_rdp = TCP_PORT_RDP; + +#define NOT_SET -1 + This->cache.bmpcache_lru[0] = NOT_SET; + This->cache.bmpcache_lru[1] = NOT_SET; + This->cache.bmpcache_lru[2] = NOT_SET; + This->cache.bmpcache_mru[0] = NOT_SET; + This->cache.bmpcache_mru[1] = NOT_SET; + This->cache.bmpcache_mru[2] = NOT_SET; + + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + + wc.lpfnWndProc = mstsc_WndProc; + wc.hbrBackground = static_cast<HBRUSH>(GetStockObject(HOLLOW_BRUSH)); + wc.lpszClassName = TEXT("MissTosca_Desktop"); + + ATOM a = RegisterClass(&wc); + + hwnd = CreateWindow + ( + MAKEINTATOM(a), + NULL, + WS_POPUP | WS_VISIBLE, + CW_USEDEFAULT, + CW_USEDEFAULT, + This->width, + This->height, + NULL, + NULL, + NULL, + This + ); + + // The righ time to start the protocol thread + DWORD dwThreadId; + HANDLE hThread = CreateThread(NULL, 0, mstsc_ProtocolIOThread, This, 0, &dwThreadId); + + // Your standard, garden variety message loop + MSG msg; + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +// EOF Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj (added) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj Mon Jul 10 03:57:54 2006 @@ -1,0 +1,231 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="rdesktop-core-tester" + ProjectGUID="{B172A623-E2BD-4E3F-86E6-620548FE255B}" + RootNamespace="rdesktopcoretester" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(SolutionDir)";"C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib $(NoInherit)" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32"" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(SolutionDir)";"C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib $(NoInherit)" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32"" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + <ProjectReference + ReferencedProjectIdentifier="{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}" + RelativePathToProject=".\rdesktop\rdesktop-core.vcproj" + /> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\rdesktop-core-tester.cpp" + > + </File> + <File + RelativePath=".\stdafx.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\stdafx.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.cpp (added) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.cpp Mon Jul 10 03:57:54 2006 @@ -1,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// rdesktop-core-tester.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h (added) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h Mon Jul 10 03:57:54 2006 @@ -1,0 +1,18 @@ +#pragma once + +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> + +#include <direct.h> +#include <io.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <winsock2.h> + +// EOF Modified: trunk/reactos/base/applications/tsclient/rdesktop/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/channels.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/channels.c Mon Jul 10 03:57:54 2006 @@ -21,10 +21,13 @@ #include "rdesktop.h" +// FIXME: header mess +#if 0 #define CHANNEL_CHUNK_LENGTH 1600 #define CHANNEL_FLAG_FIRST 0x01 #define CHANNEL_FLAG_LAST 0x02 #define CHANNEL_FLAG_SHOW_PROTOCOL 0x10 +#endif /* FIXME: We should use the information in TAG_SRV_CHANNELS to map RDP5 channels to MCS channels. Modified: trunk/reactos/base/applications/tsclient/rdesktop/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/constants.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/constants.h Mon Jul 10 03:57:54 2006 @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Miscellaneous protocol constants Copyright (C) Matthew Chapman 1999-2005 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -311,9 +311,10 @@ #define MASK_HAS_BITS(var, mask) ((var & mask)>0) #define MASK_CHANGE_BIT(var, mask, active) (var = ((var & ~mask) | (active ? mask : 0))) -/* Clipboard constants, "borrowed" from GCC system headers in +/* Clipboard constants, "borrowed" from GCC system headers in the w32 cross compiler */ +#if 0 #define CF_TEXT 1 #define CF_BITMAP 2 #define CF_METAFILEPICT 3 @@ -377,7 +378,6 @@ #define STATUS_NOTIFY_ENUM_DIR 0xc000010c #define STATUS_CANCELLED 0xc0000120 - /* RDPDR constants */ #define RDPDR_MAX_DEVICES 0x10 #define DEVICE_TYPE_SERIAL 0x01 @@ -413,7 +413,9 @@ #define exDiscReasonLicenseErrClientEncryption 0x0108 #define exDiscReasonLicenseCantUpgradeLicense 0x0109 #define exDiscReasonLicenseNoRemoteConnections 0x010a - +#endif + +#if 0 /* SeamlessRDP constants */ #define SEAMLESSRDP_NOTYETMAPPED -1 #define SEAMLESSRDP_NORMAL 0 @@ -425,3 +427,4 @@ #define SEAMLESSRDP_HELLO_RECONNECT 0x0001 #define SEAMLESSRDP_HELLO_HIDDEN 0x0002 +#endif Modified: trunk/reactos/base/applications/tsclient/rdesktop/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/licence.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/licence.c Mon Jul 10 03:57:54 2006 @@ -19,7 +19,7 @@ */ #include "rdesktop.h" -#include <openssl/rc4.h> +#include <openssl/rc4.h> // TODO: remove dependency on OpenSSL /* Generate a session key and RC4 keys, given client and server randoms */ static void Modified: trunk/reactos/base/applications/tsclient/rdesktop/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/proto.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/proto.h Mon Jul 10 03:57:54 2006 @@ -56,6 +56,7 @@ void cliprdr_send_data(RDPCLIENT * This, uint8 * data, uint32 length); void cliprdr_set_mode(RDPCLIENT * This, const char *optarg); BOOL cliprdr_init(RDPCLIENT * This); +#if 0 /* disk.c */ int disk_enum_devices(RDPCLIENT * This, uint32 * id, char *optarg); NTSTATUS disk_query_information(RDPCLIENT * This, NTHANDLE handle, uint32 info_class, STREAM out); @@ -64,6 +65,7 @@ NTSTATUS disk_create_notify(RDPCLIENT * This, NTHANDLE handle, uint32 info_class); NTSTATUS disk_query_volume_information(RDPCLIENT * This, NTHANDLE handle, uint32 info_class, STREAM out); NTSTATUS disk_query_directory(RDPCLIENT * This, NTHANDLE handle, uint32 info_class, char *pattern, STREAM out); +#endif /* mppc.c */ int mppc_expand(RDPCLIENT * This, uint8 * data, uint32 clen, uint8 ctype, uint32 * roff, uint32 * rlen); /* ewmhints.c */ @@ -153,6 +155,7 @@ char *directory, char *cookie); void rdp_reset_state(RDPCLIENT * This); void rdp_disconnect(RDPCLIENT * This); +#if 0 /* rdpdr.c */ int get_device_index(RDPCLIENT * This, NTHANDLE handle); void convert_to_unix_filename(char *filename); @@ -162,6 +165,8 @@ struct async_iorequest *iorq); void rdpdr_check_fds(RDPCLIENT * This, fd_set * rfds, fd_set * wfds, BOOL timed_out); BOOL rdpdr_abort_io(RDPCLIENT * This, uint32 fd, uint32 major, NTSTATUS status); +#endif +#if 0 /* rdpsnd.c */ void rdpsnd_send_completion(RDPCLIENT * This, uint16 tick, uint8 packet_index); BOOL rdpsnd_init(RDPCLIENT * This); @@ -173,6 +178,7 @@ void wave_out_volume(uint16 left, uint16 right); void wave_out_write(STREAM s, uint16 tick, uint8 index); void wave_out_play(void); +#endif /* secure.c */ void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt); void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2); @@ -189,10 +195,12 @@ BOOL sec_reconnect(RDPCLIENT * This, char *server); void sec_disconnect(RDPCLIENT * This); void sec_reset_state(RDPCLIENT * This); +#if 0 /* serial.c */ int serial_enum_devices(RDPCLIENT * This, uint32 * id, char *optarg); BOOL serial_get_event(RDPCLIENT * This, NTHANDLE handle, uint32 * result); BOOL serial_get_timeout(RDPCLIENT * This, NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout); +#endif /* tcp.c */ STREAM tcp_init(RDPCLIENT * This, uint32 maxlen); void tcp_send(RDPCLIENT * This, STREAM s); @@ -210,6 +218,7 @@ void ui_clip_set_mode(RDPCLIENT * This, const char *optarg); void xclip_init(RDPCLIENT * This); void xclip_deinit(RDPCLIENT * This); +#if 0 /* xkeymap.c */ BOOL xkeymap_from_locale(RDPCLIENT * This, const char *locale); FILE *xkeymap_open(const char *filename); @@ -227,6 +236,7 @@ uint16 ui_get_numlock_state(RDPCLIENT * This, unsigned int state); void reset_modifier_keys(RDPCLIENT * This); void rdp_send_scancode(RDPCLIENT * This, uint32 time, uint16 flags, uint8 scancode); +#endif /* xwin.c */ BOOL get_key_state(RDPCLIENT * This, unsigned int state, uint32 keysym); BOOL ui_init(RDPCLIENT * This); Added: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj (added) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj Mon Jul 10 03:57:54 2006 @@ -1,0 +1,255 @@ +ï»¿<?xml version="1.0" encoding="UTF-8"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="rdesktop-core" + ProjectGUID="{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="4" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_DEBUG;" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="4" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\constants.h" + > + </File> + <File + RelativePath=".\disk.h" + > + </File> + <File + RelativePath=".\orders.h" + > + </File> + <File + RelativePath=".\parse.h" + > + </File> + <File + RelativePath=".\proto.h" + > + </File> + <File + RelativePath=".\rdesktop.h" + > + </File> + <File + RelativePath=".\scancodes.h" + > + </File> + <File + RelativePath=".\seamless.h" + > + </File> + <File + RelativePath=".\types.h" + > + </File> + <File + RelativePath=".\xproto.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\bitmap.c" + > + </File> + <File + RelativePath=".\cache.c" + > + </File> + <File + RelativePath=".\channels.c" + > + </File> + <File + RelativePath=".\iso.c" + > + </File> + <File + RelativePath=".\licence.c" + > + </File> + <File + RelativePath=".\mcs.c" + > + </File> + <File + RelativePath=".\mppc.c" + > + </File> + <File + RelativePath=".\orders.c" + > + </File> + <File + RelativePath=".\pstcache.c" + > + </File> + <File + RelativePath=".\rdp.c" + > + </File> + <File + RelativePath=".\rdp5.c" + > + </File> + <File + RelativePath=".\secure.c" + > + </File> + <File + RelativePath=".\tcp.c" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h Mon Jul 10 03:57:54 2006 @@ -18,6 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include <windows.h> +#include <cchannel.h> + +#if 0 #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -32,14 +40,18 @@ #include <limits.h> /* PATH_MAX */ /* FIXME FIXME */ +#include <windows.h> +#include <X11/Xlib.h> +#include <X11/Xatom.h> +/* FIXME FIXME */ +#endif + +// TODO #include <openssl/rc4.h> #include <openssl/md5.h> #include <openssl/sha.h> #include <openssl/bn.h> #include <openssl/x509v3.h> -#include <X11/Xlib.h> -#include <X11/Xatom.h> -/* FIXME FIXME */ #define VERSION "1.4.1" @@ -128,6 +140,7 @@ #include "types.h" #include "orders.h" +#if 0 /* Used to store incoming io request, until they are ready to be completed */ /* using a linked list ensures that they are processed in the right order, */ /* if multiple ios are being done on the same fd */ @@ -141,6 +154,7 @@ struct async_iorequest *next; /* next element in list */ }; +#endif struct bmpcache_entry { @@ -149,6 +163,7 @@ sint16 next; }; +#if 0 typedef struct _seamless_group { Window wnd; @@ -174,32 +189,24 @@ struct _seamless_window *next; } seamless_window; +#endif /* holds the whole state of the RDP client */ struct rdpclient { - /* Public fields */ /* channels.c */ #define MAX_CHANNELS 6 VCHANNEL channels[MAX_CHANNELS]; unsigned int num_channels; - /* disk.c */ -#define MAX_OPEN_FILES 0x100 - FILEINFO fileinfo[MAX_OPEN_FILES]; - BOOL notify_stamp; - - /* ewmhints.c */ - Atom net_wm_state_atom, net_wm_desktop_atom; - /* licence.c */ BOOL licence_issued; + /* mcs.c */ + uint16 mcs_userid; + /* mppc.c */ RDPCOMP mppc_dict; - - /* mcs.c */ - uint16 mcs_userid; /* pstcache.c */ int pstcache_fd[8]; @@ -210,7 +217,7 @@ char title[64]; char username[64]; char hostname[16]; - char keymapname[PATH_MAX]; + char keymapname[MAX_PATH]; unsigned int keylayout; int keyboard_type; int keyboard_subtype; @@ -259,17 +266,101 @@ char redirect_cookie[128]; uint32 redirect_flags; -#ifdef WITH_RDPSND - BOOL rdpsnd_enabled; -#endif - -#ifdef HAVE_ICONV - char codepage[16]; -#endif - /* rdp.c */ uint8 *next_packet; uint32 rdp_shareid; + + /* secure.c */ + uint16 server_rdp_version; + + /* tcp.c */ + int tcp_port_rdp; + + /* cache.c */ + struct cache_ + { + struct bmpcache_entry bmpcache[3][0xa00]; + HBITMAP volatile_bc[3]; + + int bmpcache_lru[3]; + int bmpcache_mru[3]; + int bmpcache_count[3]; + + FONTGLYPH fontcache[12][256]; + DATABLOB textcache[256]; + uint8 deskcache[0x38400 * 4]; + HCURSOR cursorcache[0x20]; + } + cache; + + /* licence.c */ + struct licence_ + { + uint8 key[16]; + uint8 sign_key[16]; + } + licence; + + /* orders.c */ + struct orders_ + { + RDP_ORDER_STATE order_state; + } + orders; + + /* rdp.c */ + struct rdp_ + { +#if WITH_DEBUG + uint32 packetno; +#endif + +#ifdef HAVE_ICONV + BOOL iconv_works; +#endif + } + rdp; + + /* secure.c */ + struct secure_ + { + int rc4_key_len; + RC4_KEY rc4_decrypt_key; + RC4_KEY rc4_encrypt_key; + RSA *server_public_key; + uint32 server_public_key_len; + + uint8 sign_key[16]; + uint8 decrypt_key[16]; + uint8 encrypt_key[16]; + uint8 decrypt_update_key[16]; + uint8 encrypt_update_key[16]; + uint8 crypted_random[SEC_MAX_MODULUS_SIZE]; + + /* These values must be available to reset state - Session Directory */ + int encrypt_use_count; + int decrypt_use_count; + } + secure; + + /* tcp.c */ + struct tcp_ + { + int sock; + struct stream in; + struct stream out; + } + tcp; + +#if 0 + /* Public fields */ + /* disk.c */ +#define MAX_OPEN_FILES 0x100 + FILEINFO fileinfo[MAX_OPEN_FILES]; + BOOL notify_stamp; + + /* ewmhints.c */ + Atom net_wm_state_atom, net_wm_desktop_atom; /* rdpdr.c */ /* If select() times out, the request for the device with handle min_timeout_fd is aborted */ @@ -288,38 +379,17 @@ BOOL dsp_busy; #endif - /* secure.c */ - uint16 server_rdp_version; - - /* tcp.c */ - int tcp_port_rdp; - +#if 0 /* xwin.c */ Display *display; BOOL enable_compose; BOOL Unobscured; /* used for screenblt */ Time last_gesturetime; Window wnd; +#endif /* Private fields */ /* FIXME: it's not pretty to spill private fields this way. Use opaque pointers */ - /* cache.c */ - struct cache_ - { - struct bmpcache_entry bmpcache[3][0xa00]; - HBITMAP volatile_bc[3]; - - int bmpcache_lru[3]; - int bmpcache_mru[3]; - int bmpcache_count[3]; - - FONTGLYPH fontcache[12][256]; - DATABLOB textcache[256]; - uint8 deskcache[0x38400 * 4]; - HCURSOR cursorcache[0x20]; - } - cache; - /* cliprdr.c */ struct cliprdr_ { @@ -337,34 +407,6 @@ } ewmhints; - /* licence.c */ - struct licence_ - { - uint8 key[16]; - uint8 sign_key[16]; - } - licence; - - /* orders.c */ - struct orders_ - { - RDP_ORDER_STATE order_state; - } - orders; - - /* rdp.c */ - struct rdp_ - { -#if WITH_DEBUG - uint32 packetno; -#endif - -#ifdef HAVE_ICONV - BOOL iconv_works; -#endif - } - rdp; - /* rdpdr.c */ struct rdpdr_ { @@ -394,37 +436,6 @@ unsigned int serial; } seamless; - - /* secure.c */ - struct secure_ - { - int rc4_key_len; - RC4_KEY rc4_decrypt_key; - RC4_KEY rc4_encrypt_key; - RSA *server_public_key; - uint32 server_public_key_len; - - uint8 sign_key[16]; - uint8 decrypt_key[16]; - uint8 encrypt_key[16]; - uint8 decrypt_update_key[16]; - uint8 encrypt_update_key[16]; - uint8 crypted_random[SEC_MAX_MODULUS_SIZE]; - - /* These values must be available to reset state - Session Directory */ - int encrypt_use_count; - int decrypt_use_count; - } - secure; - - /* tcp.c */ - struct tcp_ - { - int sock; - struct stream in; - struct stream out; - } - tcp; /* xclip.c */ struct xclip_ @@ -520,6 +531,7 @@ } xkeymap; +#if 0 /* xwin.c */ struct xwin_ { @@ -565,9 +577,9 @@ binary format. If so, we can avoid an expensive translation. Note that this can be true when compatible_arch is false, e.g.: - + RDP(LE) <-> host(BE) <-> X-Server(LE) - + ('host' is the machine running rdesktop; the host simply memcpy's so its endianess doesn't matter) */ @@ -595,6 +607,8 @@ XErrorHandler old_error_handler; } xwin; +#endif +#endif }; #ifndef MAKE_PROTO Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdp.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdp.c Mon Jul 10 03:57:54 2006 @@ -20,7 +20,7 @@ #include <time.h> #include <errno.h> -#include <unistd.h> +//#include <unistd.h> #include "rdesktop.h" #ifdef HAVE_ICONV @@ -932,7 +932,7 @@ rdp_recv(This, &type); /* RDP_CTL_COOPERATE */ rdp_recv(This, &type); /* RDP_CTL_GRANT_CONTROL */ rdp_send_input(This, 0, RDP_INPUT_SYNCHRONIZE, 0, - This->numlock_sync ? ui_get_numlock_state(This, read_keyboard_state(This)) : 0, 0); + /*This->numlock_sync ? ui_get_numlock_state(This, read_keyboard_state(This)) :*/ 0, 0); // TODO: keyboard mess if (This->use_rdp5) { @@ -968,7 +968,7 @@ in_uint8p(s, mask, masklen); cursor = ui_create_cursor(This, x, y, width, height, mask, data); ui_set_cursor(This, cursor); - cache_put_cursor(This, cache_idx, cursor); + // cache_put_cursor(This, cache_idx, cursor); // TODO } /* Process a cached pointer PDU */ @@ -978,7 +978,7 @@ uint16 cache_idx; in_uint16_le(s, cache_idx); - ui_set_cursor(This, cache_get_cursor(This, cache_idx)); + ui_set_cursor(This, /*cache_get_cursor(This, cache_idx)*/ NULL); // TODO } /* Process a system pointer PDU */ Modified: trunk/reactos/base/applications/tsclient/rdesktop/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/secure.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/secure.c Mon Jul 10 03:57:54 2006 @@ -19,7 +19,9 @@ */ #include "rdesktop.h" - +#include <string.h> + +// TODO: remove dependency on OpenSSL #include <openssl/rc4.h> #include <openssl/md5.h> #include <openssl/sha.h> Modified: trunk/reactos/base/applications/tsclient/rdesktop/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/tcp.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/tcp.c Mon Jul 10 03:57:54 2006 @@ -18,6 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if 0 // FIXME: header mess #include <unistd.h> /* select read write close */ #include <sys/socket.h> /* socket connect setsockopt */ #include <sys/time.h> /* timeval */ @@ -26,7 +27,12 @@ #include <netinet/tcp.h> /* TCP_NODELAY */ #include <arpa/inet.h> /* inet_addr */ #include <errno.h> /* errno */ +#endif + #include "rdesktop.h" +#include <winsock2.h> + +typedef int socklen_t; #ifndef INADDR_NONE #define INADDR_NONE ((unsigned long) -1) @@ -59,7 +65,7 @@ sent = send(This->tcp.sock, s->data + total, length - total, 0); if (sent <= 0) { - error("send: %s\n", strerror(errno)); + // error("send: %s\n", strerror(errno)); // EOF return; } @@ -109,7 +115,7 @@ rcvd = recv(This->tcp.sock, s->end, length, 0); if (rcvd < 0) { - error("recv: %s\n", strerror(errno)); + // error("recv: %s\n", strerror(errno)); // EOF return NULL; } else if (rcvd == 0) @@ -188,7 +194,7 @@ if ((This->tcp.sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - error("socket: %s\n", strerror(errno)); + // error("socket: %s\n", strerror(errno)); // EOF return False; } @@ -197,7 +203,7 @@ if (connect(This->tcp.sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0) { - error("connect: %s\n", strerror(errno)); + // error("connect: %s\n", strerror(errno)); // EOF close(This->tcp.sock); return False; } Modified: trunk/reactos/base/applications/tsclient/rdesktop/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/types.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/types.h Mon Jul 10 03:57:54 2006 @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Common data types Copyright (C) Matthew Chapman 1999-2005 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -12,13 +12,15 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if 0 typedef int BOOL; +#endif #ifndef True #define True (1) @@ -32,17 +34,25 @@ typedef unsigned int uint32; typedef signed int sint32; +// TODO: detect Win32, avoid this mess +#if 0 typedef void *HBITMAP; +typedef void *HCURSOR; +#endif typedef void *HGLYPH; + +// TODO: nuke, use HPALETTE typedef void *HCOLOURMAP; -typedef void *HCURSOR; - + +#if 0 typedef struct _POINT { sint16 x, y; } POINT; - +#endif + +// TODO: nuke, use COLORREF typedef struct _COLOURENTRY { uint8 red; @@ -52,6 +62,7 @@ } COLOURENTRY; +// TODO: nuke, use LOGPALETTE typedef struct _COLOURMAP { uint16 ncolours; @@ -60,6 +71,7 @@ } COLOURMAP; +// TODO: nuke, use RECT typedef struct _BOUNDS { sint16 left; @@ -70,7 +82,8 @@ } BOUNDS; -typedef struct _PEN +// TODO: nuke, use LOGPEN +typedef struct _PEN { uint8 style; uint8 width; @@ -79,6 +92,7 @@ } PEN; +// TODO: nuke, use LOGBRUSH + pattern[8] typedef struct _BRUSH { uint8 xorigin; @@ -119,6 +133,7 @@ } key_translation; +// TODO: semi-nuke, wrap CHANNEL_DEF typedef struct _VCHANNEL { uint16 mcs_id; @@ -145,6 +160,7 @@ #define MAX_CBSIZE 256 /* RDPSND */ +#if 0 typedef struct { uint16 wFormatTag; @@ -156,7 +172,7 @@ uint16 cbSize; uint8 cb[MAX_CBSIZE]; } WAVEFORMATEX; - +#endif typedef struct _RDPCOMP { uint32 roff; @@ -165,6 +181,7 @@ } RDPCOMP; +#if 0 /* RDPDR */ typedef uint32 NTSTATUS; typedef uint32 NTHANDLE; @@ -264,5 +281,6 @@ uint32 info_class; } FILEINFO; +#endif typedef BOOL(*str_handle_lines_t) (RDPCLIENT * This, const char *line, void *data);

1 0

[hpoussin] 22982: First argument doesn't need to be a physical device object, it only needs to be in a PDO driver stack.
by hpoussin＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: hpoussin Date: Mon Jul 10 02:08:24 2006 New Revision: 22982 URL: http://svn.reactos.org/svn/reactos?rev=22982&view=rev Log: First argument doesn't need to be a physical device object, it only needs to be in a PDO driver stack. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Jul 10 02:08:24 2006 @@ -542,7 +542,13 @@ VOID ); -NTSTATUS +PDEVICE_OBJECT +NTAPI +IopGetLowestDevice( + IN PDEVICE_OBJECT DeviceObject +); + +NTSTATUS INIT_FUNCTION IopInitPlugPlayEvents(VOID); Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Mon Jul 10 02:08:24 2006 @@ -635,6 +635,7 @@ ASSERT_IRQL(PASSIVE_LEVEL); /* Parameters must pass three border of checks */ + PhysicalDeviceObject = IopGetLowestDevice(PhysicalDeviceObject); DeviceObjectExtension = (PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension; /* 1st level: Presence of a Device Node */

1 0

[fireball] 22981: Implement proper error-handling in IoRegisterDeviceInterface() (based on testing and MSDN documentation)
by fireball＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: fireball Date: Mon Jul 10 02:02:03 2006 New Revision: 22981 URL: http://svn.reactos.org/svn/reactos?rev=22981&view=rev Log: Implement proper error-handling in IoRegisterDeviceInterface() (based on testing and MSDN documentation) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Mon Jul 10 02:02:03 2006 @@ -630,13 +630,37 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG i; NTSTATUS Status; + PEXTENDED_DEVOBJ_EXTENSION DeviceObjectExtension; ASSERT_IRQL(PASSIVE_LEVEL); - if (!(PhysicalDeviceObject->Flags & DO_BUS_ENUMERATED_DEVICE)) - { - DPRINT("PhysicalDeviceObject 0x%p is not a valid Pdo\n", PhysicalDeviceObject); - return STATUS_INVALID_PARAMETER_1; + /* Parameters must pass three border of checks */ + DeviceObjectExtension = (PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension; + + /* 1st level: Presence of a Device Node */ + if (DeviceObjectExtension->DeviceNode == NULL) + { + DPRINT("PhysicalDeviceObject 0x%p doesn't have a DeviceNode\n", PhysicalDeviceObject); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* 2nd level: Presence of an non-zero length InstancePath */ + if (DeviceObjectExtension->DeviceNode->InstancePath.Length == 0) + { + DPRINT("PhysicalDeviceObject 0x%p's DOE has zero-length InstancePath\n", PhysicalDeviceObject); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* 3rd level: Optional, based on WDK documentation */ + if (ReferenceString != NULL) + { + /* Reference string must not contain path-separator symbols */ + for (i = 0; i < ReferenceString->Length / sizeof(WCHAR); i++) + { + if ((ReferenceString->Buffer[i] == '\\') || + (ReferenceString->Buffer[i] == '/')) + return STATUS_INVALID_DEVICE_REQUEST; + } } Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString);

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