Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 41909: Add minimal support for ARM to winebuild, just enough to get it to build and spew out spec files. Hopefully it's not used for anything more cpu-specific thank that...
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:36:36 2009 New Revision: 41909 URL: http://svn.reactos.org/svn/reactos?rev=41909&view=rev Log: Add minimal support for ARM to winebuild, just enough to get it to build and spew out spec files. Hopefully it's not used for anything more cpu-specific thank that... Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/build.h [iso-8859-1] Sun Jul 12 14:36:36 2009 @@ -112,7 +112,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM }; enum target_platform Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Sun Jul 12 14:36:36 2009 @@ -53,6 +53,8 @@ enum target_cpu target_cpu = CPU_x86; #elif defined(TARGET_amd64) enum target_cpu target_cpu = CPU_x86_64; +#elif defined (TARGET_arm) +enum target_cpu target_cpu = CPU_ARM; #else #error Unsupported CPU #endif Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/utils.c [iso-8859-1] Sun Jul 12 14:36:36 2009 @@ -516,6 +516,7 @@ case CPU_POWERPC: case CPU_SPARC: case CPU_ALPHA: + case CPU_ARM: return 4; case CPU_x86_64: return 8;

1 0

[ros-arm-bringup] 41908: Add back support for WINEBUILD_FLAGS which someone removed when going from modulehandler.cpp to rules.mak... thanks.
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:35:46 2009 New Revision: 41908 URL: http://svn.reactos.org/svn/reactos?rev=41908&view=rev Log: Add back support for WINEBUILD_FLAGS which someone removed when going from modulehandler.cpp to rules.mak... thanks. Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Sun Jul 12 14:35:46 2009 @@ -152,7 +152,7 @@ $(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)} $$(ECHO_WINEBLD) - $$(Q)$$(WINEBUILD_TARGET) -o $$@ --def -E $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} + $$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --def -E $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} endef @@ -161,7 +161,7 @@ $(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)} $$(ECHO_WINEBLD) - $$(Q)$$(WINEBUILD_TARGET) -o $$@ --pedll $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} + $$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --pedll $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} endef

1 0

[cgutman] 41907: - Store the static default gateway forward entry in DHCP_ADAPTER - Loop the adapter list backward so DhclientInfo gets linked properly
by cgutman＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: cgutman Date: Sun Jul 12 09:21:52 2009 New Revision: 41907 URL: http://svn.reactos.org/svn/reactos?rev=41907&view=rev Log: - Store the static default gateway forward entry in DHCP_ADAPTER - Loop the adapter list backward so DhclientInfo gets linked properly Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sun Jul 12 09:21:52 2009 @@ -149,7 +149,6 @@ PCHAR IPAddress = NULL, Netmask = NULL, DefaultGateway = NULL; NTSTATUS Status = STATUS_SUCCESS; DWORD Error = ERROR_SUCCESS; - MIB_IPFORWARDROW DefGatewayRow; Adapter->DhclientState.config = &Adapter->DhclientConfig; strncpy(Adapter->DhclientInfo.name, (char*)Adapter->IfMib.bDescr, @@ -181,11 +180,11 @@ DefaultGateway = RegReadString( AdapterKey, NULL, "DefaultGateway" ); if( DefaultGateway ) { - DefGatewayRow.dwForwardDest = 0; - DefGatewayRow.dwForwardMask = 0; - DefGatewayRow.dwForwardMetric1 = 1; - DefGatewayRow.dwForwardNextHop = inet_addr(DefaultGateway); - Error = CreateIpForwardEntry( &DefGatewayRow ); + Adapter->RouterMib.dwForwardDest = 0; + Adapter->RouterMib.dwForwardMask = 0; + Adapter->RouterMib.dwForwardMetric1 = 1; + Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway); + Error = CreateIpForwardEntry( &Adapter->RouterMib ); if( Error ) warning("Failed to set default gateway %s: %ld\n", DefaultGateway, Error); @@ -212,9 +211,10 @@ void AdapterInit() { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); - DWORD Error, Size = sizeof(MIB_IFTABLE), i; + DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; struct interface_info *ifi = NULL; + int i; WSAStartup(0x0101,&wsd); @@ -233,7 +233,7 @@ DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); - for( i = 0; i < Table->dwNumEntries; i++ ) { + for( i = Table->dwNumEntries - 1; i >= 0; i-- ) { DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", Table->table[i].dwIndex)); Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 );

1 0

[jimtabor] 41906: - If any dib sections was created, set the flag.
by jimtabor＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: jimtabor Date: Sun Jul 12 06:59:59 2009 New Revision: 41906 URL: http://svn.reactos.org/svn/reactos?rev=41906&view=rev Log: - If any dib sections was created, set the flag. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Jul 12 06:59:59 2009 @@ -1579,7 +1579,7 @@ *bits = bm.bmBits; } -// if (res) pdcattr->ulDirty_ |= DC_DIBSECTION; + if (res) pdcattr->ulDirty_ |= DC_DIBSECTION; return res; }

1 0

[jimtabor] 41905: - Start initializing client pfn arrays so that they can be loaded into the server information structure and help register class atoms in win32k.
by jimtabor＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: jimtabor Date: Sun Jul 12 06:09:49 2009 New Revision: 41905 URL: http://svn.reactos.org/svn/reactos?rev=41905&view=rev Log: - Start initializing client pfn arrays so that they can be loaded into the server information structure and help register class atoms in win32k. Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] Sun Jul 12 06:09:49 2009 @@ -61,3 +61,81 @@ return NtUserRegisterSystemClasses(sizeof(cls) / sizeof(cls[0]), cls); } + + +#if 0 +static PFNCLIENT pfnClientA; +static PFNCLIENT pfnClientW; +static PFNCLIENTWORKER pfnClientWorker; + +BOOL WINAPI RegisterClientPFN(VOID) +{ + NTSTATUS Status; + + pfnClientA.pfnScrollBarWndProc = ScrollBarWndProcA; + pfnClientW.pfnScrollBarWndProc = ScrollBarWndProcW; + pfnClientA.pfnTitleWndProc = IconTitleWndProc; + pfnClientW.pfnTitleWndProc = IconTitleWndProc; + pfnClientA.pfnMenuWndProc = PopupMenuWndProcA; + pfnClientW.pfnMenuWndProc = PopupMenuWndProcW; + pfnClientA.pfnDesktopWndProc = DesktopWndProc; // Fixme! + pfnClientW.pfnDesktopWndProc = DesktopWndProc; + pfnClientA.pfnDefWindowProc = DefWindowProcA; + pfnClientW.pfnDefWindowProc = DefWindowProcW; + pfnClientA.pfnMessageWindowProc = DefWindowProcA; + pfnClientW.pfnMessageWindowProc = DefWindowProcW; + pfnClientA.pfnSwitchWindowProc = DefWindowProcA; + pfnClientW.pfnSwitchWindowProc = DefWindowProcW; + pfnClientA.pfnButtonWndProc = ButtonWndProcA; + pfnClientW.pfnButtonWndProc = ButtonWndProcW + pfnClientA.pfnComboBoxWndProc = ComboWndProcA; + pfnClientW.pfnComboBoxWndProc = ComboWndProcW; + pfnClientA.pfnComboListBoxProc = ListBoxWndProcA; + pfnClientW.pfnComboListBoxProc = ListBoxWndProcW; + pfnClientA.pfnDialogWndProc = DefDlgProcA; + pfnClientW.pfnDialogWndProc = DefDlgProcW; + pfnClientA.pfnEditWndProc = EditWndProcA; + pfnClientW.pfnEditWndProc = EditWndProcW; + pfnClientA.pfnListBoxWndProc = ListBoxWndProcA; + pfnClientW.pfnListBoxWndProc = ListBoxWndProcW; + pfnClientA.pfnMDIClientWndProc = MDIClientWndProcA; + pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; + pfnClientA.pfnStaticWndProc = StaticWndProcA; + pfnClientW.pfnStaticWndProc = StaticWndProcW; + pfnClientA.pfnImeWndProc = DefWindowProcA; + pfnClientW.pfnImeWndProc = DefWindowProcW; + pfnClientA.pfnGhostWndProc = DefWindowProcA; + pfnClientW.pfnGhostWndProc = DefWindowProcW; + pfnClientA.pfnHkINLPCWPSTRUCT = DefWindowProcA; + pfnClientW.pfnHkINLPCWPSTRUCT = DefWindowProcW; + pfnClientA.pfnHkINLPCWPRETSTRUCT = DefWindowProcA; + pfnClientW.pfnHkINLPCWPRETSTRUCT = DefWindowProcW; + pfnClientA.pfnDispatchHook = DefWindowProcA; + pfnClientW.pfnDispatchHook = DefWindowProcW; + pfnClientA.pfnDispatchDefWindowProc = DefWindowProcA; + pfnClientW.pfnDispatchDefWindowProc = DefWindowProcW; + pfnClientA.pfnDispatchMessage = DefWindowProcA; + pfnClientW.pfnDispatchMessage = DefWindowProcW; + pfnClientA.pfnMDIActivateDlgProc = DefWindowProcA; + pfnClientW.pfnMDIActivateDlgProc = DefWindowProcW; + + pfnClientWorker.pfnButtonWndProc = ButtonWndProc_common; + pfnClientWorker.pfnComboBoxWndProc = ComboWndProc_common; + pfnClientWorker.pfnComboListBoxProc = ListBoxWndProc_common; +// pfnClientWorker.pfnDialogWndProc = DefDlgProc_common; + pfnClientWorker.pfnEditWndProc = EditWndProc_common; + pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; + pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; + pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; + pfnClientWorker.pfnImeWndProc = User32DefWindowProc; + pfnClientWorker.pfnGhostWndProc = User32DefWindowProc; + pfnClientWorker.pfnCtfHookProc = User32DefWindowProc; + + Status = NtUserInitializeClientPfnArrays( &pfnClientA, + &pfnClientW, + &pfnClientWorker, + User32Instance); + + return NT_SUCCESS(Status) ? TRUE : FALSE; +} +#endif Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jul 12 06:09:49 2009 @@ -231,19 +231,26 @@ WNDPROC pfnMDIActivateDlgProc; } PFNCLIENT, *PPFNCLIENT; +/* + Wine Common proc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL Unicode ); + Windows uses Ansi == TRUE, Wine uses Unicode == TRUE. + */ + +typedef LRESULT(CALLBACK *WNDPROC_EX)(HWND,UINT,WPARAM,LPARAM,BOOL); + typedef struct _PFNCLIENTWORKER { - WNDPROC pfnButtonWndProc; - WNDPROC pfnComboBoxWndProc; - WNDPROC pfnComboListBoxProc; - WNDPROC pfnDialogWndProc; - WNDPROC pfnEditWndProc; - WNDPROC pfnListBoxWndProc; - WNDPROC pfnMDIClientWndProc; - WNDPROC pfnStaticWndProc; - WNDPROC pfnImeWndProc; - WNDPROC pfnGhostWndProc; - WNDPROC pfnCtfHookProc; + WNDPROC_EX pfnButtonWndProc; + WNDPROC_EX pfnComboBoxWndProc; + WNDPROC_EX pfnComboListBoxProc; + WNDPROC_EX pfnDialogWndProc; + WNDPROC_EX pfnEditWndProc; + WNDPROC_EX pfnListBoxWndProc; + WNDPROC_EX pfnMDIClientWndProc; + WNDPROC_EX pfnStaticWndProc; + WNDPROC_EX pfnImeWndProc; + WNDPROC_EX pfnGhostWndProc; + WNDPROC_EX pfnCtfHookProc; } PFNCLIENTWORKER, *PPFNCLIENTWORKER; struct _WND;

1 0

[janderwald] 41904: - Fix build (2/X)
by janderwald＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: janderwald Date: Sun Jul 12 04:37:48 2009 New Revision: 41904 URL: http://svn.reactos.org/svn/reactos?rev=41904&view=rev Log: - Fix build (2/X) Modified: trunk/reactos/dll/win32/sndblst/sndblst.c trunk/reactos/include/reactos/libs/sound/mment4.h trunk/reactos/lib/drivers/sound/mment4/control.c Modified: trunk/reactos/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 12 04:37:48 2009 @@ -32,6 +32,7 @@ MMRESULT GetSoundBlasterDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, OUT PVOID Capabilities, IN DWORD CapabilitiesSize) { Modified: trunk/reactos/include/reactos/libs/sound/mment4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mment4.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mment4.h [iso-8859-1] Sun Jul 12 04:37:48 2009 @@ -73,6 +73,7 @@ MMRESULT SetNt4WaveDeviceFormat( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD DeviceId, IN LPWAVEFORMATEX Format, IN DWORD FormatSize); Modified: trunk/reactos/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Sun Jul 12 04:37:48 2009 @@ -200,6 +200,7 @@ MMRESULT SetNt4WaveDeviceFormat( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD DeviceId, IN LPWAVEFORMATEX Format, IN DWORD FormatSize) {

1 0

[janderwald] 41903: [AUDIO_TEST] - Fix build
by janderwald＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: janderwald Date: Sun Jul 12 04:23:09 2009 New Revision: 41903 URL: http://svn.reactos.org/svn/reactos?rev=41903&view=rev Log: [AUDIO_TEST] - Fix build Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c 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] Sun Jul 12 04:23:09 2009 @@ -124,7 +124,7 @@ i++; } - DeviceInfo.State = KSSTATE_RUN; + DeviceInfo.u.State = KSSTATE_RUN; Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); if (!Status) { @@ -154,7 +154,7 @@ printf("WDMAUD: Played buffer\n"); - DeviceInfo.State = KSSTATE_STOP; + DeviceInfo.u.State = KSSTATE_STOP; Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); if (!Status) {

1 0

[janderwald] 41902: [MMEBUDDY] - Pass DeviceId to GetDeviceCapabilities function [WDMAUD.DRV] - Use DeviceId to determine the capabilities of the requested device, not just always the first one
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 03:49:24 2009 New Revision: 41902 URL: http://svn.reactos.org/svn/reactos?rev=41902&view=rev Log: [MMEBUDDY] - Pass DeviceId to GetDeviceCapabilities function [WDMAUD.DRV] - Use DeviceId to determine the capabilities of the requested device, not just always the first one Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c 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] Sun Jul 12 03:49:24 2009 @@ -72,6 +72,7 @@ MMRESULT GetWdmDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, OUT PVOID Capabilities, IN DWORD CapabilitiesSize) { @@ -95,7 +96,7 @@ ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = 0; //FIXME + DeviceInfo.DeviceIndex = DeviceId; Result = SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_GETCAPABILITIES, Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 12 03:49:24 2009 @@ -156,6 +156,7 @@ #define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \ typedef MMRESULT (*func_typename)( \ IN struct _SOUND_DEVICE* SoundDevice, \ + IN DWORD DeviceId, \ OUT caps_type Capabilities, \ IN DWORD CapabilitiesSize); @@ -414,6 +415,7 @@ MMRESULT GetSoundDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, OUT PVOID Capabilities, IN DWORD CapabilitiesSize); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 12 03:49:24 2009 @@ -28,6 +28,7 @@ MMRESULT GetSoundDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, OUT PVOID Capabilities, IN DWORD CapabilitiesSize) { @@ -104,6 +105,7 @@ return MMSYSERR_NOTSUPPORTED; return FunctionTable->GetCapabilities(SoundDevice, + DeviceId, Capabilities, CapabilitiesSize); } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sun Jul 12 03:49:24 2009 @@ -72,6 +72,7 @@ return Result; return GetSoundDeviceCapabilities(SoundDevice, + DeviceId, Capabilities, CapabilitiesSize); }

1 0

[janderwald] 41901: - Use free index directly - Update interface
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 03:23:40 2009 New Revision: 41901 URL: http://svn.reactos.org/svn/reactos?rev=41901&view=rev Log: - Use free index directly - Update interface Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h 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] Sun Jul 12 03:23:40 2009 @@ -146,6 +146,7 @@ KSDATAFORMAT_WAVEFORMATEX * DataFormat; ULONG FilterId; ULONG PinId; + ULONG FreeIndex; if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) { @@ -166,12 +167,14 @@ } /* close pin handle which uses same virtual audio device id and pin id */ + FreeIndex = (ULONG)-1; for(Index = 0; Index < ClientInfo->NumPins; Index++) { - if (ClientInfo->hPins[Index].FilterId == FilterId && ClientInfo->hPins[Index].PinId == PinId && ClientInfo->hPins[Index].Handle) + if (ClientInfo->hPins[Index].FilterId == FilterId && ClientInfo->hPins[Index].PinId == PinId && ClientInfo->hPins[Index].Handle && ClientInfo->hPins[Index].Type == DeviceInfo->DeviceType) { ZwClose(ClientInfo->hPins[Index].Handle); ClientInfo->hPins[Index].Handle = NULL; + FreeIndex = Index; } } @@ -248,19 +251,16 @@ { PWDMAUD_HANDLE Handels; - for(Index = 0; Index < ClientInfo->NumPins; Index++) - { - if (ClientInfo->hPins[Index].Handle == NULL) - { - /* re-use a free index */ - ClientInfo->hPins[Index].Handle = PinHandle; - ClientInfo->hPins[Index].FilterId = FilterId; - ClientInfo->hPins[Index].PinId = PinId; - ClientInfo->hPins[Index].Type = DeviceInfo->DeviceType; - - DeviceInfo->hDevice = PinHandle; - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); - } + if (FreeIndex != (ULONG)-1) + { + /* re-use a free index */ + ClientInfo->hPins[Index].Handle = PinHandle; + ClientInfo->hPins[Index].FilterId = FilterId; + ClientInfo->hPins[Index].PinId = PinId; + ClientInfo->hPins[Index].Type = DeviceInfo->DeviceType; + + DeviceInfo->hDevice = PinHandle; + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } Handels = ExAllocatePool(NonPagedPool, sizeof(WDMAUD_HANDLE) * (ClientInfo->NumPins+1)); @@ -411,7 +411,7 @@ Property.Id = KSPROPERTY_CONNECTION_STATE; Property.Flags = KSPROPERTY_TYPE_SET; - State = DeviceInfo->State; + State = DeviceInfo->u.State; Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&State, sizeof(KSSTATE), &BytesReturned); @@ -647,6 +647,8 @@ return WdmAudCapabilities(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_CLOSE_WDMAUD: return WdmAudIoctlClose(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_GETPOS: + DPRINT1("IOCTL_GETPOS\n"); case IOCTL_GETDEVID: case IOCTL_GETVOLUME: case IOCTL_SETVOLUME: 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] Sun Jul 12 03:23:40 2009 @@ -30,8 +30,6 @@ HANDLE hDevice; ULONG DeviceCount; - KSSTATE State; - ULONG Volume; ULONG BufferSize; PUCHAR Buffer; @@ -41,7 +39,10 @@ WAVEFORMATEX WaveFormatEx; WAVEOUTCAPSW WaveOutCaps; AUXCAPSW AuxCaps; - WAVEINCAPSW WaveInCaps; + WAVEINCAPSW WaveInCaps; + ULONGLONG Position; + KSSTATE State; + ULONG Volume; }u; }WDMAUD_DEVICE_INFO, *PWDMAUD_DEVICE_INFO; @@ -204,5 +205,22 @@ METHOD_BUFFERED, \ FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) +/// IOCTL_GETPOS +/// +/// Description: This IOCTL retrieves the current playback / write position +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType and hDevice must be set +/// Result: The result is returned in Volume +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + +#define IOCTL_GETPOS \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 9, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) + #endif

1 0

[janderwald] 41900: - Implement retrieving position
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 03:21:41 2009 New Revision: 41900 URL: http://svn.reactos.org/svn/reactos?rev=41900&view=rev Log: - Implement retrieving position Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c 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] Sun Jul 12 03:21:41 2009 @@ -238,6 +238,7 @@ MMRESULT SetWdmWaveDeviceFormat( IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { @@ -273,7 +274,7 @@ ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = 0; //FIXME + DeviceInfo.DeviceIndex = DeviceId; DeviceInfo.u.WaveFormatEx.cbSize = WaveFormat->cbSize; DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; DeviceInfo.u.WaveFormatEx.nChannels = WaveFormat->nChannels; @@ -338,6 +339,53 @@ WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); } + + return MMSYSERR_NOERROR; +} + +MMRESULT +GetWdmPosition( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + 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); + } + + Time->wType = TIME_BYTES; + Time->u.cb = (DWORD)DeviceInfo.u.Position; return MMSYSERR_NOERROR; } @@ -386,6 +434,7 @@ FuncTable.Open = OpenWdmSoundDevice; FuncTable.Close = CloseWdmSoundDevice; FuncTable.CommitWaveBuffer = WriteFileEx_Committer2; + FuncTable.GetPos = GetWdmPosition; SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); }

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