Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 30277: Start on ksuser.
by greatlrd＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: greatlrd Date: Thu Nov 8 23:08:42 2007 New Revision: 30277 URL: http://svn.reactos.org/svn/reactos?rev=30277&view=rev Log: Start on ksuser. Added: branches/reactx/reactos/dll/directx/ksuser/ branches/reactx/reactos/dll/directx/ksuser/ksuser.c (with props) branches/reactx/reactos/dll/directx/ksuser/ksuser.def (with props) branches/reactx/reactos/dll/directx/ksuser/ksuser.h (with props) branches/reactx/reactos/dll/directx/ksuser/ksuser.rbuild (with props) branches/reactx/reactos/dll/directx/ksuser/ksuser.rc (with props) Added: branches/reactx/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.c (added) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.c Thu Nov 8 23:08:42 2007 @@ -1,0 +1,75 @@ + + +#define _KSDDK_ +#include <windows.h> +#include <ks.h> +#include "ksuser.h" + +#include <debug.h> + + + + +KSDDKAPI +NTSTATUS +NTAPI +KsCreateAllocator(HANDLE ConnectionHandle, + PKSALLOCATOR_FRAMING AllocatorFraming, + PHANDLE AllocatorHandle) +{ + + return 0; +} + +/* +KSDDKAPI +NTSTATUS +NTAPI +KsCreateClock(HANDLE ConnectionHandle, + PKSCLOCK_CREATE ClockCreate, + PHANDLE ClockHandle) +{ + UNIMPLEMENTED + return 0; +} + +KSDDKAPI +NTSTATUS +NTAPI +KsCreatePin(HANDLE FilterHandle, + PKSPIN_CONNECT Connect, + ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle) +{ + UNIMPLEMENTED + return 0; +} + +KSDDKAPI +NTSTATUS +NTAPI +KsCreateTopologyNode(HANDLE ParentHandle, + PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle) +{ + UNIMPLEMENTED + return 0; +} +*/ + +BOOL +APIENTRY +DllMain(HANDLE hModule, DWORD ulreason, LPVOID lpReserved) +{ + switch (ulreason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: branches/reactx/reactos/dll/directx/ksuser/ksuser.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/ksuser/ksuser.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.def (added) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.def Thu Nov 8 23:08:42 2007 @@ -1,0 +1,7 @@ +LIBRARY d3d8 +EXPORTS + KsCreateAllocator@12 + KsCreateClock@12 + KsCreatePin@16 + KsCreateTopologyNode@16 + Propchange: branches/reactx/reactos/dll/directx/ksuser/ksuser.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.h (added) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.h Thu Nov 8 23:08:42 2007 @@ -1,0 +1,3 @@ +#include <windows.h> + + Propchange: branches/reactx/reactos/dll/directx/ksuser/ksuser.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/ksuser/ksuser.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.rbuild (added) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.rbuild Thu Nov 8 23:08:42 2007 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ksuser" type="win32dll" installbase="system32" installname="ksuser.dll" allowwarnings="true"> + <importlibrary definition="ksuser.def" /> + <library>kernel32</library> + <library>ntdll</library> + <file>ksuser.c</file> + <file>ksuser.rc</file> +</module> Propchange: branches/reactx/reactos/dll/directx/ksuser/ksuser.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/ksuser/ksuser.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.rc (added) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.rc Thu Nov 8 23:08:42 2007 @@ -1,0 +1,10 @@ + + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "User CSA Library\0" +#define REACTOS_STR_INTERNAL_NAME "ksuser.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ksuser.dll\0" + +#include <reactos/reactx.h> + +#include <reactos/version.rc> Propchange: branches/reactx/reactos/dll/directx/ksuser/ksuser.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 30276: add __REACTOS__ specific code to get around the fact that janderwald isn't working hard enough on shell32 ; )
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 19:47:28 2007 New Revision: 30276 URL: http://svn.reactos.org/svn/reactos?rev=30276&view=rev Log: add __REACTOS__ specific code to get around the fact that janderwald isn't working hard enough on shell32 ;) Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/settings.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 19:47:28 2007 @@ -225,6 +225,7 @@ break; case IDC_SAVE: + SaveAllSettings(pInfo); SaveRdpSettingsToFile(NULL, pInfo->pRdpSettings); break; } Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Thu Nov 8 19:47:28 2007 @@ -372,8 +372,8 @@ bWrite ? GENERIC_WRITE : GENERIC_READ, 0, NULL, - bWrite ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, + bWrite ? OPEN_EXISTING: CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_HIDDEN, NULL); } @@ -400,6 +400,7 @@ /* use default file */ if (lpFile == NULL) { +#ifndef __REACTOS__ HRESULT hr; LPITEMIDLIST lpidl= NULL; @@ -417,6 +418,10 @@ CoTaskMemFree(lpidl); } } +#else + wcscpy(pszPath, L"C:\\Default.rdp"); + lpFile = pszPath; +#endif } if (lpFile) @@ -447,6 +452,7 @@ /* use default file */ if (lpFile == NULL) { +#ifndef __REACTOS__ HRESULT hr; LPITEMIDLIST lpidl= NULL; @@ -464,6 +470,10 @@ CoTaskMemFree(lpidl); } } +#else + wcscpy(pszPath, L"C:\\Default.rdp"); + lpFile = pszPath; +#endif } if (lpFile)

1 0

[greatlrd] 30275: fix wdmguid.a (it is now compatible with ddk version 3790.1830)
by greatlrd＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: greatlrd Date: Thu Nov 8 19:19:08 2007 New Revision: 30275 URL: http://svn.reactos.org/svn/reactos?rev=30275&view=rev Log: fix wdmguid.a (it is now compatible with ddk version 3790.1830) Modified: branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c Modified: branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/wdmguid/… ============================================================================== --- branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c (original) +++ branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c Thu Nov 8 19:19:08 2007 @@ -4,29 +4,61 @@ #include <guiddef.h> DEFINE_GUID(GUID_LEGACY_DEVICE_DETECTION_STANDARD, 0x50FEB0DE, 0x596A, 0x11D2, 0xA5, 0xB8, 0x00, 0x00, 0xF8, 0x1A, 0x46, 0x19); + +DEFINE_GUID(GUID_ACPI_CMOS_INTERFACE_STANDARD, 0x3A8D0384, 0x6505, 0x40CA, 0xBC, 0x39, 0x56, 0xC1, 0x5F, 0x8C, 0x5F, 0xED); +DEFINE_GUID(GUID_ACPI_INTERFACE_STANDARD, 0xB091A08A, 0xBA97, 0x11D0, 0xBD, 0x14, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_ACPI_PORT_RANGES_INTERFACE_STANDARD, 0xF14F609B, 0xCBBD, 0x4957, 0xA6, 0x74, 0xBC, 0x00, 0x21, 0x3F, 0x1C, 0x97); DEFINE_GUID(GUID_ACPI_REGS_INTERFACE_STANDARD, 0x06141966, 0x7245, 0x6369, 0x46, 0x2E, 0x4E, 0x65, 0x6C, 0x73, 0x6F, 0x6E); -DEFINE_GUID(GUID_PCMCIA_BUS_INTERFACE_STANDARD, 0x76173AF0, 0xC504, 0x11D1, 0x94, 0x7F, 0x00, 0xC0, 0x4F, 0xB9, 0x60, 0xEE); -DEFINE_GUID(GUID_INT_ROUTE_INTERFACE_STANDARD, 0x70941BF4, 0x0073, 0x11D1, 0xA0, 0x9E, 0x00, 0xC0, 0x4F, 0xC3, 0x40, 0xB1); -DEFINE_GUID(GUID_ACPI_INTERFACE_STANDARD, 0xB091A08A, 0xBA97, 0x11D0, 0xBD, 0x14, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); -DEFINE_GUID(GUID_TRANSLATOR_INTERFACE_STANDARD, 0x6C154A92, 0xAACF, 0x11D0, 0x8D, 0x2A, 0x00, 0xA0, 0xC9, 0x06, 0xB2, 0x44); + +DEFINE_GUID(GUID_AGP_TARGET_BUS_INTERFACE_STANDARD, 0xB15CFCE8, 0x06D1, 0x4D37, 0x9D, 0x4C, 0xBE, 0xDD, 0xE0, 0xC2, 0xA6, 0xFF); + DEFINE_GUID(GUID_ARBITER_INTERFACE_STANDARD, 0xE644F185, 0x8C0E, 0x11D0, 0xBE, 0xCF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); -DEFINE_GUID(GUID_AGP_TARGET_BUS_INTERFACE_STANDARD, 0xB15CFCE8, 0x06D1, 0x4D37, 0x9D, 0x4C, 0xBE, 0xDD, 0xE0, 0xC2, 0xA6, 0xFF); -DEFINE_GUID(GUID_PCI_BUS_INTERFACE_STANDARD, 0x496B8281, 0x6F25, 0x11D0, 0xBE, 0xAF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); + DEFINE_GUID(GUID_BUS_INTERFACE_STANDARD, 0x496B8280, 0x6F25, 0x11D0, 0xBE, 0xAF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); -DEFINE_GUID(GUID_PNP_POWER_NOTIFICATION, 0xC2CF0660, 0xEB7A, 0x11D1, 0xBD, 0x7F, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); -DEFINE_GUID(GUID_PNP_CUSTOM_NOTIFICATION, 0xACA73F8E, 0x8D23, 0x11D1, 0xAC, 0x7D, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); -DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_COMPLETE, 0xCB3A4008, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_CANCELLED, 0xCB3A4007, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_TARGET_DEVICE_QUERY_REMOVE, 0xCB3A4006, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_BUS_TYPE_1394, 0xF74E73EB, 0x9AC5, 0x45EB, 0xBE, 0x4D, 0x77, 0x2C, 0xC7, 0x1D, 0xDF, 0xB3); +DEFINE_GUID(GUID_BUS_TYPE_AVC, 0xC06FF265, 0xAE09, 0x48F0, 0x81, 0x2C, 0x16, 0x75, 0x3D, 0x7C, 0xBA, 0x83); +DEFINE_GUID(GUID_BUS_TYPE_DOT4PRT, 0x441EE001, 0x4342, 0x11D5, 0xA1, 0x84, 0x00, 0xC0, 0x4F, 0x60, 0x52, 0x4D); +DEFINE_GUID(GUID_BUS_TYPE_EISA, 0xDDC35509, 0xF3FC, 0x11D0, 0xA5, 0x37, 0x00, 0x00, 0xF8, 0x75, 0x3E, 0xD1); +DEFINE_GUID(GUID_BUS_TYPE_HID, 0xEEAF37D0, 0x1963, 0x47C4, 0xAA, 0x48, 0x72, 0x47, 0x6D, 0xB7, 0xCF, 0x49); +DEFINE_GUID(GUID_BUS_TYPE_INTERNAL, 0x1530EA73, 0x086B, 0x11D1, 0xA0, 0x9F, 0x00, 0xC0, 0x4F, 0xC3, 0x40, 0xB1); +DEFINE_GUID(GUID_BUS_TYPE_IRDA, 0x7AE17DC1, 0xC944, 0x44D6, 0x88, 0x1F, 0x4C, 0x2E, 0x61, 0x05, 0x3B, 0xC1); +DEFINE_GUID(GUID_BUS_TYPE_ISAPNP, 0xE676F854, 0xD87D, 0x11D0, 0x92, 0xB2, 0x00, 0xA0, 0xC9, 0x05, 0x5F, 0xC5); +DEFINE_GUID(GUID_BUS_TYPE_LPTENUM, 0xC4CA1000, 0x2DDC, 0x11D5, 0xA1, 0x7A, 0x00, 0xC0, 0x4F, 0x60, 0x52, 0x4D); +DEFINE_GUID(GUID_BUS_TYPE_MCA, 0x1C75997A, 0xDC33, 0x11D0, 0x92, 0xB2, 0x00, 0xA0, 0xC9, 0x05, 0x5F, 0xC5); +DEFINE_GUID(GUID_BUS_TYPE_PCI, 0xC8EBDFB0, 0xB510, 0x11D0, 0x80, 0xE5, 0x00, 0xA0, 0xC9, 0x25, 0x42, 0xE3); +DEFINE_GUID(GUID_BUS_TYPE_PCMCIA, 0x09343630, 0xAF9F, 0x11D0, 0x92, 0xE9, 0x00, 0x00, 0xF8, 0x1E, 0x1B, 0x30); +DEFINE_GUID(GUID_BUS_TYPE_SD, 0xE700CC04, 0x4036, 0x4E89, 0x95, 0x79, 0x89, 0xEB, 0xF4, 0x5F, 0x00, 0xCD); +DEFINE_GUID(GUID_BUS_TYPE_SERENUM, 0x77114A87, 0x8944, 0x11D1, 0xBD, 0x90, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0x2D); +DEFINE_GUID(GUID_BUS_TYPE_USB, 0x9D7DEBBC, 0xC85D, 0x11D1, 0x9E, 0xB4, 0x00, 0x60, 0x08, 0xC3, 0xA1, 0x9A); +DEFINE_GUID(GUID_BUS_TYPE_USBPRINT, 0x441EE000, 0x4342, 0x11D5, 0xA1, 0x84, 0x00, 0xC0, 0x4F, 0x60, 0x52, 0x4D); + +DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); + +DEFINE_GUID(GUID_HWPROFILE_CHANGE_CANCELLED, 0xCB3A4002, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); DEFINE_GUID(GUID_HWPROFILE_CHANGE_COMPLETE, 0xCB3A4003, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_HWPROFILE_CHANGE_CANCELLED, 0xCB3A4002, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); DEFINE_GUID(GUID_HWPROFILE_QUERY_CHANGE, 0xCB3A4001, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_INT_ROUTE_INTERFACE_STANDARD, 0x70941BF4, 0x0073, 0x11D1, 0xA0, 0x9E, 0x00, 0xC0, 0x4F, 0xC3, 0x40, 0xB1); -/* FIXME: shouldn't go there! */ -DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, - 0x4AFA3D53L, 0x74A7, 0x11d0, 0xbe, 0x5e, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_MF_ENUMERATION_INTERFACE, 0xAEB895F0, 0x5586, 0x11D1, 0x8D, 0x84, 0x00, 0xA0, 0xC9, 0x06, 0xB2, 0x44); + +DEFINE_GUID(GUID_PCI_BUS_INTERFACE_STANDARD, 0x496B8281, 0x6F25, 0x11D0, 0xBE, 0xAF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_PCI_DEVICE_PRESENT_INTERFACE, 0xD1B82C26, 0xBF49, 0x45EF, 0xB2, 0x16, 0x71, 0xCB, 0xD7, 0x88, 0x9B, 0x57); + +DEFINE_GUID(GUID_PCMCIA_BUS_INTERFACE_STANDARD, 0x76173AF0, 0xC504, 0x11D1, 0x94, 0x7F, 0x00, 0xC0, 0x4F, 0xB9, 0x60, 0xEE); + +DEFINE_GUID(GUID_PNP_CUSTOM_NOTIFICATION, 0xACA73F8E, 0x8D23, 0x11D1, 0xAC, 0x7D, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); +DEFINE_GUID(GUID_PNP_LOCATION_INTERFACE, 0x70211B0E, 0x0AFB, 0x47DB, 0xAF, 0xC1, 0x41, 0x0B, 0xF8, 0x42, 0x49, 0x7A); +DEFINE_GUID(GUID_PNP_POWER_NOTIFICATION, 0xC2CF0660, 0xEB7A, 0x11D1, 0xBD, 0x7F, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); + +DEFINE_GUID(GUID_POWER_DEVICE_ENABLE, 0x827C0A6F, 0xFEB0, 0x11D0, 0xBD, 0x26, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_POWER_DEVICE_TIMEOUTS, 0xA45DA735, 0xFEB0, 0x11D0, 0xBD, 0x26, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_POWER_DEVICE_WAKE_ENABLE, 0xA9546A82, 0xFEB0, 0x11D0, 0xBD, 0x26, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); + +DEFINE_GUID(GUID_TARGET_DEVICE_QUERY_REMOVE, 0xCB3A4006, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_CANCELLED, 0xCB3A4007, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_COMPLETE, 0xCB3A4008, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_TRANSLATOR_INTERFACE_STANDARD, 0x6C154A92, 0xAACF, 0x11D0, 0x8D, 0x2A, 0x00, 0xA0, 0xC9, 0x06, 0xB2, 0x44); /* EOF */

1 0

[gedmurphy] 30274: - save all settings to memory when the connect button is hit - add some slightly hackish code to get the thing working. - you should now be able to connect to Windows machines using your choice of IP address, resolution and bpp.
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 18:29:23 2007 New Revision: 30274 URL: http://svn.reactos.org/svn/reactos?rev=30274&view=rev Log: - save all settings to memory when the connect button is hit - add some slightly hackish code to get the thing working. - you should now be able to connect to Windows machines using your choice of IP address, resolution and bpp. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/mstsc.rbuild trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/settings.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 18:29:23 2007 @@ -20,63 +20,7 @@ #include <precomp.h> - #define MAX_KEY_NAME 255 - -/* As slider control can't contain user data, we have to keep an - * array of RESOLUTION_INFO to have our own associated data. - */ -typedef struct _RESOLUTION_INFO -{ - DWORD dmPelsWidth; - DWORD dmPelsHeight; -} RESOLUTION_INFO, *PRESOLUTION_INFO; - -typedef struct _SETTINGS_ENTRY -{ - struct _SETTINGS_ENTRY *Blink; - struct _SETTINGS_ENTRY *Flink; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; -} SETTINGS_ENTRY, *PSETTINGS_ENTRY; - -typedef struct _DISPLAY_DEVICE_ENTRY -{ - struct _DISPLAY_DEVICE_ENTRY *Flink; - LPWSTR DeviceDescription; - LPWSTR DeviceName; - LPWSTR DeviceKey; - LPWSTR DeviceID; - DWORD DeviceStateFlags; - PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ - DWORD SettingsCount; - PRESOLUTION_INFO Resolutions; - DWORD ResolutionsCount; - PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ - SETTINGS_ENTRY InitialSettings; -} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; - -typedef struct _INFO -{ - PRDPSETTINGS pRdpSettings; - PDISPLAY_DEVICE_ENTRY DisplayDeviceList; - PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; - HWND hSelf; - HWND hTab; - HWND hGeneralPage; - HWND hDisplayPage; - HBITMAP hHeader; - BITMAP headerbitmap; - HICON hMstscSm; - HICON hMstscLg; - HICON hLogon; - HICON hConn; - HICON hRemote; - HICON hColor; - HBITMAP hSpectrum; - BITMAP bitmap; -} INFO, *PINFO; HINSTANCE hInst; @@ -560,15 +504,6 @@ WM_SETTEXT, 0, (LPARAM)Buffer); - - /* save new settings */ - SetIntegerToSettings(pInfo->pRdpSettings, - L"desktopwidth", - pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth); - SetIntegerToSettings(pInfo->pRdpSettings, - L"desktopheight", - pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight); - } @@ -1039,6 +974,11 @@ { if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { + if (LOWORD(wParam) == IDOK ) + { + SaveAllSettings(pInfo); + } + if (pInfo) { HeapFree(GetProcessHeap(), Modified: trunk/reactos/base/applications/mstsc/mstsc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc.rbuild (original) +++ trunk/reactos/base/applications/mstsc/mstsc.rbuild Thu Nov 8 18:29:23 2007 @@ -26,8 +26,8 @@ <file>pstcache.c</file> <file>rdp5.c</file> <file>rdp.c</file> - <file>rdpfile.c</file> <file>secure.c</file> + <file>settings.c</file> <file>ssl_calls.c</file> <file>tcp.c</file> <file>uimain.c</file> Modified: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Thu Nov 8 18:29:23 2007 @@ -48,7 +48,7 @@ BufferSecurityCheck="false" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CallingConvention="0" @@ -605,11 +605,11 @@ > </File> <File - RelativePath=".\rdpfile.c" - > - </File> - <File RelativePath=".\secure.c" + > + </File> + <File + RelativePath=".\settings.c" > </File> <File @@ -633,10 +633,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - <File - RelativePath=".\todo.h" - > - </File> </Filter> <Filter Name="Resource Files" Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h (original) +++ trunk/reactos/base/applications/mstsc/precomp.h Thu Nov 8 18:29:23 2007 @@ -17,6 +17,8 @@ #define MAXKEY 256 #define MAXVALUE 256 +extern LPWSTR lpSettings[]; + typedef struct _SETTINGS { WCHAR Key[MAXKEY]; @@ -33,6 +35,61 @@ INT NumSettings; } RDPSETTINGS, *PRDPSETTINGS; +/* As slider control can't contain user data, we have to keep an + * array of RESOLUTION_INFO to have our own associated data. + */ +typedef struct _RESOLUTION_INFO +{ + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} RESOLUTION_INFO, *PRESOLUTION_INFO; + +typedef struct _SETTINGS_ENTRY +{ + struct _SETTINGS_ENTRY *Blink; + struct _SETTINGS_ENTRY *Flink; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} SETTINGS_ENTRY, *PSETTINGS_ENTRY; + +typedef struct _DISPLAY_DEVICE_ENTRY +{ + struct _DISPLAY_DEVICE_ENTRY *Flink; + LPWSTR DeviceDescription; + LPWSTR DeviceName; + LPWSTR DeviceKey; + LPWSTR DeviceID; + DWORD DeviceStateFlags; + PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ + DWORD SettingsCount; + PRESOLUTION_INFO Resolutions; + DWORD ResolutionsCount; + PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ + SETTINGS_ENTRY InitialSettings; +} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; + +typedef struct _INFO +{ + PRDPSETTINGS pRdpSettings; + PDISPLAY_DEVICE_ENTRY DisplayDeviceList; + PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; + HWND hSelf; + HWND hTab; + HWND hGeneralPage; + HWND hDisplayPage; + HBITMAP hHeader; + BITMAP headerbitmap; + HICON hMstscSm; + HICON hMstscLg; + HICON hLogon; + HICON hConn; + HICON hRemote; + HICON hColor; + HBITMAP hSpectrum; + BITMAP bitmap; +} INFO, *PINFO; + BOOL OpenRDPConnectDialog(HINSTANCE hInstance, PRDPSETTINGS pRdpSettings); PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); @@ -40,6 +97,7 @@ LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); BOOL SetIntegerToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, INT Value); BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue); +VOID SaveAllSettings(PINFO pInfo); #endif /* __TODO_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Thu Nov 8 18:29:23 2007 @@ -2,7 +2,7 @@ #include <precomp.h> #define NUM_SETTINGS 6 -LPWSTR lpSettings[NUM_SETTINGS] = +LPWSTR lpSettings[NUM_SETTINGS] = { L"screen mode id", L"desktopwidth", @@ -12,6 +12,61 @@ L"compression", }; +VOID +SaveAllSettings(PINFO pInfo) +{ + INT ret; + WCHAR szKey[MAXKEY]; + WCHAR szValue[MAXVALUE]; + + /* server */ + if (GetDlgItemText(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + szValue, + MAXVALUE)) + { + SetStringToSettings(pInfo->pRdpSettings, + L"full address", + szValue); + } + + /* resolution */ + ret = SendDlgItemMessage(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_GETPOS, + 0, + 0); + if (ret != -1) + { + SetIntegerToSettings(pInfo->pRdpSettings, + L"desktopwidth", + pInfo->DisplayDeviceList->Resolutions[ret].dmPelsWidth); + SetIntegerToSettings(pInfo->pRdpSettings, + L"desktopheight", + pInfo->DisplayDeviceList->Resolutions[ret].dmPelsHeight); + } + + /* bpp */ + ret = SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETCURSEL, + 0, + 0); + if (ret != CB_ERR) + { + ret = SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETITEMDATA, + ret, + 0); + if (ret != CB_ERR) + { + SetIntegerToSettings(pInfo->pRdpSettings, + L"session bpp", + ret); + } + } +} BOOL Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Thu Nov 8 18:29:23 2007 @@ -20,6 +20,10 @@ #include <winsock2.h> /* winsock2.h first */ #include <precomp.h> + +//FIXME: remove eventually +#define _UNICODE +#include <tchar.h> extern char g_username[]; @@ -69,6 +73,21 @@ int i; len = strlen(size1); + for (i = 0; i < len; i++) + { + sizex[i] = size1[i]; + } + sizex[len] = 0; +} + +/*****************************************************************************/ +static void +uni_to_str(char * sizex, TCHAR * size1) +{ + int len; + int i; + + len = _tcslen(size1); for (i = 0; i < len; i++) { sizex[i] = size1[i]; @@ -1290,13 +1309,18 @@ if (OpenRDPConnectDialog(hInstance, pRdpSettings)) { - strcpy(g_servername, "192.168.40.50"); + char szValue[MAXVALUE]; + + uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address")); + + strcpy(g_servername, szValue); //g_port = 3389; - strcpy(g_username, "buildbot"); - strcpy(g_password, "P4ssw0rd"); - g_server_depth = 16; - g_width = 800; - g_height = 600; + strcpy(g_username, ""); + strcpy(g_password, ""); + g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); + if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */ + g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth"); + g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight"); g_screen_width = GetSystemMetrics(SM_CXSCREEN); g_screen_height = GetSystemMetrics(SM_CYSCREEN); g_xoff = GetSystemMetrics(SM_CXEDGE) * 2;

1 0

[gedmurphy] 30273: rename rdpfile.c to settings.c
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 17:34:13 2007 New Revision: 30273 URL: http://svn.reactos.org/svn/reactos?rev=30273&view=rev Log: rename rdpfile.c to settings.c Added: trunk/reactos/base/applications/mstsc/settings.c - copied unchanged from r30271, trunk/reactos/base/applications/mstsc/rdpfile.c Removed: trunk/reactos/base/applications/mstsc/rdpfile.c Removed: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c (removed) @@ -1,442 +1,0 @@ - -#include <precomp.h> - -#define NUM_SETTINGS 6 -LPWSTR lpSettings[NUM_SETTINGS] = -{ - L"screen mode id", - L"desktopwidth", - L"desktopheight", - L"session bpp", - L"full address", - L"compression", -}; - - - -BOOL -SetIntegerToSettings(PRDPSETTINGS pRdpSettings, - LPWSTR lpKey, - INT Value) -{ - BOOL bRet = FALSE; - - if (pRdpSettings) - { - INT i; - - for (i = 0; i < pRdpSettings->NumSettings; i++) - { - if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) - { - if (pRdpSettings->pSettings[i].Type == L'i') - { - pRdpSettings->pSettings[i].Value.i = Value; - bRet = TRUE; - break; - } - } - } - } - - return bRet; -} - - -BOOL -SetStringToSettings(PRDPSETTINGS pRdpSettings, - LPWSTR lpKey, - LPWSTR lpValue) -{ - BOOL bRet = FALSE; - - if (pRdpSettings) - { - INT i; - - for (i = 0; i < pRdpSettings->NumSettings; i++) - { - if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) - { - if (pRdpSettings->pSettings[i].Type == L's') - { - wcscpy(pRdpSettings->pSettings[i].Value.s, lpValue); - bRet = TRUE; - break; - } - } - } - } - - return bRet; -} - - -INT -GetIntegerFromSettings(PRDPSETTINGS pRdpSettings, - LPWSTR lpKey) -{ - INT Value = -1; - - if (pRdpSettings) - { - INT i; - - for (i = 0; i < pRdpSettings->NumSettings; i++) - { - if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) - { - if (pRdpSettings->pSettings[i].Type == L'i') - { - Value = pRdpSettings->pSettings[i].Value.i; - break; - } - } - } - } - - return Value; -} - - -LPWSTR -GetStringFromSettings(PRDPSETTINGS pRdpSettings, - LPWSTR lpKey) -{ - LPWSTR lpValue = NULL; - - if (pRdpSettings) - { - INT i; - - for (i = 0; i < pRdpSettings->NumSettings; i++) - { - if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) - { - if (pRdpSettings->pSettings[i].Type == L's') - { - lpValue = pRdpSettings->pSettings[i].Value.s; - break; - } - } - } - } - - return lpValue; -} - - -static BOOL -WriteRdpFile(HANDLE hFile, - PRDPSETTINGS pRdpSettings) -{ - WCHAR line[MAXKEY + MAXVALUE + 4]; - DWORD BytesToWrite, BytesWritten; - BOOL bRet; - INT i, k; - - for (i = 0; i < pRdpSettings->NumSettings; i++) - { - /* only write out values in the lpSettings struct */ - for (k = 0; k < NUM_SETTINGS; k++) - { - if (wcscmp(lpSettings[k], pRdpSettings->pSettings[i].Key) == 0) - { - if (pRdpSettings->pSettings[i].Type == L'i') - { - _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:i:%d\r\n", - pRdpSettings->pSettings[i].Key, - pRdpSettings->pSettings[i].Value.i); - } - else - { - _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:s:%s\r\n", - pRdpSettings->pSettings[i].Key, - pRdpSettings->pSettings[i].Value.s); - } - - BytesToWrite = wcslen(line) * sizeof(WCHAR); - - bRet = WriteFile(hFile, - line, - BytesToWrite, - &BytesWritten, - NULL); - if (!bRet || BytesWritten == 0) - return FALSE; - } - } - } - - return TRUE; -} - - -static VOID -ParseSettings(PRDPSETTINGS pRdpSettings, - LPWSTR lpBuffer) -{ - LPWSTR lpStr = lpBuffer; - WCHAR lpKey[MAXKEY]; - WCHAR lpValue[MAXVALUE]; - INT NumSettings = 0; - INT s; - - if (lpStr) - { - /* get number of settings */ - while (*lpStr) - { - if (*lpStr == L'\n') - NumSettings++; - lpStr++; - } - lpStr = lpBuffer; - - if (NumSettings == 0) - return; - - /* move past unicode byte order */ - if (lpStr[0] == 0xFEFF || lpStr[0] == 0xFFFE) - lpStr += 1; - - pRdpSettings->pSettings = HeapAlloc(GetProcessHeap(), - 0, - sizeof(SETTINGS) * NumSettings); - if (pRdpSettings->pSettings) - { - pRdpSettings->NumSettings = NumSettings; - - for (s = 0; s < NumSettings; s++) - { - INT i = 0, k; - - /* get a key */ - while (*lpStr != L':') - { - lpKey[i++] = *lpStr++; - } - lpKey[i] = 0; - - for (k = 0; k < NUM_SETTINGS; k++) - { - if (wcscmp(lpSettings[k], lpKey) == 0) - { - wcscpy(pRdpSettings->pSettings[s].Key, lpKey); - - /* get the type */ - lpStr++; - if (*lpStr == L'i' || *lpStr == L's') - pRdpSettings->pSettings[s].Type = *lpStr; - - lpStr += 2; - - /* get a value */ - i = 0; - while (*lpStr != L'\r') - { - lpValue[i++] = *lpStr++; - } - lpValue[i] = 0; - - if (pRdpSettings->pSettings[s].Type == L'i') - { - pRdpSettings->pSettings[s].Value.i = _wtoi(lpValue); - } - else if (pRdpSettings->pSettings[s].Type == L's') - { - wcscpy(pRdpSettings->pSettings[s].Value.s, lpValue); - } - else - pRdpSettings->pSettings[s].Type = 0; - } - } - - /* move onto next setting */ - while (*lpStr != L'\n') - { - lpStr++; - } - lpStr++; - } - } - } -} - - -static LPWSTR -ReadRdpFile(HANDLE hFile) -{ - LPWSTR lpBuffer = NULL; - DWORD BytesToRead, BytesRead; - BOOL bRes; - - if (hFile) - { - BytesToRead = GetFileSize(hFile, NULL); - if (BytesToRead) - { - lpBuffer = HeapAlloc(GetProcessHeap(), - 0, - BytesToRead + 2); - if (lpBuffer) - { - bRes = ReadFile(hFile, - lpBuffer, - BytesToRead, - &BytesRead, - NULL); - if (bRes) - { - lpBuffer[BytesRead / 2] = 0; - } - else - { - HeapFree(GetProcessHeap(), - 0, - lpBuffer); - - lpBuffer = NULL; - } - } - } - } - - return lpBuffer; -} - - -static HANDLE -OpenRdpFile(LPWSTR path, BOOL bWrite) -{ - HANDLE hFile = NULL; - - if (path) - { - hFile = CreateFileW(path, - bWrite ? GENERIC_WRITE : GENERIC_READ, - 0, - NULL, - bWrite ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - } - - return hFile; -} - - -static VOID -CloseRdpFile(HANDLE hFile) -{ - if (hFile) - CloseHandle(hFile); -} - - -BOOL -SaveRdpSettingsToFile(LPWSTR lpFile, - PRDPSETTINGS pRdpSettings) -{ - WCHAR pszPath[MAX_PATH]; - HANDLE hFile; - BOOL bRet = FALSE; - - /* use default file */ - if (lpFile == NULL) - { - HRESULT hr; - LPITEMIDLIST lpidl= NULL; - - hr = SHGetFolderLocation(NULL, - CSIDL_PERSONAL, - NULL, - 0, - &lpidl); - if (hr == S_OK) - { - if (SHGetPathFromIDListW(lpidl, pszPath)) - { - wcscat(pszPath, L"\\Default.rdp"); - lpFile = pszPath; - CoTaskMemFree(lpidl); - } - } - } - - if (lpFile) - { - hFile = OpenRdpFile(lpFile, TRUE); - if (hFile) - { - if (WriteRdpFile(hFile, pRdpSettings)) - { - bRet = TRUE; - } - - CloseRdpFile(hFile); - } - } - - return bRet; -} - - -PRDPSETTINGS -LoadRdpSettingsFromFile(LPWSTR lpFile) -{ - PRDPSETTINGS pRdpSettings = NULL; - WCHAR pszPath[MAX_PATH]; - HANDLE hFile; - - /* use default file */ - if (lpFile == NULL) - { - HRESULT hr; - LPITEMIDLIST lpidl= NULL; - - hr = SHGetFolderLocation(NULL, - CSIDL_PERSONAL, - NULL, - 0, - &lpidl); - if (hr == S_OK) - { - if (SHGetPathFromIDListW(lpidl, pszPath)) - { - wcscat(pszPath, L"\\Default.rdp"); - lpFile = pszPath; - CoTaskMemFree(lpidl); - } - } - } - - if (lpFile) - { - LPWSTR lpBuffer = NULL; - - pRdpSettings = HeapAlloc(GetProcessHeap(), - 0, - sizeof(RDPSETTINGS)); - if (pRdpSettings) - { - hFile = OpenRdpFile(lpFile, FALSE); - if (hFile) - { - lpBuffer = ReadRdpFile(hFile); - if (lpBuffer) - { - ParseSettings(pRdpSettings, lpBuffer); - - HeapFree(GetProcessHeap(), - 0, - lpBuffer); - } - - CloseRdpFile(hFile); - } - } - } - - return pRdpSettings; -}

1 0

[tkreuzer] 30272: rename NtGdiGetClipBox to NtGdiGetAppClipBox
by tkreuzer＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: tkreuzer Date: Thu Nov 8 17:29:31 2007 New Revision: 30272 URL: http://svn.reactos.org/svn/reactos?rev=30272&view=rev Log: rename NtGdiGetClipBox to NtGdiGetAppClipBox Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Nov 8 17:29:31 2007 @@ -2399,7 +2399,7 @@ LPRECT lprc) { /* FIXME some part need be done in user mode */ - return NtGdiGetClipBox(hdc, lprc); + return NtGdiGetAppClipBox(hdc, lprc); } /* Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Nov 8 17:29:31 2007 @@ -210,14 +210,6 @@ UINT LastChar, LPABC abc); -/* Use NtGdiGetAppClipBox. */ -int -STDCALL -NtGdiGetClipBox ( - HDC hDC, - LPRECT rc - ); - /* Use NtGdiGetColorSpaceforBitmap. */ HCOLORSPACE STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Thu Nov 8 17:29:31 2007 @@ -196,10 +196,10 @@ return retval; } -int STDCALL NtGdiGetClipBox(HDC hDC, - LPRECT rc) -{ - int Ret; +INT STDCALL +NtGdiGetAppClipBox(HDC hDC, LPRECT rc) +{ + INT Ret; NTSTATUS Status = STATUS_SUCCESS; RECT Saferect; @@ -220,7 +220,6 @@ if(!NT_SUCCESS(Status)) { - SetLastNtError(Status); return ERROR; } Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Thu Nov 8 17:29:31 2007 @@ -2465,19 +2465,6 @@ /* * @unimplemented */ -INT -STDCALL -NtGdiGetAppClipBox( - IN HDC hdc, - OUT LPRECT prc) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ DWORD STDCALL NtGdiGetCharacterPlacementW( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Nov 8 17:29:31 2007 @@ -746,7 +746,6 @@ NtGdiGetAspectRatioFilterEx 2 NtGdiGetBkColor 1 NtGdiGetBkMode 1 -NtGdiGetClipBox 2 NtGdiGetColorSpace 1 NtGdiGetCurrentPositionEx 2 NtGdiGetEnhMetaFile 1

1 0

[gedmurphy] 30271: move to a precompiled header
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 16:24:13 2007 New Revision: 30271 URL: http://svn.reactos.org/svn/reactos?rev=30271&view=rev Log: move to a precompiled header Added: trunk/reactos/base/applications/mstsc/precomp.h - copied unchanged from r30269, trunk/reactos/base/applications/mstsc/todo.h Removed: trunk/reactos/base/applications/mstsc/todo.h Modified: trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/channels.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/iso.c trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/mcs.c trunk/reactos/base/applications/mstsc/mppc.c trunk/reactos/base/applications/mstsc/mstsc.rbuild trunk/reactos/base/applications/mstsc/orders.c trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/rdp5.c trunk/reactos/base/applications/mstsc/rdpfile.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/tcp.c trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… ============================================================================== --- trunk/reactos/base/applications/mstsc/bitmap.c (original) +++ trunk/reactos/base/applications/mstsc/bitmap.c Thu Nov 8 16:24:13 2007 @@ -28,7 +28,7 @@ /* indent is confused by this file */ /* *INDENT-OFF* */ -#include "todo.h" +#include <precomp.h> #define CVAL(p) (*(p++)) #ifdef NEED_ALIGN Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… ============================================================================== --- trunk/reactos/base/applications/mstsc/bsops.c (original) +++ trunk/reactos/base/applications/mstsc/bsops.c Thu Nov 8 16:24:13 2007 @@ -21,7 +21,7 @@ //#include <stdlib.h> //#include <string.h> //#include "bsops.h" -#include "todo.h" +#include <precomp.h> /* globals */ static char * g_bs = 0; Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… ============================================================================== --- trunk/reactos/base/applications/mstsc/cache.c (original) +++ trunk/reactos/base/applications/mstsc/cache.c Thu Nov 8 16:24:13 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> /* BITMAP CACHE */ extern int g_pstcache_fd[]; Modified: trunk/reactos/base/applications/mstsc/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ch… ============================================================================== --- trunk/reactos/base/applications/mstsc/channels.c (original) +++ trunk/reactos/base/applications/mstsc/channels.c Thu Nov 8 16:24:13 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> #define MAX_CHANNELS 6 #define CHANNEL_CHUNK_LENGTH 1600 Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> #define MAX_KEY_NAME 255 @@ -186,11 +186,11 @@ LPWSTR lpText; SetWindowPos(pInfo->hGeneralPage, - NULL, - 15, - 110, - 0, - 0, + NULL, + 13, + 110, + 0, + 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); pInfo->hLogon = LoadImageW(hInst, @@ -717,7 +717,7 @@ SetWindowPos(pInfo->hDisplayPage, NULL, - 15, + 13, 110, 0, 0, Modified: trunk/reactos/base/applications/mstsc/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/is… ============================================================================== --- trunk/reactos/base/applications/mstsc/iso.c (original) +++ trunk/reactos/base/applications/mstsc/iso.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> /* Send a self-contained ISO PDU */ static void Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… ============================================================================== --- trunk/reactos/base/applications/mstsc/licence.c (original) +++ trunk/reactos/base/applications/mstsc/licence.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> //#include <openssl/rc4.h> void * Modified: trunk/reactos/base/applications/mstsc/mcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mc… ============================================================================== --- trunk/reactos/base/applications/mstsc/mcs.c (original) +++ trunk/reactos/base/applications/mstsc/mcs.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> uint16 g_mcs_userid; extern VCHANNEL g_channels[]; Modified: trunk/reactos/base/applications/mstsc/mppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mp… ============================================================================== --- trunk/reactos/base/applications/mstsc/mppc.c (original) +++ trunk/reactos/base/applications/mstsc/mppc.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> /* mppc decompression */ /* http://www.faqs.org/rfcs/rfc2118.html */ Modified: trunk/reactos/base/applications/mstsc/mstsc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc.rbuild (original) +++ trunk/reactos/base/applications/mstsc/mstsc.rbuild Thu Nov 8 16:24:13 2007 @@ -34,4 +34,5 @@ <file>win32.c</file> </compilationunit> <file>rdc.rc</file> + <pch>precomp.h</pch> </module> Modified: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… ============================================================================== --- trunk/reactos/base/applications/mstsc/orders.c (original) +++ trunk/reactos/base/applications/mstsc/orders.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> extern uint8 *g_next_packet; Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… ============================================================================== --- trunk/reactos/base/applications/mstsc/pstcache.c (original) +++ trunk/reactos/base/applications/mstsc/pstcache.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> #define MAX_CELL_SIZE 0x1000 /* pixels */ Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c (original) +++ trunk/reactos/base/applications/mstsc/rdp.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> extern uint16 g_mcs_userid; Modified: trunk/reactos/base/applications/mstsc/rdp5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp5.c (original) +++ trunk/reactos/base/applications/mstsc/rdp5.c Thu Nov 8 16:24:13 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> extern uint8 *g_next_packet; Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Thu Nov 8 16:24:13 2007 @@ -1,5 +1,5 @@ -#include "todo.h" +#include <precomp.h> #define NUM_SETTINGS 6 LPWSTR lpSettings[NUM_SETTINGS] = Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c (original) +++ trunk/reactos/base/applications/mstsc/secure.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> //#include <openssl/rc4.h> //#include <openssl/md5.h> Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c Thu Nov 8 16:24:13 2007 @@ -20,7 +20,7 @@ */ -#include "todo.h" +#include <precomp.h> #define APP_CC Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… ============================================================================== --- trunk/reactos/base/applications/mstsc/tcp.c (original) +++ trunk/reactos/base/applications/mstsc/tcp.c Thu Nov 8 16:24:13 2007 @@ -19,7 +19,7 @@ */ -#include "todo.h" +#include <precomp.h> #ifdef _WIN32 #define socklen_t int Removed: trunk/reactos/base/applications/mstsc/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/to… ============================================================================== --- trunk/reactos/base/applications/mstsc/todo.h (original) +++ trunk/reactos/base/applications/mstsc/todo.h (removed) @@ -1,45 +1,0 @@ -#include <windows.h> -#include <commctrl.h> -#include <shlobj.h> -#include <stdio.h> -#include "uimain.h" -#include "rdesktop.h" -#include "bsops.h" -#include "orders.h" -#include "resource.h" - -//#include <stdio.h> - -#ifndef __TODO_MSTSC_H -#define __TODO_MSTSC_H - - -#define MAXKEY 256 -#define MAXVALUE 256 - -typedef struct _SETTINGS -{ - WCHAR Key[MAXKEY]; - WCHAR Type; // holds 'i' or 's' - union { - INT i; - WCHAR s[MAXVALUE]; - } Value; -} SETTINGS, *PSETTINGS; - -typedef struct _RDPSETTINGS -{ - PSETTINGS pSettings; - INT NumSettings; -} RDPSETTINGS, *PRDPSETTINGS; - -BOOL OpenRDPConnectDialog(HINSTANCE hInstance, PRDPSETTINGS pRdpSettings); -PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); -BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); -INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); -LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); -BOOL SetIntegerToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, INT Value); -BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue); - - -#endif /* __TODO_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c (original) +++ trunk/reactos/base/applications/mstsc/uimain.c Thu Nov 8 16:24:13 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "todo.h" +#include <precomp.h> char g_username[256] = ""; char g_hostname[256] = ""; Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Thu Nov 8 16:24:13 2007 @@ -19,7 +19,7 @@ */ #include <winsock2.h> /* winsock2.h first */ -#include "todo.h" +#include <precomp.h> extern char g_username[];

1 0

[gedmurphy] 30270: add missing break
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 16:06:00 2007 New Revision: 30270 URL: http://svn.reactos.org/svn/reactos?rev=30270&view=rev Log: add missing break Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 16:06:00 2007 @@ -1048,6 +1048,8 @@ EndDialog(hDlg, LOWORD(wParam)); } + + break; } case WM_NOTIFY:

1 0

[gedmurphy] 30269: fix the header mess and get it building with rosbe, albeit with many warnings at the moment
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 15:47:25 2007 New Revision: 30269 URL: http://svn.reactos.org/svn/reactos?rev=30269&view=rev Log: fix the header mess and get it building with rosbe, albeit with many warnings at the moment Modified: trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/bsops.h trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/channels.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/iso.c trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/mcs.c trunk/reactos/base/applications/mstsc/mppc.c trunk/reactos/base/applications/mstsc/mstsc.rbuild trunk/reactos/base/applications/mstsc/orders.c trunk/reactos/base/applications/mstsc/orders.h trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/rdesktop.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/rdp5.c trunk/reactos/base/applications/mstsc/rdpfile.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/tcp.c trunk/reactos/base/applications/mstsc/todo.h trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/uimain.h trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… ============================================================================== --- trunk/reactos/base/applications/mstsc/bitmap.c (original) +++ trunk/reactos/base/applications/mstsc/bitmap.c Thu Nov 8 15:47:25 2007 @@ -28,7 +28,7 @@ /* indent is confused by this file */ /* *INDENT-OFF* */ -#include "rdesktop.h" +#include "todo.h" #define CVAL(p) (*(p++)) #ifdef NEED_ALIGN Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… ============================================================================== --- trunk/reactos/base/applications/mstsc/bsops.c (original) +++ trunk/reactos/base/applications/mstsc/bsops.c Thu Nov 8 15:47:25 2007 @@ -18,23 +18,24 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdlib.h> -#include <string.h> -#include "bsops.h" +//#include <stdlib.h> +//#include <string.h> +//#include "bsops.h" +#include "todo.h" /* globals */ static char * g_bs = 0; static int g_bs_size = 0; -static int g_width = 800; -static int g_height = 600; +static int g_width1 = 800; +static int g_height1 = 600; static int g_bpp = 8; static int g_Bpp = 1; -static int g_clip_left = 0; -static int g_clip_top = 0; -static int g_clip_right = 800; -static int g_clip_bottom = 600; +static int g_clip_left1 = 0; +static int g_clip_top1 = 0; +static int g_clip_right1 = 800; +static int g_clip_bottom1 = 600; /* for bs_patblt */ static unsigned char g_hatch_patterns[] = @@ -82,9 +83,9 @@ { char * p; - if (x >= 0 && x < g_width && y >= 0 && y < g_height) - { - p = g_bs + (y * g_width * g_Bpp) + (x * g_Bpp); + if (x >= 0 && x < g_width1 && y >= 0 && y < g_height1) + { + p = g_bs + (y * g_width1 * g_Bpp) + (x * g_Bpp); if (g_Bpp == 1) { return *((unsigned char *) p); @@ -112,12 +113,12 @@ char * p; if (!use_clip || - (x >= g_clip_left && x < g_clip_right && - y >= g_clip_top && y < g_clip_bottom)) - { - if (x >= 0 && x < g_width && y >= 0 && y < g_height) - { - p = g_bs + (y * g_width * g_Bpp) + (x * g_Bpp); + (x >= g_clip_left1 && x < g_clip_right1 && + y >= g_clip_top1 && y < g_clip_bottom1)) + { + if (x >= 0 && x < g_width1 && y >= 0 && y < g_height1) + { + p = g_bs + (y * g_width1 * g_Bpp) + (x * g_Bpp); if (rop != 12) { pixel = bs_do_rop(rop, pixel, bs_get_pixel(x, y)); @@ -144,9 +145,9 @@ { char * p; - if (x >= 0 && x < g_width && y >= 0 && y < g_height) - { - p = g_bs + (y * g_width * g_Bpp) + (x * g_Bpp); + if (x >= 0 && x < g_width1 && y >= 0 && y < g_height1) + { + p = g_bs + (y * g_width1 * g_Bpp) + (x * g_Bpp); return p; } else @@ -163,17 +164,17 @@ { free(g_bs); } - g_width = width; - g_height = height; + g_width1 = width; + g_height1 = height; g_bpp = bpp; g_Bpp = (bpp + 7) / 8; g_bs_size = width * height * g_Bpp; g_bs = malloc(g_bs_size); memset(g_bs, 0, g_bs_size); - g_clip_left = 0; - g_clip_top = 0; - g_clip_right = width; - g_clip_bottom = height; + g_clip_left1 = 0; + g_clip_top1 = 0; + g_clip_right1 = width; + g_clip_bottom1 = height; } /*****************************************************************************/ @@ -190,20 +191,20 @@ void bs_set_clip(int x, int y, int cx, int cy) { - g_clip_left = x; - g_clip_top = y; - g_clip_right = x + cx; - g_clip_bottom = y + cy; + g_clip_left1 = x; + g_clip_top1 = y; + g_clip_right1 = x + cx; + g_clip_bottom1 = y + cy; } /*****************************************************************************/ void bs_reset_clip(void) { - g_clip_left = 0; - g_clip_top = 0; - g_clip_right = g_width; - g_clip_bottom = g_height; + g_clip_left1 = 0; + g_clip_top1 = 0; + g_clip_right1 = g_width1; + g_clip_bottom1 = g_height1; } /*****************************************************************************/ @@ -326,29 +327,29 @@ int dx; int dy; - if (g_clip_left > *x) - { - dx = g_clip_left - *x; + if (g_clip_left1 > *x) + { + dx = g_clip_left1 - *x; } else { dx = 0; } - if (g_clip_top > *y) - { - dy = g_clip_top - *y; + if (g_clip_top1 > *y) + { + dy = g_clip_top1 - *y; } else { dy = 0; } - if (*x + *cx > g_clip_right) - { - *cx = (*cx - ((*x + *cx) - g_clip_right)); - } - if (*y + *cy > g_clip_bottom) - { - *cy = (*cy - ((*y + *cy) - g_clip_bottom)); + if (*x + *cx > g_clip_right1) + { + *cx = (*cx - ((*x + *cx) - g_clip_right1)); + } + if (*y + *cy > g_clip_bottom1) + { + *cy = (*cy - ((*y + *cy) - g_clip_bottom1)); } *cx = *cx - dx; *cy = *cy - dy; @@ -793,13 +794,13 @@ return; } /* nothing to draw, memset and leave */ - if (x + cx < 0 || y + cy < 0 || x >= g_width || y >= g_height) + if (x + cx < 0 || y + cy < 0 || x >= g_width1 || y >= g_height1) { memset(dst, 0, cx * cy * g_Bpp); return; } /* check if it goes over an edge */ - if (x < 0 || y < 0 || x + cx > g_width || y + cy > g_height) + if (x < 0 || y < 0 || x + cx > g_width1 || y + cy > g_height1) { memset(dst, 0, cx * cy * g_Bpp); if (x < 0) @@ -808,9 +809,9 @@ dst += -x * g_Bpp; x = 0; } - if (x + cx > g_width) - { - cx = g_width - x; + if (x + cx > g_width1) + { + cx = g_width1 - x; } for (i = 0; i < cy; i++) { Modified: trunk/reactos/base/applications/mstsc/bsops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… ============================================================================== --- trunk/reactos/base/applications/mstsc/bsops.h (original) +++ trunk/reactos/base/applications/mstsc/bsops.h Thu Nov 8 15:47:25 2007 @@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef __BSOPS_MSTSC_H +#define __BSOPS_MSTSC_H int bs_get_pixel(int x, int y); void bs_set_pixel(int x, int y, int pixel, int rop, int use_clip); @@ -47,3 +50,5 @@ int brush_style, char * brush_pattern, int brush_x_org, int brush_y_org, int bgcolour, int fgcolour); + +#endif /* __BSOPS_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… ============================================================================== --- trunk/reactos/base/applications/mstsc/cache.c (original) +++ trunk/reactos/base/applications/mstsc/cache.c Thu Nov 8 15:47:25 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" /* BITMAP CACHE */ extern int g_pstcache_fd[]; Modified: trunk/reactos/base/applications/mstsc/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ch… ============================================================================== --- trunk/reactos/base/applications/mstsc/channels.c (original) +++ trunk/reactos/base/applications/mstsc/channels.c Thu Nov 8 15:47:25 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" #define MAX_CHANNELS 6 #define CHANNEL_CHUNK_LENGTH 1600 Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 15:47:25 2007 @@ -18,11 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <windows.h> -#include <commctrl.h> -#include <stdio.h> -#include <todo.h> -#include "resource.h" +#include "todo.h" #define MAX_KEY_NAME 255 @@ -72,6 +68,8 @@ HWND hDisplayPage; HBITMAP hHeader; BITMAP headerbitmap; + HICON hMstscSm; + HICON hMstscLg; HICON hLogon; HICON hConn; HICON hRemote; @@ -541,11 +539,19 @@ Pixel, sizeof(Pixel) / sizeof(WCHAR))) { +#ifdef _MSC_VER _swprintf(Buffer, Pixel, pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, Pixel); +#else + swprintf(Buffer, + Pixel, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, + Pixel); +#endif } } @@ -678,11 +684,20 @@ Pixel, sizeof(Pixel) / sizeof(WCHAR))) { +#ifdef _MSC_VER _swprintf(Buffer, Pixel, width, height, Pixel); +#else + swprintf(Buffer, + Pixel, + width, + height, + Pixel); +#endif + SendDlgItemMessageW(pInfo->hDisplayPage, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, @@ -918,6 +933,34 @@ /* add main settings pointer */ pInfo->pRdpSettings = pRdpSettings; + /* set the dialog icons */ + pInfo->hMstscSm = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_MSTSC), + IMAGE_ICON, + 16, + 16, + LR_DEFAULTCOLOR); + if (pInfo->hMstscSm) + { + SendMessageW(hwnd, + WM_SETICON, + ICON_SMALL, + (WPARAM)pInfo->hMstscSm); + } + pInfo->hMstscLg = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_MSTSC), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + if (pInfo->hMstscLg) + { + SendMessageW(hwnd, + WM_SETICON, + ICON_BIG, + (WPARAM)pInfo->hMstscLg); + } + pInfo->hHeader = (HBITMAP)LoadImageW(hInst, MAKEINTRESOURCEW(IDB_HEADER), IMAGE_BITMAP, @@ -940,10 +983,10 @@ (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; - LoadStringW(hInst, IDS_TAB_GENERAL, str, 256); ZeroMemory(&item, sizeof(TCITEM)); item.mask = TCIF_TEXT; - item.pszText = str; + if (LoadStringW(hInst, IDS_TAB_GENERAL, str, 256)) + item.pszText = str; item.cchTextMax = 256; (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } @@ -954,10 +997,10 @@ (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; - LoadStringW(hInst, IDS_TAB_DISPLAY, str, 256); ZeroMemory(&item, sizeof(TCITEM)); item.mask = TCIF_TEXT; - item.pszText = str; + if (LoadStringW(hInst, IDS_TAB_DISPLAY, str, 256)) + item.pszText = str; item.cchTextMax = 256; (void)TabCtrl_InsertItem(pInfo->hTab, 1, &item); } @@ -1057,6 +1100,13 @@ { if (pInfo) { + if (pInfo->hMstscSm) + DestroyIcon(pInfo->hMstscSm); + if (pInfo->hMstscLg) + DestroyIcon(pInfo->hMstscLg); + if (pInfo->hHeader) + DeleteObject(pInfo->hHeader); + HeapFree(GetProcessHeap(), 0, pInfo); Modified: trunk/reactos/base/applications/mstsc/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/is… ============================================================================== --- trunk/reactos/base/applications/mstsc/iso.c (original) +++ trunk/reactos/base/applications/mstsc/iso.c Thu Nov 8 15:47:25 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" /* Send a self-contained ISO PDU */ static void Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… ============================================================================== --- trunk/reactos/base/applications/mstsc/licence.c (original) +++ trunk/reactos/base/applications/mstsc/licence.c Thu Nov 8 15:47:25 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" //#include <openssl/rc4.h> void * @@ -33,8 +33,8 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len); -extern char g_username[64]; -extern char g_hostname[16]; +extern char g_username[]; +extern char g_hostname[]; static uint8 g_licence_key[16]; static uint8 g_licence_sign_key[16]; Modified: trunk/reactos/base/applications/mstsc/mcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mc… ============================================================================== --- trunk/reactos/base/applications/mstsc/mcs.c (original) +++ trunk/reactos/base/applications/mstsc/mcs.c Thu Nov 8 15:47:25 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" uint16 g_mcs_userid; extern VCHANNEL g_channels[]; Modified: trunk/reactos/base/applications/mstsc/mppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mp… ============================================================================== --- trunk/reactos/base/applications/mstsc/mppc.c (original) +++ trunk/reactos/base/applications/mstsc/mppc.c Thu Nov 8 15:47:25 2007 @@ -18,10 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdio.h> -#include <string.h> - -#include "rdesktop.h" +#include "todo.h" /* mppc decompression */ /* http://www.faqs.org/rfcs/rfc2118.html */ Modified: trunk/reactos/base/applications/mstsc/mstsc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc.rbuild (original) +++ trunk/reactos/base/applications/mstsc/mstsc.rbuild Thu Nov 8 15:47:25 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="no"> +<module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes" allowwarnings="true"> <include base="mstsc">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -9,6 +9,9 @@ <library>gdi32</library> <library>comctl32</library> <library>ws2_32</library> + <library>advapi32</library> + <library>shell32</library> + <library>ole32</library> <compilationunit name="unit.c"> <file>bitmap.c</file> <file>bsops.c</file> @@ -23,6 +26,7 @@ <file>pstcache.c</file> <file>rdp5.c</file> <file>rdp.c</file> + <file>rdpfile.c</file> <file>secure.c</file> <file>ssl_calls.c</file> <file>tcp.c</file> Modified: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… ============================================================================== --- trunk/reactos/base/applications/mstsc/orders.c (original) +++ trunk/reactos/base/applications/mstsc/orders.c Thu Nov 8 15:47:25 2007 @@ -18,8 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" -#include "orders.h" +#include "todo.h" + extern uint8 *g_next_packet; static RDP_ORDER_STATE g_order_state; Modified: trunk/reactos/base/applications/mstsc/orders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… ============================================================================== --- trunk/reactos/base/applications/mstsc/orders.h (original) +++ trunk/reactos/base/applications/mstsc/orders.h Thu Nov 8 15:47:25 2007 @@ -18,6 +18,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __ORDERS_MSTSC_H +#define __ORDERS_MSTSC_H + #define RDP_ORDER_STANDARD 0x01 #define RDP_ORDER_SECONDARY 0x02 #define RDP_ORDER_BOUNDS 0x04 @@ -366,3 +369,5 @@ } RDP_COLCACHE_ORDER; + +#endif /* __ORDERS_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… ============================================================================== --- trunk/reactos/base/applications/mstsc/pstcache.c (original) +++ trunk/reactos/base/applications/mstsc/pstcache.c Thu Nov 8 15:47:25 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" #define MAX_CELL_SIZE 0x1000 /* pixels */ Modified: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdesktop.h (original) +++ trunk/reactos/base/applications/mstsc/rdesktop.h Thu Nov 8 15:47:25 2007 @@ -18,11 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __RDESKTOP_MSTSC_H +#define __RDESKTOP_MSTSC_H + #include <stdlib.h> #include <stdio.h> #include <string.h> #ifdef _WIN32 -#include <winsock2.h> /* winsock2.h first */ +//#include <winsock2.h> /* winsock2.h first */ #include <windows.h> #include <time.h> #else /* WIN32 */ @@ -124,3 +127,5 @@ #ifndef MAKE_PROTO #include "proto.h" #endif + +#endif /* __RDESKTOP_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c (original) +++ trunk/reactos/base/applications/mstsc/rdp.c Thu Nov 8 15:47:25 2007 @@ -18,26 +18,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -//#include <time.h> -#ifndef _WIN32 -#include <errno.h> -#include <unistd.h> -#endif -#include "rdesktop.h" - -#ifdef HAVE_ICONV -#ifdef HAVE_ICONV_H -#include <iconv.h> -#endif - -#ifndef ICONV_CONST -#define ICONV_CONST "" -#endif -#endif +#include "todo.h" + extern uint16 g_mcs_userid; -extern char g_username[64]; -extern char g_codepage[16]; +extern char g_username[]; +extern char g_codepage[]; extern BOOL g_bitmap_compression; extern BOOL g_orders; extern BOOL g_encryption; Modified: trunk/reactos/base/applications/mstsc/rdp5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp5.c (original) +++ trunk/reactos/base/applications/mstsc/rdp5.c Thu Nov 8 15:47:25 2007 @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" extern uint8 *g_next_packet; Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Thu Nov 8 15:47:25 2007 @@ -1,8 +1,5 @@ -#include <windows.h> -#include <stdio.h> -#include <shlobj.h> -#include <todo.h> -#include "resource.h" + +#include "todo.h" #define NUM_SETTINGS 6 LPWSTR lpSettings[NUM_SETTINGS] = Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c (original) +++ trunk/reactos/base/applications/mstsc/secure.c Thu Nov 8 15:47:25 2007 @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" +#include "todo.h" //#include <openssl/rc4.h> //#include <openssl/md5.h> @@ -62,7 +62,7 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len); -extern char g_hostname[16]; +extern char g_hostname[]; extern int g_width; extern int g_height; extern unsigned int g_keylayout; Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c Thu Nov 8 15:47:25 2007 @@ -20,7 +20,7 @@ */ -#include "rdesktop.h" +#include "todo.h" #define APP_CC Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… ============================================================================== --- trunk/reactos/base/applications/mstsc/tcp.c (original) +++ trunk/reactos/base/applications/mstsc/tcp.c Thu Nov 8 15:47:25 2007 @@ -18,18 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _WIN32 -#include <unistd.h> /* select read write close */ -#include <sys/socket.h> /* socket connect setsockopt */ -#include <sys/time.h> /* timeval */ -#include <netdb.h> /* gethostbyname */ -#include <netinet/in.h> /* sockaddr_in */ -#include <netinet/tcp.h> /* TCP_NODELAY */ -#include <arpa/inet.h> /* inet_addr */ -#include <errno.h> /* errno */ -#endif /* _WIN32 */ - -#include "rdesktop.h" + +#include "todo.h" #ifdef _WIN32 #define socklen_t int Modified: trunk/reactos/base/applications/mstsc/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/to… ============================================================================== --- trunk/reactos/base/applications/mstsc/todo.h (original) +++ trunk/reactos/base/applications/mstsc/todo.h Thu Nov 8 15:47:25 2007 @@ -1,3 +1,19 @@ +#include <windows.h> +#include <commctrl.h> +#include <shlobj.h> +#include <stdio.h> +#include "uimain.h" +#include "rdesktop.h" +#include "bsops.h" +#include "orders.h" +#include "resource.h" + +//#include <stdio.h> + +#ifndef __TODO_MSTSC_H +#define __TODO_MSTSC_H + + #define MAXKEY 256 #define MAXVALUE 256 @@ -24,3 +40,6 @@ LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); BOOL SetIntegerToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, INT Value); BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue); + + +#endif /* __TODO_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c (original) +++ trunk/reactos/base/applications/mstsc/uimain.c Thu Nov 8 15:47:25 2007 @@ -18,8 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "rdesktop.h" -#include "bsops.h" +#include "todo.h" char g_username[256] = ""; char g_hostname[256] = ""; @@ -97,9 +96,12 @@ mi_reset_clip(void); void mi_line(int x1, int y1, int x2, int y2, int colour); +void* mi_create_cursor(unsigned int x, unsigned int y, int width, int height, unsigned char * andmask, unsigned char * xormask); + + void mi_destroy_cursor(void * cursor); void Modified: trunk/reactos/base/applications/mstsc/uimain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.h (original) +++ trunk/reactos/base/applications/mstsc/uimain.h Thu Nov 8 15:47:25 2007 @@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef __UIMAIN_MSTSC_H +#define __UIMAIN_MSTSC_H /* in uimain.c */ int @@ -74,3 +77,5 @@ #define UI_MAX(a, b) (((a) > (b)) ? (a) : (b)) #undef UI_MIN #define UI_MIN(a, b) (((a) < (b)) ? (a) : (b)) + +#endif /* __UIMAIN_MSTSC_H */ Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Thu Nov 8 15:47:25 2007 @@ -19,12 +19,8 @@ */ #include <winsock2.h> /* winsock2.h first */ -#include <windows.h> -#include <winuser.h> -#include <stdio.h> -#include "uimain.h" #include "todo.h" -#include "resource.h" + extern char g_username[]; extern char g_hostname[]; @@ -999,7 +995,7 @@ } else { - if (state == 1) /* -g */ + if (state == 1) /* -g widthxheight*/ { state = 0; if (strcmp(param1, "workarea") == 0) @@ -1022,12 +1018,12 @@ } g_width_height_set = 1; } - if (state == 2) /* -t */ + if (state == 2) /* -t port */ { state = 0; g_tcp_port_rdp = atol(param1); } - if (state == 3) /* -a */ + if (state == 3) /* -a bpp */ { state = 0; g_server_depth = atol(param1); @@ -1036,32 +1032,32 @@ mi_error("invalid server bpp\r\n"); } } - if (state == 5) /* -u */ + if (state == 5) /* -u username */ { state = 0; strcpy(g_username, param1); } - if (state == 6) /* -p */ + if (state == 6) /* -p password */ { state = 0; strcpy(g_password, param1); } - if (state == 7) /* -d */ + if (state == 7) /* -d domain */ { state = 0; strcpy(g_domain, param1); } - if (state == 8) /* -s */ + if (state == 8) /* -s shell */ { state = 0; strcpy(g_shell, param1); } - if (state == 9) /* -c */ + if (state == 9) /* -c workin directory*/ { state = 0; strcpy(g_directory, param1); } - if (state == 10) /* -n */ + if (state == 10) /* -n host name*/ { state = 0; strcpy(g_hostname, param1); @@ -1272,28 +1268,12 @@ return (state == 0); } -#ifdef WITH_DEBUG -/*****************************************************************************/ -int -main(int argc, char ** argv) -{ - WSADATA d; - - WSAStartup(MAKEWORD(2, 0), &d); - if (!mi_process_cl(argv[0])) - { - mi_show_params(); - WSACleanup(); - return 0; - } - return ui_main(); -} -#else /* WITH_DEBUG */ + /*****************************************************************************/ int WINAPI -WinMain(HINSTANCE hInstance, +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, + LPWSTR lpCmdLine, int nCmdShow) { PRDPSETTINGS pRdpSettings; @@ -1310,6 +1290,18 @@ if (OpenRDPConnectDialog(hInstance, pRdpSettings)) { + strcpy(g_servername, "192.168.40.50"); + //g_port = 3389; + strcpy(g_username, "buildbot"); + strcpy(g_password, "P4ssw0rd"); + g_server_depth = 16; + g_width = 800; + g_height = 600; + g_screen_width = GetSystemMetrics(SM_CXSCREEN); + g_screen_height = GetSystemMetrics(SM_CYSCREEN); + g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; + g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; + ui_main(); ret = 0; } @@ -1328,7 +1320,7 @@ return ret; } -#endif /* WITH_DEBUG */ + /*****************************************************************************/ void

1 0

[dreimer] 30268: Added CCache to the Install Selection. Sorted the Section a bit more effective.
by dreimer＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: dreimer Date: Thu Nov 8 15:29:02 2007 New Revision: 30268 URL: http://svn.reactos.org/svn/reactos?rev=30268&view=rev Log: Added CCache to the Install Selection. Sorted the Section a bit more effective. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Nov 8 15:29:02 2007 @@ -3,6 +3,7 @@ - Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) - Updated: NASM to 0.99.06 (Daniel Reimer) +- Updated: You can now select the components you want to install. (Daniel Reimer) - Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer) - Added French translation. (Pierre Schweitzer) @@ -53,7 +54,7 @@ - Fix a warning in echoh.c. (Peter Ward) - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) - Merged the NSIS files back together. (Peter Ward) -- Rewrote Scut in C. (Peter Ward) +- Rewrote Scut in C. (Peter Ward) - Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer) - Remove typos. (Peter Ward, Daniel Reimer) @@ -70,7 +71,7 @@ - Added more Error Messages to prevent confusion and stupid mistakes. (Daniel Reimer) - Remove trailing Spaces. (Daniel Reimer) - Make helpfile entries dependant on the installed optional files. (Daniel Reimer) - - Added echo Messages which tell a sucessful process. (Daniel Reimer) + - Added echo Messages which inform you about a sucessful process. (Daniel Reimer) - Sorted and fixed parts of the help. (Daniel Reimer, Peter Ward) - Modify many "if" to "if /I" to ignore lower and upper case. (Daniel Reimer) - Modify ERROR messages in scut to abort the process when Name and Path are specified by Shell Commands, too. (Daniel Reimer) Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Thu Nov 8 15:29:02 2007 @@ -98,7 +98,7 @@ ;; MUI end. -Section -BaseFiles SEC02 +Section -BaseFiles SEC01 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -124,13 +124,29 @@ File /r Root\Tools\tee.exe SectionEnd -Section -MinGWGCCNASM SEC01 - SetOutPath "$INSTDIR\4.1.3\" +Section -MinGWGCCNASM SEC02 + SetOutPath "$INSTDIR\4.1.3" SetOverwrite try File /r Components\4.1.3\*.* SectionEnd -Section /o "SVN Tools" SEC03 +Section /o "RosBE Configurator" SEC03 + SetShellVarContext current + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\options.cmd + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Root\Tools\options.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + SetOutPath $REACTOS_SOURCE_DIRECTORY + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ + "$INSTDIR\Tools\options.exe" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section /o "SVN Tools" SEC04 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -150,7 +166,24 @@ File /r Root\Tools\licenses\*.* SectionEnd -Section /o "relAddr2Line Tool" SEC04 +Section /o "Shortcut Tool" SEC05 + SetShellVarContext current + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\scut.cmd + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Root\Tools\scut.exe +SectionEnd + +Section /o "CCache" SEC06 + SetShellVarContext current + SetOutPath "$INSTDIR\4.1.3\bin" + SetOverwrite try + File /r Root\Tools\ccache.exe +SectionEnd + +Section /o "relAddr2Line Tool" SEC07 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -162,34 +195,7 @@ File /r Root\Tools\chkslash.exe SectionEnd -Section /o "RosBE Configurator" SEC05 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\options.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Root\Tools\options.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ - "$INSTDIR\Tools\options.exe" - !insertmacro MUI_STARTMENU_WRITE_END - -SectionEnd - -Section /o "Shortcut Tool" SEC06 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\scut.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Root\Tools\scut.exe -SectionEnd - -Section /o "Other Tools" SEC07 +Section /o "Other Tools" SEC08 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -198,7 +204,7 @@ File /r Root\Config.cmd SectionEnd -Section -StartMenuShortcuts SEC08 +Section -StartMenuShortcuts SEC09 SetShellVarContext current ;; @@ -216,7 +222,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC09 +Section /o "Desktop Shortcuts" SEC10 SetShellVarContext current ;; @@ -226,7 +232,7 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\terminal.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC10 +Section /o "Quick Launch Shortcuts" SEC11 SetShellVarContext current ;; @@ -236,7 +242,7 @@ CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\terminal.ico" SectionEnd -Section -Post SEC11 +Section -Post SEC12 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

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