Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 19436: Use a standard header instead of redefining size_t.
by navaraf＠svn.reactos.com 22 Nov '05

22 Nov '05

Use a standard header instead of redefining size_t. Modified: trunk/reactos/lib/rtl/qsort.c _____ Modified: trunk/reactos/lib/rtl/qsort.c --- trunk/reactos/lib/rtl/qsort.c 2005-11-22 00:15:47 UTC (rev 19435) +++ trunk/reactos/lib/rtl/qsort.c 2005-11-22 00:16:37 UTC (rev 19436) @@ -38,6 +38,8 @@ * PROGRAMMER: Adapted from CygWin newlib 2000-03-12. */ +#include <stddef.h> + #ifndef __GNUC__ #define inline #endif @@ -45,7 +47,6 @@ /* FIXME: these types should be from the default includes */ typedef int (* _pfunccmp_t) (char *, char *); -typedef int size_t; #define min(a,b) ((a)<(b)?(a):(b))

1 0

[navaraf] 19435: Fix a typo.
by navaraf＠svn.reactos.com 22 Nov '05

22 Nov '05

Fix a typo. Modified: trunk/reactos/lib/kernel32/debug/debugger.c _____ Modified: trunk/reactos/lib/kernel32/debug/debugger.c --- trunk/reactos/lib/kernel32/debug/debugger.c 2005-11-22 00:05:23 UTC (rev 19434) +++ trunk/reactos/lib/kernel32/debug/debugger.c 2005-11-22 00:15:47 UTC (rev 19435) @@ -77,7 +77,7 @@ /* * NOTE: I'm not sure if the function is complete. * - * @unmplemented + * @unimplemented */ BOOL WINAPI

1 0

[ion] 19434: - Remove usage of STATIC, and use static in the right place.
by ion＠svn.reactos.com 22 Nov '05

22 Nov '05

- Remove usage of STATIC, and use static in the right place. Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/synch/event.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/window.c _____ Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -17,7 +17,6 @@ #define NDEBUG #include "../include/debug.h" - /* FUNCTIONS ****************************************************************/ /* Check whether a file is an OS/2 or a very old Windows executable @@ -26,7 +25,7 @@ * FIXME: is reading the module imports the only way of discerning * old Windows binaries from OS/2 ones ? At least it seems so... */ -STATIC DWORD STDCALL +static DWORD STDCALL InternalIsOS2OrOldWin(HANDLE hFile, IMAGE_DOS_HEADER *mz, IMAGE_OS2_HEADER *ne) { DWORD CurPos; @@ -78,7 +77,7 @@ return Ret; } -STATIC DWORD STDCALL +static DWORD STDCALL InternalGetBinaryType(HANDLE hFile) { union _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -2898,7 +2898,7 @@ } -BOOL STATIC +static BOOL AddConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { if (HandlerRoutine == NULL) @@ -2932,7 +2932,7 @@ } -BOOL STATIC +static BOOL RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { ULONG i; _____ Modified: trunk/reactos/lib/kernel32/synch/event.c --- trunk/reactos/lib/kernel32/synch/event.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/synch/event.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -90,7 +90,7 @@ } Status = NtCreateEvent(&hEvent, - STANDARD_RIGHTS_ALL | EVENT_READ_ACCESS | EVENT_WRITE_ACCESS, + EVENT_ALL_ACCESS, &ObjectAttributes, (bManualReset ? NotificationEvent : SynchronizationEvent), bInitialState); _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -210,7 +210,7 @@ SelectObject(hDC, hSaveBrush); } -STATIC VOID FASTCALL +static VOID FASTCALL IntDrawScrollArrows(HDC hDC, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { RECT RectLT, RectRB; @@ -253,7 +253,7 @@ DrawFrameControl(hDC, &RectRB, DFC_SCROLL, ScrollDirFlagRB); } -STATIC VOID FASTCALL +static VOID FASTCALL IntScrollDrawMovingThumb(HDC Dc, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { INT Pos = ScrollTrackingPos; @@ -291,7 +291,7 @@ ScrollMovingThumb = ! ScrollMovingThumb; } -STATIC LONG FASTCALL +static LONG FASTCALL IntScrollGetObjectId(INT SBType) { if (SB_VERT == SBType) @@ -306,7 +306,7 @@ return OBJID_CLIENT; } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) { ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); @@ -382,7 +382,7 @@ } } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { RECT TempRect = *Rect; @@ -400,7 +400,7 @@ return PtInRect(&TempRect, Pt); } -STATIC DWORD FASTCALL +static DWORD FASTCALL IntScrollHitTest(PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, POINT Pt, BOOL Dragging) { INT ArrowSize, ThumbSize, ThumbPos; @@ -479,7 +479,7 @@ * relative to the left or to the top. * Return TRUE if the scrollbar is vertical, FALSE if horizontal. */ -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollBarRect(HWND Wnd, INT Bar, RECT *Rect, INT *ArrowSize, INT *ThumbSize, INT *ThumbPos) @@ -629,7 +629,7 @@ * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ -STATIC UINT FASTCALL +static UINT FASTCALL IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) { @@ -676,7 +676,7 @@ /*********************************************************************** * IntScrollClipPos */ -STATIC POINT IntScrollClipPos(PRECT Rect, POINT Pt) +static POINT IntScrollClipPos(PRECT Rect, POINT Pt) { if (Pt.x < Rect->left) { @@ -704,7 +704,7 @@ * * Draw the size grip. */ -STATIC void FASTCALL +static void FASTCALL IntScrollDrawSizeGrip(HWND Wnd, HDC Dc) { RECT Rect; @@ -723,7 +723,7 @@ * * Handle a keyboard event (only for SB_CTL scrollbars with focus). */ -STATIC void FASTCALL +static void FASTCALL IntScrollHandleKbdEvent( HWND Wnd /* [in] Handle of window with scrollbar(s) */, WPARAM wParam /* [in] Variable input including enable state */, @@ -778,7 +778,7 @@ * Handle a mouse or timer event for the scrollbar. * 'Pt' is the location of the mouse event in drawing coordinates */ -STATIC VOID FASTCALL +static VOID FASTCALL IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { static POINT PrevPt; /* Previous mouse position for timer events */ @@ -1136,7 +1136,7 @@ } } -STATIC INT FASTCALL +static INT FASTCALL IntScrollGetScrollPos(HWND Wnd, INT Bar) { SCROLLINFO ScrollInfo; @@ -1151,7 +1151,7 @@ return ScrollInfo.nPos; } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) { BOOL Result; _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -70,7 +70,7 @@ } -HANDLE STATIC +static HANDLE LoadCursorImage(HINSTANCE hinst, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; @@ -249,7 +249,7 @@ } -HANDLE STATIC +static HANDLE LoadIconImage(HINSTANCE hinst, LPCWSTR lpszName, INT width, INT height, UINT fuLoad) { HANDLE hResource; @@ -443,7 +443,7 @@ } -HANDLE STATIC +static HANDLE LoadBitmapImage(HINSTANCE hInstance, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -366,7 +366,7 @@ #define ON_BOTTOM_BORDER(hit) \ (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT)) -VOID STATIC +static VOID UserDrawWindowFrame(HDC hdc, const RECT *rect, ULONG width, ULONG height) { @@ -394,7 +394,7 @@ SelectObject( hdc, hbrush ); } -VOID STATIC +static VOID UserDrawMovingFrame(HDC hdc, RECT *rect, BOOL thickframe) { if(thickframe) @@ -407,7 +407,7 @@ } } -VOID STATIC +static VOID DefWndDoSizeMove(HWND hwnd, WORD wParam) { HRGN DesktopRgn; @@ -723,7 +723,7 @@ * * Track a mouse button press on the horizontal or vertical scroll-bar. */ -STATIC VOID +static VOID DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt) { INT ScrollBar; _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/hook.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -139,7 +139,7 @@ return NtUserCallNextHookEx(Hook, Code, wParam, lParam); } -STATIC +static HHOOK FASTCALL IntSetWindowsHook( _____ Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/message.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -963,7 +963,7 @@ } } -STATIC LRESULT FASTCALL +static LRESULT FASTCALL IntCallWindowProcA(BOOL IsAnsiProc, WNDPROC WndProc, HWND hWnd, _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/window.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -379,9 +379,8 @@ return NtUserGetForegroundWindow(); } - +static BOOL -STATIC User32EnumWindows ( HDESK hDesktop, HWND hWndparent,

1 0

[jimtabor] 19433: Removed ActCtx.c.
by jimtabor＠svn.reactos.com 21 Nov '05

21 Nov '05

Removed ActCtx.c. Deleted: trunk/reactos/lib/kernel32/misc/ActCtx.c _____ Deleted: trunk/reactos/lib/kernel32/misc/ActCtx.c --- trunk/reactos/lib/kernel32/misc/ActCtx.c 2005-11-21 22:53:25 UTC (rev 19432) +++ trunk/reactos/lib/kernel32/misc/ActCtx.c 2005-11-21 22:56:09 UTC (rev 19433) @@ -1,96 +0,0 @@ -#include <k32.h> - -#define NDEBUG -#include "../include/debug.h" - -/* - * @implemented - */ -BOOL -STDCALL -FindActCtxSectionStringA( - DWORD dwFlags, - const GUID *lpExtensionGuid, - ULONG ulSectionId, - LPCSTR lpStringToFind, - PACTCTX_SECTION_KEYED_DATA ReturnedData - ) -{ - BOOL bRetVal; - LPWSTR lpStringToFindW; - - /* Convert lpStringToFind */ - if (lpStringToFind) - { - BasepAnsiStringToHeapUnicodeString(lpStringToFind, - (LPWSTR*) &lpStringToFindW); - } - - /* Call the Unicode function */ - bRetVal = FindActCtxSectionStringA(dwFlags, - lpExtensionGuid, - ulSectionId, - lpStringToFind, - ReturnedData); - - /* Clean up */ - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpStringToFindW); - - return bRetVal; -} - - -/* - * @implemented - */ -HANDLE -STDCALL -CreateActCtxA( - PCACTCTXA pActCtx - ) -{ - ACTCTXW pActCtxW; - HANDLE hRetVal; - - ZeroMemory(&pActCtxW, sizeof(pActCtxW)); - pActCtxW.cbSize = sizeof(pActCtxW); - pActCtxW.dwFlags = pActCtx->dwFlags; - pActCtxW.wProcessorArchitecture = pActCtx->wProcessorArchitecture; - pActCtxW.dwFlags = pActCtx->wProcessorArchitecture; - - pActCtxW.hModule = pActCtx->hModule; - - /* Convert ActCtx Strings */ - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, - (LPWSTR*) &pActCtxW.lpSource); - } - - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, - (LPWSTR*) &pActCtxW.lpAssemblyDirectory); - } - if (pActCtx->lpResourceName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, - (LPWSTR*) &pActCtxW.lpResourceName); - } - if (pActCtx->lpApplicationName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, - (LPWSTR*) &pActCtxW.lpApplicationName); - } - - /* Call the Unicode function */ - hRetVal = CreateActCtxW(&pActCtxW); - - /* Clean up */ - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpSource); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpAssemblyDirectory); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpApplicationName); - - return hRetVal; -}

1 0

[jimtabor] 19432: Rename file.
by jimtabor＠svn.reactos.com 21 Nov '05

21 Nov '05

Rename file. Added: trunk/reactos/lib/kernel32/misc/actctx.c _____ Copied: trunk/reactos/lib/kernel32/misc/actctx.c (from rev 19430, trunk/reactos/lib/kernel32/misc/ActCtx.c)

1 0

[greatlrd] 19431: french translation by bulio
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

french translation by bulio Added: trunk/reactos/lib/userenv/Fr.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/userenv/Fr.rc --- trunk/reactos/lib/userenv/Fr.rc 2005-11-21 22:16:31 UTC (rev 19430) +++ trunk/reactos/lib/userenv/Fr.rc 2005-11-21 22:45:00 UTC (rev 19431) @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Dossiers et Arrangements" + IDS_APPDATA "DonnÚes Applications" + IDS_DESKTOP "Bureau" + IDS_FAVORITES "Favorits" + IDS_STARTMENU "DÚmarrer" + IDS_PROGRAMS "DÚmarrer\\Programmes" + IDS_ADMINTOOLS "DÚmarrer\\Programmes\\Outils Administrative" + IDS_STARTUP "DÚmarrer\\Programmes\\DÚmarrage" + IDS_MYDOCUMENTS "Mes Documents" + IDS_MYPICTURES "Mes Documents\\Mes Photos" + IDS_MYMUSIC "Mes Documents\\Ma Musique" + IDS_MYVIDEOS "Mes Documents\\Mes VidÚos" + IDS_TEMPLATES "Calibres" + IDS_RECENT "RecÚnements" + IDS_SENDTO "Envoyer?" + IDS_PRINTHOOD "ImprimezHood" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "Arrangements Local" + IDS_LOCALAPPDATA "Arrangements Local\\DonnÚes Application" + IDS_TEMP "Arrangements Local\\Temporaire" + IDS_CACHE "Arrangements Local\\Dossiers Internet Temporaire" + IDS_HISTORY "Arrangements Local\\Histoire" + IDS_COOKIES "Biscuits" + IDS_PROGRAMFILES "%SystemDrive%\\Programme Dossiers" +END + _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-11-21 22:16:31 UTC (rev 19430) +++ trunk/reactos/lib/userenv/userenv.rc 2005-11-21 22:45:00 UTC (rev 19431) @@ -38,6 +38,7 @@ #include "De.rc" #include "En.rc" +#include "Fr.rc" #include "Ja.rc" #include "Nl.rc" #include "Pl.rc"

1 0

[greatlrd] 19430: small cleanup and bugfix
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

small cleanup and bugfix Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 22:05:22 UTC (rev 19429) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 22:16:31 UTC (rev 19430) @@ -684,14 +684,6 @@ } - - -//FIXME: Params are MS-specific -static MMRESULT WriteWaveDevice(LPWAVEHDR pHdr, PWAVEALLOC pClient) -{ - return MMSYSERR_NOERROR; -} - //FIXME: MS-specific code, except for name of the func! MMRESULT GetPositionWaveDevice(PWAVEALLOC pClient, LPMMTIME lpmmt, DWORD dwSize) { @@ -728,7 +720,6 @@ -//FIXME: Params are MS-specific MMRESULT soundSetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl) { @@ -746,6 +737,7 @@ return Result; } + MMRESULT soundGetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl) { @@ -855,7 +847,15 @@ // save WAVEALLOC pointer in the WaveHeader pWaveHdr->reserved = dwUser; - return WriteWaveDevice(pWaveHdr, (PWAVEALLOC)dwUser); + + pWaveHdr->dwFlags |= WHDR_INQUEUE; + pWaveHdr->dwFlags &= ~WHDR_DONE; + pTask->AuxParam.pHdr = pWaveHdr; + + pTask->AuxFunction = WaveThreadAddBuffer; + SetEvent(pTask->AuxEvent1); + WaitForSingleObject(pTask->AuxEvent2, INFINITE); + return pTask->AuxReturnCode; } case WODM_PAUSE:

1 0

[gvg] 19429: Clean zlib host files
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

Clean zlib host files Modified: trunk/reactos/lib/zlib/zlib.mak _____ Modified: trunk/reactos/lib/zlib/zlib.mak --- trunk/reactos/lib/zlib/zlib.mak 2005-11-21 22:01:13 UTC (rev 19428) +++ trunk/reactos/lib/zlib/zlib.mak 2005-11-21 22:05:22 UTC (rev 19429) @@ -103,4 +103,4 @@ .PHONY: zlib_host_clean zlib_host_clean: -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL) -clean: zlib_clean +clean: zlib_host_clean

1 0

[greatlrd] 19428: implement soundSetData
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

implement soundSetData Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 21:51:30 UTC (rev 19427) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 22:01:13 UTC (rev 19428) @@ -732,7 +732,19 @@ MMRESULT soundSetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl) { - return MMSYSERR_NOERROR; + HANDLE hDevcie; + MMRESULT Result; + DWORD BytesReturned; + + Result = OpenDevice(DeviceType, DeviceId, &hDevcie, GENERIC_READ); + if (Result != MMSYSERR_NOERROR) + return Result; + + Result = DeviceIoControl(hDevcie, Ioctl, Data, Length, NULL, 0, &BytesReturned, NULL) ? + MMSYSERR_NOERROR : TranslateStatus(); + CloseHandle(hDevcie); + + return Result; } MMRESULT soundGetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl)

1 0

[greatlrd] 19427: implement soundGetData and WaveThreadSetState
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

implement soundGetData and WaveThreadSetState Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 21:22:13 UTC (rev 19426) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 21:51:30 UTC (rev 19427) @@ -28,6 +28,7 @@ void waveOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); void waveLoopOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); void waveBreakOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); +static MMRESULT waveSetState(PWAVEALLOC pClient, ULONG State); /* ============================ * INTERNAL @@ -94,7 +95,58 @@ break; case WaveThreadSetState: - DPRINT("UNIMPLMENENT WaveThreadSetState "); + pClient->AuxReturnCode = waveSetState(pClient, pClient->AuxParam.State); + + if (pClient->AuxParam.State == WAVE_DD_RESET) + { + PWAVEHDR pHdr; + + pClient->LoopHead = NULL; + pClient->AuxReturnCode = MMSYSERR_NOERROR; + for (pHdr = pClient->DeviceQueue; pHdr != NULL; pHdr = pHdr->lpNext) + { + pHdr->dwFlags |= WHDR_COMPLETE; + } + + pClient->BufferPosition = 0; + pClient->NextBuffer = NULL; + } + else + { + if (pClient->DeviceType == WaveInDevice && pClient->AuxReturnCode == MMSYSERR_NOERROR) + { + if (pClient->AuxParam.State == WAVE_DD_STOP) + { + if (pClient->DeviceQueue) + { + while (!(pClient->DeviceQueue->dwFlags & WHDR_COMPLETE) && + pClient->BytesOutstanding != 0) + { + waveSetState(pClient, WAVE_DD_RECORD); + pClient->AuxReturnCode = waveSetState(pClient, WAVE_DD_STOP); + if (pClient->AuxReturnCode != MMSYSERR_NOERROR) + break; + + } + if (pClient->AuxReturnCode == MMSYSERR_NOERROR) + { + pClient->DeviceQueue->dwFlags |= WHDR_COMPLETE; + if (pClient->NextBuffer == pClient->DeviceQueue) + { + pClient->NextBuffer = pClient->DeviceQueue->lpNext; + pClient->BufferPosition = 0; + } + } + } + } + else + { + if (pClient->AuxParam.State == WAVE_DD_RECORD) + pClient->AuxReturnCode = waveReadWrite(pClient); + } + } + } + break; case WaveThreadGetData: @@ -382,7 +434,33 @@ } return MMSYSERR_NOERROR; } +static MMRESULT waveSetState(PWAVEALLOC pClient, ULONG State) +{ + OVERLAPPED Overlap; + DWORD BytesReturned; + memset((PVOID)&Overlap, 0, sizeof(Overlap)); + + Overlap.hEvent = pClient->Event; + + if (!DeviceIoControl(pClient->hDev, IOCTL_WAVE_SET_STATE, + &State, sizeof(State), NULL, 0, &BytesReturned, &Overlap)) + { + DWORD cbTransfer; + if (GetLastError() == ERROR_IO_PENDING) + { + if (!GetOverlappedResult(pClient->hDev, &Overlap, &cbTransfer, TRUE)) + return TranslateStatus(); + } + else + return TranslateStatus(); + + } + + while (SleepEx(0, TRUE) == WAIT_IO_COMPLETION) {} + return MMSYSERR_NOERROR; +} + void wavePartialOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped) { LPWAVEHDR pHdr; @@ -648,18 +726,29 @@ return mErr;*/ return MMSYSERR_NOERROR; } + + //FIXME: Params are MS-specific MMRESULT soundSetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl) { return MMSYSERR_NOERROR; } - -//FIXME: Params are MS-specific MMRESULT soundGetData(UINT DeviceType, UINT DeviceId, UINT Length, PBYTE Data, ULONG Ioctl) { - return MMSYSERR_NOERROR; + HANDLE hDevice; + MMRESULT Result; + DWORD BytesReturned; + + Result = OpenDevice(DeviceType, DeviceId, &hDevice, GENERIC_READ); + if (Result != MMSYSERR_NOERROR) + return Result; + + Result = DeviceIoControl(hDevice, Ioctl, NULL, 0, (LPVOID)Data, Length, + &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); + CloseHandle(hDevice); + return Result; }

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