Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 43141: Remove now unneeded ARC cdrom hack. We're now able to boot from a LiveCD, even if ReactOS directory is not "reactos"
by hpoussin＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: hpoussin Date: Fri Sep 25 00:05:10 2009 New Revision: 43141 URL: http://svn.reactos.org/svn/reactos?rev=43141&view=rev Log: Remove now unneeded ARC cdrom hack. We're now able to boot from a LiveCD, even if ReactOS directory is not "reactos" Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Fri Sep 25 00:05:10 2009 @@ -19,107 +19,6 @@ PCHAR IoLoaderArcBootDeviceName; /* FUNCTIONS *****************************************************************/ - -BOOLEAN -INIT_FUNCTION -NTAPI -IopApplyRosCdromArcHack(IN ULONG i) -{ - ULONG DeviceNumber = -1; - OBJECT_ATTRIBUTES ObjectAttributes; - ANSI_STRING InstallName; - UNICODE_STRING DeviceName; - CHAR Buffer[128], RosSysPath[16]; - FILE_BASIC_INFORMATION FileInfo; - NTSTATUS Status; - PCHAR p, q; - PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); - extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; - - /* Change this if you want ROS to boot properly from another directory */ - sprintf(RosSysPath, "%s", "reactos"); - - /* Only ARC Name left - Build full ARC Name */ - p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); - if (p) - { - /* Build installer name */ - sprintf(Buffer, "\\Device\\CdRom%lu\\%s\\ntoskrnl.exe", i, RosSysPath); - RtlInitAnsiString(&InstallName, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Try to find the installer */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - - /* Check if we found the file */ - if (NT_SUCCESS(Status)) - { - /* We did, save the device number */ - DeviceNumber = i; - } - else - { - /* Build live CD kernel name */ - sprintf(Buffer, - "\\Device\\CdRom%lu\\%s\\system32\\ntoskrnl.exe", - i, RosSysPath); - RtlInitAnsiString(&InstallName, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, - &InstallName, - TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Try to find it */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - } - - if (!InitIsWinPEMode) - { - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) - { - q++; - strcpy(Buffer, q); - sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); - } - } - } - - /* OK, how many disks are there? */ - DeviceNumber += ConfigInfo->DiskCount; - - /* Return whether this is the CD or not */ - if ((InitIsWinPEMode) || (ExpInTextModeSetup)) - { - return TRUE; - } - - /* Failed */ - return FALSE; -} BOOLEAN INIT_FUNCTION @@ -278,7 +177,8 @@ BOOLEAN INIT_FUNCTION NTAPI -IopAssignArcNamesToCdrom(IN PULONG Buffer, +IopAssignArcNamesToCdrom(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PULONG Buffer, IN ULONG DiskNumber) { CHAR ArcBuffer[128]; @@ -292,6 +192,10 @@ ULONG i, CheckSum = 0; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; + PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; + PLIST_ENTRY NextEntry; + PARC_DISK_SIGNATURE ArcDiskEntry; + BOOLEAN IsBootCdRom = FALSE; /* Build the device name */ sprintf(ArcBuffer, "\\Device\\CdRom%lu", DiskNumber); @@ -348,22 +252,24 @@ /* Now calculate the checksum */ for (i = 0; i < 2048 / sizeof(ULONG); i++) CheckSum += Buffer[i]; - /* - * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM - * ARC Path name, and what happens here is a comparision of both checksums - * in order to see if this is the actual boot CD. - * - * In ReactOS this doesn't currently happen, instead we have a hack on top - * of this file which scans the CD for the ntoskrnl.exe file, then modifies - * the LoaderBlock's ARC Path with the right CDROM path. Consequently, we - * get the same state as if NTLDR had properly booted us, except that we do - * not actually need to check the signature, since the hack already did the - * check for ntoskrnl.exe, which is just as good. - * - * The signature code stays however, because eventually FreeLDR will work - * like NTLDR, and, conversly, we do want to be able to be booted by NTLDR. - */ - if (IopApplyRosCdromArcHack(DiskNumber)) + /* Search if this device is the actual boot CD */ + for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; + NextEntry != &ArcDiskInfo->DiskSignatureListHead; + NextEntry = NextEntry->Flink) + { + /* Get the current ARC disk signature entry */ + ArcDiskEntry = CONTAINING_RECORD(NextEntry, + ARC_DISK_SIGNATURE, + ListEntry); + if (CheckSum == ArcDiskEntry->CheckSum && + strcmp(KeLoaderBlock->ArcBootDeviceName, ArcDiskEntry->ArcName) == 0) + { + IsBootCdRom = TRUE; + break; + } + } + + if (IsBootCdRom) { /* This is the boot CD-ROM, build the ARC name */ sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); @@ -583,7 +489,7 @@ for (i = 0; i < ConfigInfo->CdRomCount; i++) { /* Give it an ARC name */ - if (IopAssignArcNamesToCdrom(PartitionBuffer, i)) break; + if (IopAssignArcNamesToCdrom(LoaderBlock, PartitionBuffer, i)) break; } /* Free the buffer */

1 0

[hpoussin] 43140: [freeldr] Put cdrom information in block list information
by hpoussin＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: hpoussin Date: Thu Sep 24 23:29:31 2009 New Revision: 43140 URL: http://svn.reactos.org/svn/reactos?rev=43140&view=rev Log: [freeldr] Put cdrom information in block list information Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Thu Sep 24 23:29:31 2009 @@ -981,6 +981,29 @@ DiskIsDriveRemovable(BootDrive)) { /* TODO: Check if it's really a cdrom drive */ + ULONG* Buffer; + ULONG Checksum = 0; + + /* Read the MBR */ + if (!MachDiskReadLogicalSectors(BootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) + { + DPRINTM(DPRINT_HWDETECT, "Reading MBR failed\n"); + return; + } + + Buffer = (ULONG*)DISKREADBUFFER; + + /* Calculate the MBR checksum */ + for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; + DPRINTM(DPRINT_HWDETECT, "Checksum: %x\n", Checksum); + + /* Fill out the ARC disk block */ + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; + strcpy(reactos_arc_strings[reactos_disk_count], BootPath); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; + FsRegisterDevice(BootPath, &DiskVtbl); } }

1 0

[janderwald] 43139: - Fix derefercing of null pointer - Brought to you by Amine Khaldi (amine48rz)
by janderwald＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: janderwald Date: Thu Sep 24 22:32:31 2009 New Revision: 43139 URL: http://svn.reactos.org/svn/reactos?rev=43139&view=rev Log: - Fix derefercing of null pointer - Brought to you by Amine Khaldi (amine48rz) Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Thu Sep 24 22:32:31 2009 @@ -581,8 +581,10 @@ Adapter = AdapterFindInfo( ip ); if( Adapter ) setup_adapter( Adapter, new_lease ); - else warning("Could not find adapter for info %p\n", ip); - + else { + warning("Could not find adapter for info %p\n", ip); + return; + } set_name_servers( Adapter, new_lease ); }

1 0

[janderwald] 43138: [WDMAUD.DRV] - Implement copying mixer capabilities [WDMAUD_KERNEL] - Partly implement retrieving mixer capabilties - Implement retrieving mixer name
by janderwald＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: janderwald Date: Thu Sep 24 21:24:22 2009 New Revision: 43138 URL: http://svn.reactos.org/svn/reactos?rev=43138&view=rev Log: [WDMAUD.DRV] - Implement copying mixer capabilities [WDMAUD_KERNEL] - Partly implement retrieving mixer capabilties - Implement retrieving mixer name Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Thu Sep 24 21:24:22 2009 @@ -125,6 +125,19 @@ /* This is pretty much a big hack right now */ switch ( DeviceType ) { + case MIXER_DEVICE_TYPE: + { + LPMIXERCAPS MixerCaps = (LPMIXERCAPS) Capabilities; + + CopyWideString(MixerCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); + + MixerCaps->cDestinations = DeviceInfo.u.MixCaps.cDestinations; + MixerCaps->fdwSupport = DeviceInfo.u.MixCaps.fdwSupport; + MixerCaps->vDriverVersion = DeviceInfo.u.MixCaps.vDriverVersion; + MixerCaps->wMid = DeviceInfo.u.MixCaps.wMid; + MixerCaps->wPid = DeviceInfo.u.MixCaps.wPid; + break; + } case WAVE_OUT_DEVICE_TYPE : { LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Thu Sep 24 21:24:22 2009 @@ -706,6 +706,13 @@ DPRINT("WdmAudCapabilities entered\n"); + if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) + { + Status = WdmAudMixerCapabilities(DeviceObject, DeviceInfo, ClientInfo); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + + Status = GetFilterIdAndPinId(DeviceObject, DeviceInfo, ClientInfo, &FilterId, &PinId); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Thu Sep 24 21:24:22 2009 @@ -34,6 +34,7 @@ union { + MIXERCAPSW MixCaps; MIXERCONTROLDETAILS MixDetails; MIXERLINECONTROLSW MixControls; MIXERLINEW MixLine; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Thu Sep 24 21:24:22 2009 @@ -36,53 +36,67 @@ } NTSTATUS +GetSysAudioDevicePnpName( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceIndex, + OUT LPWSTR * Device) +{ + ULONG BytesReturned; + KSP_PIN Pin; + NTSTATUS Status; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + /* first check if the device index is within bounds */ + if (DeviceIndex >= GetSysAudioDeviceCount(DeviceObject)) + return STATUS_INVALID_PARAMETER; + + /* setup the query request */ + Pin.Property.Set = KSPROPSETID_Sysaudio; + Pin.Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME; + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + Pin.PinId = DeviceIndex; + + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* query sysaudio for the device path */ + Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY) + sizeof(ULONG), NULL, 0, &BytesReturned); + + /* check if the request failed */ + if (Status != STATUS_BUFFER_TOO_SMALL || BytesReturned == 0) + return STATUS_UNSUCCESSFUL; + + /* allocate buffer for the device */ + *Device = ExAllocatePool(NonPagedPool, BytesReturned); + if (!Device) + return STATUS_INSUFFICIENT_RESOURCES; + + /* query sysaudio again for the device path */ + Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY) + sizeof(ULONG), (PVOID)*Device, BytesReturned, &BytesReturned); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + ExFreePool(*Device); + return Status; + } + + return Status; +} + +NTSTATUS OpenSysAudioDeviceByIndex( IN PDEVICE_OBJECT DeviceObject, IN ULONG DeviceIndex, IN PHANDLE DeviceHandle, IN PFILE_OBJECT * FileObject) { - LPWSTR Device; + LPWSTR Device = NULL; + NTSTATUS Status; HANDLE hDevice; - ULONG BytesReturned; - KSP_PIN Pin; - NTSTATUS Status; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - /* first check if the device index is within bounds */ - if (DeviceIndex >= GetSysAudioDeviceCount(DeviceObject)) - return STATUS_INVALID_PARAMETER; - - /* setup the query request */ - Pin.Property.Set = KSPROPSETID_Sysaudio; - Pin.Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME; - Pin.Property.Flags = KSPROPERTY_TYPE_GET; - Pin.PinId = DeviceIndex; - - - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* query sysaudio for the device path */ - Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY) + sizeof(ULONG), NULL, 0, &BytesReturned); - - /* check if the request failed */ - if (Status != STATUS_BUFFER_TOO_SMALL || BytesReturned == 0) - return STATUS_UNSUCCESSFUL; - - /* allocate buffer for the device */ - Device = ExAllocatePool(NonPagedPool, BytesReturned); - if (!Device) - return STATUS_INSUFFICIENT_RESOURCES; - - /* query sysaudio again for the device path */ - Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY) + sizeof(ULONG), (PVOID)Device, BytesReturned, &BytesReturned); - - if (!NT_SUCCESS(Status)) - { - /* failed */ - ExFreePool(Device); - return Status; - } + + Status = GetSysAudioDevicePnpName(DeviceObject, DeviceIndex, &Device); + if (!NT_SUCCESS(Status)) + return Status; /* now open the device */ Status = WdmAudOpenSysAudioDevice(Device, &hDevice); @@ -228,6 +242,122 @@ return Count; } +ULONG +IsOutputMixer( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceIndex) +{ + ULONG DeviceCount, Index, Count; + NTSTATUS Status; + HANDLE hDevice; + PFILE_OBJECT FileObject; + PKSMULTIPLE_ITEM MultipleItem; + + /* get number of devices */ + DeviceCount = GetSysAudioDeviceCount(DeviceObject); + + if (!DeviceCount) + return 0; + + Index = 0; + Count = 0; + do + { + /* open the virtual audio device */ + Status = OpenSysAudioDeviceByIndex(DeviceObject, Index, &hDevice, &FileObject); + + if (NT_SUCCESS(Status)) + { + /* retrieve all available node types */ + Status = GetFilterNodeTypes(FileObject, &MultipleItem); + if (NT_SUCCESS(Status)) + { + if (CountNodeType(MultipleItem, (LPGUID)&KSNODETYPE_DAC)) + { + /* increment (output) mixer count */ + if (DeviceIndex == Count) + { + ExFreePool(MultipleItem); + ObDereferenceObject(FileObject); + ZwClose(hDevice); + return TRUE; + } + + Count++; + } + + if (CountNodeType(MultipleItem, (LPGUID)&KSNODETYPE_ADC)) + { + /* increment (input) mixer count */ + if (DeviceIndex == Count) + { + ExFreePool(MultipleItem); + ObDereferenceObject(FileObject); + ZwClose(hDevice); + return FALSE; + } + Count++; + } + ExFreePool(MultipleItem); + } + ObDereferenceObject(FileObject); + ZwClose(hDevice); + } + + Index++; + }while(Index < DeviceCount); + + ASSERT(0); + return FALSE; +} + + + + +NTSTATUS +WdmAudMixerCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + NTSTATUS Status; + LPWSTR Device; + WCHAR Buffer[100]; + + Status = GetSysAudioDevicePnpName(DeviceObject, DeviceInfo->DeviceIndex,&Device); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get device name %x\n", Status); + return Status; + } + + DeviceInfo->u.MixCaps.cDestinations = 1; //FIXME + + Status = FindProductName(Device, sizeof(Buffer) / sizeof(WCHAR), Buffer); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + DeviceInfo->u.MixCaps.szPname[0] = L'\0'; + } + else + { + if (IsOutputMixer(DeviceObject, DeviceInfo->DeviceIndex)) + { + wcscat(Buffer, L" output"); + } + else + { + wcscat(Buffer, L" Input"); + } + RtlMoveMemory(DeviceInfo->u.MixCaps.szPname, Buffer, min(MAXPNAMELEN, wcslen(Buffer)+1) * sizeof(WCHAR)); + DeviceInfo->u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + } + + return Status; +} + + NTSTATUS WdmAudControlOpenMixer( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Thu Sep 24 21:24:22 2009 @@ -108,4 +108,16 @@ IN LPWSTR DeviceName, OUT PHANDLE Handle); +NTSTATUS +FindProductName( + IN LPWSTR PnpName, + IN ULONG ProductNameSize, + OUT LPWSTR ProductName); + +NTSTATUS +WdmAudMixerCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo); + #endif

1 0

[fireball] 43137: - Drop in Wine 1.1.29 user32, gdi32, winex11.drv, server. Part 2/2.
by fireball＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: fireball Date: Thu Sep 24 20:58:15 2009 New Revision: 43137 URL: http://svn.reactos.org/svn/reactos?rev=43137&view=rev Log: - Drop in Wine 1.1.29 user32, gdi32, winex11.drv, server. Part 2/2. Added: vendor/wine/dlls/gdi32/Wine-1_1_29/ - copied from r43101, vendor/wine/dlls/gdi32/current/ vendor/wine/dlls/gdi32/Wine-1_1_29/freetype.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/Wine-1_1_29/metafile.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/metafile.c vendor/wine/dlls/gdi32/Wine-1_1_29/opengl.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/opengl.c vendor/wine/dlls/gdi32/Wine-1_1_29/tests/bitmap.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/tests/bitmap.c vendor/wine/dlls/gdi32/Wine-1_1_29/tests/font.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/Wine-1_1_29/tests/metafile.c - copied unchanged from r43136, vendor/wine/dlls/gdi32/current/tests/metafile.c vendor/wine/dlls/user32/Wine-1_1_29/ - copied from r43101, vendor/wine/dlls/user32/current/ vendor/wine/dlls/user32/Wine-1_1_29/button.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/button.c vendor/wine/dlls/user32/Wine-1_1_29/defdlg.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/defdlg.c vendor/wine/dlls/user32/Wine-1_1_29/defwnd.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/defwnd.c vendor/wine/dlls/user32/Wine-1_1_29/dialog.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/dialog.c vendor/wine/dlls/user32/Wine-1_1_29/edit.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/edit.c vendor/wine/dlls/user32/Wine-1_1_29/focus.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/focus.c vendor/wine/dlls/user32/Wine-1_1_29/hook.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/hook.c vendor/wine/dlls/user32/Wine-1_1_29/menu.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/menu.c vendor/wine/dlls/user32/Wine-1_1_29/message.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/Wine-1_1_29/resources/user32_De.rc - copied unchanged from r43136, vendor/wine/dlls/user32/current/resources/user32_De.rc vendor/wine/dlls/user32/Wine-1_1_29/resources/user32_Fr.rc - copied unchanged from r43136, vendor/wine/dlls/user32/current/resources/user32_Fr.rc vendor/wine/dlls/user32/Wine-1_1_29/resources/user32_Pt.rc - copied unchanged from r43136, vendor/wine/dlls/user32/current/resources/user32_Pt.rc vendor/wine/dlls/user32/Wine-1_1_29/resources/user32_Ru.rc - copied unchanged from r43136, vendor/wine/dlls/user32/current/resources/user32_Ru.rc vendor/wine/dlls/user32/Wine-1_1_29/spy.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/spy.c vendor/wine/dlls/user32/Wine-1_1_29/tests/combo.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/combo.c vendor/wine/dlls/user32/Wine-1_1_29/tests/dialog.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/dialog.c vendor/wine/dlls/user32/Wine-1_1_29/tests/edit.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/edit.c vendor/wine/dlls/user32/Wine-1_1_29/tests/input.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/input.c vendor/wine/dlls/user32/Wine-1_1_29/tests/menu.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/menu.c vendor/wine/dlls/user32/Wine-1_1_29/tests/msg.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/Wine-1_1_29/tests/resource.rc - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/resource.rc vendor/wine/dlls/user32/Wine-1_1_29/tests/win.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/Wine-1_1_29/user32.spec - copied unchanged from r43136, vendor/wine/dlls/user32/current/user32.spec vendor/wine/dlls/user32/Wine-1_1_29/win.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/user32/Wine-1_1_29/winpos.c - copied unchanged from r43136, vendor/wine/dlls/user32/current/winpos.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/ - copied from r43101, vendor/wine/dlls/winex11.drv/current/ vendor/wine/dlls/winex11.drv/Wine-1_1_29/bitblt.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/bitblt.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/bitmap.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/bitmap.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/brush.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/brush.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/clipboard.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/clipboard.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/dib.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/event.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/graphics.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/graphics.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/init.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/init.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/keyboard.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/keyboard.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/mouse.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/mouse.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/opengl.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/opengl.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/palette.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/palette.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/window.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/x11drv.h - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/Wine-1_1_29/xrandr.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/xrandr.c vendor/wine/dlls/winex11.drv/Wine-1_1_29/xrender.c - copied unchanged from r43136, vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/Wine-1_1_29/ - copied from r43101, vendor/wine/server/current/ vendor/wine/server/Wine-1_1_29/async.c - copied unchanged from r43136, vendor/wine/server/current/async.c vendor/wine/server/Wine-1_1_29/change.c - copied unchanged from r43136, vendor/wine/server/current/change.c vendor/wine/server/Wine-1_1_29/debugger.c - copied unchanged from r43136, vendor/wine/server/current/debugger.c vendor/wine/server/Wine-1_1_29/fd.c - copied unchanged from r43136, vendor/wine/server/current/fd.c vendor/wine/server/Wine-1_1_29/file.c - copied unchanged from r43136, vendor/wine/server/current/file.c vendor/wine/server/Wine-1_1_29/file.h - copied unchanged from r43136, vendor/wine/server/current/file.h vendor/wine/server/Wine-1_1_29/mapping.c - copied unchanged from r43136, vendor/wine/server/current/mapping.c vendor/wine/server/Wine-1_1_29/process.c - copied unchanged from r43136, vendor/wine/server/current/process.c vendor/wine/server/Wine-1_1_29/procfs.c - copied unchanged from r43136, vendor/wine/server/current/procfs.c vendor/wine/server/Wine-1_1_29/protocol.def - copied unchanged from r43136, vendor/wine/server/current/protocol.def vendor/wine/server/Wine-1_1_29/request.h - copied unchanged from r43136, vendor/wine/server/current/request.h vendor/wine/server/Wine-1_1_29/sock.c - copied unchanged from r43136, vendor/wine/server/current/sock.c vendor/wine/server/Wine-1_1_29/trace.c - copied unchanged from r43136, vendor/wine/server/current/trace.c Removed: vendor/wine/dlls/gdi32/Wine-1_1_25/ vendor/wine/dlls/user32/Wine-1_1_25/ vendor/wine/dlls/winex11.drv/Wine-1_1_25/ vendor/wine/server/Wine-1_1_25/

1 0

[fireball] 43136: - Drop in Wine 1.1.29 user32, gdi32, winex11.drv, server. Part 1/2.
by fireball＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: fireball Date: Thu Sep 24 20:54:44 2009 New Revision: 43136 URL: http://svn.reactos.org/svn/reactos?rev=43136&view=rev Log: - Drop in Wine 1.1.29 user32, gdi32, winex11.drv, server. Part 1/2. Modified: vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/metafile.c vendor/wine/dlls/gdi32/current/opengl.c vendor/wine/dlls/gdi32/current/tests/bitmap.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/metafile.c vendor/wine/dlls/user32/current/button.c vendor/wine/dlls/user32/current/defdlg.c vendor/wine/dlls/user32/current/defwnd.c vendor/wine/dlls/user32/current/dialog.c vendor/wine/dlls/user32/current/edit.c vendor/wine/dlls/user32/current/focus.c vendor/wine/dlls/user32/current/hook.c vendor/wine/dlls/user32/current/menu.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/resources/user32_De.rc vendor/wine/dlls/user32/current/resources/user32_Fr.rc vendor/wine/dlls/user32/current/resources/user32_Pt.rc vendor/wine/dlls/user32/current/resources/user32_Ru.rc vendor/wine/dlls/user32/current/spy.c vendor/wine/dlls/user32/current/tests/combo.c vendor/wine/dlls/user32/current/tests/dialog.c vendor/wine/dlls/user32/current/tests/edit.c vendor/wine/dlls/user32/current/tests/input.c vendor/wine/dlls/user32/current/tests/menu.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/tests/resource.rc vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/user32.spec vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/user32/current/winpos.c vendor/wine/dlls/winex11.drv/current/bitblt.c vendor/wine/dlls/winex11.drv/current/bitmap.c vendor/wine/dlls/winex11.drv/current/brush.c vendor/wine/dlls/winex11.drv/current/clipboard.c vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/graphics.c vendor/wine/dlls/winex11.drv/current/init.c vendor/wine/dlls/winex11.drv/current/keyboard.c vendor/wine/dlls/winex11.drv/current/mouse.c vendor/wine/dlls/winex11.drv/current/opengl.c vendor/wine/dlls/winex11.drv/current/palette.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/current/xrandr.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/async.c vendor/wine/server/current/change.c vendor/wine/server/current/debugger.c vendor/wine/server/current/fd.c vendor/wine/server/current/file.c vendor/wine/server/current/file.h vendor/wine/server/current/mapping.c vendor/wine/server/current/process.c vendor/wine/server/current/procfs.c vendor/wine/server/current/protocol.def vendor/wine/server/current/request.h vendor/wine/server/current/sock.c vendor/wine/server/current/trace.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… Modified: vendor/wine/dlls/gdi32/current/metafile.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/metafile.… Modified: vendor/wine/dlls/gdi32/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/opengl.c?… Modified: vendor/wine/dlls/gdi32/current/tests/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/bit… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Modified: vendor/wine/dlls/gdi32/current/tests/metafile.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/met… Modified: vendor/wine/dlls/user32/current/button.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/button.c… Modified: vendor/wine/dlls/user32/current/defdlg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/defdlg.c… Modified: vendor/wine/dlls/user32/current/defwnd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/defwnd.c… Modified: vendor/wine/dlls/user32/current/dialog.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/dialog.c… Modified: vendor/wine/dlls/user32/current/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/edit.c?r… Modified: vendor/wine/dlls/user32/current/focus.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/focus.c?… Modified: vendor/wine/dlls/user32/current/hook.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/hook.c?r… Modified: vendor/wine/dlls/user32/current/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/menu.c?r… Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… Modified: vendor/wine/dlls/user32/current/resources/user32_De.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Fr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Pt.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Ru.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/spy.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/spy.c?re… Modified: vendor/wine/dlls/user32/current/tests/combo.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/co… Modified: vendor/wine/dlls/user32/current/tests/dialog.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/di… Modified: vendor/wine/dlls/user32/current/tests/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ed… Modified: vendor/wine/dlls/user32/current/tests/input.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/in… Modified: vendor/wine/dlls/user32/current/tests/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/me… Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… Modified: vendor/wine/dlls/user32/current/tests/resource.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/re… Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… Modified: vendor/wine/dlls/user32/current/user32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user32.s… Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… Modified: vendor/wine/dlls/user32/current/winpos.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/winpos.c… Modified: vendor/wine/dlls/winex11.drv/current/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/brush.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bru… Modified: vendor/wine/dlls/winex11.drv/current/clipboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/cli… Modified: vendor/wine/dlls/winex11.drv/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/dib… Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… Modified: vendor/wine/dlls/winex11.drv/current/graphics.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/gra… Modified: vendor/wine/dlls/winex11.drv/current/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ini… Modified: vendor/wine/dlls/winex11.drv/current/keyboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/key… Modified: vendor/wine/dlls/winex11.drv/current/mouse.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/mou… Modified: vendor/wine/dlls/winex11.drv/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ope… Modified: vendor/wine/dlls/winex11.drv/current/palette.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/pal… Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/x11drv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/xrandr.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xra… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/async.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/async.c?rev=4… Modified: vendor/wine/server/current/change.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/change.c?rev=… Modified: vendor/wine/server/current/debugger.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/debugger.c?re… Modified: vendor/wine/server/current/fd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/fd.c?rev=4313… Modified: vendor/wine/server/current/file.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/file.c?rev=43… Modified: vendor/wine/server/current/file.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/file.h?rev=43… Modified: vendor/wine/server/current/mapping.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/mapping.c?rev… Modified: vendor/wine/server/current/process.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.c?rev… Modified: vendor/wine/server/current/procfs.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/procfs.c?rev=… Modified: vendor/wine/server/current/protocol.def URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/protocol.def?… Modified: vendor/wine/server/current/request.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/request.h?rev… Modified: vendor/wine/server/current/sock.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/sock.c?rev=43… Modified: vendor/wine/server/current/trace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/trace.c?rev=4…

1 0

[fireball] 43135: - Uncomment ws2help from reactos.dff too as it now builds.
by fireball＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: fireball Date: Thu Sep 24 20:53:28 2009 New Revision: 43135 URL: http://svn.reactos.org/svn/reactos?rev=43135&view=rev Log: - Uncomment ws2help from reactos.dff too as it now builds. Modified: branches/arwinss/reactos/boot/bootdata/packages/reactos.dff Modified: branches/arwinss/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/bootdata/p… ============================================================================== --- branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Sep 24 20:53:28 2009 @@ -454,7 +454,7 @@ dll\win32\wldap32\wldap32.dll 1 dll\win32\wmi\wmi.dll 1 dll\win32\ws2_32\ws2_32.dll 1 -;dll\win32\ws2help\ws2help.dll 1 +dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 dll\win32\wshtcpip\wshtcpip.dll 1 dll\win32\wsock32\wsock32.dll 1

1 0

[sginsberg] 43134: Remove leftover ws2help.h that somehow didn't get deleted by the latest sync -- ws2help now builds again as the correct header gets included. Re-enable ws2help and ws2_32 again -- both build fine.
by sginsberg＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: sginsberg Date: Thu Sep 24 20:51:53 2009 New Revision: 43134 URL: http://svn.reactos.org/svn/reactos?rev=43134&view=rev Log: Remove leftover ws2help.h that somehow didn't get deleted by the latest sync -- ws2help now builds again as the correct header gets included. Re-enable ws2help and ws2_32 again -- both build fine. Removed: branches/arwinss/reactos/dll/win32/ws2help/ws2help.h Modified: branches/arwinss/reactos/dll/win32/win32.rbuild Modified: branches/arwinss/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/win32… ============================================================================== --- branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Sep 24 20:51:53 2009 @@ -628,12 +628,12 @@ <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory> - +</directory> <directory name="wshirda"> <xi:include href="wshirda/wshirda.rbuild" /> </directory> Removed: branches/arwinss/reactos/dll/win32/ws2help/ws2help.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2he… ============================================================================== --- branches/arwinss/reactos/dll/win32/ws2help/ws2help.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/ws2help/ws2help.h (removed) @@ -1,21 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 Helper DLL for TCP/IP - * FILE: include/ws2help.h - * PURPOSE: WinSock 2 Helper DLL for TCP/IP header - */ -#ifndef __WS2HELP_H -#define __WS2HELP_H - -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include <wsahelp.h> - -#define EXPORT WINAPI - -#endif /* __WS2HELP_H */ - -/* EOF */

1 0

[janderwald] 43133: [WDMAUD.DRV] - Implement opening / closing of mixer devices [AUDIO_TEST] - Add DirectKs sample test function [WDMAUD_KERNEL] - Use KSSTREAM header of the changed interface
by janderwald＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: janderwald Date: Thu Sep 24 20:11:22 2009 New Revision: 43133 URL: http://svn.reactos.org/svn/reactos?rev=43133&view=rev Log: [WDMAUD.DRV] - Implement opening / closing of mixer devices [AUDIO_TEST] - Add DirectKs sample test function [WDMAUD_KERNEL] - Use KSSTREAM header of the changed interface Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -520,8 +520,12 @@ ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.hDevice = Handle; DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; //FIXME - DeviceInfo.Buffer = BufferOut; - DeviceInfo.BufferSize = BufferLength; + DeviceInfo.Header.FrameExtent = BufferLength; + DeviceInfo.Header.DataUsed = BufferLength; + DeviceInfo.Header.Data = BufferOut; + DeviceInfo.Header.Size = sizeof(KSSTREAM_HEADER); + DeviceInfo.Header.PresentationTime.Numerator = 1; + DeviceInfo.Header.PresentationTime.Denominator = 1; Overlap->OriginalBufferSize = Length; Overlap->OriginalCompletionRoutine = CompletionRoutine; Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -216,14 +216,17 @@ DeviceInfo.hDevice = SoundDeviceInstance->Handle; /* First stop the stream */ - DeviceInfo.u.State = KSSTATE_STOP; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); + if (DeviceType != MIXER_DEVICE_TYPE) + { + DeviceInfo.u.State = KSSTATE_STOP; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_CLOSE_WDMAUD, @@ -253,6 +256,67 @@ IN DWORD WaveFormatSize) { /* Whatever... */ + return MMSYSERR_NOERROR; +} + + +MMRESULT +SetWdmMixerDeviceFormat( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PVOID Identifier; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + + Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceIdentifier(SoundDevice, &Identifier); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } + + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + /* Store sound device handle instance handle */ + Instance->Handle = (PVOID)DeviceInfo.hDevice; + return MMSYSERR_NOERROR; } @@ -350,7 +414,7 @@ { if (DeviceInfo.u.FrameSize) { - Instance->FrameSize = DeviceInfo.u.FrameSize; + //Instance->FrameSize = DeviceInfo.u.FrameSize; Instance->BufferCount = WaveFormat->nAvgBytesPerSec / Instance->FrameSize; SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); } @@ -391,10 +455,14 @@ SND_ASSERT(Handle); ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.Header.FrameExtent = Length; + DeviceInfo.Header.DataUsed = Length; + DeviceInfo.Header.Data = OffsetPtr; + DeviceInfo.Header.Size = sizeof(KSSTREAM_HEADER); + DeviceInfo.Header.PresentationTime.Numerator = 1; + DeviceInfo.Header.PresentationTime.Denominator = 1; DeviceInfo.hDevice = Handle; DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; //FIXME - DeviceInfo.Buffer = OffsetPtr; - DeviceInfo.BufferSize = Length; Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -498,7 +566,15 @@ ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); FuncTable.GetCapabilities = GetWdmDeviceCapabilities; FuncTable.QueryWaveFormatSupport = QueryWdmWaveDeviceFormatSupport; - FuncTable.SetWaveFormat = SetWdmWaveDeviceFormat; + if (DeviceType == MIXER_DEVICE_TYPE) + { + FuncTable.SetWaveFormat = SetWdmMixerDeviceFormat; + } + else + { + FuncTable.SetWaveFormat = SetWdmWaveDeviceFormat; + } + FuncTable.Open = OpenWdmSoundDevice; FuncTable.Close = CloseWdmSoundDevice; #ifndef USERMODE_MIXER Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -1,15 +1,251 @@ #define _UNICODE #define UNICODE +#define WIN32_NO_STATUS +#define _KSDDK_ + #include <windows.h> #include <mmsystem.h> #include <stdio.h> #include <math.h> - -#define _2pi 6.283185307179586476925286766559 - +#include <setupapi.h> +#include <ndk/ntndk.h> #include <ks.h> #include <ksmedia.h> #include "interface.h" + + +#define _2pi 6.283185307179586476925286766559 + + + +#include <ks.h> + + +GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + + +const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSINTERFACESETID_Standard = {0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + + +VOID +TestKs() +{ + SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVINFO_DATA DeviceData; + PSP_DEVICE_INTERFACE_DETAIL_DATA DetailData; + HDEVINFO DeviceHandle; + PKSDATAFORMAT_WAVEFORMATEX DataFormat; + PKSPIN_CONNECT PinConnect; + PKSSTREAM_HEADER Packet; + PKSPROPERTY Property; + KSSTATE State; + DWORD Length; + HANDLE FilterHandle; + HANDLE PinHandle; + PSHORT SoundBuffer; + UINT i = 0; + BOOL Result; + NTSTATUS Status; + + // + // Get a handle to KS Audio Interfaces + // + DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, + NULL, + NULL, + DIGCF_DEVICEINTERFACE); //DIGCF_PRESENT + + printf("DeviceHandle %p\n", DeviceHandle); + + // + // Enumerate the first interface + // + InterfaceData.cbSize = sizeof(InterfaceData); + InterfaceData.Reserved = 0; + Result = SetupDiEnumDeviceInterfaces(DeviceHandle, + NULL, + &CategoryGuid, + 1, + &InterfaceData); + + printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); + + // + // Get the interface details (namely the device path) + // + Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); + DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), + 0, + Length); + DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + DeviceData.cbSize = sizeof(DeviceData); + DeviceData.Reserved = 0; + Result = SetupDiGetDeviceInterfaceDetail(DeviceHandle, + &InterfaceData, + DetailData, + Length, + NULL, + &DeviceData); + + wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); + + // + // Open a handle to the device + // + FilterHandle = CreateFile(DetailData->DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + printf("Handle %p\n", FilterHandle); + + // + // Close the interface handle and clean up + // + SetupDiDestroyDeviceInfoList(DeviceHandle); + + // + // Allocate a KS Pin Connection Request Structure + // + Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX); + printf("Length %ld KSPIN %u DATAFORAMT %u\n", Length, sizeof(KSPIN_CONNECT), sizeof(KSDATAFORMAT_WAVEFORMATEX)); + PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), 0, Length); + DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)(PinConnect + 1); + + // + // Setup the KS Pin Data + // + PinConnect->Interface.Set = KSINTERFACESETID_Standard; + PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; + PinConnect->Interface.Flags = 0; + PinConnect->Medium.Set = KSMEDIUMSETID_Standard; + PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; + PinConnect->Medium.Flags = 0; + PinConnect->PinId = 0; + PinConnect->PinToHandle = NULL; + PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; + PinConnect->Priority.PrioritySubClass = 1; + + // + // Setup the KS Data Format Information + // + DataFormat->WaveFormatEx.wFormatTag = WAVE_FORMAT_PCM; + DataFormat->WaveFormatEx.nChannels = 2; + DataFormat->WaveFormatEx.nSamplesPerSec = 48000; + DataFormat->WaveFormatEx.nBlockAlign = 4; + DataFormat->WaveFormatEx.nAvgBytesPerSec = 48000 * 4; + DataFormat->WaveFormatEx.wBitsPerSample = 16; + DataFormat->WaveFormatEx.cbSize = 0; + DataFormat->DataFormat.FormatSize = sizeof(KSDATAFORMAT) + + sizeof(WAVEFORMATEX); + DataFormat->DataFormat.Flags = KSDATAFORMAT_ATTRIBUTES; + DataFormat->DataFormat.Reserved = 0; + DataFormat->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + DataFormat->DataFormat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat->DataFormat.SampleSize = 4; + + // + // Create the pin + // + Status = KsCreatePin(FilterHandle, PinConnect, GENERIC_WRITE, &PinHandle); + + printf("PinHandle %p Status %lx\n", PinHandle, Status); + + // + // Allocate a buffer for 1 second + // + Length = 48000 * 4; + SoundBuffer = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); + + // + // Fill the buffer with a 500 Hz sine tone + // + while (i < Length / 2) + { + // + // Generate the wave for each channel: + // Amplitude * sin( Sample * Frequency * 2PI / SamplesPerSecond ) + // + SoundBuffer[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); + i++; + SoundBuffer[i] = 0x7FFF * sin((0.5 * i - 2) * 500 * _2pi / 48000); + i++; + } + + // + // Create and fill out the KS Stream Packet + // + Packet = (PKSSTREAM_HEADER)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(KSSTREAM_HEADER)); + Packet->Data = SoundBuffer; + Packet->FrameExtent = Length; + Packet->DataUsed = Length; + Packet->Size = sizeof(KSSTREAM_HEADER); + Packet->PresentationTime.Numerator = 1; + Packet->PresentationTime.Denominator = 1; + + // + // Setup a KS Property to change the state + // + Property = (PKSPROPERTY)HeapAlloc(GetProcessHeap(), 0, sizeof(KSPROPERTY)); + Property->Set = KSPROPSETID_Connection; + Property->Id = KSPROPERTY_CONNECTION_STATE; + Property->Flags = KSPROPERTY_TYPE_SET; + + // + // Change the state to run + // + State = KSSTATE_RUN; + DeviceIoControl(PinHandle, + IOCTL_KS_PROPERTY, + Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); + + // + // Play our 1-second buffer + // + DeviceIoControl(PinHandle, + IOCTL_KS_WRITE_STREAM, + NULL, + 0, + Packet, + Packet->Size, + &Length, + NULL); + + // + // Change the state to stop + // + State = KSSTATE_STOP; + DeviceIoControl(PinHandle, + IOCTL_KS_PROPERTY, + Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); + + CloseHandle(PinHandle); + CloseHandle(FilterHandle); +} int __cdecl @@ -24,6 +260,8 @@ HANDLE hWdmAud; WDMAUD_DEVICE_INFO DeviceInfo; + TestKs(); + return 0; hWdmAud = CreateFileW(L"\\\\.\\wdmaud", GENERIC_READ | GENERIC_WRITE, @@ -139,8 +377,8 @@ // // Play our 1-second buffer // - DeviceInfo.Buffer = (PUCHAR)SoundBuffer; - DeviceInfo.BufferSize = Length; + DeviceInfo.Header.Data = (PUCHAR)SoundBuffer; + DeviceInfo.Header.DataUsed = DeviceInfo.Header.FrameExtent = Length; Status = DeviceIoControl(hWdmAud, IOCTL_WRITEDATA, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); if (!Status) { Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -4,8 +4,11 @@ <define name="PC_NO_IMPORTS" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="wdmaud_kernel">.</include> + <include base="libsamplerate">.</include> <library>kernel32</library> - + <library>setupapi</library> + <library>libsamplerate</library> + <library>ksuser</library> <file>audio_test.c</file> </module> Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -327,8 +327,9 @@ if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE && DeviceInfo->DeviceType != WAVE_IN_DEVICE_TYPE) { - DPRINT1("FIXME: Unsupported device type %x\n", DeviceInfo->DeviceType); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + DPRINT("FIXME: Unsupported device type %x\n", DeviceInfo->DeviceType); + DeviceInfo->DeviceCount = 0; + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } Pin.Property.Set = KSPROPSETID_Sysaudio; @@ -393,7 +394,7 @@ /* store result count */ DeviceInfo->DeviceCount = Result; - DPRINT1("WdmAudControlDeviceType Status %x Devices %u\n", Status, DeviceInfo->DeviceCount); + DPRINT("WdmAudControlDeviceType Status %x Devices %u\n", Status, DeviceInfo->DeviceCount); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } @@ -415,7 +416,7 @@ Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: invalid device handle provided %p\n", DeviceInfo->hDevice); + DPRINT1("Error: invalid device handle provided %p Type %x\n", DeviceInfo->hDevice, DeviceInfo->DeviceType); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } @@ -1037,14 +1038,14 @@ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - Packet->Header.FrameExtent = DeviceInfo->BufferSize; - Packet->Header.DataUsed = DeviceInfo->BufferSize; + Packet->Header.FrameExtent = DeviceInfo->Header.FrameExtent; + Packet->Header.DataUsed = DeviceInfo->Header.DataUsed; Packet->Header.Size = sizeof(KSSTREAM_HEADER); Packet->Header.PresentationTime.Numerator = 1; Packet->Header.PresentationTime.Denominator = 1; Packet->Irp = Irp; - Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->BufferSize); + Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->Header.DataUsed); if (!Buffer) { /* no memory */ @@ -1054,7 +1055,7 @@ } Packet->Header.Data = Buffer; - Mdl = IoAllocateMdl(DeviceInfo->Buffer, DeviceInfo->BufferSize, FALSE, FALSE, FALSE); + Mdl = IoAllocateMdl(DeviceInfo->Header.Data, DeviceInfo->Header.DataUsed, FALSE, FALSE, FALSE); if (!Mdl) { /* no memory */ @@ -1096,7 +1097,7 @@ return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); } - RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->BufferSize); + RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->Header.DataUsed); MmUnlockPages(Mdl); IoFreeMdl(Mdl); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -25,17 +25,18 @@ typedef struct { + KSSTREAM_HEADER Header; SOUND_DEVICE_TYPE DeviceType; ULONG DeviceIndex; HANDLE hDevice; ULONG DeviceCount; - ULONG BufferSize; - PUCHAR Buffer; - union { + MIXERCONTROLDETAILS MixDetails; + MIXERLINECONTROLSW MixControls; + MIXERLINEW MixLine; WAVEFORMATEX WaveFormatEx; WAVEOUTCAPSW WaveOutCaps; AUXCAPSW AuxCaps; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -238,6 +238,8 @@ ULONG Index; PWDMAUD_HANDLE Handels; + DPRINT("WdmAudControlOpenMixer\n"); + if (DeviceInfo->DeviceIndex >= GetNumOfMixerDevices(DeviceObject)) { /* mixer index doesnt exist */ Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -273,12 +273,15 @@ return MMSYSERR_NOTSUPPORTED; } - /* Stop the streaming thread (TODO - is this for wave only?) */ - Result = DestroySoundThread(SoundDeviceInstance->Thread); - SND_ASSERT( MMSUCCESS(Result) ); /* It should succeed! */ - if ( ! MMSUCCESS(Result ) ) - { - return TranslateInternalMmResult(Result); + /* Stop the streaming thread */ + if ( SoundDeviceInstance->Thread ) + { + Result = DestroySoundThread(SoundDeviceInstance->Thread); + SND_ASSERT( MMSUCCESS(Result) ); /* It should succeed! */ + if ( ! MMSUCCESS(Result ) ) + { + return TranslateInternalMmResult(Result); + } } /* Blank this out here */ Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Thu Sep 24 20:11:22 2009 @@ -15,8 +15,102 @@ #include <ntddsnd.h> #include <sndtypes.h> +#undef NDEBUG +#include <mmebuddy.h> -#include <mmebuddy.h> + +MMRESULT +MmeCloseMixerDevice( + IN DWORD PrivateHandle) +{ + MMRESULT Result; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + PSOUND_DEVICE SoundDevice; + + SND_TRACE(L"Closing mixer device \n"); + + VALIDATE_MMSYS_PARAMETER( PrivateHandle ); + SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; + + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) + return MMSYSERR_INVALHANDLE; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + + Result = DestroySoundDeviceInstance(SoundDeviceInstance); + + return Result; +} + +MMRESULT +MmeOpenMixerDevice( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPMIXEROPENDESC OpenParameters, + IN DWORD Flags, + OUT DWORD* PrivateHandle) +{ + MMRESULT Result; + PMMFUNCTION_TABLE FunctionTable; + PSOUND_DEVICE SoundDevice; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + + SND_TRACE(L"Opening mixer device"); + + VALIDATE_MMSYS_PARAMETER( OpenParameters ); + + Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + /* Check that winmm gave us a private handle to fill */ + VALIDATE_MMSYS_PARAMETER( PrivateHandle ); + + /* Create a sound device instance and open the sound device */ + Result = CreateSoundDeviceInstance(SoundDevice, &SoundDeviceInstance); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( ! FunctionTable->SetWaveFormat ) + return MMSYSERR_NOTSUPPORTED; + + Result = FunctionTable->SetWaveFormat(SoundDeviceInstance, DeviceId, NULL, 0); + if ( ! MMSUCCESS(Result) ) + { + /* TODO: Destroy sound instance */ + return TranslateInternalMmResult(Result); + } + + /* Store the device instance pointer in the private handle - is DWORD safe here? */ + *PrivateHandle = (DWORD) SoundDeviceInstance; + + /* Store the additional information we were given - FIXME: Need flags! */ + SetSoundDeviceInstanceMmeData(SoundDeviceInstance, + (HDRVR)OpenParameters->hmx, + OpenParameters->dwCallback, + OpenParameters->dwInstance, + Flags); + + /* Let the application know the device is open */ + ReleaseEntrypointMutex(DeviceType); +#if 0 + NotifyMmeClient(SoundDeviceInstance, + DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_OPEN : WIM_OPEN, + 0); +#endif + AcquireEntrypointMutex(DeviceType); + + SND_TRACE(L"Mixer device now open\n"); + + return MMSYSERR_NOERROR; +} /* Standard MME driver entry-point for messages relating to mixers. @@ -60,11 +154,19 @@ case MXDM_OPEN : { + Result = MmeOpenMixerDevice(MIXER_DEVICE_TYPE, + DeviceId, + (LPMIXEROPENDESC) Parameter1, + Parameter2, + (DWORD*) PrivateHandle); + break; } case MXDM_CLOSE : { + Result = MmeCloseMixerDevice(PrivateHandle); + break; }

1 0

[sginsberg] 43132: - msctf: Define function calling convention compatibly for MSVC. Patch sent to and accepted by Wine.
by sginsberg＠svn.reactos.org 24 Sep '09

24 Sep '09

Author: sginsberg Date: Thu Sep 24 20:01:03 2009 New Revision: 43132 URL: http://svn.reactos.org/svn/reactos?rev=43132&view=rev Log: - msctf: Define function calling convention compatibly for MSVC. Patch sent to and accepted by Wine. Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/threadmgr.c Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen… ============================================================================== --- trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] Thu Sep 24 20:01:03 2009 @@ -572,7 +572,7 @@ return Compartment_Release((ITfCompartment *)This); } -static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { CompartmentSink *cs; @@ -607,7 +607,7 @@ return S_OK; } -static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { CompartmentSink *sink; Compartment *This = impl_from_ITfSourceVtbl(iface); Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… ============================================================================== --- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Thu Sep 24 20:01:03 2009 @@ -599,7 +599,7 @@ /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ContextSink *es; @@ -632,7 +632,7 @@ return S_OK; } -static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); @@ -683,7 +683,7 @@ return Context_Release((ITfContext *)This); } -static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, const WCHAR *pchText, LONG cch, ITfRange **ppRange) { @@ -719,7 +719,7 @@ return hr; } -static WINAPI HRESULT InsertAtSelection_InsertEmbeddedAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertEmbeddedAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, IDataObject *pDataObject, ITfRange **ppRange) { @@ -759,7 +759,7 @@ return Context_Release((ITfContext *)This); } -static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid, IUnknown *punk) { Context *This = impl_from_ITfSourceSingleVtbl(iface); @@ -767,7 +767,7 @@ return E_NOTIMPL; } -static WINAPI HRESULT SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid) { Context *This = impl_from_ITfSourceSingleVtbl(iface); Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… ============================================================================== --- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Thu Sep 24 20:01:03 2009 @@ -288,7 +288,7 @@ /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); @@ -296,7 +296,7 @@ return E_NOTIMPL; } -static WINAPI HRESULT DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); FIXME("STUB:(%p)\n",This); Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… ============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Thu Sep 24 20:01:03 2009 @@ -694,7 +694,7 @@ return InputProcessorProfiles_Release((ITfInputProcessorProfiles *)This); } -static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI IPPSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { InputProcessorProfilesSink *ipps; @@ -729,7 +729,7 @@ return S_OK; } -static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { InputProcessorProfilesSink *sink; InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Thu Sep 24 20:01:03 2009 @@ -572,7 +572,7 @@ /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgrSink *tms; @@ -607,7 +607,7 @@ return S_OK; } -static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); @@ -1073,7 +1073,7 @@ } -static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) { struct list *cursor; @@ -1090,7 +1090,7 @@ return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { struct list *cursor; @@ -1107,7 +1107,7 @@ return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( +static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { @@ -1125,7 +1125,7 @@ return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor; @@ -1142,7 +1142,7 @@ return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs