Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[sedwards] 19542: ifndef not ifdef....like I said, it works for me on my mingw either way

by sedwards＠svn.reactos.com

ifndef not ifdef....like I said, it works for me on my mingw either way Modified: trunk/reactos/lib/crt/include/float.h _____ Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-11-25 04:14:59 UTC (rev 19541) +++ trunk/reactos/lib/crt/include/float.h 2005-11-25 04:39:08 UTC (rev 19542) @@ -91,7 +91,7 @@ #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ -#ifdef __GNUC__ +#ifndef __GNUC__ #define DBL_MAX_10_EXP 308 #define S_IFIFO -1 #define UINT64_MAX 0xffffffffffffffff

18 years, 9 months

[turner] 19541: Read the registry to set the wallpaper mode in in WinSta.

by turner＠svn.reactos.com

Read the registry to set the wallpaper mode in in WinSta. Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-25 03:50:49 UTC (rev 19540) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-25 04:14:59 UTC (rev 19541) @@ -6,7 +6,7 @@ * FILE: subsys/win32k/ntuser/misc.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) * REVISION HISTORY: - * 2003/05/22 Created + * 2003/05/22 CreatedStyleNum */ #include <w32k.h> @@ -928,7 +928,18 @@ the current wallpaper bitmap */ HBITMAP hOldBitmap, hNewBitmap; ASSERT(pvParam); - + UNICODE_STRING Key = RTL_CONSTANT_STRING(L"\\Registry\\User\\.Default\\Control Panel\\Desktop"); + UNICODE_STRING Tile = RTL_CONSTANT_STRING(L"TileWallpaper"); + UNICODE_STRING Style = RTL_CONSTANT_STRING(L"WallpaperStyle"); + OBJECT_ATTRIBUTES KeyAttributes; + NTSTATUS Status; + HANDLE KeyHandle = NULL; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + ULONG TileNum = 0; + ULONG StyleNum = 0; + hNewBitmap = *(HBITMAP*)pvParam; if(hNewBitmap != NULL) { @@ -953,6 +964,96 @@ /* delete the old wallpaper */ NtGdiDeleteObject(hOldBitmap); } + + /* Set the style */ + + /*default value is center */ + WinStaObject->WallpaperMode = wmCenter; + + /* find the tile value in the registry */ + InitializeObjectAttributes(&KeyAttributes, &Key, OBJ_CASE_INSENSITIVE, + NULL, NULL); + ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + + Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, + 0, 0, &ResLength); + + ResLength += sizeof(KEY_VALUE_PARTIAL_INFORMATION); + KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); + Length = ResLength; + + if(!KeyValuePartialInfo) + { + NtClose(KeyHandle); + return 0; + } + + Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, Length, &ResLength); + if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) + { + NtClose(KeyHandle); + ExFreePool(KeyValuePartialInfo); + return 0; + } + + Tile.Length = KeyValuePartialInfo->DataLength; + Tile.MaximumLength = KeyValuePartialInfo->DataLength; + Tile.Buffer = (PWSTR)KeyValuePartialInfo->Data; + + Status = RtlUnicodeStringToInteger(&Tile, 0, &TileNum); + if(!NT_SUCCESS(Status)) + { + TileNum = 0; + } + ExFreePool(KeyValuePartialInfo); + + /* start over again and look for the style*/ + ResLength = 0; + Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation, + 0, 0, &ResLength); + + ResLength += sizeof(KEY_VALUE_PARTIAL_INFORMATION); + KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); + Length = ResLength; + + if(!KeyValuePartialInfo) + { + NtClose(KeyHandle); + return 0; + } + + Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, Length, &ResLength); + if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) + { + NtClose(KeyHandle); + ExFreePool(KeyValuePartialInfo); + return 0; + } + + Style.Length = KeyValuePartialInfo->DataLength; + Style.MaximumLength = KeyValuePartialInfo->DataLength; + Style.Buffer = (PWSTR)KeyValuePartialInfo->Data; + + Status = RtlUnicodeStringToInteger(&Style, 0, &StyleNum); + if(!NT_SUCCESS(Status)) + { + StyleNum = 0; + } + ExFreePool(KeyValuePartialInfo); + + /* Check the values we found in the registry */ + if(TileNum && !StyleNum) + { + WinStaObject->WallpaperMode = wmTile; + } + else if(!TileNum && StyleNum == 2) + { + WinStaObject->WallpaperMode = wmStretch; + } + + NtClose(KeyHandle); break; } case SPI_GETDESKWALLPAPER:

18 years, 9 months

[silverblade] 19540: Fixed GETDEVCAPS message handling (bad macros) and implemented some primitive memory leak detection.

by silverblade＠svn.reactos.com

Fixed GETDEVCAPS message handling (bad macros) and implemented some primitive memory leak detection. Added: trunk/reactos/lib/wdmaud/callbacks.c Modified: trunk/reactos/lib/wdmaud/devices.c Added: trunk/reactos/lib/wdmaud/memtrack.c Modified: trunk/reactos/lib/wdmaud/user.c Modified: trunk/reactos/lib/wdmaud/wdmaud.def Modified: trunk/reactos/lib/wdmaud/wdmaud.h Modified: trunk/reactos/lib/wdmaud/wdmaud.xml _____ Added: trunk/reactos/lib/wdmaud/callbacks.c --- trunk/reactos/lib/wdmaud/callbacks.c 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/callbacks.c 2005-11-25 03:50:49 UTC (rev 19540) @@ -0,0 +1,86 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/wdmaud.h + * PURPOSE: WDM Audio Support - Callbacks + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 24, 2005: Started + */ + +#include <windows.h> +#include "wdmaud.h" + + +/* + CheckCallbacks + + This appears to just be used by the mixer stuff. + + If the global callback file mapping handle isn't set, return FALSE. + + Check the first parameter. If the value is below that of the first + DWORD in the mapped view, return FALSE. + + TODO: Finish analysis +*/ + +BOOL CheckCallbacks() +{ + return FALSE; +} + +/* + CreateWdmaudCallbacks + + The original appears to use a security descriptor... We won't bother + with that for now. + + Create a file mapping with the name "Global\WDMAUD_Callbacks". + The current process is used as the file handle for the file mapping. The + file mapping attributes should be set to a length of 12 bytes, the + security descriptor we ignore and the handle doesn't need to be + inheritable. + + The maximum size should be set to 1028 bytes, and the file view + protection should be set to PAGE_READWRITE. + + The result of the file mapping creation is stored in the global callback + handle. + + If the creation succeeded, try and map a view of the file, from offset 0 + for 1028 bytes, with READ and WRITE access. + + If this succeeds, close the created file mapping handle, and set the + global handle to the one returned by the file mapping function. +*/ + +BOOL CreateWdmaudCallbacks() +{ + return FALSE; +} + + +/* + GetWdmaudCallbacks + + If the global callback handle is already set, do nothing. + + Open the file mapping to "Global\WDMAUD_Callbacks" with READ and WRITE + access. The handle doesn't need to be inherited. + + The handle is stored as the global callback handle. + + If the file was opened successfully, map the view of 1028 bytes from + offset 0 with READ and WRITE access. + + If this fails, close the global callback handle and set it to NULL. + + ...and then return +*/ + +BOOL GetWdmaudCallbacks() +{ + return FALSE; +} Property changes on: trunk/reactos/lib/wdmaud/callbacks.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/wdmaud/devices.c --- trunk/reactos/lib/wdmaud/devices.c 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/devices.c 2005-11-25 03:50:49 UTC (rev 19540) @@ -17,6 +17,7 @@ const char WDMAUD_DEVICE_INFO_SIG[4] = "WADI"; const char WDMAUD_DEVICE_STATE_SIG[4] = "WADS"; +const char WDMAUD_NULL_SIGNATURE[4] = {0,0,0,0}; BOOL IsValidDevicePath(WCHAR* path) @@ -102,6 +103,8 @@ PWDMAUD_DEVICE_INFO device_data = 0; int path_size = 0; + DPRINT("Creating device data for device type %d\n", (int) device_type); + if ( ! IsValidDevicePath(device_path) ) { DPRINT1("No valid device interface given!\n"); @@ -110,7 +113,7 @@ /* 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); + /* DPRINT("Size of path is %d\n", (int) path_size); */ heap = GetProcessHeap(); @@ -123,11 +126,15 @@ 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)); +*/ + device_data = (PWDMAUD_DEVICE_INFO) + AllocMem(path_size + sizeof(WDMAUD_DEVICE_INFO)); + if ( ! device_data ) { DPRINT1("Unable to allocate memory for device data (error %d)\n", @@ -152,6 +159,19 @@ } } +/* + CloneDeviceData + + This isn't all that great... Maybe some macros would be better: + BEGIN_CLONING_STRUCT(source, target) + CLONE_MEMBER(member) + END_CLONING_STRUCT() + + The main problem is that sometimes we'll want to copy more than + the data presented here. I guess we could blindly copy EVERYTHING + but that'd be excessive. +*/ + PWDMAUD_DEVICE_INFO CloneDeviceData(PWDMAUD_DEVICE_INFO original) { PWDMAUD_DEVICE_INFO clone = NULL; @@ -181,8 +201,33 @@ void DeleteDeviceData(PWDMAUD_DEVICE_INFO device_data) { + HANDLE heap; + ASSERT( device_data ); - /* TODO */ + + /* Erase the signature to prevent any possible future mishaps */ + *device_data->signature = *WDMAUD_NULL_SIGNATURE; + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("Couldn't get the process heap (error %d)\n", + (int) GetLastError()); + goto exit; + } + + FreeMem(device_data); + /* + { + DPRINT1("Couldn't free device data memory (error %d)\n", + (int) GetLastError()); + } + */ + + exit : + /* We just return */ + return; } MMRESULT ModifyDevicePresence( @@ -198,11 +243,9 @@ DPRINT("ModifyDevicePresence - %s a device\n", adding ? "adding" : "removing"); - DPRINT("Topology path %S\n", device_path); + /* DPRINT("Topology path %S\n", device_path); */ + DPRINT("Devtype %d\n", (int) device_type); - /* FIXME: DeviceType! */ - /* TODO: Assert on device type? */ - ASSERT( IsValidDeviceType(device_type) ); ASSERT( device_path ); @@ -215,8 +258,6 @@ goto cleanup; } -/* device_data->type = device_type; */ - ioctl = adding ? IOCTL_WDMAUD_ADD_DEVICE : IOCTL_WDMAUD_REMOVE_DEVICE; kernel_result = CallKernelDevice(device_data, @@ -268,7 +309,6 @@ DPRINT("Getting num devs\n"); - /*device_data->type = device_type;*/ device_data->with_critical_section = FALSE; if ( CallKernelDevice(device_data, @@ -294,14 +334,19 @@ } /* - This is a bit messed up + GetDeviceCapabilities + + This uses a different structure to the traditional documentation, because + we handle plug and play devices. + + Much sleep was lost over implementing this. */ MMRESULT GetDeviceCapabilities( CHAR device_type, DWORD device_id, WCHAR* device_path, - LPCOMMONCAPS caps + LPMDEVICECAPSEX caps ) { PWDMAUD_DEVICE_INFO device = NULL; @@ -309,39 +354,13 @@ DPRINT("Device path %S\n", device_path); - /* Hmm - caps->wMid seems to be 0x54 (84) from XP's winmm.dll */ - if (caps->wMid == 0) + /* Is this right? */ + if (caps->cbSize == 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; + DPRINT1("We appear to have been given an invalid parameter\n"); + return MMSYSERR_INVALPARAM; } -#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); @@ -356,23 +375,13 @@ 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); + *(LPWORD)caps->pCaps = (WORD) 0x43; - 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); + (DWORD)caps->cbSize, + (DWORD)caps->pCaps); if ( result != MMSYSERR_NOERROR ) { @@ -380,11 +389,8 @@ goto cleanup; } - + /* Return code will already be MMSYSERR_NOERROR by now */ - /* What do we return? */ - /*return MMSYSERR_NOERROR; */ /* already set by now */ - cleanup : { if ( device ) @@ -515,7 +521,7 @@ 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)); @@ -526,7 +532,7 @@ result = MMSYSERR_NOMEM; goto cleanup; } - + /* Initialize the critical section */ InitializeCriticalSection(device->state->queue_critical_section); @@ -537,7 +543,7 @@ /* 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; @@ -547,7 +553,7 @@ DPRINT("All systems are go...\n"); result = TryOpenDevice(device, open_details->lpFormat); - + if ( result != MMSYSERR_NOERROR ) { DPRINT1("Format not supported?\n"); @@ -585,7 +591,8 @@ } /* - This cleanup may need checking for memory leakage :/ + This cleanup may need checking for memory leakage. It's not very pretty + to look at, either... */ cleanup : @@ -601,7 +608,7 @@ DeleteCriticalSection(device->state->queue_critical_section); HeapFree(heap, 0, device->state->queue_critical_section); } - + HeapFree(heap, 0, device->state); } _____ Added: trunk/reactos/lib/wdmaud/memtrack.c --- trunk/reactos/lib/wdmaud/memtrack.c 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/memtrack.c 2005-11-25 03:50:49 UTC (rev 19540) @@ -0,0 +1,72 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/memtrack.c + * PURPOSE: WDM Audio Support - Memory Tracking + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 18, 2005: Created + * + */ + +#include "wdmaud.h" + +static int alloc_count = 0; + +LPVOID AllocMem(DWORD size) +{ + HANDLE heap; + LPVOID pointer; + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("SEVERE ERROR! Couldn't get process heap! (error %d)\n", + (int) GetLastError()); + return NULL; + } + + pointer = HeapAlloc(heap, HEAP_ZERO_MEMORY, size); + + if ( pointer ) + alloc_count ++; + + ReportMem(); + + return pointer; +} + +VOID FreeMem(LPVOID pointer) +{ + HANDLE heap; + + if ( ! pointer ) + { + DPRINT1("Trying to free a NULL pointer!\n"); + return; + } + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("SEVERE ERROR! Couldn't get process heap! (error %d)\n", + (int) GetLastError()); + return; + } + + if ( ! HeapFree(heap, 0, pointer) ) + alloc_count --; + + ReportMem(); +} + +VOID ReportMem() +{ + DPRINT("Memory blocks allocated: %d\n", (int) alloc_count); + + if ( alloc_count < 0 ) + DPRINT1("FREEMEM HAS BEEN CALLED TOO MANY TIMES!\n"); +} Property changes on: trunk/reactos/lib/wdmaud/memtrack.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/wdmaud/user.c --- trunk/reactos/lib/wdmaud/user.c 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/user.c 2005-11-25 03:50:49 UTC (rev 19540) @@ -47,23 +47,24 @@ case DRV_LOAD : DPRINT("DRV_LOAD\n"); /* We should initialize the device list */ - return DRV_OK; // dont need to do any more + return TRUE; // dont need to do any more case DRV_FREE : /* We should stop all wave and MIDI playback */ DPRINT("DRV_FREE\n"); - return DRV_OK; + return TRUE; /* DRV_OPEN is sent when WINMM wishes to open the driver. Param1 can specify configuration information, but we don't need any. */ case DRV_OPEN : - return DRV_OK; + DPRINT("DRV_OPEN\n"); + return TRUE; case DRV_CLOSE : DPRINT("DRV_CLOSE\n"); - return DRV_OK; + return TRUE; /* Enabling this driver causes the kernel-mode portion of WDMAUD to @@ -84,7 +85,7 @@ case DRV_DISABLE : DPRINT("DRV_DISABLE\n"); DisableKernelInterface(); - return DRV_OK; + return TRUE; /* We don't actually support configuration or installation, so these @@ -155,7 +156,7 @@ case WIDM_GETDEVCAPS : DPRINT("WIDM_GETDEVCAPS\n"); - return GetWaveInCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetWaveInCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); }; return MMSYSERR_NOERROR; @@ -185,7 +186,7 @@ case DRVM_EXIT : DPRINT("DRVM_EXIT\n"); - return RemoveWaveInDevice((WCHAR*) p2); /* FIXME? */ + return RemoveWaveOutDevice((WCHAR*) p2); /* FIXME? */ /* * WODM_GETNUMDEVS @@ -203,7 +204,7 @@ */ case WODM_GETDEVCAPS : DPRINT("WODM_GETDEVCAPS\n"); - return GetWaveOutCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetWaveOutCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); /* * WODM_OPEN @@ -264,7 +265,7 @@ case MIDM_GETDEVCAPS : DPRINT("MIDM_GETDEVCAPS\n"); - return GetMidiInCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetMidiInCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); }; DPRINT("* NOT IMPLEMENTED *\n"); @@ -297,7 +298,7 @@ case MODM_GETDEVCAPS : DPRINT("MODM_GETDEVCAPS\n"); - return GetMidiOutCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetMidiOutCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); }; DPRINT("* NOT IMPLEMENTED *\n"); @@ -330,7 +331,7 @@ case MXDM_GETDEVCAPS : DPRINT("MXDM_GETDEVCAPS\n"); - return GetMixerCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetMixerCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); /* ... */ }; @@ -359,7 +360,7 @@ case AUXDM_GETDEVCAPS : DPRINT("AUXDM_GETDEVCAPS\n"); - return GetAuxCapabilities(id, (WCHAR*) p2, (LPCOMMONCAPS) p1); + return GetAuxCapabilities(id, (WCHAR*) p2, (LPMDEVICECAPSEX) p1); /* ... */ }; @@ -379,6 +380,8 @@ else if (Reason == DLL_PROCESS_DETACH) { + DPRINT("*** wdmaud.drv is being closed ***\n"); + ReportMem(); } return TRUE; _____ Modified: trunk/reactos/lib/wdmaud/wdmaud.def --- trunk/reactos/lib/wdmaud/wdmaud.def 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/wdmaud.def 2005-11-25 03:50:49 UTC (rev 19540) @@ -4,12 +4,23 @@ ; ; ReactOS Operating System ; +; Each of the "message" functions can be commented out to stop the +; corresponding device type from being supported. This is mainly so we can +; focus on debugging a particular device type. +; LIBRARY wdmaud.drv EXPORTS +; DriverProc is needed so the driver can startup and shutdown DriverProc@20 +; Wave input support ;widMessage@20 +; Wave output support wodMessage@20 +; Midi input support ;midMessage@20 +; Midi output support ;modMessage@20 +; Mixer support ;mxdMessage@20 +; Auxiliary device support ;auxMessage@20 _____ Modified: trunk/reactos/lib/wdmaud/wdmaud.h --- trunk/reactos/lib/wdmaud/wdmaud.h 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/wdmaud.h 2005-11-25 03:50:49 UTC (rev 19540) @@ -31,49 +31,7 @@ /* HACK! */ #define DbgPrint printf -/* TODO: Put elsewhere */ -#if 0 -typedef struct tagWAVEOUTCAPS2A { - WORD wMid; /* manufacturer ID */ - WORD wPid; /* product ID */ - MMVERSION vDriverVersion; /* version of the driver */ - CHAR szPname[MAXPNAMELEN]; /* product name (NULL terminated string) */ - DWORD dwFormats; /* formats supported */ - WORD wChannels; /* number of sources supported */ - WORD wReserved1; /* packing */ - DWORD dwSupport; /* functionality supported by driver */ - GUID ManufacturerGuid; /* for extensible MID mapping */ - GUID ProductGuid; /* for extensible PID mapping */ - GUID NameGuid; /* for name lookup in registry */ -} WAVEOUTCAPS2A, *PWAVEOUTCAPS2A, *NPWAVEOUTCAPS2A, *LPWAVEOUTCAPS2A; -typedef struct tagWAVEOUTCAPS2W { - WORD wMid; /* manufacturer ID */ - WORD wPid; /* product ID */ - MMVERSION vDriverVersion; /* version of the driver */ - WCHAR szPname[MAXPNAMELEN]; /* product name (NULL terminated string) */ - DWORD dwFormats; /* formats supported */ - WORD wChannels; /* number of sources supported */ - WORD wReserved1; /* packing */ - DWORD dwSupport; /* functionality supported by driver */ - GUID ManufacturerGuid; /* for extensible MID mapping */ - GUID ProductGuid; /* for extensible PID mapping */ - GUID NameGuid; /* for name lookup in registry */ -} WAVEOUTCAPS2W, *PWAVEOUTCAPS2W, *NPWAVEOUTCAPS2W, *LPWAVEOUTCAPS2W; -#ifdef UNICODE -typedef WAVEOUTCAPS2W WAVEOUTCAPS2; -typedef PWAVEOUTCAPS2W PWAVEOUTCAPS2; -typedef NPWAVEOUTCAPS2W NPWAVEOUTCAPS2; -typedef LPWAVEOUTCAPS2W LPWAVEOUTCAPS2; -#else -typedef WAVEOUTCAPS2A WAVEOUTCAPS2; -typedef PWAVEOUTCAPS2A PWAVEOUTCAPS2; -typedef NPWAVEOUTCAPS2A NPWAVEOUTCAPS2; -typedef LPWAVEOUTCAPS2A LPWAVEOUTCAPS2; -#endif // UNICODE -#endif - - /* Handy macros */ @@ -82,6 +40,10 @@ DPRINT("%s %s\n", message, success == MMSYSERR_NOERROR ? "succeeded" : "failed") + +#define GOBAL_CALLBACKS_PATH L"Global\\WDMAUD_Callbacks" + + /* Private IOCTLs shared between wdmaud.sys and wdmaud.drv @@ -201,19 +163,17 @@ of a device type. */ +/* + This is used as a general-purpose structure to retrieve capabilities + from the driver. +*/ typedef struct { - WORD wMid; - WORD wPid; - MMVERSION vDriverVersion; - WCHAR szPname[MAXPNAMELEN]; -} COMMONCAPSW, *LPCOMMONCAPSW; + DWORD cbSize; + LPVOID pCaps; +} MDEVICECAPSEX, *LPMDEVICECAPSEX; -/* Unicode, anyone? */ -typedef COMMONCAPSW COMMONCAPS; -typedef LPCOMMONCAPSW LPCOMMONCAPS; - -/* More abstraction */ +/* Abstraction */ typedef LPVOID PWDMAUD_HEADER; /* @@ -440,20 +400,20 @@ CHAR device_type, DWORD device_id, WCHAR* device_path, - LPCOMMONCAPS caps); + LPMDEVICECAPSEX caps); #define GetWaveInCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_WAVE_IN, device_path, caps); + GetDeviceCapabilities(WDMAUD_WAVE_IN, id, device_path, caps); #define GetWaveOutCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_WAVE_OUT, device_path, caps); + GetDeviceCapabilities(WDMAUD_WAVE_OUT, id, device_path, caps); #define GetMidiInCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_MIDI_IN, device_path, caps); + GetDeviceCapabilities(WDMAUD_MIDI_IN, id, device_path, caps); #define GetMidiOutCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_MIDI_OUT, device_path, caps); + GetDeviceCapabilities(WDMAUD_MIDI_OUT, id, device_path, caps); #define GetMixerCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_MIXER, device_path, caps); + GetDeviceCapabilities(WDMAUD_MIXER, id, device_path, caps); #define GetAuxCapabilities(id, device_path, caps) \ - GetDeviceCapabilities(id, WDMAUD_AUX, device_path, caps); + GetDeviceCapabilities(WDMAUD_AUX, id, device_path, caps); MMRESULT OpenWaveDevice( CHAR device_type, @@ -504,4 +464,15 @@ /* MORE... */ +/* + DEBUGGING + RESOURCE TRACKING +*/ + +LPVOID AllocMem(DWORD size); +VOID FreeMem(LPVOID pointer); +VOID ReportMem(); + +#define AutoAlloc(type) \ + (type*) MemAlloc(sizeof(type)); + #endif _____ Modified: trunk/reactos/lib/wdmaud/wdmaud.xml --- trunk/reactos/lib/wdmaud/wdmaud.xml 2005-11-25 03:41:24 UTC (rev 19539) +++ trunk/reactos/lib/wdmaud/wdmaud.xml 2005-11-25 03:50:49 UTC (rev 19540) @@ -16,5 +16,6 @@ <file>wavehdr.c</file> <file>threads.c</file> <file>helper.c</file> + <file>memtrack.c</file> <file>wdmaud.rc</file> </module>

18 years, 9 months

[sedwards] 19539: add a check for gcc to the constants recently added for the msvc port. They seem to cause problems on some gcc's but not mine.

by sedwards＠svn.reactos.com

add a check for gcc to the constants recently added for the msvc port. They seem to cause problems on some gcc's but not mine. Modified: trunk/reactos/lib/crt/include/float.h _____ Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-11-25 00:17:40 UTC (rev 19538) +++ trunk/reactos/lib/crt/include/float.h 2005-11-25 03:41:24 UTC (rev 19539) @@ -91,9 +91,11 @@ #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ +#ifdef __GNUC__ #define DBL_MAX_10_EXP 308 #define S_IFIFO -1 #define UINT64_MAX 0xffffffffffffffff +#endif #ifndef RC_INVOKED

18 years, 9 months

[ion] 19538: - Update NDK to remove zwfuncs.h and place the native functions in their respective xxfuncs.h instead, so that applications can now include only what they need. Add more xxfuncs.h files for every API.

by ion＠svn.reactos.com

- Update NDK to remove zwfuncs.h and place the native functions in their respective xxfuncs.h instead, so that applications can now include only what they need. Add more xxfuncs.h files for every API. - Make the NDK smarter so that using #define NTOS_MODE_USER isn't needed anymore: the NDK can now auto-detect the presence of windows.h or ntddk.h and make the appropriate decision. - re-arrange ntndk.h to include all types in alphabetical order, and then all functions, regardless of um/kmode usage. - Make each file auto-detect if this is NTOS_MODE_USER or not and include each files it needs, instead of depending on a predefined order inside ntndk.h This way, any file can be included from both user-mode or kmode as simply as #include <iofuncs.h>, wthout any adtional work. - Update FIXME list with these changes and delay NDK release date since my trip is lasting a day longer. - Fix ntsecapi.h to define UNICODE_STRING, like it does in the PSDK. - Fix apps including ntsecapi + winternl.h These two cause a conflict even on PSDK and shouldn't be included together. - Make winlogon include only the NDK files it needs (2) instead of the whole NDK, as test for this faster newly supported method. - Remove some NDK apps from the FIXME list (the ones that weren't being built/are on my rewrite branch/are better off including the whole NDK instead of file-by-file). - Update debug.h to define RtlAssert and DbgPrint in case the NDK or DDK aren't already included, which will allow some of the apps to stop using the NDK solely for DPRINT/DPRINT1. Diabled for now since a lot of code needs to be changed to #include <debug.h> *After* they include the other headers. (so that the anti-double-definition check can work). Modified: trunk/reactos/include/ndk/cctypes.h Added: trunk/reactos/include/ndk/cmfuncs.h Modified: trunk/reactos/include/ndk/cmtypes.h Added: trunk/reactos/include/ndk/dbgkfuncs.h Modified: trunk/reactos/include/ndk/dbgktypes.h Modified: trunk/reactos/include/ndk/exfuncs.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/inbvfuncs.h Modified: trunk/reactos/include/ndk/iofuncs.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/kdtypes.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ldrtypes.h Added: trunk/reactos/include/ndk/lpcfuncs.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Added: trunk/reactos/include/ndk/pofuncs.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Deleted: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/netapi32/wksta.c Modified: trunk/reactos/subsys/system/winlogon/winlogon.h Modified: trunk/reactos/w32api/include/ntsecapi.h _____ Modified: trunk/reactos/include/ndk/cctypes.h --- trunk/reactos/include/ndk/cctypes.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/cctypes.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -22,12 +22,16 @@ // // Dependencies // +#include <umtypes.h> +#ifndef NTOS_MODE_USER + // // Kernel Exported CcData // extern ULONG NTSYSAPI CcFastReadNotPossible; extern ULONG NTSYSAPI CcFastReadWait; +#endif #endif // _CCTYPES_H _____ Added: trunk/reactos/include/ndk/cmfuncs.h --- trunk/reactos/include/ndk/cmfuncs.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/cmfuncs.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -0,0 +1,436 @@ +/*++ NDK Version: 0095 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + cmfuncs.h + +Abstract: + + Function definitions for the Configuration Manager. + +Author: + + Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + +--*/ + +#ifndef _CMFUNCS_H +#define _CMFUNCS_H + +// +// Dependencies +// +#include <umtypes.h> + +// +// Native calls +// +NTSTATUS +NTAPI +NtCreateKey( + OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG TitleIndex, + IN PUNICODE_STRING Class OPTIONAL, + IN ULONG CreateOptions, + IN PULONG Disposition OPTIONAL +); + +NTSTATUS +NTAPI +NtDeleteKey( + IN HANDLE KeyHandle +); + +NTSTATUS +NTAPI +NtDeleteValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName +); + +NTSTATUS +NTAPI +NtEnumerateKey( + IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtEnumerateValueKey( + IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtFlushKey( + IN HANDLE KeyHandle +); + +NTSTATUS +NTAPI +NtGetPlugPlayEvent( + IN ULONG Reserved1, + IN ULONG Reserved2, + OUT PPLUGPLAY_EVENT_BLOCK Buffer, + IN ULONG BufferSize +); + +NTSTATUS +NTAPI +NtInitializeRegistry( + BOOLEAN SetUpBoot +); + +NTSTATUS +NTAPI +NtLoadKey( + IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes +); + +NTSTATUS +NTAPI +NtLoadKey2( + IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes, + IN ULONG Flags +); + +NTSTATUS +NTAPI +NtNotifyChangeKey( + IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN Asynchroneous, + OUT PVOID ChangeBuffer, + IN ULONG Length, + IN BOOLEAN WatchSubtree +); + +NTSTATUS +NTAPI +NtOpenKey( + OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtPlugPlayControl( + IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, + IN OUT PVOID Buffer, + IN ULONG BufferSize +); + +NTSTATUS +NTAPI +NtQueryKey( + IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtQueryMultipleValueKey( + IN HANDLE KeyHandle, + IN OUT PKEY_VALUE_ENTRY ValueList, + IN ULONG NumberOfValues, + OUT PVOID Buffer, + IN OUT PULONG Length, + OUT PULONG ReturnLength +); + +NTSTATUS +NTAPI +NtQueryValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtReplaceKey( + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE Key, + IN POBJECT_ATTRIBUTES ReplacedObjectAttributes +); + +NTSTATUS +NTAPI +NtRestoreKey( + IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG RestoreFlags +); + +NTSTATUS +NTAPI +NtSaveKey( + IN HANDLE KeyHandle, + IN HANDLE FileHandle +); + +NTSTATUS +NTAPI +NtSaveKeyEx( + IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG Flags +); + +NTSTATUS +NTAPI +NtSetInformationKey( + IN HANDLE KeyHandle, + IN KEY_SET_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG KeyInformationLength +); + +NTSTATUS +NTAPI +NtSetValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN ULONG TitleIndex OPTIONAL, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize +); + +NTSTATUS +NTAPI +NtUnloadKey( + IN POBJECT_ATTRIBUTES KeyObjectAttributes +); + +NTSTATUS +NTAPI +ZwCreateKey( + OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG TitleIndex, + IN PUNICODE_STRING Class OPTIONAL, + IN ULONG CreateOptions, + IN PULONG Disposition OPTIONAL +); + +NTSTATUS +NTAPI +ZwDeleteKey( + IN HANDLE KeyHandle +); + +NTSTATUS +NTAPI +ZwDeleteValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName +); + +NTSTATUS +NTAPI +ZwEnumerateKey( + IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +ZwEnumerateValueKey( + IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +ZwFlushKey( + IN HANDLE KeyHandle +); + +NTSTATUS +NTAPI +ZwGetPlugPlayEvent( + IN ULONG Reserved1, + IN ULONG Reserved2, + OUT PPLUGPLAY_EVENT_BLOCK Buffer, + IN ULONG BufferSize +); + +NTSTATUS +NTAPI +ZwInitializeRegistry( + BOOLEAN SetUpBoot +); + +NTSTATUS +NTAPI +ZwLoadKey( + IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes +); + +NTSTATUS +NTAPI +ZwLoadKey2( + IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes, + IN ULONG Flags +); + +NTSTATUS +NTAPI +ZwNotifyChangeKey( + IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN Asynchroneous, + OUT PVOID ChangeBuffer, + IN ULONG Length, + IN BOOLEAN WatchSubtree +); + +NTSTATUS +NTAPI +ZwOpenKey( + OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +ZwPlugPlayControl( + IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, + IN OUT PVOID Buffer, + IN ULONG BufferSize +); + +NTSTATUS +NTAPI +ZwQueryKey( + IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +ZwQueryMultipleValueKey( + IN HANDLE KeyHandle, + IN OUT PKEY_VALUE_ENTRY ValueList, + IN ULONG NumberOfValues, + OUT PVOID Buffer, + IN OUT PULONG Length, + OUT PULONG ReturnLength +); + +NTSTATUS +NTAPI +ZwQueryValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +ZwReplaceKey( + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE Key, + IN POBJECT_ATTRIBUTES ReplacedObjectAttributes +); + +NTSTATUS +NTAPI +ZwRestoreKey( + IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG RestoreFlags +); + +NTSTATUS +NTAPI +ZwSaveKey( + IN HANDLE KeyHandle, + IN HANDLE FileHandle +); + +NTSTATUS +NTAPI +ZwSaveKeyEx( + IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG Flags +); + +NTSTATUS +NTAPI +ZwSetInformationKey( + IN HANDLE KeyHandle, + IN KEY_SET_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG KeyInformationLength +); + +NTSTATUS +NTAPI +ZwSetValueKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN ULONG TitleIndex OPTIONAL, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize +); + +NTSTATUS +NTAPI +ZwUnloadKey( + IN POBJECT_ATTRIBUTES KeyObjectAttributes +); + +#endif _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/cmtypes.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -22,8 +22,9 @@ // // Dependencies // +#include <umtypes.h> #include <cfg.h> -#include "iotypes.h" +#include <iotypes.h> #define MAX_BUS_NAME 24 @@ -86,12 +87,6 @@ #define CM_RESOURCE_PORT_WINDOW_DECODE 0x0080 // -// Interrupt Resource Descriptor Flags -// -#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 -#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 - -// // Memory Resource Descriptor Flags // #define CM_RESOURCE_MEMORY_READ_WRITE 0x0000 _____ Added: trunk/reactos/include/ndk/dbgkfuncs.h --- trunk/reactos/include/ndk/dbgkfuncs.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/dbgkfuncs.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -0,0 +1,87 @@ +/*++ NDK Version: 0095 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + dbgkfuncs.h + +Abstract: + + Function definitions for the User Mode Debugging Facility. + +Author: + + Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + +--*/ + +#ifndef _DBGKFUNCS_H +#define _DBGKFUNCS_H + +// +// Dependencies +// +#include <umtypes.h> + +// +// Native calls +// +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateDebugObject( + OUT PHANDLE DebugHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN KillProcessOnExit +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtDebugContinue( + IN HANDLE DebugObject, + IN PCLIENT_ID AppClientId, + IN NTSTATUS ContinueStatus +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtWaitForDebugEvent( + IN HANDLE DebugObject, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +ZwCreateDebugObject( + OUT PHANDLE DebugHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN KillProcessOnExit +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +ZwDebugContinue( + IN HANDLE DebugObject, + IN PCLIENT_ID AppClientId, + IN NTSTATUS ContinueStatus +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +ZwWaitForDebugEvent( + IN HANDLE DebugObject, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange +); +#endif _____ Modified: trunk/reactos/include/ndk/dbgktypes.h --- trunk/reactos/include/ndk/dbgktypes.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/dbgktypes.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -8,7 +8,7 @@ Abstract: - Type definitions for the Debug Subsystem. + Type definitions for the User Mode Debugging Facility. Author: @@ -22,6 +22,8 @@ // // Dependencies // +#include <umtypes.h> +#include <lpctypes.h> // // Debug Object Access Masks _____ Modified: trunk/reactos/include/ndk/exfuncs.h --- trunk/reactos/include/ndk/exfuncs.h 2005-11-24 23:07:36 UTC (rev 19537) +++ trunk/reactos/include/ndk/exfuncs.h 2005-11-25 00:17:40 UTC (rev 19538) @@ -22,8 +22,15 @@ // // Dependencies // +#include <umtypes.h> // +// Don't include WMI headers just for one define +// +typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER; + +#ifndef NTOS_MODE_USER +// // Fast Mutex functions // VOID @@ -33,5 +40,736 @@ VOID FASTCALL ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex); +#endif +// +// Native Calls +// +NTSTATUS +NTAPI +NtAddAtom( + IN PWSTR AtomName, + IN ULONG AtomNameLength, + IN OUT PRTL_ATOM Atom +); + +NTSTATUS +NTAPI +NtCancelTimer( + IN HANDLE TimerHandle, + OUT PBOOLEAN CurrentState OPTIONAL +); + +NTSTATUS +NTAPI +NtClearEvent( + IN HANDLE EventHandle +); + +NTSTATUS +NTAPI +NtCreateEvent( + OUT PHANDLE EventHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN EVENT_TYPE EventType, + IN BOOLEAN InitialState +); + +NTSTATUS +NTAPI +NtCreateEventPair( + OUT PHANDLE EventPairHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtCreateMutant( + OUT PHANDLE MutantHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN InitialOwner +); + +NTSTATUS +NTAPI +NtCreateSemaphore( + OUT PHANDLE SemaphoreHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN LONG InitialCount, + IN LONG MaximumCount +); + +NTSTATUS +NTAPI +NtCreateTimer( + OUT PHANDLE TimerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN TIMER_TYPE TimerType +); + +NTSTATUS +NTAPI +NtDeleteAtom( + IN RTL_ATOM Atom +); + +NTSTATUS +NTAPI +NtDisplayString( + IN PUNICODE_STRING DisplayString +); + +NTSTATUS +NTAPI +NtFindAtom( + IN PWSTR AtomName, + IN ULONG AtomNameLength, + OUT PRTL_ATOM Atom OPTIONAL +); + +NTSTATUS +NTAPI +NtOpenEvent( + OUT PHANDLE EventHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtOpenEventPair( + OUT PHANDLE EventPairHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtOpenMutant( + OUT PHANDLE MutantHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtOpenSemaphore( + OUT PHANDLE SemaphoreHandle, + IN ACCESS_MASK DesiredAcces, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtOpenTimer( + OUT PHANDLE TimerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI +NtPulseEvent( + IN HANDLE EventHandle, + IN PLONG PulseCount OPTIONAL +); + +NTSTATUS +NTAPI +NtQueryDefaultLocale( + IN BOOLEAN UserProfile, + OUT PLCID DefaultLocaleId +); + +NTSTATUS +NTAPI +NtQueryDefaultUILanguage( + PLANGID LanguageId +); + +NTSTATUS +NTAPI +NtQueryEvent( + IN HANDLE EventHandle, + IN EVENT_INFORMATION_CLASS EventInformationClass, + OUT PVOID EventInformation, + IN ULONG EventInformationLength, + OUT PULONG ReturnLength +); + +NTSTATUS +NTAPI +NtQueryInformationAtom( + IN RTL_ATOM Atom, + IN ATOM_INFORMATION_CLASS AtomInformationClass, + OUT PVOID AtomInformation, + IN ULONG AtomInformationLength, + OUT PULONG ReturnLength OPTIONAL +); + +NTSTATUS +NTAPI +NtQueryInstallUILanguage( + PLANGID LanguageId +); + +NTSTATUS +NTAPI +NtQueryMutant( + IN HANDLE MutantHandle, + IN MUTANT_INFORMATION_CLASS MutantInformationClass, + OUT PVOID MutantInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtQuerySemaphore( + IN HANDLE SemaphoreHandle, + IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, + OUT PVOID SemaphoreInformation, + IN ULONG Length, + OUT PULONG ReturnLength +); + +NTSTATUS +NTAPI +NtQuerySystemEnvironmentValue( + IN PUNICODE_STRING Name, + OUT PWSTR Value, + ULONG Length, + PULONG ReturnLength +); + +NTSTATUS +NTAPI +NtQuerySystemInformation( + IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtQueryTimer( + IN HANDLE TimerHandle, + IN TIMER_INFORMATION_CLASS TimerInformationClass, + OUT PVOID TimerInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + +NTSTATUS +NTAPI +NtRaiseHardError( + IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response +); + +NTSTATUS +NTAPI +NtReleaseMutant( + IN HANDLE MutantHandle, + IN PLONG ReleaseCount OPTIONAL +); + +NTSTATUS +NTAPI +NtReleaseSemaphore( + IN HANDLE SemaphoreHandle, + IN LONG ReleaseCount, + OUT PLONG PreviousCount +); + +NTSTATUS +NTAPI +NtResetEvent( + IN HANDLE EventHandle, + OUT PLONG NumberOfWaitingThreads OPTIONAL +); + +NTSTATUS +NTAPI +NtSetDefaultLocale( + IN BOOLEAN UserProfile, + IN LCID DefaultLocaleId +); + +NTSTATUS +NTAPI +NtSetDefaultUILanguage( + LANGID LanguageId +); + +NTSTATUS +NTAPI +NtSetDefaultHardErrorPort( + IN HANDLE PortHandle +); + +NTSTATUS +NTAPI +NtSetEvent( + IN HANDLE EventHandle, + OUT PLONG PreviousState OPTIONAL +); + +NTSTATUS +NTAPI +NtSetHighEventPair( + IN HANDLE EventPairHandle +); + +NTSTATUS +NTAPI +NtSetHighWaitLowEventPair( + IN HANDLE EventPairHandle +); + +NTSTATUS +NTAPI +NtSetLowEventPair( + HANDLE EventPair +); + +NTSTATUS +NTAPI +NtSetLowWaitHighEventPair( + HANDLE EventPair +); + +NTSTATUS +NTAPI +NtSetSystemEnvironmentValue( + IN PUNICODE_STRING VariableName, + IN PUNICODE_STRING Value +); + +NTSTATUS +NTAPI +NtSetSystemInformation( + IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + IN PVOID SystemInformation, + IN ULONG SystemInformationLength +); + +NTSTATUS +NTAPI +NtSetTimer( + IN HANDLE TimerHandle, + IN PLARGE_INTEGER DueTime, + IN PTIMER_APC_ROUTINE TimerApcRoutine, + IN PVOID TimerContext, + IN BOOLEAN WakeTimer, + IN LONG Period OPTIONAL, + OUT PBOOLEAN PreviousState OPTIONAL +); + +NTSTATUS +NTAPI +NtSetUuidSeed( + IN PUCHAR UuidSeed +); + +NTSTATUS +NTAPI +NtShutdownSystem( + IN SHUTDOWN_ACTION Action +); + +NTSTATUS +NTAPI +NtWaitHighEventPair( + IN HANDLE EventPairHandle +); + +NTSTATUS +NTAPI +NtWaitLowEventPair( + IN HANDLE EventPairHandle +); + +NTSTATUS +NTAPI +NtTraceEvent( + IN ULONG TraceHandle, + IN ULONG Flags, + IN ULONG TraceHeaderLength, + IN PEVENT_TRACE_HEADER TraceHeader +); + +NTSTATUS +NTAPI +ZwAddAtom( [truncated at 1000 lines; 8826 more skipped]

18 years, 9 months

[gedmurphy] 19537: silence some warnings.

by gedmurphy＠svn.reactos.com

silence some warnings. Modified: trunk/reactos/lib/iphlpapi/ifenum.h Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum.h --- trunk/reactos/lib/iphlpapi/ifenum.h 2005-11-24 22:08:38 UTC (rev 19536) +++ trunk/reactos/lib/iphlpapi/ifenum.h 2005-11-24 23:07:36 UTC (rev 19537) @@ -139,6 +139,11 @@ */ char *toIPAddressString(unsigned int addr, char string[16]); +/* add and delete IP addresses */ +NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex, + PULONG NteContext, PULONG NteInstance ); +NTSTATUS deleteIpAddress( ULONG NteContext ); + /* Inserts a route into the route table. */ DWORD createIpForwardEntryOS(PMIB_IPFORWARDROW pRoute); _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-24 22:08:38 UTC (rev 19536) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-24 23:07:36 UTC (rev 19537) @@ -613,6 +613,7 @@ winsEnabled = TRUE; RegCloseKey(hKey); } + for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; DWORD addrLen = sizeof(ptr->Address), type;

18 years, 9 months

[jimtabor] 19536: Fix missed files. Svn problem?

by jimtabor＠svn.reactos.com

Fix missed files. Svn problem? Added: trunk/reactos/drivers/multimedia/portcls/ Added: trunk/reactos/drivers/multimedia/portcls/portcls.c Added: trunk/reactos/drivers/multimedia/portcls/portcls.def Added: trunk/reactos/drivers/multimedia/portcls/portcls.h Added: trunk/reactos/drivers/multimedia/portcls/portcls.rc Added: trunk/reactos/drivers/multimedia/portcls/portcls.xml _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,505 @@ +/* + * ReactOS PortCls Driver + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Sound System + * PURPOSE: Audio Port Class Functions + * FILE: drivers/dd/sound/portcls/portcls.c + * PROGRAMMERS: + * + * REVISION HISTORY: + * 21 November 2005 Created James Tabor + */ +#include <windows.h> +#include "portcls.h" + + +#define NDEBUG +#include <debug.h> + + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +DWORD STDCALL +DllInitialize(DWORD Unknown) +{ + return 0; +} + +/* + * @implemented + */ +DWORD STDCALL +DllUnload(VOID) +{ + return 0; +} + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddAdapterDevice( + DWORD DriverObject, + DWORD PhysicalDeviceObject, + DWORD StartDevice, + DWORD MaxObjects, + DWORD DeviceExtensionSize +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddContentHandlers( + DWORD ContentId, + DWORD paHandlers, + DWORD NumHandlers +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompleteIrp( + DWORD DeviceObject, + DWORD Irp, + DWORD Status +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + DWORD PropertyRequest, + DWORD NtStatus +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCreateContentMixed( + DWORD paContentId, + DWORD cContentId, + DWORD pMixedContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDestroyContent( + DWORD ContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDispatchIrp( + DWORD DeviceObject, + DWORD Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToDeviceObject( + DWORD ContentId, + DWORD Reserved, + DWORD DrmForward +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToFileObject( + DWORD ContentId, + DWORD FileObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToInterface( + DWORD ContentId, + DWORD Unknown, + DWORD NumMethods +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardIrpSynchronous( + DWORD DeviceObject, + DWORD Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetContentRights( + DWORD ContentId, + DWORD DrmRights +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetDeviceProperty( + DWORD DeviceObject, + DWORD DeviceProperty, + DWORD BufferLength, + DWORD PropertyBuffer, + DWORD ResultLength +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcInitializeAdapterDriver( + DWORD DriverObject, + DWORD RegistryPathName, + DWORD AddDevice +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewDmaChannel( + DWORD OutDmaChannel, + DWORD Unknown, + DWORD PoolType, + DWORD DeviceDescription, + DWORD DeviceObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewInterruptSync( + DWORD OutInterruptSync, + DWORD Unknown, + DWORD ResourceList, + DWORD ResourceIndex, + DWORD Mode +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewMiniport( + DWORD OutMiniport, + DWORD ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewPort( + DWORD OutPort, + DWORD ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewRegistryKey( + DWORD OutRegistryKey, + DWORD Unknown, + DWORD RegistryKeyType, + DWORD DesiredAccess, + DWORD DeviceObject, + DWORD SubDevice, + DWORD ObjectAttributes, + DWORD CreateOptions, + DWORD Disposition +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceList( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD TranslatedResources, + DWORD UntranslatedResources +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceSublist( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD ParentList, + DWORD MaximumEntries +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewServiceGroup( + DWORD OutServiceGroup, + DWORD Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + DWORD Unknown, + DWORD pvContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnection( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + DWORD DeviceObject, + DWORD FromString, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToString, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterSubdevice( + DWORD DeviceObject, + DWORD SubdevName, + DWORD Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRequestNewPowerState( + DWORD pDeviceObject, + DWORD RequestedNewState +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcUnregisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.def --- trunk/reactos/drivers/multimedia/portcls/portcls.def 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.def 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,36 @@ +; +; Exports definition file for portcls.sys +; +EXPORTS +PcAddAdapterDevice@20 +PcAddContentHandlers@12 +PcCompleteIrp@12 +PcCompletePendingPropertyRequest@8 +PcCreateContentMixed@12 +PcDestroyContent@4 +PcDispatchIrp@8 +PcForwardContentToDeviceObject@12 +PcForwardContentToFileObject@8 +PcForwardContentToInterface@12 +PcForwardIrpSynchronous@8 +PcGetContentRights@8 +PcGetDeviceProperty@20 +PcGetTimeInterval@8 +PcInitializeAdapterDriver@12 +PcNewDmaChannel@20 +PcNewInterruptSync@20 +PcNewMiniport@8 +PcNewPort@8 +PcNewRegistryKey@36 +PcNewResourceList@20 +PcNewResourceSublist@20 +PcNewServiceGroup@8 +PcRegisterAdapterPowerManagement@8 +PcRegisterIoTimeout@12 +PcRegisterPhysicalConnection@20 +PcRegisterPhysicalConnectionFromExternal@20 +PcRegisterPhysicalConnectionToExternal@20 +PcRegisterSubdevice@12 +PcRequestNewPowerState@8 +PcUnregisterIoTimeout@12 + Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.h --- trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,252 @@ +/* + + Move to w32api when it is ready. + + */ +#ifndef _PORTCLS_H +#define _PORTCLS_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include <windef.h> +#include <ddk/ntddk.h> + +#define PORTCLASSAPI extern + +PORTCLASSAPI NTSTATUS STDCALL +PcAddAdapterDevice( + DWORD DriverObject, + DWORD PhysicalDeviceObject, + DWORD StartDevice, + DWORD MaxObjects, + DWORD DeviceExtensionSize +); + +PORTCLASSAPI NTSTATUS STDCALL +PcAddContentHandlers( + DWORD ContentId, + DWORD paHandlers, + DWORD NumHandlers +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompleteIrp( + DWORD DeviceObject, + DWORD Irp, + DWORD Status +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + DWORD PropertyRequest, + DWORD NtStatus +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCreateContentMixed( + DWORD paContentId, + DWORD cContentId, + DWORD pMixedContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDestroyContent( + DWORD ContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDispatchIrp( + DWORD DeviceObject, + DWORD Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToDeviceObject( + DWORD ContentId, + DWORD Reserved, + DWORD DrmForward +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToFileObject( + DWORD ContentId, + DWORD FileObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToInterface( + DWORD ContentId, + DWORD Unknown, + DWORD NumMethods +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardIrpSynchronous( + DWORD DeviceObject, + DWORD Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetContentRights( + DWORD ContentId, + DWORD DrmRights +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetDeviceProperty( + DWORD DeviceObject, + DWORD DeviceProperty, + DWORD BufferLength, + DWORD PropertyBuffer, + DWORD ResultLength +); + +PORTCLASSAPI ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +); + +PORTCLASSAPI NTSTATUS STDCALL +PcInitializeAdapterDriver( + DWORD DriverObject, + DWORD RegistryPathName, + DWORD AddDevice +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewDmaChannel( + DWORD OutDmaChannel, + DWORD Unknown, + DWORD PoolType, + DWORD DeviceDescription, + DWORD DeviceObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewInterruptSync( + DWORD OutInterruptSync, + DWORD Unknown, + DWORD ResourceList, + DWORD ResourceIndex, + DWORD Mode +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewMiniport( + DWORD OutMiniport, + DWORD ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewPort( + DWORD OutPort, + DWORD ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewRegistryKey( + DWORD OutRegistryKey, + DWORD Unknown, + DWORD RegistryKeyType, + DWORD DesiredAccess, + DWORD DeviceObject, + DWORD SubDevice, + DWORD ObjectAttributes, + DWORD CreateOptions, + DWORD Disposition +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceList( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD TranslatedResources, + DWORD UntranslatedResources +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceSublist( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD ParentList, + DWORD MaximumEntries +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewServiceGroup( + DWORD OutServiceGroup, + DWORD Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + DWORD Unknown, + DWORD pvContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnection( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + DWORD DeviceObject, + DWORD FromString, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToString, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterSubdevice( + DWORD DeviceObject, + DWORD SubdevName, + DWORD Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRequestNewPowerState( + DWORD pDeviceObject, + DWORD RequestedNewState +); + +PORTCLASSAPI NTSTATUS STDCALL +PcUnregisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.rc --- trunk/reactos/drivers/multimedia/portcls/portcls.rc 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rc 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "PORTCLS Port Class Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "portcls\0" +#define REACTOS_STR_ORIGINAL_FILENAME "portcls.sys\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.xml --- trunk/reactos/drivers/multimedia/portcls/portcls.xml 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.xml 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,8 @@ +<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys"> + <importlibrary definition="portcls.def" /> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>portcls.c</file> + <file>portcls.rc</file> +</module> Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.xml ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[hbirr] 19535: - Allow trailing back slashes only for directories.

by hbirr＠svn.reactos.com

- Allow trailing back slashes only for directories. - Allow trailing back slashes, if a new directory will be created. Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-11-24 18:05:53 UTC (rev 19534) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-11-24 21:08:13 UTC (rev 19535) @@ -337,9 +337,11 @@ return Status; } +static NTSTATUS VfatOpenFile ( PDEVICE_EXTENSION DeviceExt, + PUNICODE_STRING PathNameU, PFILE_OBJECT FileObject, PVFATFCB* ParentFcb ) /* @@ -348,10 +350,8 @@ { PVFATFCB Fcb; NTSTATUS Status; - UNICODE_STRING PathNameU; - WCHAR Buffer[260]; - DPRINT ("VfatOpenFile(%08lx, %08lx, '%wZ')\n", DeviceExt, FileObject, &FileObject->FileName); + DPRINT ("VfatOpenFile(%08lx, '%wZ', %08lx, %08lx)\n", DeviceExt, PathNameU, FileObject, ParentFcb); if (FileObject->RelatedFileObject) { @@ -403,21 +403,10 @@ (*ParentFcb)->RefCount++; } - PathNameU.Buffer = Buffer; - PathNameU.Length = 0; - PathNameU.MaximumLength = sizeof(Buffer); - RtlCopyUnicodeString(&PathNameU, &FileObject->FileName); - if (PathNameU.Length > sizeof(WCHAR) && - PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR) - 1] == L'\\') - { - PathNameU.Length -= sizeof(WCHAR); - } - PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR)] = 0; - /* try first to find an existing FCB in memory */ DPRINT ("Checking for existing FCB in memory\n"); - Status = vfatGetFCBForFile (DeviceExt, ParentFcb, &Fcb, &PathNameU); + Status = vfatGetFCBForFile (DeviceExt, ParentFcb, &Fcb, PathNameU); if (!NT_SUCCESS (Status)) { DPRINT ("Could not make a new FCB, status: %x\n", Status); @@ -456,6 +445,7 @@ LARGE_INTEGER AllocationSize; BOOLEAN Dots; UNICODE_STRING FileNameU; + UNICODE_STRING PathNameU; /* Unpack the various parameters. */ Stack = IoGetCurrentIrpStackLocation (Irp); @@ -473,6 +463,12 @@ return(STATUS_INVALID_PARAMETER); } + if (RequestedOptions & FILE_DIRECTORY_FILE && + RequestedOptions & FILE_NON_DIRECTORY_FILE) + { + return(STATUS_INVALID_PARAMETER); + } + /* This a open operation for the volume itself */ if (FileObject->FileName.Length == 0 && FileObject->RelatedFileObject == NULL) @@ -506,12 +502,13 @@ /* * Check for illegal characters and illegale dot sequences in the file name */ - c = FileObject->FileName.Buffer + FileObject->FileName.Length / sizeof(WCHAR); + PathNameU = FileObject->FileName; + c = PathNameU.Buffer + PathNameU.Length / sizeof(WCHAR); last = c - 1; Dots = TRUE; - while (c-- > FileObject->FileName.Buffer) + while (c-- > PathNameU.Buffer) { - if (*c == L'\\' || c == FileObject->FileName.Buffer) + if (*c == L'\\' || c == PathNameU.Buffer) { if (Dots && last > c) { @@ -530,9 +527,22 @@ return(STATUS_OBJECT_NAME_INVALID); } } + if (FileObject->RelatedFileObject && PathNameU.Buffer[0] == L'\\') + { + return(STATUS_OBJECT_NAME_INVALID); + } + if (PathNameU.Length > sizeof(WCHAR) && PathNameU.Buffer[PathNameU.Length/sizeof(WCHAR)-1] == L'\\') + { + if (!(RequestedOptions & FILE_DIRECTORY_FILE)) + { + /* FIXME: Is this the right error message? */ + return(STATUS_OBJECT_NAME_INVALID); + } + PathNameU.Length -= sizeof(WCHAR); + } /* Try opening the file. */ - Status = VfatOpenFile (DeviceExt, FileObject, &ParentFcb); + Status = VfatOpenFile (DeviceExt, &PathNameU, FileObject, &ParentFcb); /* * If the directory containing the file to open doesn't exist then @@ -562,7 +572,7 @@ ULONG Attributes; Attributes = Stack->Parameters.Create.FileAttributes; - vfatSplitPathName(&FileObject->FileName, NULL, &FileNameU); + vfatSplitPathName(&PathNameU, NULL, &FileNameU); Status = VfatAddEntry (DeviceExt, &FileNameU, &pFcb, ParentFcb, RequestedOptions, (UCHAR)(Attributes & FILE_ATTRIBUTE_VALID_FLAGS)); vfatReleaseFCB (DeviceExt, ParentFcb); _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-24 18:05:53 UTC (rev 19534) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-24 21:08:13 UTC (rev 19535) @@ -478,10 +478,6 @@ NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext); -NTSTATUS VfatOpenFile (PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject, - PVFATFCB* parentFcb); - NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Parent, PUNICODE_STRING FileToFindU,

18 years, 9 months

[gvg] 19534: Fix optimized builds

by gvg＠svn.reactos.com

Fix optimized builds Modified: trunk/reactos/lib/inflib/inflib.xml _____ Modified: trunk/reactos/lib/inflib/inflib.xml --- trunk/reactos/lib/inflib/inflib.xml 2005-11-24 17:57:15 UTC (rev 19533) +++ trunk/reactos/lib/inflib/inflib.xml 2005-11-24 18:05:53 UTC (rev 19534) @@ -1,5 +1,6 @@ <module name="inflib" type="staticlibrary"> <include base="inflib">.</include> + <define name="__NO_CTYPE_INLINES" /> <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file>

18 years, 9 months

[chorns] 19533: Store renamed file in the right directory

by chorns＠svn.reactos.com

Store renamed file in the right directory Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:33:38 UTC (rev 19532) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 17:57:15 UTC (rev 19533) @@ -189,7 +189,7 @@ revision); string destinationFilename = Path.Combine(Path.GetDirectoryName(sourceFilename), distributionFilename); - File.Move(sourceFilename, distributionFilename); + File.Move(sourceFilename, destinationFilename); string server; string directory; SplitRemotePublishPath(publishPath, out server, out directory);

18 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
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