Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42269: - Add declarations of cursor related RosUser APIs.
by fireball＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: fireball Date: Tue Jul 28 16:10:13 2009 New Revision: 42269 URL: http://svn.reactos.org/svn/reactos?rev=42269&view=rev Log: - Add declarations of cursor related RosUser APIs. Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Tue Jul 28 16:10:13 2009 @@ -37,6 +37,18 @@ ); #endif +BOOL NTAPI +RosUserGetCursorPos( LPPOINT pt ); + +BOOL NTAPI +RosUserSetCursorPos( INT x, INT y ); + +BOOL NTAPI +RosUserClipCursor( LPCRECT clip ); + +void NTAPI +RosUserSetCursor( ICONINFO* IconInfo ); + VOID NTAPI RosUserConnectCsrss();

1 0

[janderwald] 42268: - Implement KsGetObjectFromFileObject, KsGetObjectFromFileObject, KsGetObjectTypeFromIrp, KsGetParent
by janderwald＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: janderwald Date: Tue Jul 28 15:52:57 2009 New Revision: 42268 URL: http://svn.reactos.org/svn/reactos?rev=42268&view=rev Log: - Implement KsGetObjectFromFileObject, KsGetObjectFromFileObject, KsGetObjectTypeFromIrp, KsGetParent Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -512,6 +512,11 @@ /* initialize create item list */ InitializeListHead(&Header->ItemList); + + /* initialize basic header */ + Header->BasicHeader.Type = KsObjectTypeDevice; + Header->BasicHeader.KsDevice = &Header->KsDevice; + Header->BasicHeader.Parent.KsDevice = &Header->KsDevice; /* are there any create items provided */ if (ItemsCount && ItemsList) Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -653,7 +653,6 @@ KsSetDevicePnpAndBaseObject(Header, PhysicalDeviceObject, NextDeviceObject); /* initialize IKsDevice interface */ Header->lpVtblIKsDevice = &vt_IKsDevice; - Header->Type = KsObjectTypeDevice; Header->ref = 1; /* FIXME Power state */ Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -865,6 +865,7 @@ This->FilterFactory = iface; This->FileObject = IoStack->FileObject; This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; + This->Header.Parent.KsFilterFactory = iface->lpVtbl->GetStruct(iface); This->Header.Type = KsObjectTypeFilter; /* allocate the stream descriptors */ @@ -919,6 +920,7 @@ This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; This->ObjectHeader->Type = KsObjectTypeFilter; This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; + This->ObjectHeader->ObjectType = (PVOID)&This->Filter; /* completed initialization */ Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -185,6 +185,7 @@ This->FilterFactory.FilterDescriptor = Descriptor; This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; This->Header.Type = KsObjectTypeFilterFactory; + This->Header.Parent.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; This->DeviceHeader = DeviceExtension->DeviceHeader; InitializeListHead(&This->SymbolicLinkList); Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -28,6 +28,7 @@ UNICODE_STRING ObjectClass; PUNKNOWN Unknown; + PVOID ObjectType; PDEVICE_OBJECT TargetDevice; LIST_ENTRY TargetDeviceListEntry; @@ -55,11 +56,17 @@ { KSOBJECTTYPE Type; PKSDEVICE KsDevice; + union + { + PKSDEVICE KsDevice; + PKSFILTERFACTORY KsFilterFactory; + PKSFILTER KsFilter; + }Parent; }KSBASIC_HEADER, *PKSBASIC_HEADER; typedef struct { - KSOBJECTTYPE Type; + KSBASIC_HEADER BasicHeader; KSDEVICE KsDevice; IKsDeviceVtbl *lpVtblIKsDevice; Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Jul 28 15:52:57 2009 @@ -140,7 +140,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI PVOID @@ -148,50 +148,66 @@ KsGetObjectFromFileObject( IN PFILE_OBJECT FileObject) { + PKSIOBJECT_HEADER ObjectHeader; + + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + + /* return associated object */ + return ObjectHeader->ObjectType; +} + +/* + @implemented +*/ +KSDDKAPI +KSOBJECTTYPE +NTAPI +KsGetObjectTypeFromFileObject( + IN PFILE_OBJECT FileObject) +{ + PKSIOBJECT_HEADER ObjectHeader; + + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + /* return type */ + return ObjectHeader->Type; +} + +/* + @implemented +*/ +KSOBJECTTYPE +NTAPI +KsGetObjectTypeFromIrp( + IN PIRP Irp) +{ + PKSIOBJECT_HEADER ObjectHeader; + PIO_STACK_LOCATION IoStack; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext; + /* return type */ + return ObjectHeader->Type; +} + +/* + @unimplemented +*/ +PUNKNOWN +NTAPI +KsGetOuterUnknown( + IN PVOID Object) +{ UNIMPLEMENTED return NULL; -} - -/* - @unimplemented -*/ -KSDDKAPI -KSOBJECTTYPE -NTAPI -KsGetObjectTypeFromFileObject( - IN PFILE_OBJECT FileObject) -{ - UNIMPLEMENTED - return (KSOBJECTTYPE)-1; -} - -/* - @unimplemented -*/ -KSOBJECTTYPE -NTAPI -KsGetObjectTypeFromIrp( - IN PIRP Irp) -{ - UNIMPLEMENTED - return (KSOBJECTTYPE)-1; -} - -/* - @unimplemented -*/ -PUNKNOWN -NTAPI -KsGetOuterUnknown( - IN PVOID Object) -{ - UNIMPLEMENTED - return NULL; - -} - -/* - @unimplemented + +} + +/* + @implemented */ KSDDKAPI PVOID @@ -199,8 +215,11 @@ KsGetParent( IN PVOID Object) { - UNIMPLEMENTED - return NULL; -} - - + PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); + /* sanity check */ + ASSERT(BasicHeader->Parent.KsDevice != NULL); + /* return object type */ + return (PVOID)BasicHeader->Parent.KsDevice; +} + +

1 0

[fireball] 42267: Giannis Adamopoulos - Implement table growing in add_atom_entry, grow_handle_table and add_handle_to_array. - Uncomment all_windows_from_point and get_window_children_from_point.
by fireball＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: fireball Date: Tue Jul 28 15:50:45 2009 New Revision: 42267 URL: http://svn.reactos.org/svn/reactos?rev=42267&view=rev Log: Giannis Adamopoulos - Implement table growing in add_atom_entry, grow_handle_table and add_handle_to_array. - Uncomment all_windows_from_point and get_window_children_from_point. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] Tue Jul 28 15:50:45 2009 @@ -138,10 +138,11 @@ if (new_size > MAX_ATOMS) new_size = MAX_ATOMS; if (new_size > table->count) { - //new_table = ExAllocatePool(PagedPool, sizeof(*table->handles) * new_size); - //RtlCopyMemory(new_table, table, sizeof(*table->handles)); - //new_table = realloc( table->handles, sizeof(*table->handles) * new_size ); - UNIMPLEMENTED; + new_table = ExAllocatePool(PagedPool, sizeof(*table->handles) * new_size); + RtlCopyMemory(new_table, table, sizeof(*table->handles)); + new_table = ExReallocPool(table->handles , + sizeof(*table->handles) * new_size, + sizeof(*table->handles) * table->count); } if (!new_table) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] Tue Jul 28 15:50:45 2009 @@ -184,12 +184,13 @@ /* grow a handle table */ static int grow_handle_table( struct handle_table *table ) { -#if 0 struct handle_entry *new_entries; int count = min( table->count * 2, MAX_HANDLE_ENTRIES ); if (count == table->count || - !(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) ))) + !(new_entries = ExReallocPool( table->entries, + count * sizeof(struct handle_entry) , + table->count * sizeof(struct handle_entry)))) { set_error( STATUS_INSUFFICIENT_RESOURCES ); return 0; @@ -197,10 +198,6 @@ table->entries = new_entries; table->count = count; return 1; -#else - UNIMPLEMENTED; - return 0; -#endif } /* allocate the first free entry in the handle table */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Tue Jul 28 15:50:45 2009 @@ -240,7 +240,9 @@ if (array->count >= array->total) { int new_total = max( array->total * 2, 32 ); - user_handle_t *new_array = realloc( array->handles, new_total * sizeof(*new_array) ); + user_handle_t *new_array = ExReallocPool(array->handles, + new_total * sizeof(user_handle_t), + array->total * sizeof(user_handle_t)); if (!new_array) { ExFreePool( array->handles ); @@ -688,7 +690,6 @@ } /* return list of all windows containing point (in absolute coords) */ -#if 0 static int all_windows_from_point( struct window *top, int x, int y, struct user_handle_array *array ) { struct window *ptr; @@ -718,7 +719,6 @@ if (!add_handle_to_array( array, top->handle )) return 0; return 1; } -#endif /* return the thread owning a window */ PTHREADINFO get_window_thread( user_handle_t handle ) @@ -1981,7 +1981,6 @@ /* get a list of the window children that contain a given point */ DECL_HANDLER(get_window_children_from_point) { -#if 0 struct user_handle_array array; struct window *parent = get_window( req->parent ); data_size_t len; @@ -1997,9 +1996,6 @@ len = min( get_reply_max_size((void*)req), array.count * sizeof(user_handle_t) ); if (len) set_reply_data_ptr( (void*)req, array.handles, len ); else ExFreePool( array.handles ); -#else - UNIMPLEMENTED; -#endif }

1 0

[fireball] 42266: - Make desktop window occupy whole primary surface (as usual, dimensions are hacked to 800x600 with a corresponding // FIXME:) if it's size is set to 0x0 at creation time. This fixes a number of window drawing problems, particularly arwinss issue nr. 5.
by fireball＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: fireball Date: Tue Jul 28 15:11:22 2009 New Revision: 42266 URL: http://svn.reactos.org/svn/reactos?rev=42266&view=rev Log: - Make desktop window occupy whole primary surface (as usual, dimensions are hacked to 800x600 with a corresponding // FIXME:) if it's size is set to 0x0 at creation time. This fixes a number of window drawing problems, particularly arwinss issue nr. 5. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Tue Jul 28 15:11:22 2009 @@ -20,6 +20,7 @@ #include <ndk/ntndk.h> #include "ntrosgdi.h" #include "winent.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); @@ -281,7 +282,37 @@ BOOL CDECL RosDrv_CreateDesktopWindow( HWND hwnd ) { - WARN("RosDrv_CreateDesktopWindow(%x)\n", hwnd); + unsigned int width, height; + + /* retrieve the real size of the desktop */ + SERVER_START_REQ( get_window_rectangles ) + { + req->handle = wine_server_user_handle( hwnd ); + wine_server_call( req ); + width = reply->window.right - reply->window.left; + height = reply->window.bottom - reply->window.top; + } + SERVER_END_REQ; + + TRACE("RosDrv_CreateDesktopWindow(%x), w %d h %d\n", hwnd, width, height); + + if (!width && !height) /* not initialized yet */ + { + SERVER_START_REQ( set_window_pos ) + { + req->handle = wine_server_user_handle( hwnd ); + req->previous = 0; + req->flags = SWP_NOZORDER; + req->window.left = 0; + req->window.top = 0; + req->window.right = 800; // FIXME: Use primary surface's dimensions! + req->window.bottom = 600; + req->client = req->window; + wine_server_call( req ); + } + SERVER_END_REQ; + } + return TRUE; }

1 0

[gschneider] 42265: RosDbg: - Add support for saving the chosen pipe mode - Create pipe connected and disconnected signaling functions to support code reuse
by gschneider＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: gschneider Date: Tue Jul 28 13:10:26 2009 New Revision: 42265 URL: http://svn.reactos.org/svn/reactos?rev=42265&view=rev Log: RosDbg: - Add support for saving the chosen pipe mode - Create pipe connected and disconnected signaling functions to support code reuse Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/Connect.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Tue Jul 28 13:10:26 2009 @@ -44,6 +44,24 @@ cmdList = new List<string>(); } + private void signalConnected() + { + bClientConn = true; + if (ClientConnectedEvent != null) + { + ClientConnectedEvent(this, EventArgs.Empty); + } + } + + private void signalDisconnected() + { + bClientConn = false; + if (ClientDisconnectedEvent != null) + { + ClientDisconnectedEvent(this, EventArgs.Empty); + } + } + private void WaitForConnection() { try @@ -53,11 +71,7 @@ if (sStream.IsConnected) { ioStream = sStream; - bClientConn = true; - if (ClientConnectedEvent != null) - { - ClientConnectedEvent(this, EventArgs.Empty); - } + signalConnected(); } } catch (IOException) @@ -88,11 +102,7 @@ if (cStream.IsConnected) { ioStream = cStream; - bClientConn = true; - if (ClientConnectedEvent != null) - { - ClientConnectedEvent(this, EventArgs.Empty); - } + signalConnected(); return true; } else @@ -216,12 +226,8 @@ * Connecion closed! * We'll hijack this thread and use it to set up our pipe server again. * This thread will terminate once the connection is set up, it does not block. - */ - if (ClientDisconnectedEvent != null) - { - ClientDisconnectedEvent(this, EventArgs.Empty); - } - + */ + signalDisconnected(); break; } } Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] Tue Jul 28 13:10:26 2009 @@ -102,6 +102,7 @@ pipeMode = ConnectionMode.MODE_AUTO; Settings.SelectedConnType = Type; + Settings.Mode = cType.SelectedItem.ToString(); Settings.Save(); Close(); Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Jul 28 13:10:26 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.66")] -[assembly: AssemblyFileVersion("1.0.2.66")] +[assembly: AssemblyVersion("1.0.2.67")] +[assembly: AssemblyFileVersion("1.0.2.67")] Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Tue Jul 28 13:10:26 2009 @@ -265,7 +265,11 @@ public static string SourceDirectory { get { return mProperties.SourceDirectory; } } public static string OutputDirectory { get { return mProperties.OutputDirectory; } } - public static string Mode { get { return mProperties.Mode; } } + public static string Mode + { + get { return mProperties.Mode; } + set { mProperties.Mode = value; } + } public static string Pipe { get { return mProperties.Pipe; } } public static string ComPort { get { return mProperties.Port; } } public static string Baudrate { get { return mProperties.Baudrate; } }

1 0

[janderwald] 42264: - Implement KoDriverInitialize, KoDeviceInitialize - Fix storing of device descriptor in KsInitializeDriver, KsAddDevice
by janderwald＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: janderwald Date: Tue Jul 28 12:22:02 2009 New Revision: 42264 URL: http://svn.reactos.org/svn/reactos?rev=42264&view=rev Log: - Implement KoDriverInitialize, KoDeviceInitialize - Fix storing of device descriptor in KsInitializeDriver, KsAddDevice Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/kstypes.h Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Tue Jul 28 12:22:02 2009 @@ -8,7 +8,6 @@ #include "priv.h" - /* @unimplemented @@ -1167,8 +1166,209 @@ } -/* - @unimplemented +NTSTATUS +NTAPI +KopDispatchClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKO_OBJECT_HEADER Header; + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get ko object header */ + Header = (PKO_OBJECT_HEADER)IoStack->FileObject->FsContext2; + + /* free ks object header */ + KsFreeObjectHeader(Header->ObjectHeader); + + /* free ko object header */ + FreeItem(Header); + + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* release bus object */ + KsDereferenceBusObject((KSDEVICE_HEADER)DeviceExtension->DeviceHeader); + + /* complete request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + + +static KSDISPATCH_TABLE KoDispatchTable = +{ + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KopDispatchClose, + KsDispatchQuerySecurity, + KsDispatchSetSecurity, + KsDispatchFastIoDeviceControlFailure, + KsDispatchFastReadFailure, + KsDispatchFastReadFailure, +}; + + +NTSTATUS +NTAPI +KopDispatchCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKO_OBJECT_HEADER Header = NULL; + PIO_STACK_LOCATION IoStack; + PKO_DRIVER_EXTENSION DriverObjectExtension; + NTSTATUS Status; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (!IoStack->FileObject) + { + DPRINT1("FileObject not attached!\n"); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + + /* get driver object extension */ + DriverObjectExtension = (PKO_DRIVER_EXTENSION)IoGetDriverObjectExtension(DeviceObject->DriverObject, (PVOID)KoDriverInitialize); + if (!DriverObjectExtension) + { + DPRINT1("FileObject not attached!\n"); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + + /* allocate ko object header */ + Header = (PKO_OBJECT_HEADER)AllocateItem(NonPagedPool, sizeof(KO_OBJECT_HEADER)); + if (!Header) + { + DPRINT1("failed to allocate KO_OBJECT_HEADER\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + /* initialize create item */ + Header->CreateItem.Create = KopDispatchCreate; + RtlInitUnicodeString(&Header->CreateItem.ObjectClass, KOSTRING_CreateObject); + + + /* now allocate the object header */ + Status = KsAllocateObjectHeader(&Header->ObjectHeader, 1, &Header->CreateItem, Irp, &KoDispatchTable); + if (!NT_SUCCESS(Status)) + { + /* failed */ + goto cleanup; + } + + /* FIXME + * extract clsid and interface id from irp + * call the standard create handler + */ + + UNIMPLEMENTED + + IoStack->FileObject->FsContext2 = (PVOID)Header; + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; + +cleanup: + + if (Header && Header->ObjectHeader) + KsFreeObjectHeader(Header->ObjectHeader); + + if (Header) + FreeItem(Header); + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + + + +NTSTATUS +NTAPI +KopAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status = STATUS_DEVICE_REMOVED; + PDEVICE_OBJECT FunctionalDeviceObject= NULL; + PDEVICE_OBJECT NextDeviceObject; + PDEVICE_EXTENSION DeviceExtension; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* create the device object */ + Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), NULL, FILE_DEVICE_KS, FILE_DEVICE_SECURE_OPEN, FALSE, &FunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* allocate the create item */ + CreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + + if (!CreateItem) + { + /* not enough memory */ + IoDeleteDevice(FunctionalDeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize create item */ + CreateItem->Create = KopDispatchCreate; + RtlInitUnicodeString(&CreateItem->ObjectClass, KOSTRING_CreateObject); + + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)FunctionalDeviceObject->DeviceExtension; + + /* now allocate the device header */ + Status = KsAllocateDeviceHeader((KSDEVICE_HEADER*)&DeviceExtension->DeviceHeader, 1, CreateItem); + if (!NT_SUCCESS(Status)) + { + /* failed */ + IoDeleteDevice(FunctionalDeviceObject); + FreeItem(CreateItem); + return Status; + } + + /* now attach to device stack */ + NextDeviceObject = IoAttachDeviceToDeviceStack(FunctionalDeviceObject, PhysicalDeviceObject); + if (NextDeviceObject) + { + /* store pnp base object */ + KsSetDevicePnpAndBaseObject((KSDEVICE_HEADER)DeviceExtension->DeviceHeader, NextDeviceObject, FunctionalDeviceObject); + /* set device flags */ + FunctionalDeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + FunctionalDeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + } + else + { + /* failed */ + KsFreeDeviceHeader((KSDEVICE_HEADER)DeviceExtension->DeviceHeader); + FreeItem(CreateItem); + IoDeleteDevice(FunctionalDeviceObject); + Status = STATUS_DEVICE_REMOVED; + } + + /* return result */ + return Status; +} + + +/* + @implemented */ COMDDKAPI NTSTATUS @@ -1176,12 +1376,16 @@ KoDeviceInitialize( IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented + PDEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + return KsAddObjectCreateItemToDeviceHeader((KSDEVICE_HEADER)DeviceExtension->DeviceHeader, KopDispatchCreate, NULL, KOSTRING_CreateObject, NULL); +} + +/* + @implemented */ COMDDKAPI NTSTATUS @@ -1191,8 +1395,38 @@ IN PUNICODE_STRING RegistryPathName, IN KoCreateObjectHandler CreateObjectHandler) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PKO_DRIVER_EXTENSION DriverObjectExtension; + NTSTATUS Status; + + /* allocate driver object extension */ + Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KoDriverInitialize, sizeof(KO_DRIVER_EXTENSION), (PVOID*)&DriverObjectExtension); + + /* did it work */ + if (NT_SUCCESS(Status)) + { + /* store create handler */ + DriverObjectExtension->CreateObjectHandler = CreateObjectHandler; + + /* Setting our IRP handlers */ + DriverObject->MajorFunction[IRP_MJ_PNP] = KsDefaultDispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; + + /* The driver unload routine */ + DriverObject->DriverUnload = KsNullDriverUnload; + + /* The driver-supplied AddDevice */ + DriverObject->DriverExtension->AddDevice = KopAddDevice; + + /* KS handles these */ + DPRINT1("Setting KS function handlers\n"); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + + } + + return Status; } /* Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Jul 28 12:22:02 2009 @@ -688,7 +688,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -712,7 +712,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -737,7 +737,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -759,7 +759,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Tue Jul 28 12:22:02 2009 @@ -116,13 +116,16 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - PKSDEVICE_DESCRIPTOR *DriverObjectExtension; - PKSDEVICE_DESCRIPTOR Descriptor = NULL; + PKS_DRIVER_EXTENSION DriverObjectExtension; + const KSDEVICE_DESCRIPTOR *Descriptor = NULL; + /* get stored driver object extension */ DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, (PVOID)KsAddDevice); + if (DriverObjectExtension) { - Descriptor = *DriverObjectExtension; + /* get the stored descriptor see KsInitializeDriver */ + Descriptor = DriverObjectExtension->Descriptor; } return KsCreateDevice(DriverObject, PhysicalDeviceObject, Descriptor, 0, NULL); @@ -140,17 +143,18 @@ IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL ) { - PKSDEVICE_DESCRIPTOR *DriverObjectExtension; + PKS_DRIVER_EXTENSION DriverObjectExtension; NTSTATUS Status; if (Descriptor) { - Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KsAddDevice, sizeof(PKSDEVICE_DESCRIPTOR), (PVOID*)&DriverObjectExtension); + Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KsAddDevice, sizeof(KS_DRIVER_EXTENSION), (PVOID*)&DriverObjectExtension); if (NT_SUCCESS(Status)) { - *DriverObjectExtension = (KSDEVICE_DESCRIPTOR*)Descriptor; + DriverObjectExtension->Descriptor = Descriptor; } } + /* Setting our IRP handlers */ DriverObject->MajorFunction[IRP_MJ_CREATE] = IKsDevice_Create; DriverObject->MajorFunction[IRP_MJ_PNP] = IKsDevice_Pnp; Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Jul 28 12:22:02 2009 @@ -1,5 +1,22 @@ #ifndef KSTYPES_H__ #define KSTYPES_H__ + +typedef struct +{ + KoCreateObjectHandler CreateObjectHandler; +}KO_DRIVER_EXTENSION, *PKO_DRIVER_EXTENSION; + +typedef struct +{ + const KSDEVICE_DESCRIPTOR *Descriptor; +}KS_DRIVER_EXTENSION, *PKS_DRIVER_EXTENSION; + +typedef struct +{ + KSOBJECT_HEADER ObjectHeader; + KSOBJECT_CREATE_ITEM CreateItem; +}KO_OBJECT_HEADER, *PKO_OBJECT_HEADER; + typedef struct {

1 0

[fireball] 42263: - Fix a regression introduced in 40710, which caused all machine-specific memory regions to be concatenated into one big LoaderSpecialMemory. Restore previous behaviour by properly matching Arc and bootloader memory types.
by fireball＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: fireball Date: Tue Jul 28 12:00:58 2009 New Revision: 42263 URL: http://svn.reactos.org/svn/reactos?rev=42263&view=rev Log: - Fix a regression introduced in 40710, which caused all machine-specific memory regions to be concatenated into one big LoaderSpecialMemory. Restore previous behaviour by properly matching Arc and bootloader memory types. Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Jul 28 12:00:58 2009 @@ -277,6 +277,38 @@ MemoryMapPageAllocated = LoaderFree; break; } + case MemoryFirmwarePermanent: + { + // + // Firmware permanent memory + // + MemoryMapPageAllocated = LoaderFirmwarePermanent; + break; + } + case MemoryFirmwareTemporary: + { + // + // Firmware temporary memory + // + MemoryMapPageAllocated = LoaderFirmwareTemporary; + break; + } + case MemoryLoadedProgram: + { + // + // Bootloader code + // + MemoryMapPageAllocated = LoaderLoadedProgram; + break; + } + case MemorySpecialMemory: + { + // + // Special reserved memory + // + MemoryMapPageAllocated = LoaderSpecialMemory; + break; + } default: { //

1 0

[gschneider] 42262: RosDbg: Signal if a client connected in pipe client mode, this mode works with QEMU now
by gschneider＠svn.reactos.org 28 Jul '09

28 Jul '09

Author: gschneider Date: Tue Jul 28 03:25:09 2009 New Revision: 42262 URL: http://svn.reactos.org/svn/reactos?rev=42262&view=rev Log: RosDbg: Signal if a client connected in pipe client mode, this mode works with QEMU now Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Tue Jul 28 03:25:09 2009 @@ -54,7 +54,6 @@ { ioStream = sStream; bClientConn = true; - if (ClientConnectedEvent != null) { ClientConnectedEvent(this, EventArgs.Empty); @@ -89,6 +88,11 @@ if (cStream.IsConnected) { ioStream = cStream; + bClientConn = true; + if (ClientConnectedEvent != null) + { + ClientConnectedEvent(this, EventArgs.Empty); + } return true; } else @@ -120,13 +124,11 @@ case ConnectionMode.MODE_CLIENT: CreateClientPipe(name); - - /* pipe open, everything fine */ return true; case ConnectionMode.MODE_SERVER: CreateServerPipe(name); - return true; + return true; } return false; } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Jul 28 03:25:09 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.65")] -[assembly: AssemblyFileVersion("1.0.2.65")] +[assembly: AssemblyVersion("1.0.2.66")] +[assembly: AssemblyFileVersion("1.0.2.66")]

1 0

[gschneider] 42261: RosDbg: - Handle thread abortions gradually, avoid calling Thread.abort() - Fixes a crash that happened when closing connection to a pipe server waiting for connections - Fix typo
by gschneider＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: gschneider Date: Tue Jul 28 01:58:40 2009 New Revision: 42261 URL: http://svn.reactos.org/svn/reactos?rev=42261&view=rev Log: RosDbg: - Handle thread abortions gradually, avoid calling Thread.abort() - Fixes a crash that happened when closing connection to a pipe server waiting for connections - Fix typo Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Tue Jul 28 01:58:40 2009 @@ -25,6 +25,7 @@ private List<String> cmdList; /*list of commands pending to be written */ private bool bClientConn; private Thread waitThread; + private NamedPipeServerStream sStream; public event EventHandler ClientConnectedEvent; public event EventHandler ClientDisconnectedEvent; @@ -43,34 +44,39 @@ cmdList = new List<string>(); } - private void WaitForConnection(object data) - { - NamedPipeServerStream pipeStream = (NamedPipeServerStream)data; - - pipeStream.WaitForConnection(); - - if (pipeStream.IsConnected) - { - ioStream = pipeStream; - bClientConn = true; - - if (ClientConnectedEvent != null) - { - ClientConnectedEvent(this, EventArgs.Empty); - } + private void WaitForConnection() + { + try + { + sStream.WaitForConnection(); + + if (sStream.IsConnected) + { + ioStream = sStream; + bClientConn = true; + + if (ClientConnectedEvent != null) + { + ClientConnectedEvent(this, EventArgs.Empty); + } + } + } + catch (IOException) + { + /* Pipe got killed externally */ } } public void CreateServerPipe(string name) { /* create a pipe and wait for a client */ - NamedPipeServerStream sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, + sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous, PIPE_SIZE, PIPE_SIZE); waitThread = new Thread(WaitForConnection); - waitThread.Start(sStream); - } - + waitThread.Start(); + } + public bool CreateClientPipe(string name) { /* try to connect as a client */ @@ -136,7 +142,9 @@ newWriteData.Set(); if (waitThread != null) - waitThread.Abort(); + { + sStream.Close(); + } } public void WriteLoop() Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Tue Jul 28 01:58:40 2009 @@ -315,7 +315,7 @@ mConnection.StartTCP(newConnection.Host, newConnection.Port); break; } - connectToolStripMenuItem.Text = "&Disconect"; + connectToolStripMenuItem.Text = "&Disconnect"; } } else @@ -461,7 +461,7 @@ { Process.Start(((ToolStripMenuItem)sender).Name); } - catch (Exception ex) + catch (Exception) { } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Jul 28 01:58:40 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.64")] -[assembly: AssemblyFileVersion("1.0.2.64")] +[assembly: AssemblyVersion("1.0.2.65")] +[assembly: AssemblyFileVersion("1.0.2.65")]

1 0

[gschneider] 42260: RosDbg: - Don't crash if there are no COM ports available (inspired by Talley's patch), remove serial tab in that case to avoid user confusion - Get rid of tab order dependencies See issue #4585 for more details.
by gschneider＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: gschneider Date: Tue Jul 28 00:21:45 2009 New Revision: 42260 URL: http://svn.reactos.org/svn/reactos?rev=42260&view=rev Log: RosDbg: - Don't crash if there are no COM ports available (inspired by Talley's patch), remove serial tab in that case to avoid user confusion - Get rid of tab order dependencies See issue #4585 for more details. Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] Tue Jul 28 00:21:45 2009 @@ -112,12 +112,21 @@ int i = 0; /* Serial */ - foreach (string s in SerialPort.GetPortNames()) + string[] serialPorts = SerialPort.GetPortNames(); + if (serialPorts == null || serialPorts.Length == 0) { - cPort.Items.Add(s); + tabControl.TabPages.Remove(tabSerial); + Settings.SelectedConnType = ConnectionType.Pipe; } - SelectComboItem(cPort, Settings.ComPort); - SelectComboItem(cBaud, Settings.Baudrate); + else + { + foreach (string s in serialPorts) + { + cPort.Items.Add(s); + } + SelectComboItem(cPort, Settings.ComPort); + SelectComboItem(cBaud, Settings.Baudrate); + } /* Pipe */ DefaultRadioBtn.Text += " [" + defaultPipeName + "]"; @@ -128,7 +137,18 @@ } cType.SelectedIndex = i; - tabControl.SelectedIndex = (int) Settings.SelectedConnType; + switch (Settings.SelectedConnType) + { + case ConnectionType.Pipe: + tabControl.SelectedTab = tabPipe; + break; + case ConnectionType.Serial: + tabControl.SelectedTab = tabSerial; + break; + case ConnectionType.Socket: + tabControl.SelectedTab = tabSocket; + break; + } } private void CustomRadioBtn_CheckedChanged(object sender, EventArgs e) @@ -139,7 +159,18 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e) { - Type = (ConnectionType) ((TabControl)sender).SelectedIndex; + if (tabControl.SelectedTab == tabPipe) + { + Type = ConnectionType.Pipe; + } + else if(tabControl.SelectedTab == tabSerial) + { + Type = ConnectionType.Serial; + } + else if (tabControl.SelectedTab == tabSocket) + { + Type = ConnectionType.Socket; + } } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Jul 28 00:21:45 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.63")] -[assembly: AssemblyFileVersion("1.0.2.63")] +[assembly: AssemblyVersion("1.0.2.64")] +[assembly: AssemblyFileVersion("1.0.2.64")]

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