Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[chorns] 19532: Rename ISO before upload

by chorns＠svn.reactos.com

Rename ISO before upload Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:23:07 UTC (rev 19531) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:33:38 UTC (rev 19532) @@ -185,6 +185,11 @@ string branch, int revision) { + string distributionFilename = GetDistributionFilename(branch, + revision); + string destinationFilename = Path.Combine(Path.GetDirectoryName(sourceFilename), + distributionFilename); + File.Move(sourceFilename, distributionFilename); string server; string directory; SplitRemotePublishPath(publishPath, out server, out directory); @@ -196,7 +201,7 @@ if (!ftpClient.DirectoryExists(branch)) ftpClient.MakeDir(branch); ftpClient.ChangeDir(branch); - ftpClient.Upload(sourceFilename); + ftpClient.Upload(destinationFilename); ftpClient.Close(); }

18 years, 9 months

[hpoussin] 19531: Patch by Elrond:

by hpoussin＠svn.reactos.com

Patch by Elrond: - Let NpfsListeningCancelRoutine show the pipe name it is trying to act on. - Add more ASSERT()s to NpfsRead, which seems to act quite strange sometimes Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-11-24 14:36:47 UTC (rev 19530) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-11-24 16:23:07 UTC (rev 19531) @@ -22,10 +22,11 @@ { PNPFS_WAITER_ENTRY Waiter; - DPRINT1("NpfsListeningCancelRoutine() called\n"); - Waiter = (PNPFS_WAITER_ENTRY)&Irp->Tail.Overlay.DriverContext; + DPRINT1("NpfsListeningCancelRoutine() called for <%wZ>\n", + &Waiter->Fcb->Pipe->PipeName); + IoReleaseCancelSpinLock(Irp->CancelIrql); _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-11-24 14:36:47 UTC (rev 19530) +++ trunk/reactos/drivers/fs/np/rw.c 2005-11-24 16:23:07 UTC (rev 19531) @@ -442,6 +442,7 @@ break; } } + ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); if (Fcb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n");

18 years, 9 months

[silverblade] 19530: Partial implementation of WDMAUD.DRV - device capability querying fails

by silverblade＠svn.reactos.com

Partial implementation of WDMAUD.DRV - device capability querying fails Added: trunk/reactos/lib/wdmaud/ Added: trunk/reactos/lib/wdmaud/TODO Added: trunk/reactos/lib/wdmaud/control.c Added: trunk/reactos/lib/wdmaud/devices.c Added: trunk/reactos/lib/wdmaud/helper.c Added: trunk/reactos/lib/wdmaud/kernel.c Added: trunk/reactos/lib/wdmaud/threads.c Added: trunk/reactos/lib/wdmaud/user.c Added: trunk/reactos/lib/wdmaud/wavehdr.c Added: trunk/reactos/lib/wdmaud/wdmaud.def Added: trunk/reactos/lib/wdmaud/wdmaud.h Added: trunk/reactos/lib/wdmaud/wdmaud.rc Added: trunk/reactos/lib/wdmaud/wdmaud.xml _____ Added: trunk/reactos/lib/wdmaud/TODO --- trunk/reactos/lib/wdmaud/TODO 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/TODO 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,4 @@ +To-Do: +- Globally store the heap handle +- Ensure cleanups are... clean... +- Clone device info in OPEN/close? _____ Added: trunk/reactos/lib/wdmaud/control.c --- trunk/reactos/lib/wdmaud/control.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/control.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,47 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/wavehdr.c + * PURPOSE: WDM Audio Support - Device Control (Play/Stop etc.) + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 23, 2005: Created + */ + +#include <windows.h> +#include "wdmaud.h" + +/* + TODO: + Make these work for the other device types! +*/ + +MMRESULT StartDevice(PWDMAUD_DEVICE_INFO device) +{ + MMRESULT result; + DWORD ioctl_code; + + result = ValidateDeviceInfoAndState(device); + + if ( result != MMSYSERR_NOERROR ) + return result; + + ioctl_code = device == WDMAUD_WAVE_IN ? IOCTL_WDMAUD_WAVE_IN_START : + device == WDMAUD_WAVE_OUT ? IOCTL_WDMAUD_WAVE_OUT_START : + 0x0000; + + ASSERT( ioctl_code ); +} + +MMRESULT StopDevice(PWDMAUD_DEVICE_INFO device) +{ +} + +MMRESULT PauseDevice(PWDMAUD_DEVICE_INFO device) +{ +} + +MMRESULT StopDeviceLooping(PWDMAUD_DEVICE_INFO device) +{ +} Property changes on: trunk/reactos/lib/wdmaud/control.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/devices.c --- trunk/reactos/lib/wdmaud/devices.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/devices.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,697 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/devices.c + * PURPOSE: WDM Audio Support - Device Management + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 18, 2005: Created + * + * WARNING! SOME OF THESE FUNCTIONS OUGHT TO COPY THE DEVICE INFO STRUCTURE + * THAT HAS BEEN FED TO THEM! +*/ + +#include <windows.h> +#include "wdmaud.h" + +const char WDMAUD_DEVICE_INFO_SIG[4] = "WADI"; +const char WDMAUD_DEVICE_STATE_SIG[4] = "WADS"; + + +BOOL IsValidDevicePath(WCHAR* path) +{ + if (IsBadReadPtr(path, 1)) /* TODO: Replace with flags */ + { + DPRINT1("Bad interface\n"); + return FALSE; + } + + /* Original driver seems to check for strlenW < 0x1000 */ + + return TRUE; +} + +MMRESULT ValidateDeviceInfo(PWDMAUD_DEVICE_INFO device_info) +{ + if ( IsBadWritePtr(device_info, sizeof(WDMAUD_DEVICE_INFO)) ) + return MMSYSERR_INVALPARAM; + + if ( *device_info->signature != *WDMAUD_DEVICE_INFO_SIG ) + return MMSYSERR_INVALPARAM; + + return MMSYSERR_NOERROR; +} + +MMRESULT ValidateDeviceState(PWDMAUD_DEVICE_STATE state) +{ + if ( IsBadWritePtr(state, sizeof(WDMAUD_DEVICE_INFO)) ) + return MMSYSERR_INVALPARAM; + + if ( *state->signature != *WDMAUD_DEVICE_STATE_SIG ) + return MMSYSERR_INVALPARAM; + + return MMSYSERR_NOERROR; +} + +/* + ValidateDeviceStateEvents should be used in conjunction with the standard + state validation routine. +*/ + +MMRESULT ValidateDeviceStateEvents(PWDMAUD_DEVICE_STATE state) +{ + if ( ( (DWORD) state->exit_thread_event == 0x00000000 ) && + ( (DWORD) state->exit_thread_event != 0x48484848 ) ) + { + DPRINT1("Bad exit thread event\n"); + return MMSYSERR_INVALPARAM; + } + + if ( ( (DWORD) state->queue_event == 0x00000000 ) && + ( (DWORD) state->queue_event != 0x42424242 ) && + ( (DWORD) state->queue_event != 0x43434343 ) ) + { + DPRINT1("Bad queue event\n"); + return MMSYSERR_INVALPARAM; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT ValidateDeviceInfoAndState(PWDMAUD_DEVICE_INFO device_info) +{ + MMRESULT result; + + result = ValidateDeviceInfo(device_info); + + if ( result != MMSYSERR_NOERROR ) + return result; + + result = ValidateDeviceState(device_info->state); + + if ( result != MMSYSERR_NOERROR ) + return result; + + return MMSYSERR_NOERROR; +} + +PWDMAUD_DEVICE_INFO CreateDeviceData(CHAR device_type, WCHAR* device_path) +{ + HANDLE heap = 0; + PWDMAUD_DEVICE_INFO device_data = 0; + int path_size = 0; + + if ( ! IsValidDevicePath(device_path) ) + { + DPRINT1("No valid device interface given!\n"); + goto cleanup; + } + + /* Take into account this is a unicode string... */ + path_size = (lstrlen(device_path) + 1) * sizeof(WCHAR); + DPRINT("Size of path is %d\n", (int) path_size); + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("Couldn't get the process heap (error %d)\n", + (int) GetLastError()); + goto cleanup; + } + + DPRINT("Allocating %d bytes\n", + path_size + sizeof(WDMAUD_DEVICE_INFO)); + + device_data = (PWDMAUD_DEVICE_INFO) HeapAlloc(heap, + HEAP_ZERO_MEMORY, + path_size + sizeof(WDMAUD_DEVICE_INFO)); + + if ( ! device_data ) + { + DPRINT1("Unable to allocate memory for device data (error %d)\n", + (int) GetLastError()); + goto cleanup; + } + + DPRINT("Copying signature\n"); + memcpy(device_data->signature, WDMAUD_DEVICE_INFO_SIG, 4); + + DPRINT("Copying path (0x%x)\n", (int)device_path); + lstrcpy(device_data->path, device_path); + + device_data->type = device_type; + + cleanup : + { + /* No cleanup needed (no failures possible after allocation.) */ + DPRINT("Performing cleanup\n"); + + return device_data; + } +} + +PWDMAUD_DEVICE_INFO CloneDeviceData(PWDMAUD_DEVICE_INFO original) +{ + PWDMAUD_DEVICE_INFO clone = NULL; + + if ( ValidateDeviceInfo(original) != MMSYSERR_NOERROR) + { + DPRINT1("Original device data was invalid\n"); + return NULL; + } + + /* This will set the type and path, so we can forget about those */ + clone = CreateDeviceData(original->type, original->path); + + if ( ! clone ) + { + DPRINT1("Clone creation failed\n"); + return NULL; + } + + clone->id = original->id; + clone->wave_handle = original->wave_handle; /* ok? */ + + /* TODO: Maybe we should copy some more? */ + + return clone; +} + +void DeleteDeviceData(PWDMAUD_DEVICE_INFO device_data) +{ + ASSERT( device_data ); + /* TODO */ +} + +MMRESULT ModifyDevicePresence( + CHAR device_type, + WCHAR* device_path, + BOOL adding) +{ + DWORD ioctl = 0; + PWDMAUD_DEVICE_INFO device_data = 0; + MMRESULT result = MMSYSERR_ERROR; + MMRESULT kernel_result = MMSYSERR_ERROR; + + DPRINT("ModifyDevicePresence - %s a device\n", + adding ? "adding" : "removing"); + + DPRINT("Topology path %S\n", device_path); + + /* FIXME: DeviceType! */ + /* TODO: Assert on device type? */ + + ASSERT( IsValidDeviceType(device_type) ); + ASSERT( device_path ); + + device_data = CreateDeviceData(device_type, device_path); + + if ( ! device_data ) + { + DPRINT1("Couldn't allocate memory for device data\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + +/* device_data->type = device_type; */ + + ioctl = adding ? IOCTL_WDMAUD_ADD_DEVICE : IOCTL_WDMAUD_REMOVE_DEVICE; + + kernel_result = CallKernelDevice(device_data, + ioctl, + 0, + 0); + + if ( kernel_result != MMSYSERR_NOERROR ) + { + DPRINT1("WdmAudioIoControl FAILED with error %d\n", (int) kernel_result); + + switch ( kernel_result ) + { + /* TODO: Translate into a real error code */ + default : + result = MMSYSERR_ERROR; + } + + goto cleanup; + } + + DPRINT("ModifyDevicePresence succeeded\n"); + + result = MMSYSERR_NOERROR; + + cleanup : + { + if ( device_data ) + DeleteDeviceData(device_data); + + return result; + } +} + +DWORD GetDeviceCount(CHAR device_type, WCHAR* topology_path) +{ + PWDMAUD_DEVICE_INFO device_data; + int device_count = 0; + + DPRINT("Topology path %S\n", topology_path); + + device_data = CreateDeviceData(device_type, topology_path); + + if (! device_data) + { + DPRINT1("Couldn't allocate device data\n"); + goto cleanup; + } + + DPRINT("Getting num devs\n"); + + /*device_data->type = device_type;*/ + device_data->with_critical_section = FALSE; + + if ( CallKernelDevice(device_data, + IOCTL_WDMAUD_GET_DEVICE_COUNT, + 0, + 0) != MMSYSERR_NOERROR ) + { + DPRINT1("Failed\n"); + goto cleanup; + } + + device_count = device_data->id; + + DPRINT("There are %d devs\n", device_count); + + cleanup : + { + if ( device_data ) + DeleteDeviceData(device_data); + + return device_count; + } +} + +/* + This is a bit messed up +*/ + +MMRESULT GetDeviceCapabilities( + CHAR device_type, + DWORD device_id, + WCHAR* device_path, + LPCOMMONCAPS caps +) +{ + PWDMAUD_DEVICE_INFO device = NULL; + MMRESULT result = MMSYSERR_ERROR; + + DPRINT("Device path %S\n", device_path); + + /* Hmm - caps->wMid seems to be 0x54 (84) from XP's winmm.dll */ + if (caps->wMid == 0) + { + return MMSYSERR_NOERROR; + + DPRINT("caps->wMid == 0\n"); + + DPRINT("Manufacturer: 0x%x (%d)\n", caps->wMid, caps->wMid); + DPRINT("Product: 0x%x (%d)\n", caps->wPid, caps->wPid); + DPRINT("Device is: %S\n", caps->szPname); + + if ( IsWaveOutDeviceType(device_type) ) + { + LPWAVEOUTCAPS woc = (LPWAVEOUTCAPS) caps; + DPRINT("Formats: %d\n", (int) woc->dwFormats); + DPRINT("Channels: %d\n", woc->wChannels); + DPRINT("Reserved: %d\n", woc->wReserved1); + DPRINT("Support: %d\n", (int) woc->dwSupport); + } + + return MMSYSERR_NOERROR; + } + +#if 0 + int i; + for (i = 0; i < 64; i ++) + { + DPRINT("0x%x\n", *(((UCHAR*)caps) + i)); + } + + return MMSYSERR_NOERROR; +#endif + + DPRINT("Going to have to query the kernel-mode part\n"); + + device = CreateDeviceData(device_type, device_path); + + if ( ! device ) + { + DPRINT("Unable to allocate device data memory\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + device->id = device_id; + device->with_critical_section = FALSE; + + /* ? */ + DPRINT("Caps wMid is 0x%x\n", (int) caps->wMid); + DPRINT("Driver version is 0x%x\n", (int) caps->vDriverVersion); + + DPRINT("%S\n", (WCHAR*) caps->vDriverVersion); + + LPWORD theword; + theword = (LPWORD) caps->vDriverVersion; + *theword = 0x43; + //caps->vDriverVersion=0x4300; + + + DPRINT("Calling kernel device\n"); + result = CallKernelDevice(device, + IOCTL_WDMAUD_GET_CAPABILITIES, + (DWORD)caps->wMid, + (DWORD)caps->vDriverVersion); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("IoControl failed\n"); + goto cleanup; + } + + + + /* What do we return? */ + /*return MMSYSERR_NOERROR; */ /* already set by now */ + + cleanup : + { + if ( device ) + DeleteDeviceData(device); + + return result; + } +} + +MMRESULT TryOpenDevice( + PWDMAUD_DEVICE_INFO device, + LPWAVEFORMATEX format +) +{ + if ( device->id > 0x64 ) /* FIXME */ + { + DPRINT1("device->id > 0x64 ! ???\n"); + return MMSYSERR_BADDEVICEID; /* OK? */ + } + + /* We'll only have a format set for wave devices */ + if ( format ) + { + if ( format->wFormatTag == 1 ) + { + DWORD sample_size; + + DPRINT("Standard (PCM) format\n"); + sample_size = format->nChannels * format->wBitsPerSample; + device->state->sample_size = sample_size; + + if ( CallKernelDevice(device, + IOCTL_WDMAUD_OPEN_DEVICE, + 0x10, + (DWORD)format) + != MMSYSERR_NOERROR ) + { + DPRINT("Call failed\n"); + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; /* WAVERR_BADFORMAT? */ + } + } + else + { + /* FIXME */ + DPRINT("Non-PCM format\n"); + return MMSYSERR_NOTSUPPORTED; + } + } + + /* If we got this far without error, the format is supported! */ + return MMSYSERR_NOERROR; +} + +MMRESULT OpenWaveDevice( + CHAR device_type, + DWORD device_id, + LPWAVEOPENDESC open_details, + DWORD flags, + DWORD user_data +) +{ + HANDLE heap = 0; + PWDMAUD_DEVICE_INFO device = NULL; + WCHAR* device_path = NULL; + MMRESULT result = MMSYSERR_ERROR; + + /* ASSERT(open_details); */ + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("Couldn't get the process heap (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_ERROR; + goto cleanup; + } + + DPRINT("OpenDevice called\n"); + + device_path = (WCHAR*) open_details->dnDevNode; + device = CreateDeviceData(device_type, device_path); + + if ( ! device ) + { + DPRINT1("Couldn't create device data\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + DPRINT("Allocated device data, allocating device state\n"); + + device->state = HeapAlloc(heap, + HEAP_ZERO_MEMORY, + sizeof(WDMAUD_DEVICE_STATE)); + + if ( ! device->state ) + { + DPRINT1("Couldn't allocate memory for device state (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + /* FIXME: ok here ? */ + device->type = device_type; + device->id = device_id; + device->flags = flags; + + if ( flags & WAVE_FORMAT_QUERY ) + { + DPRINT("Do I support this format? Hmm...\n"); + + result = TryOpenDevice(device, open_details->lpFormat); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Format not supported\n"); + goto cleanup; + } + + DPRINT("Yes, I do support this format!\n"); + } + else + { + + DPRINT("You actually want me to open the device, huh?\n"); + + /* Allocate memory for the "queue" critical section */ + + device->state->queue_critical_section = + HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(CRITICAL_SECTION)); + + if ( ! device->state->queue_critical_section ) + { + DPRINT1("Couldn't allocate memory for queue critical section (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + /* Initialize the critical section */ + InitializeCriticalSection(device->state->queue_critical_section); + + /* We need these so we can contact the client later */ + device->client_instance = open_details->dwInstance; + device->client_callback = open_details->dwCallback; + + /* Reset state */ + device->state->open_descriptor = NULL; + device->state->unknown_24 = 0; + + device->state->is_running = FALSE; + device->state->is_paused = + device->type == WDMAUD_WAVE_IN ? TRUE : FALSE; + + memcpy(device->state->signature, WDMAUD_DEVICE_STATE_SIG, 4); + + DPRINT("All systems are go...\n"); + + result = TryOpenDevice(device, open_details->lpFormat); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT1("Format not supported?\n"); + goto cleanup; /* no need to set result - already done */ + } + + /* Enter the critical section while updating the device list */ + EnterCriticalSection(device->state->queue_critical_section); + /* ... */ + LeaveCriticalSection(device->state->queue_critical_section); + + /* The wave device handle is actually our structure. Neat, eh? */ + open_details->hWave = (HWAVE) device; + + /* We also need to set our "user data" for winmm */ + LPVOID* ud = (LPVOID*) user_data; /* FIXME */ + *ud = device; + + if (device->client_callback) + { + DWORD message; + + message = (device->type == WDMAUD_WAVE_IN ? WIM_OPEN : + WDMAUD_WAVE_OUT ? WOM_OPEN : -1); + + DPRINT("About to call the client callback\n"); + + /* Call the callback */ + NotifyClient(device, message, 0, 0); + + DPRINT("...it is done!\n"); + } + + result = MMSYSERR_NOERROR; + } + + /* + This cleanup may need checking for memory leakage :/ + */ + + cleanup : + { + if ( ( result != MMSYSERR_NOERROR ) && ( heap ) ) + { + if ( device ) + { + if ( device->state ) + { + if ( device->state->queue_critical_section ) + { + DeleteCriticalSection(device->state->queue_critical_section); + HeapFree(heap, 0, device->state->queue_critical_section); + } + + HeapFree(heap, 0, device->state); + } + + DeleteDeviceData(device); + } + } + + DPRINT("Returning %d\n", (int) result); + + return result; + } +} + +MMRESULT CloseDevice( + PWDMAUD_DEVICE_INFO device +) +{ + MMRESULT result = MMSYSERR_ERROR; + + DPRINT("CloseDevice()\n"); + + DUMP_WDMAUD_DEVICE_INFO(device); + + if ( ValidateDeviceInfo(device) != MMSYSERR_NOERROR ) + { + DPRINT1("Invalid device info passed to CloseDevice\n"); + result = MMSYSERR_INVALHANDLE; + goto cleanup; + } + + /* TODO: Check state! */ + + if ( device->id > 0x64 ) /* FIXME ? */ + { + DPRINT1("??\n"); + goto cleanup; + } + + switch(device->type) + { + case WDMAUD_WAVE_OUT : + { + if ( device->state->open_descriptor ) + { + DPRINT1("Device is still playing!\n"); + result = WAVERR_STILLPLAYING; + goto cleanup; + } + + /* TODO: Destroy completion thread */ + + break; + } + + default : + { + DPRINT1("Sorry, device type %d not supported yet!\n", (int) device->type); + goto cleanup; + } + } + + result = CallKernelDevice(device, IOCTL_WDMAUD_CLOSE_DEVICE, 0, 0); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT1("Couldn't close the device!\n"); + goto cleanup; + } + + if (device->client_callback) + { + DWORD message; + + message = (device->type == WDMAUD_WAVE_IN ? WIM_CLOSE : + WDMAUD_WAVE_OUT ? WOM_CLOSE : + WDMAUD_MIDI_IN ? MIM_CLOSE : + WDMAUD_MIDI_OUT ? MOM_CLOSE : -1); + + DPRINT("About to call the client callback\n"); + + /* Call the callback */ + NotifyClient(device, message, 0, 0); + + DPRINT("...it is done!\n"); + } + + /* Result was set earlier by CallKernelDevice */ + + cleanup : + { + return result; + } +} Property changes on: trunk/reactos/lib/wdmaud/devices.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/helper.c --- trunk/reactos/lib/wdmaud/helper.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/helper.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,46 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/helper.c + * PURPOSE: Multimedia User Mode Driver - Helper Funcs + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 13, 2005: Created + */ + +#include <windows.h> +#include <mmsystem.h> + +/* + TranslateWinError converts Win32 error codes (returned by + GetLastError, typically) into MMSYSERR codes. +*/ + +MMRESULT TranslateWinError(DWORD error) +{ + switch(error) + { + case NO_ERROR : + case ERROR_IO_PENDING : + return MMSYSERR_NOERROR; + + case ERROR_BUSY : + return MMSYSERR_ALLOCATED; + + case ERROR_NOT_SUPPORTED : + case ERROR_INVALID_FUNCTION : + return MMSYSERR_NOTSUPPORTED; + + case ERROR_NOT_ENOUGH_MEMORY : + return MMSYSERR_NOMEM; + + case ERROR_ACCESS_DENIED : + return MMSYSERR_BADDEVICEID; + + case ERROR_INSUFFICIENT_BUFFER : + return MMSYSERR_INVALPARAM; + } + + return MMSYSERR_ERROR; +} Property changes on: trunk/reactos/lib/wdmaud/helper.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/kernel.c --- trunk/reactos/lib/wdmaud/kernel.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/kernel.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,358 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/kernel.c + * PURPOSE: WDM Audio Support - Kernel Mode Interface + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 18, 2005: Created + */ + +#define INITGUID /* FIXME */ + +#include <windows.h> +#include <setupapi.h> +#include "wdmaud.h" + +/* HACK ALERT - This goes in ksmedia.h */ +DEFINE_GUID(KSCATEGORY_WDMAUD, + 0x3e227e76L, 0x690d, 0x11d2, 0x81, 0x61, 0x00, 0x00, 0xf8, 0x77, 0x5b, 0xf1); + +/* This stores the handle of the kernel device */ +static HANDLE kernel_device_handle = NULL; + +//static WCHAR* + + +/* + TODO: There's a variant of this that uses critical sections... +*/ + +MMRESULT CallKernelDevice( + PWDMAUD_DEVICE_INFO device, + DWORD ioctl_code, + DWORD param1, + DWORD param2) +{ + OVERLAPPED overlap; + MMRESULT result = MMSYSERR_ERROR; + DWORD name_len = 0; + DWORD bytes_returned = 0; + BOOL using_critical_section = FALSE; + + ASSERT(kernel_device_handle); + ASSERT(device); + + DPRINT("Creating event\n"); + overlap.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if ( ! overlap.hEvent ) + { + DPRINT1("CreateEvent failed - error %d\n", (int)GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + DPRINT("Sizeof wchar == %d\n", (int) sizeof(WCHAR)); + name_len = lstrlen(device->path) * sizeof(WCHAR); /* ok ? */ + + /* These seem to carry optional structures */ + device->ioctl_param1 = param1; + device->ioctl_param2 = param2; + + /* Enter critical section if wave/midi device, and if required */ + if ( ( ! IsMixerDeviceType(device->type) ) && + ( ! IsAuxDeviceType(device->type) ) && + ( device->with_critical_section ) ) + { + /* this seems to crash under some conditions */ + ASSERT(device->state); + using_critical_section = TRUE; + EnterCriticalSection(device->state->queue_critical_section); + } + + DPRINT("Calling DeviceIoControl with IOCTL %x\n", (int) ioctl_code); + + if ( ! DeviceIoControl(kernel_device_handle, + ioctl_code, + device, + name_len + sizeof(WDMAUD_DEVICE_INFO), + device, + sizeof(WDMAUD_DEVICE_INFO), + &bytes_returned, + &overlap) ) + { + DWORD error = GetLastError(); + + if (error != ERROR_IO_PENDING) + { + DPRINT1("FAILED in CallKernelDevice (error %d)\n", (int) error); + + DUMP_WDMAUD_DEVICE_INFO(device); + + result = TranslateWinError(error); + goto cleanup; + } + + DPRINT("Waiting for overlap I/O event\n"); + + /* Wait for the IO to be complete */ + WaitForSingleObject(overlap.hEvent, INFINITE); + } + + result = MMSYSERR_NOERROR; + DPRINT("CallKernelDevice succeeded :)\n"); + + DUMP_WDMAUD_DEVICE_INFO(device); + + cleanup : + { + /* Leave the critical section */ + if ( using_critical_section ) + LeaveCriticalSection(device->state->queue_critical_section); + + if ( overlap.hEvent ) + CloseHandle(overlap.hEvent); + + return result; + } +} + + +static BOOL ChangeKernelDeviceState(BOOL enable) +{ + PWDMAUD_DEVICE_INFO device = NULL; + DWORD ioctl_code; + MMRESULT call_result; + + ioctl_code = enable ? IOCTL_WDMAUD_HELLO : IOCTL_WDMAUD_GOODBYE; + + device = CreateDeviceData(WDMAUD_AUX, L""); + + if ( ! device ) + { + DPRINT1("Couldn't create a new device instance structure\n"); + return FALSE; + } + + DPRINT("Setting device type and disabling critical section\n"); + + device->type = WDMAUD_AUX; + device->with_critical_section = FALSE; + + DPRINT("Calling kernel device\n"); + + call_result = CallKernelDevice(device, ioctl_code, 0, 0); + + DeleteDeviceData(device); + + if ( call_result != MMSYSERR_NOERROR ) + { + DPRINT1("Kernel device doesn't like us! (error %d)\n", (int) GetLastError()); + return FALSE; + } + else + { + return TRUE; + } +} + + +BOOL EnableKernelInterface() +{ + /* SetupAPI variables/structures for querying device data */ + SP_DEVICE_INTERFACE_DATA interface_data; + PSP_DEVICE_INTERFACE_DETAIL_DATA detail = NULL; + DWORD detail_size = 0; [truncated at 1000 lines; 2036 more skipped]

18 years, 9 months

[hpoussin] 19529: Display the unknown class name in error message

by hpoussin＠svn.reactos.com

Display the unknown class name in error message Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-24 14:34:41 UTC (rev 19528) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-24 14:34:44 UTC (rev 19529) @@ -124,7 +124,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to lookup class atom!\n"); + DPRINT1("Failed to lookup class atom (ClassName '%S')!\n", ClassName); return FALSE; }

18 years, 9 months

[silverblade] 19528: Fixing EOL...

by silverblade＠svn.reactos.com

Fixing EOL... Property changes on: trunk/reactos/drivers/multimedia/README ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/directory.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/avstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/connect.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/ks.def ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/ks.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/stubs.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/wdmaud/entry.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[chorns] 19527: Check for presence of directory

by chorns＠svn.reactos.com

Check for presence of directory Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs --- trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 13:33:37 UTC (rev 19526) +++ trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 13:57:25 UTC (rev 19527) @@ -354,7 +354,21 @@ return msg; } - + + public bool DirectoryExists(string directory) + { + try + { + ChangeDir(directory); + ChangeDir(".."); + return true; + } + catch (FtpException) + { + return false; + } + } + /// <summary> /// Return the size of a file. /// </summary> _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 13:33:37 UTC (rev 19526) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 13:57:25 UTC (rev 19527) @@ -193,7 +193,7 @@ if (directory != "") ftpClient.ChangeDir(directory); /* Create destination directory if it does not already exist */ - if (ftpClient.GetFileList(branch).Length < 1) + if (!ftpClient.DirectoryExists(branch)) ftpClient.MakeDir(branch); ftpClient.ChangeDir(branch); ftpClient.Upload(sourceFilename);

18 years, 9 months

[silverblade] 19526: Remove portcls from old location

by silverblade＠svn.reactos.com

Remove portcls from old location Deleted: trunk/reactos/drivers/dd/portcls/ Modified: trunk/reactos/drivers/directory.xml Modified: trunk/reactos/drivers/readme _____ Modified: trunk/reactos/drivers/directory.xml --- trunk/reactos/drivers/directory.xml 2005-11-24 13:30:51 UTC (rev 19525) +++ trunk/reactos/drivers/directory.xml 2005-11-24 13:33:37 UTC (rev 19526) @@ -26,4 +26,7 @@ <directory name="usb"> <xi:include href="usb/directory.xml" /> </directory> + </group> _____ Modified: trunk/reactos/drivers/readme --- trunk/reactos/drivers/readme 2005-11-24 13:30:51 UTC (rev 19525) +++ trunk/reactos/drivers/readme 2005-11-24 13:33:37 UTC (rev 19526) @@ -9,3 +9,4 @@ loop = Allows accessing a file as a block device scramdisk = Filesystem encryption driver event = Sample driver demonstrating notifying a user thread using an event + multimedia = Multimedia drivers (sound/video) and kernel streaming

18 years, 9 months

[silverblade] 19525: Some preliminary stubbing of the Kernel Streaming components (portcls being moved from other directory)

by silverblade＠svn.reactos.com

Some preliminary stubbing of the Kernel Streaming components (portcls being moved from other directory) Added: trunk/reactos/drivers/multimedia/ Added: trunk/reactos/drivers/multimedia/README Added: trunk/reactos/drivers/multimedia/avtest/ Added: trunk/reactos/drivers/multimedia/avtest/avtest.xml Added: trunk/reactos/drivers/multimedia/avtest/entry.c Added: trunk/reactos/drivers/multimedia/directory.xml Added: trunk/reactos/drivers/multimedia/ks/ Added: trunk/reactos/drivers/multimedia/ks/avstream.c Added: trunk/reactos/drivers/multimedia/ks/connect.c Added: trunk/reactos/drivers/multimedia/ks/ks.def Added: trunk/reactos/drivers/multimedia/ks/ks.xml Added: trunk/reactos/drivers/multimedia/ks/stubs.c Added: trunk/reactos/drivers/multimedia/ks.h Added: trunk/reactos/drivers/multimedia/wdmaud/ Added: trunk/reactos/drivers/multimedia/wdmaud/entry.c Added: trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml _____ Added: trunk/reactos/drivers/multimedia/README --- trunk/reactos/drivers/multimedia/README 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/README 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,17 @@ +This is a directory for the kernel streaming components, along with multimedia +kernel-mode drivers. + +Platform components: +- ks.sys Kernel Streaming (and AvStream) +- sysaudio Filter graph builder (topology?) +- portcls Port Class +- wdmaud Kernel-mode portion of the MME (Win 3.1-style) driver + +Optional drivers: +- sndblst Sound Blaster (+ Pro / 16) compatible driver +- mpu401 MPU-401 MIDI compatible driver + +Much of this code exists only as stubs for future implementation. + +-Andrew Greenwood + Property changes on: trunk/reactos/drivers/multimedia/README ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/avtest/avtest.xml --- trunk/reactos/drivers/multimedia/avtest/avtest.xml 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/avtest/avtest.xml 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,8 @@ +<module name="avtest" type="kernelmodedriver" installbase="system32/drivers" installname="avtest.sys" warnings="true"> + <include base="avtest">.</include> + <include base="avtest">..</include> + <define name="__USE_W32API" /> + <library>ks</library> + <library>ntoskrnl</library> + <file>entry.c</file> +</module> Property changes on: trunk/reactos/drivers/multimedia/avtest/avtest.xml ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/avtest/entry.c --- trunk/reactos/drivers/multimedia/avtest/entry.c 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/avtest/entry.c 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,83 @@ +#include <debug.h> +#include <ks.h> + +/* Where do we go? */ +#ifndef SIZEOF_ARRAY + #define SIZEOF_ARRAY(array) \ + (sizeof(array) / sizeof(array[0])) +#endif + +/* Not in the DDK but hey! */ +#define DEFINE_KSFILTER_DISPATCH(name) \ + const KSFILTER_DISPATCH name = + +/* To be put in KS.H */ +#define DEFINE_KSFILTER_DESCRIPTOR(name) \ + const KSFILTER_DESCRIPTOR name = + +#define DEFINE_KSFILTER_DESCRIPTOR_TABLE(name) \ + const KSFILTER_DESCRIPTOR* const name[] = + + + +NTSTATUS FilterCreate( + IN OUT PKSFILTER Filter, + IN PIRP Irp) +{ + return STATUS_SUCCESS; +} + +NTSTATUS FilterClose( + IN OUT PKSFILTER Filter, + IN PIRP Irp) +{ + return STATUS_SUCCESS; +} + +NTSTATUS Process( + IN PKSFILTER Filter, + IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex) +{ + return STATUS_SUCCESS; +} + + +DEFINE_KSFILTER_DISPATCH(FilterDispatch) +{ + FilterCreate, + FilterClose, + Process, + NULL // Reset +}; + +DEFINE_KSFILTER_DESCRIPTOR(FilterDesc) +{ +}; + +DEFINE_KSFILTER_DESCRIPTOR_TABLE(FilterDescs) +{ + &FilterDesc +}; + + + +const KSDEVICE_DESCRIPTOR DeviceDescriptor = +{ + NULL, + SIZEOF_ARRAY(FilterDescs), + FilterDescs +}; + + +/* Funcs */ + +NTSTATUS STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName) +{ + DPRINT1("AVStream test component loaded!\n"); + + return KsInitializeDriver(DriverObject, RegistryPathName, + &DeviceDescriptor); +} Property changes on: trunk/reactos/drivers/multimedia/avtest/entry.c ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/directory.xml --- trunk/reactos/drivers/multimedia/directory.xml 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/directory.xml 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,24 @@ + + +<directory name="portcls"> + <xi:include href="portcls/portcls.xml" /> +</directory> + + + + + Property changes on: trunk/reactos/drivers/multimedia/directory.xml ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks/avstream.c --- trunk/reactos/drivers/multimedia/ks/avstream.c 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks/avstream.c 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,16 @@ +#include <ks.h> +#include <debug.h> + + +NTSTATUS NTAPI +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) +{ + DPRINT("KsInitializeDriver\n"); + + /* This should set up IRPs etc. */ + + return STATUS_NOT_IMPLEMENTED; +} Property changes on: trunk/reactos/drivers/multimedia/ks/avstream.c ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks/connect.c --- trunk/reactos/drivers/multimedia/ks/connect.c 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks/connect.c 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,57 @@ +/* + ReactOS Kernel Streaming component + + Written (or rather, stubbed!) by Andrew Greenwood + September 2005 +*/ + +#include <ks.h> + +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle) +{ +} + +KSDDKAPI NTSTATUS NTAPI +KsHandleSizedListQuery( + IN PIRP Irp, + IN ULONG DataItemsCount, + IN ULONG DataItemSize, + IN const VOID* DataItems) +{ +} + +KSDDKAPI NTSTATUS NTAPI +KsPinDataIntersection( + IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN PFNKSINTERSECTHANDLER IntersectHandler) +{ +} + +KSDDKAPI NTSTATUS NTAPI +KsPinPropertyHandler( + IN PIRP Irp, + IN PKSPROPERTY Property, + IN OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor) +{ +} + +KSDDKAPI NTSTATUS NTAPI +KsValidateConnectRequest( + IN PIRP Irp, + IN ULONG DescriptorsCount, + IN KSPIN_DESCRIPTOR* Descriptor, + OUT PKSPIN_CONNECT* Connect) +{ +} + Property changes on: trunk/reactos/drivers/multimedia/ks/connect.c ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks/ks.def --- trunk/reactos/drivers/multimedia/ks/ks.def 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks/ks.def 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,7 @@ +; ks.sys - Kernel Streaming + +LIBRARY ks.sys + +EXPORTS +KsInitializeDriver@12 + Property changes on: trunk/reactos/drivers/multimedia/ks/ks.def ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks/ks.xml --- trunk/reactos/drivers/multimedia/ks/ks.xml 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks/ks.xml 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,9 @@ +<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" warnings="true"> + <include base="ks">.</include> + <include base="ks">..</include> + <importlibrary definition="ks.def" /> + <library>ntoskrnl</library> + <define name="__USE_W32API" /> +  + <file>avstream.c</file> +</module> Property changes on: trunk/reactos/drivers/multimedia/ks/ks.xml ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks/stubs.c --- trunk/reactos/drivers/multimedia/ks/stubs.c 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks/stubs.c 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,112 @@ +#include "ks.h" + + +typedef struct _KSDEVICE_DESCRIPTOR +{ +} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; + +typedef struct _KSDEVICE +{ +} KSDEVICE, *PKSDEVICE; + + +NTSTATUS +KsAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + /* KsCreateDevice(DriverObject, PhysicalDeviceObject, ...); */ + + return STATUS_NOT_IMPLEMENTED; +} + + + +NTSTATUS +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +KsInitializeDevice( + IN PDEVICE_OBJECT FunctionalDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT NextDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) +{ + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +KsCreateDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, + IN ULONG ExtensionSize OPTIONAL, + OUT PKSDEVICE* Device OPTIONAL) +{ + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +KsTerminateDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + return STATUS_NOT_IMPLEMENTED; +} + + + +VOID +KsAcquireDevice( + IN PKSDEVICE Device) +{ + /* Acquire device mutex */ +} + +VOID +KsReleaseDevice( + IN PKSDEVICE Device) +{ + /* Releases device mutex and exits critical region */ +} + +VOID +KsAcquireControl( + IN PVOID Object) +{ + /* Acquire filter control mutex for Object */ + /* Object should be pointed to a KSFILTER or KSPIN */ +} + + +PKSDEVICE +KsGetDevice( + IN PVOID Object) +{ + /* ? */ + return 0; +} + +// inline +/* +PKSDEVICE __inline +KsFilterGetDevice( + IN PKSFILTER Filter) +{ + return KsGetDevice((PVOID) Filter); +} + +PKSDEVICE __inline +KsPinGetDevice( + IN PKSPIN Pin) +{ + return KsGetDevice((PVOID) Pin); +} +*/ Property changes on: trunk/reactos/drivers/multimedia/ks/stubs.c ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/ks.h --- trunk/reactos/drivers/multimedia/ks.h 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/ks.h 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,352 @@ +/* + Kernel Streaming + + Part of the ReactOS project + (See ReactOS licence for usage restrictions/permissions) + + This file created by Andrew Greenwood. + + Started September 12th, 2005. + + You may notice some structs are empty. These are just placeholders and + should be fleshed-out when functions are implemented that require the + use of such structs. +*/ + +#ifndef __INCLUDES_REACTOS_KS_H__ +#define __INCLUDES_REACTOS_KS_H__ + +#include <ddk/ntddk.h> + +/* What's this meant to be?! */ +#define KSDDKAPI + + +/* Some unimplemented structs :) */ + +typedef struct _BUS_INTERFACE_REFERENCE +{ +} BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; + +typedef struct _KSPIN_DESCRIPTOR +{ +} KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR; + +typedef struct _KSPIN_DESCRIPTOR_EX +{ +} KSPIN_DESCRIPTOR_EX, *PKSPIN_DESCRIPTOR_EX; + + +/* This is just to shut the compiler up so DON'T USE IT! */ +typedef void (*PFNKSINTERSECTHANDLER)(void); + + + +typedef struct _KS_COMPRESSION +{ + ULONG RatioNumerator; + ULONG RatioDenominator; + ULONG RatioConstantMargin; +} KS_COMPRESSION, *PKS_COMPRESSION; + +typedef struct _KS_FRAMING_RANGE +{ + ULONG MinFrameSize; + ULONG MaxFrameSize; + ULONG Stepping; +} KS_FRAMING_RANGE, *PKS_FRAMING_RANGE; + +typedef struct _KS_FRAMING_RANGE_WEIGHTED +{ + /* Obsolete */ +} KS_FRAMING_RANGE_WEIGHTED, *PKS_FRAMING_RANGE_WEIGHTED; + +typedef struct _KS_FRAMING_ITEM +{ + GUID MemoryType; + GUID BusType; + ULONG MemoryFlags; + ULONG BusFlags; + ULONG Flags; + ULONG Frames; + ULONG FileAlignment; + ULONG MemoryTypeWeight; + KS_FRAMING_RANGE PhysicalRange; + KS_FRAMING_RANGE_WEIGHTED FramingRange; +} KS_FRAMING_ITEM, *PKS_FRAMING_ITEM; + + + +typedef struct _KSALLOCATOR_FRAMING +{ + union + { + ULONG OptionFlags; + ULONG RequirementsFlags; + }; + POOL_TYPE PoolType; + ULONG Frames; + ULONG FrameSize; + ULONG FileAlignment; + ULONG Reserved; +} KSALLOCATOR_FRAMING, *PKSALLOCATOR_FRAMING; + +typedef struct _KSALLOCATOR_FRAMING_EX +{ + ULONG CountItems; + ULONG PinFlags; + KS_COMPRESSION OutputCompression; + ULONG PinWeight; + KS_FRAMING_ITEM FramingItem[1]; +} KSALLOCATOR_FRAMING_EX, *PKSALLOCATOR_FRAMING_EX; + + + +typedef struct _KSATTRIBUTE +{ + ULONG Size; + ULONG Flags; + GUID Attribute; +} KSATTRIBUTE, *PKSATTRIBUTE; + + +/* +typedef struct _KSBUFFER_ITEM +{ + KSDPC_ITEM DpcItem; + LIST_ENTRY BufferList; +} KSBUFFER_ITEM, *PKSBUFFER_ITEM; +*/ + + +typedef struct _KSIDENTIFIER +{ + GUID Set; + ULONG Id; + ULONG Flags; +} KSIDENTIFIER; + +typedef KSIDENTIFIER KSPIN_MEDIUM, *PKSPIN_MEDIUM; +typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; +typedef KSIDENTIFIER KSPROPERTY, *PKSPROPERTY; + +typedef struct _KSPRIORITY +{ + ULONG PriorityClass; + ULONG PrioritySubClass; +} KSPRIORITY, *PKSPRIORITY; + +typedef struct _KSPIN_CONNECT +{ + KSPIN_INTERFACE Interface; + KSPIN_MEDIUM Medium; + ULONG PinId; + HANDLE PinToHandle; + KSPRIORITY Priority; +} KSPIN_CONNECT, *PKSPIN_CONNECT; + +typedef struct _KSP_PIN +{ + KSPROPERTY Property; + ULONG PinId; + ULONG Reserved; +} KSP_PIN, *PKSP_PIN; + + +typedef struct _KSDEVICE +{ + /* TODO */ +} KSDEVICE, *PKSDEVICE; + + +/* Device dispatch routines */ + +typedef NTSTATUS + (*PFNKSDEVICECREATE) + ( + IN PKSDEVICE Device + ); + +typedef NTSTATUS + (*PFNKSDEVICEPNPSTART) + ( + IN PKSDEVICE Device, + IN PIRP Irp, + IN PCM_RESOURCE_LIST TranslatedResourceList OPTIONAL, + IN PCM_RESOURCE_LIST UntranslatedResourceList OPTIONAL + ); + +typedef NTSTATUS + (*PFNKSDEVICE) + ( + IN PKSDEVICE Device + ); + +typedef NTSTATUS + (*PFNKSDEVICEIRP) + ( + IN PKSDEVICE Device, + IN PIRP Irp + ); + +typedef VOID + (*PFNKSDEVICEIRPVOID) + ( + IN PKSDEVICE Device, + IN PIRP Irp + ); + +typedef NTSTATUS + (*PFNKSDEVICEQUERYCAPABILITIES) + ( + IN PKSDEVICE Device, + IN PIRP Irp, + IN OUT PDEVICE_CAPABILITIES Capabilities + ); + +typedef NTSTATUS + (*PFNKSDEVICEQUERYPOWER) + ( + IN PKSDEVICE Device, + IN PIRP Irp, + IN DEVICE_POWER_STATE DeviceTo, + IN DEVICE_POWER_STATE DeviceFrom, + IN SYSTEM_POWER_STATE SystemTo, + IN SYSTEM_POWER_STATE SystemFrom, + IN POWER_ACTION Action + ); + +typedef VOID + (*PFNKSDEVICESETPOWER) + ( + IN PKSDEVICE Device, + IN PIRP Irp, + IN DEVICE_POWER_STATE To, + IN DEVICE_POWER_STATE From + ); + +typedef struct _KSDEVICE_DISPATCH +{ + PFNKSDEVICECREATE Add; + PFNKSDEVICEPNPSTART Start; + PFNKSDEVICE PostStart; + PFNKSDEVICEIRP QueryStop; + PFNKSDEVICEIRPVOID CancelStop; + PFNKSDEVICEIRPVOID Stop; + PFNKSDEVICEIRP QueryRemove; + PFNKSDEVICEIRPVOID CancelRemove; + PFNKSDEVICEIRPVOID Remove; + PFNKSDEVICEQUERYCAPABILITIES QueryCapabilities; + PFNKSDEVICEIRPVOID SurpriseRemoval; + PFNKSDEVICEQUERYPOWER Querypower; + PFNKSDEVICESETPOWER SetPower; +} KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; + + + +/* Some more unimplemented stuff */ + +typedef struct _KSFILTER +{ +} KSFILTER, *PKSFILTER; + +typedef struct _KSPROCESSPIN_INDEXENTRY +{ +} KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY; + + +/* Filter dispatch routines */ + +typedef NTSTATUS + (*PFNKSFILTERIRP) + ( + IN PKSFILTER Filter, + IN PIRP Irp + ); + +typedef NTSTATUS + (*PFNKSFILTERPROCESS) + ( + IN PKSFILTER FIlter, + IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex + ); + +typedef NTSTATUS + (*PFNKSFILTERVOID) + ( + IN PKSFILTER Filter + ); + +typedef struct _KSFILTER_DISPATCH +{ + PFNKSFILTERIRP Create; + PFNKSFILTERIRP Close; + PFNKSFILTERPROCESS Process; + PFNKSFILTERVOID Reset; +} KSFILTER_DISPATCH, *PKSFILTER_DISPATCH; + + + +/* TODO! */ + +typedef struct _KSAUTOMATION_TABLE +{ +} KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + +typedef struct _KSNODE_DESCRIPTOR +{ +} KSNODE_DESCRIPTOR, *PKSNODE_DESCRIPTOR; + +typedef struct _KSTOPOLOGY_CONNECTION +{ +} KSTOPOLOGY_CONNECTION, *PKSTOPOLOGY_CONNECTION; + +typedef struct _KSCOMPONENTID +{ +} KSCOMPONENTID, *PKSCOMPONENTID; + + +/* Descriptors (filter, device, ...) */ + +typedef struct _KSFILTER_DESCRIPTOR +{ + const KSFILTER_DISPATCH* Dispatch; + const KSAUTOMATION_TABLE* AutomationTable; + ULONG Version; + ULONG Flags; + const GUID* ReferenceGuid; + ULONG PinDescriptorsCount; + ULONG PinDescriptorSize; + const KSPIN_DESCRIPTOR_EX* PinDescriptors; + ULONG CategoriesCount; + const GUID* Categories; + ULONG NodeDescriptorsCount; + ULONG NodeDescriptorSize; + const KSNODE_DESCRIPTOR* NodeDescriptors; + ULONG ConnectionsCount; + const KSTOPOLOGY_CONNECTION* Connections; + const KSCOMPONENTID* ComponentId; +} KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR; + +typedef struct _KSDEVICE_DESCRIPTOR +{ + const KSDEVICE_DISPATCH* Dispatch; + ULONG FilterDescriptorsCount; + const KSFILTER_DESCRIPTOR* const* FilterDescriptors; + ULONG Version; /* Doesn't appear to be in the documentation */ +} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; + + + + +/* + API functions +*/ + +NTSTATUS NTAPI +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL); + +#endif Property changes on: trunk/reactos/drivers/multimedia/ks.h ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/wdmaud/entry.c --- trunk/reactos/drivers/multimedia/wdmaud/entry.c 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/wdmaud/entry.c 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,59 @@ +/* + This doesn't do much yet... +*/ + +#include <debug.h> + +#define InPassiveIrql() \ + (KeGetCurrentIrql() == IRQL_PASSIVE_LEVEL) + + +NTSTATUS AudioDeviceControl( + IN PDEVICE_OBJECT device, + IN PIRP irp +) +{ + return STATUS_SUCCESS; +} + + +NTSTATUS AudioAddDevice( + IN PDRIVER_OBJECT driver, + IN PDEVICE_OBJECT device +) +{ + DPRINT("AudioAddDevice called\n"); + + if ( ! IsPassiveIrql() ) + { + /* What do we do?! */ + /* RtlAssert("FAIL", __FILE__, __LINE__, "?" */ + } + + return STATUS_SUCCESS; +} + +VOID AudioUnload( + IN PDRIVER_OBJECT driver +) +{ + DPRINT("AudioUnload called\n"); +} + + + +NTSTATUS STDCALL +DriverEntry( + IN PDRIVER_OBJECT driver, + IN PUNICODE_STRING registry_path +) +{ + DPRINT("Wdmaud.sys loaded\n"); + + driver->DriverExtension->AddDevice = AudioAddDevice; + driver->DriverUnload = AudioUnload; + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AudioDeviceControl; + + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/multimedia/wdmaud/entry.c ___________________________________________________________________ Name: svn:executable + * _____ Added: trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml --- trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml 2005-11-24 13:22:13 UTC (rev 19524) +++ trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml 2005-11-24 13:30:51 UTC (rev 19525) @@ -0,0 +1,7 @@ +<module name="wdmaud_kernel" type="kernelmodedriver" installbase="system32/drivers" installname="wdmaud.sys" warnings="true"> + <include base="wdmaud">.</include> + <include base="wdmaud">..</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <file>entry.c</file> +</module> Property changes on: trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml ___________________________________________________________________ Name: svn:executable + *

18 years, 9 months

[hpoussin] 19524: Sort entries in usbport.def

by hpoussin＠svn.reactos.com

Sort entries in usbport.def Define some functions only if DEBUG_MODE is defined Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbport/hcd.c Modified: trunk/reactos/drivers/usb/usbport/usbport.def _____ Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-24 13:22:13 UTC (rev 19524) @@ -656,7 +656,7 @@ #define dev_warn(x,f,arg...) do {} while (0) #define dev_err(x,f,arg...) do {} while (0) #define pr_debug(x,f,arg...) do {} while (0) -#define usbprintk +#define usbprintk(arg...) dev_printk(0,0,0,## arg) #endif _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -625,6 +625,7 @@ /*---------------------------------------------------------------------- ---*/ +#ifdef DEBUG_MODE // HCFS itself static char *hcfs2string (int state) { @@ -636,6 +637,7 @@ } return "?"; } +#endif static void ohci_stop (struct usb_hcd *hcd) { _____ Modified: trunk/reactos/drivers/usb/usbhub/fdo.c --- trunk/reactos/drivers/usb/usbhub/fdo.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbhub/fdo.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -103,7 +103,7 @@ PdoExtension->IsFDO = FALSE; PdoExtension->dev = dev->children[i]; - sprintf(Buffer[0], "%lu", i + 1); + sprintf(Buffer[0], "%lu", i); Status = UsbhubInitMultiSzString( &PdoExtension->InstanceId, Buffer[0], NULL); _____ Modified: trunk/reactos/drivers/usb/usbport/hcd.c --- trunk/reactos/drivers/usb/usbport/hcd.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbport/hcd.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -822,6 +822,7 @@ new_alloc = old_alloc + (int) bustime; if (new_alloc > FRAME_TIME_MAX_USECS_ALLOC) { +#ifdef DEBUG_MODE #ifdef DEBUG char *mode = #ifdef CONFIG_USB_BANDWIDTH @@ -832,6 +833,7 @@ dev_dbg (&dev->dev, "usb_check_bandwidth %sFAILED: %d + %ld = %d usec\n", mode, old_alloc, bustime, new_alloc); #endif +#endif #ifdef CONFIG_USB_BANDWIDTH bustime = -ENOSPC; /* report error */ #endif _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.def --- trunk/reactos/drivers/usb/usbport/usbport.def 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbport/usbport.def 2005-11-24 13:22:13 UTC (rev 19524) @@ -2,33 +2,33 @@ ; Exports definition file for usbcore.sys ; EXPORTS -usb_init@0 -usb_exit@0 -usb_init_urb@4 +RegisterPortDriver@8 +usb_alloc_bus@4 +usb_alloc_dev@8 usb_alloc_urb@8 -usb_free_urb@4 -usb_get_string -usb_get_urb@4 -usb_get_dev@4 -usb_submit_urb@8 -usb_unlink_urb@4 usb_bus_init@4 -usb_alloc_bus@4 -usb_free_bus@4 -usb_register_bus@4 -usb_deregister_bus@4 -usb_register_root_hub@8 usb_calc_bus_time@16 usb_check_bandwidth@8 usb_claim_bandwidth@16 -usb_release_bandwidth@12 +usb_connect@4 +usb_deregister_bus@4 +usb_disabled@0 +usb_exit@0 +usb_free_bus@4 +usb_free_urb@4 +usb_get_dev@4 +usb_get_string +usb_get_urb@4 usb_hcd_giveback_urb@12 ;usb_hcd_irq@12 +usb_hcd_pci_probe@8 +usb_hcd_pci_remove@4 usb_hc_died@4 -usb_alloc_dev@8 -usb_connect@4 +usb_init@0 +usb_init_urb@4 usb_put_dev@4 -usb_disabled@0 -usb_hcd_pci_probe@8 -usb_hcd_pci_remove@4 -RegisterPortDriver@8 \ No newline at end of file +usb_release_bandwidth@12 +usb_register_bus@4 +usb_register_root_hub@8 +usb_submit_urb@8 +usb_unlink_urb@4 \ No newline at end of file

18 years, 9 months

[chorns] 19523: Publish ISOs via FTP

by chorns＠svn.reactos.com

Publish ISOs via FTP Modified: trunk/cis/ReactOS.CustomRevisionAction/App.config Added: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/App.config --- trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-24 11:03:23 UTC (rev 19522) +++ trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-24 12:34:08 UTC (rev 19523) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <configuration> <appSettings> - <add key="publishPath" value="c:\iso" /> + <add key="publishPath" value="c:\iso" />  <add key="smtpServer" value="localhost" /> <add key="errorEmail" value="mailbox@somewhere-on-the-net" /> <add key="makeParameters" value="" /> _____ Added: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs --- trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 11:03:23 UTC (rev 19522) +++ trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 12:34:08 UTC (rev 19523) @@ -0,0 +1,1035 @@ +using System; +using System.Net; +using System.IO; +using System.Text; +using System.Net.Sockets; +using System.Diagnostics; +using System.Runtime.Remoting; +using System.Runtime.Remoting.Messaging; + +/* + * FTP Client library in C# + * Author: Jaimon Mathew + * mailto:jaimonmathew@rediffmail.com + * http://www.csharphelp.com/archives/archive9.html + * + * Addapted for use by Dan Glass 07/03/03 + */ + + +namespace ReactOS.CustomRevisionAction +{ + + public class FtpClient + { + + public class FtpException : Exception + { + public FtpException(string message) : base(message){} + public FtpException(string message, Exception innerException) : base(message,innerException){} + } + + private static int BUFFER_SIZE = 512; + private static Encoding ASCII = Encoding.ASCII; + + private bool verboseDebugging = false; + + // defaults + private string server = "localhost"; + private string remotePath = "."; + private string username = "anonymous"; + private string password = "anonymous(a)anonymous.net"; + private string message = null; + private string result = null; + + private int port = 21; + private int bytes = 0; + private int resultCode = 0; + + private bool loggedin = false; + private bool binMode = false; + + private Byte[] buffer = new Byte[BUFFER_SIZE]; + private Socket clientSocket = null; + + private int timeoutSeconds = 10; + + /// <summary> + /// Default contructor + /// </summary> + public FtpClient() + { + } + /// <summary> + /// + /// </summary> + /// <param name="server"></param> + /// <param name="username"></param> + /// <param name="password"></param> + public FtpClient(string server, string username, string password) + { + this.server = server; + this.username = username; + this.password = password; + } + /// <summary> + /// + /// </summary> + /// <param name="server"></param> + /// <param name="username"></param> + /// <param name="password"></param> + /// <param name="timeoutSeconds"></param> + /// <param name="port"></param> + public FtpClient(string server, string username, string password, int timeoutSeconds, int port) + { + this.server = server; + this.username = username; + this.password = password; + this.timeoutSeconds = timeoutSeconds; + this.port = port; + } + + /// <summary> + /// Display all communications to the debug log + /// </summary> + public bool VerboseDebugging + { + get + { + return this.verboseDebugging; + } + set + { + this.verboseDebugging = value; + } + } + /// <summary> + /// Remote server port. Typically TCP 21 + /// </summary> + public int Port + { + get + { + return this.port; + } + set + { + this.port = value; + } + } + /// <summary> + /// Timeout waiting for a response from server, in seconds. + /// </summary> + public int Timeout + { + get + { + return this.timeoutSeconds; + } + set + { + this.timeoutSeconds = value; + } + } + /// <summary> + /// Gets and Sets the name of the FTP server. + /// </summary> + /// <returns></returns> + public string Server + { + get + { + return this.server; + } + set + { + this.server = value; + } + } + /// <summary> + /// Gets and Sets the port number. + /// </summary> + /// <returns></returns> + public int RemotePort + { + get + { + return this.port; + } + set + { + this.port = value; + } + } + /// <summary> + /// GetS and Sets the remote directory. + /// </summary> + public string RemotePath + { + get + { + return this.remotePath; + } + set + { + this.remotePath = value; + } + + } + /// <summary> + /// Gets and Sets the username. + /// </summary> + public string Username + { + get + { + return this.username; + } + set + { + this.username = value; + } + } + /// <summary> + /// Gets and Set the password. + /// </summary> + public string Password + { + get + { + return this.password; + } + set + { + this.password = value; + } + } + + /// <summary> + /// If the value of mode is true, set binary mode for downloads, else, Ascii mode. + /// </summary> + public bool BinaryMode + { + get + { + return this.binMode; + } + set + { + if ( this.binMode == value ) return; + + if ( value ) + sendCommand("TYPE I"); + + else + sendCommand("TYPE A"); + + if ( this.resultCode != 200 ) throw new FtpException(result.Substring(4)); + } + } + /// <summary> + /// Login to the remote server. + /// </summary> + public void Login() + { + if ( this.loggedin ) this.Close(); + + Debug.WriteLine("Opening connection to " + this.server, "FtpClient" ); + + IPAddress addr = null; + IPEndPoint ep = null; + + try + { + this.clientSocket = new Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp ); + addr = Dns.Resolve(this.server).AddressList[0]; + ep = new IPEndPoint( addr, this.port ); + this.clientSocket.Connect(ep); + } + catch(Exception ex) + { + // doubtfull + if ( this.clientSocket != null && this.clientSocket.Connected ) this.clientSocket.Close(); + + throw new FtpException("Couldn't connect to remote server",ex); + } + + this.readResponse(); + + if(this.resultCode != 220) + { + this.Close(); + throw new FtpException(this.result.Substring(4)); + } + + this.sendCommand( "USER " + username ); + + if( !(this.resultCode == 331 || this.resultCode == 230) ) + { + this.cleanup(); + throw new FtpException(this.result.Substring(4)); + } + + if( this.resultCode != 230 ) + { + this.sendCommand( "PASS " + password ); + + if( !(this.resultCode == 230 || this.resultCode == 202) ) + { + this.cleanup(); + throw new FtpException(this.result.Substring(4)); + } + } + + this.loggedin = true; + + Debug.WriteLine( "Connected to " + this.server, "FtpClient" ); + + this.ChangeDir(this.remotePath); + } + + /// <summary> + /// Close the FTP connection. + /// </summary> + public void Close() + { + Debug.WriteLine("Closing connection to " + this.server, "FtpClient" ); + + if( this.clientSocket != null ) + { + this.sendCommand("QUIT"); + } + + this.cleanup(); + } + + /// <summary> + /// Return a string array containing the remote directory's file list. + /// </summary> + /// <returns></returns> + public string[] GetFileList() + { + return this.GetFileList("*.*"); + } + + /// <summary> + /// Return a string array containing the remote directory's file list. + /// </summary> + /// <param name="mask"></param> + /// <returns></returns> + public string[] GetFileList(string mask) + { + if ( !this.loggedin ) this.Login(); + + Socket cSocket = createDataSocket(); + + this.sendCommand("NLST " + mask); + + if(!(this.resultCode == 150 || this.resultCode == 125)) throw new FtpException(this.result.Substring(4)); + + this.message = ""; + + DateTime timeout = DateTime.Now.AddSeconds(this.timeoutSeconds); + + while( timeout > DateTime.Now ) + { + int bytes = cSocket.Receive(buffer, buffer.Length, 0); + this.message += ASCII.GetString(buffer, 0, bytes); + + if ( bytes < this.buffer.Length ) break; + } + + string[] msg = this.message.Replace("\r","").Split('\n'); + + cSocket.Close(); + + if ( this.message.IndexOf( "No such file or directory" ) != -1 ) + msg = new string[]{}; + + this.readResponse(); + + if ( this.resultCode != 226 ) + msg = new string[]{}; + // throw new FtpException(result.Substring(4)); + + return msg; + } + + /// <summary> + /// Return the size of a file. + /// </summary> + /// <param name="fileName"></param> + /// <returns></returns> + public long GetFileSize(string fileName) + { + if ( !this.loggedin ) this.Login(); + + this.sendCommand("SIZE " + fileName); + long size=0; + + if ( this.resultCode == 213 ) + size = long.Parse(this.result.Substring(4)); + + else + throw new FtpException(this.result.Substring(4)); + + return size; + } + + + /// <summary> + /// Download a file to the Assembly's local directory, + /// keeping the same file name. + /// </summary> + /// <param name="remFileName"></param> + public void Download(string remFileName) + { + this.Download(remFileName,"",false); + } + + /// <summary> + /// Download a remote file to the Assembly's local directory, + /// keeping the same file name, and set the resume flag. + /// </summary> + /// <param name="remFileName"></param> + /// <param name="resume"></param> + public void Download(string remFileName,Boolean resume) + { + this.Download(remFileName,"",resume); + } + + /// <summary> + /// Download a remote file to a local file name which can include + /// a path. The local file name will be created or overwritten, + /// but the path must exist. + /// </summary> + /// <param name="remFileName"></param> + /// <param name="locFileName"></param> + public void Download(string remFileName,string locFileName) + { + this.Download(remFileName,locFileName,false); + } + + /// <summary> + /// Download a remote file to a local file name which can include + /// a path, and set the resume flag. The local file name will be + /// created or overwritten, but the path must exist. + /// </summary> + /// <param name="remFileName"></param> + /// <param name="locFileName"></param> + /// <param name="resume"></param> + public void Download(string remFileName,string locFileName,Boolean resume) + { + if ( !this.loggedin ) this.Login(); + + this.BinaryMode = true; + + Debug.WriteLine("Downloading file " + remFileName + " from " + server + "/" + remotePath, "FtpClient" ); + + if (locFileName.Equals("")) + { + locFileName = remFileName; + } + + FileStream output = null; + + if ( !File.Exists(locFileName) ) + output = File.Create(locFileName); + + else + output = new FileStream(locFileName,FileMode.Open); + + Socket cSocket = createDataSocket(); + + long offset = 0; + + if ( resume ) + { + offset = output.Length; + + if ( offset > 0 ) + { + this.sendCommand( "REST " + offset ); + if ( this.resultCode != 350 ) + { + //Server dosnt support resuming + offset = 0; + Debug.WriteLine("Resuming not supported:" + result.Substring(4), "FtpClient" ); + } + else + { + Debug.WriteLine("Resuming at offset " + offset, "FtpClient" ); + output.Seek( offset, SeekOrigin.Begin ); + } + } + } + + this.sendCommand("RETR " + remFileName); + + if ( this.resultCode != 150 && this.resultCode != 125 ) + { + throw new FtpException(this.result.Substring(4)); + } + + DateTime timeout = DateTime.Now.AddSeconds(this.timeoutSeconds); + + while ( timeout > DateTime.Now ) + { + this.bytes = cSocket.Receive(buffer, buffer.Length, 0); + output.Write(this.buffer,0,this.bytes); + + if ( this.bytes <= 0) + { + break; + } + } + + output.Close(); + + if ( cSocket.Connected ) cSocket.Close(); + + this.readResponse(); + + if( this.resultCode != 226 && this.resultCode != 250 ) + throw new FtpException(this.result.Substring(4)); + } + + + /// <summary> + /// Upload a file. + /// </summary> + /// <param name="fileName"></param> + public void Upload(string fileName) + { + this.Upload(fileName,false); + } + + + /// <summary> + /// Upload a file and set the resume flag. + /// </summary> + /// <param name="fileName"></param> + /// <param name="resume"></param> + public void Upload(string fileName, bool resume) + { + if ( !this.loggedin ) this.Login(); + + Socket cSocket = null ; + long offset = 0; + + if ( resume ) + { + try + { + this.BinaryMode = true; + + offset = GetFileSize( Path.GetFileName(fileName) ); + } + catch(Exception) + { + // file not exist + offset = 0; + } + } + + // open stream to read file + FileStream input = new FileStream(fileName,FileMode.Open); + + if ( resume && input.Length < offset ) + { + // different file size + Debug.WriteLine("Overwriting " + fileName, "FtpClient"); + offset = 0; + } + else if ( resume && input.Length == offset ) + { + // file done + input.Close(); + Debug.WriteLine("Skipping completed " + fileName + " - turn resume off to not detect.", "FtpClient"); + return; + } + + // dont create untill we know that we need it + cSocket = this.createDataSocket(); + + if ( offset > 0 ) + { + this.sendCommand( "REST " + offset ); + if ( this.resultCode != 350 ) + { + Debug.WriteLine("Resuming not supported", "FtpClient"); + offset = 0; + } + } + + this.sendCommand( "STOR " + Path.GetFileName(fileName) ); + + if ( this.resultCode != 125 && this.resultCode != 150 ) throw new FtpException(result.Substring(4)); + + if ( offset != 0 ) + { + Debug.WriteLine("Resuming at offset " + offset, "FtpClient" ); + + input.Seek(offset,SeekOrigin.Begin); + } + + Debug.WriteLine( "Uploading file " + fileName + " to " + remotePath, "FtpClient" ); + + while ((bytes = input.Read(buffer,0,buffer.Length)) > 0) + { + cSocket.Send(buffer, bytes, 0); + } + + input.Close(); + + if (cSocket.Connected) + { + cSocket.Close(); + } + + this.readResponse(); + + if( this.resultCode != 226 && this.resultCode != 250 ) throw new FtpException(this.result.Substring(4)); + } + + /// <summary> + /// Upload a directory and its file contents + /// </summary> + /// <param name="path"></param> + /// <param name="recurse">Whether to recurse sub directories</param> + public void UploadDirectory(string path, bool recurse) + { + this.UploadDirectory(path,recurse,"*.*"); + } + + /// <summary> + /// Upload a directory and its file contents + /// </summary> + /// <param name="path"></param> + /// <param name="recurse">Whether to recurse sub directories</param> + /// <param name="mask">Only upload files of the given mask - everything is '*.*'</param> + public void UploadDirectory(string path, bool recurse, string mask) + { + string[] dirs = path.Replace("/",@"\").Split('\\'); + string rootDir = dirs[ dirs.Length - 1 ]; + + // make the root dir if it doed not exist + if ( this.GetFileList(rootDir).Length < 1 ) this.MakeDir(rootDir); + + this.ChangeDir(rootDir); + + foreach ( string file in Directory.GetFiles(path,mask) ) + { + this.Upload(file,true); + } + if ( recurse ) + { + foreach ( string directory in Directory.GetDirectories(path) ) + { + this.UploadDirectory(directory,recurse,mask); + } + } + + this.ChangeDir(".."); + } + + /// <summary> + /// Delete a file from the remote FTP server. + /// </summary> + /// <param name="fileName"></param> + public void DeleteFile(string fileName) + { + if ( !this.loggedin ) this.Login(); + + this.sendCommand( "DELE " + fileName ); + + if ( this.resultCode != 250 ) throw new FtpException(this.result.Substring(4)); + + Debug.WriteLine( "Deleted file " + fileName, "FtpClient" ); + } + + /// <summary> + /// Rename a file on the remote FTP server. + /// </summary> + /// <param name="oldFileName"></param> + /// <param name="newFileName"></param> + /// <param name="overwrite">setting to false will throw exception if it exists</param> + public void RenameFile(string oldFileName,string newFileName, bool overwrite) + { + if ( !this.loggedin ) this.Login(); + + this.sendCommand( "RNFR " + oldFileName ); + + if ( this.resultCode != 350 ) throw new FtpException(this.result.Substring(4)); + + if ( !overwrite && this.GetFileList(newFileName).Length > 0 ) throw new FtpException("File already exists"); + + this.sendCommand( "RNTO " + newFileName ); + + if ( this.resultCode != 250 ) throw new FtpException(this.result.Substring(4)); + + Debug.WriteLine( "Renamed file " + oldFileName + " to " + newFileName, "FtpClient" ); + } + + /// <summary> + /// Create a directory on the remote FTP server. + /// </summary> + /// <param name="dirName"></param> + public void MakeDir(string dirName) + { + if ( !this.loggedin ) this.Login(); + + this.sendCommand( "MKD " + dirName ); + + if ( this.resultCode != 250 && this.resultCode != 257 ) throw new FtpException(this.result.Substring(4)); + + Debug.WriteLine( "Created directory " + dirName, "FtpClient" ); + } + + /// <summary> + /// Delete a directory on the remote FTP server. + /// </summary> + /// <param name="dirName"></param> + public void RemoveDir(string dirName) + { + if ( !this.loggedin ) this.Login(); + + this.sendCommand( "RMD " + dirName ); + + if ( this.resultCode != 250 ) throw new FtpException(this.result.Substring(4)); + + Debug.WriteLine( "Removed directory " + dirName, "FtpClient" ); + } + + /// <summary> + /// Change the current working directory on the remote FTP server. + /// </summary> + /// <param name="dirName"></param> + public void ChangeDir(string dirName) + { + if( dirName == null || dirName.Equals(".") || dirName.Length == 0 ) + { + return; + } + + if ( !this.loggedin ) this.Login(); + + this.sendCommand( "CWD " + dirName ); + + if ( this.resultCode != 250 ) throw new FtpException(result.Substring(4)); + + this.sendCommand( "PWD" ); + + if ( this.resultCode != 257 ) throw new FtpException(result.Substring(4)); + + // gonna have to do better than this.... + this.remotePath = this.message.Split('"')[1]; + + Debug.WriteLine( "Current directory is " + this.remotePath, "FtpClient" ); + } + + /// <summary> + /// + /// </summary> + private void readResponse() + { + this.message = ""; + this.result = this.readLine(); + + if ( this.result.Length > 3 ) + this.resultCode = int.Parse( this.result.Substring(0,3) ); + else + this.result = null; + } + + /// <summary> + /// + /// </summary> + /// <returns></returns> + private string readLine() + { + while(true) + { + this.bytes = clientSocket.Receive( this.buffer, this.buffer.Length, 0 ); + this.message += ASCII.GetString( this.buffer, 0, this.bytes ); + + if ( this.bytes < this.buffer.Length ) + { + break; + } + } + + string[] msg = this.message.Split('\n'); + + if ( this.message.Length > 2 ) + this.message = msg[ msg.Length - 2 ]; + + else + this.message = msg[0]; + + + if ( this.message.Length > 4 && !this.message.Substring(3,1).Equals(" ") ) return this.readLine(); + + if ( this.verboseDebugging ) + { + for(int i = 0; i < msg.Length - 1; i++) + { + Debug.Write( msg[i], "FtpClient" ); + } + } + + return message; + } + + /// <summary> + /// + /// </summary> + /// <param name="command"></param> + private void sendCommand(String command) + { + if ( this.verboseDebugging ) Debug.WriteLine(command,"FtpClient"); + + Byte[] cmdBytes = Encoding.ASCII.GetBytes( ( command + "\r\n" ).ToCharArray() ); + clientSocket.Send( cmdBytes, cmdBytes.Length, 0); + this.readResponse(); + } + + /// <summary> + /// when doing data transfers, we need to open another socket for it. + /// </summary> + /// <returns>Connected socket</returns> + private Socket createDataSocket() + { + this.sendCommand("PASV"); + + if ( this.resultCode != 227 ) throw new FtpException(this.result.Substring(4)); + + int index1 = this.result.IndexOf('('); + int index2 = this.result.IndexOf(')'); + + string ipData = this.result.Substring(index1+1,index2-index1-1); + + int[] parts = new int[6]; + + int len = ipData.Length; + int partCount = 0; + string buf=""; + + for (int i = 0; i < len && partCount <= 6; i++) + { + char ch = char.Parse( ipData.Substring(i,1) ); + + if ( char.IsDigit(ch) ) + buf+=ch; + + else if (ch != ',') + throw new FtpException("Malformed PASV result: " + result); + + if ( ch == ',' || i+1 == len ) + { + try + { + parts[partCount++] = int.Parse(buf); + buf = ""; + } + catch (Exception ex) + { + throw new FtpException("Malformed PASV result (not supported?): " + this.result, ex); + } + } + } + + string ipAddress = parts[0] + "."+ parts[1]+ "." + parts[2] + "." + parts[3]; + + int port = (parts[4] << 8) + parts[5]; + + Socket socket = null; + IPEndPoint ep = null; + + try + { + socket = new Socket(AddressFamily.InterNetwork,SocketType.Stream,ProtocolType.Tcp); + ep = new IPEndPoint(Dns.Resolve(ipAddress).AddressList[0], port); + socket.Connect(ep); + } + catch(Exception ex) + { + // doubtfull.... + if ( socket != null && socket.Connected ) socket.Close(); + + throw new FtpException("Can't connect to remote server", ex); + } + + return socket; + } + + /// <summary> + /// Always release those sockets. + /// </summary> + private void cleanup() + { + if ( this.clientSocket!=null ) + { + this.clientSocket.Close(); + this.clientSocket = null; + } + this.loggedin = false; + } + + /// <summary> + /// Destuctor + /// </summary> + ~FtpClient() + { + this.cleanup(); + } + + + /*********************************************************************** ***************************************/ + #region Async methods (auto generated) + +/* + WinInetApi.FtpClient ftp = new WinInetApi.FtpClient(); + + MethodInfo[] methods = ftp.GetType().GetMethods(BindingFlags.DeclaredOnly|BindingFlags.Instance |BindingFlags.Public); + + foreach ( MethodInfo method in methods ) + { + string param = ""; + string values = ""; + foreach ( ParameterInfo i in method.GetParameters() ) + { + param += i.ParameterType.Name + " " + i.Name + ","; + values += i.Name + ","; + } + + + Debug.WriteLine("private delegate " + method.ReturnType.Name + " " + method.Name + "Callback(" + param.TrimEnd(',') + ");"); + + Debug.WriteLine("public System.IAsyncResult Begin" + method.Name + "( " + param + " System.AsyncCallback callback )"); + Debug.WriteLine("{"); + Debug.WriteLine("" + method.Name + "Callback ftpCallback = new " + method.Name + "Callback(" + values + " this." + method.Name + ");"); + Debug.WriteLine("return ftpCallback.BeginInvoke(callback, null);"); + Debug.WriteLine("}"); + Debug.WriteLine("public void End" + method.Name + "(System.IAsyncResult asyncResult)"); + Debug.WriteLine("{"); + Debug.WriteLine(method.Name + "Callback fc = (" + method.Name + "Callback) ((AsyncResult)asyncResult).AsyncDelegate;"); + Debug.WriteLine("fc.EndInvoke(asyncResult);"); + Debug.WriteLine("}"); + //Debug.WriteLine(method); + } +*/ + + + private delegate void LoginCallback(); + public System.IAsyncResult BeginLogin( System.AsyncCallback callback ) + { + LoginCallback ftpCallback = new LoginCallback( this.Login); + return ftpCallback.BeginInvoke(callback, null); + } + private delegate void CloseCallback(); + public System.IAsyncResult BeginClose( System.AsyncCallback callback ) + { + CloseCallback ftpCallback = new CloseCallback( this.Close); + return ftpCallback.BeginInvoke(callback, null); + } + private delegate String[] GetFileListCallback(); + public System.IAsyncResult BeginGetFileList( System.AsyncCallback callback ) + { + GetFileListCallback ftpCallback = new GetFileListCallback( this.GetFileList); + return ftpCallback.BeginInvoke(callback, null); + } + private delegate String[] GetFileListMaskCallback(String mask); + public System.IAsyncResult BeginGetFileList( String mask, System.AsyncCallback callback ) + { + GetFileListMaskCallback ftpCallback = new GetFileListMaskCallback(this.GetFileList); + return ftpCallback.BeginInvoke(mask, callback, null); + } + private delegate Int64 GetFileSizeCallback(String fileName); + public System.IAsyncResult BeginGetFileSize( String fileName, System.AsyncCallback callback ) + { + GetFileSizeCallback ftpCallback = new GetFileSizeCallback(this.GetFileSize); + return ftpCallback.BeginInvoke(fileName, callback, null); + } + private delegate void DownloadCallback(String remFileName); + public System.IAsyncResult BeginDownload( String remFileName, System.AsyncCallback callback ) + { + DownloadCallback ftpCallback = new DownloadCallback(this.Download); + return ftpCallback.BeginInvoke(remFileName, callback, null); + } + private delegate void DownloadFileNameResumeCallback(String remFileName,Boolean resume); + public System.IAsyncResult BeginDownload( String remFileName,Boolean resume, System.AsyncCallback callback ) + { + DownloadFileNameResumeCallback ftpCallback = new DownloadFileNameResumeCallback(this.Download); + return ftpCallback.BeginInvoke(remFileName, resume, callback, null); + } + private delegate void DownloadFileNameFileNameCallback(String remFileName,String locFileName); + public System.IAsyncResult BeginDownload( String remFileName,String locFileName, System.AsyncCallback callback ) + { + DownloadFileNameFileNameCallback ftpCallback = new DownloadFileNameFileNameCallback(this.Download); + return ftpCallback.BeginInvoke(remFileName, locFileName, callback, null); + } + private delegate void DownloadFileNameFileNameResumeCallback(String remFileName,String locFileName,Boolean resume); + public System.IAsyncResult BeginDownload( String remFileName,String locFileName,Boolean resume, System.AsyncCallback callback ) + { + DownloadFileNameFileNameResumeCallback ftpCallback = new DownloadFileNameFileNameResumeCallback(this.Download); + return ftpCallback.BeginInvoke(remFileName, locFileName, resume, callback, null); + } + private delegate void UploadCallback(String fileName); + public System.IAsyncResult BeginUpload( String fileName, System.AsyncCallback callback ) + { + UploadCallback ftpCallback = new UploadCallback(this.Upload); + return ftpCallback.BeginInvoke(fileName, callback, null); [truncated at 1000 lines; 176 more skipped]

18 years, 9 months

← Newer
1
...
24
25
26
27
28
29
30
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005