Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 37950: - implement IServiceGroup interface - implement PcNewServiceGroup
by janderwald＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: janderwald Date: Mon Dec 8 17:30:16 2008 New Revision: 37950 URL: http://svn.reactos.org/svn/reactos?rev=37950&view=rev Log: - implement IServiceGroup interface - implement PcNewServiceGroup Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c (with props) Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWavePci.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWavePci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWavePci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWavePci.cpp (removed) @@ -1,1 +1,0 @@ - Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Dec 8 17:30:16 2008 @@ -21,6 +21,7 @@ <file>undoc.c</file> <file>resource.c</file> <file>registry.c</file> + <file>service_group.c</file> <file>port.c</file> <file>port_dmus.c</file> <file>port_midi.c</file> Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Mon Dec 8 17:30:16 2008 @@ -1,0 +1,270 @@ +#include "private.h" + +typedef struct +{ + LIST_ENTRY Entry; + IN PSERVICESINK pServiceSink; +}GROUP_ENTRY, *PGROUP_ENTRY; + +typedef struct +{ + IServiceGroupVtbl *lpVtbl; + + LONG ref; + LIST_ENTRY ServiceSinkHead; + + BOOL Initialized; + BOOL TimerActive; + KTIMER Timer; + KEVENT DpcEvent; + KDPC Dpc; + +}IServiceGroupImpl; + +const GUID IID_IServiceGroup; +const GUID IID_IServiceSink; + +//--------------------------------------------------------------- +// IUnknown methods +// + + +NTSTATUS +STDMETHODCALLTYPE +IServiceGroup_fnQueryInterface( + IServiceGroup* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + if (IsEqualGUIDAligned(refiid, &IID_IServiceGroup) || + IsEqualGUIDAligned(refiid, &IID_IServiceSink)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +STDMETHODCALLTYPE +IServiceGroup_fnAddRef( + IServiceGroup* iface) +{ + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IServiceGroup_fnRelease( + IServiceGroup* iface) +{ + PLIST_ENTRY CurEntry; + PGROUP_ENTRY Entry; + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + while(!IsListEmpty(&This->ServiceSinkHead)) + { + CurEntry = RemoveHeadList(&This->ServiceSinkHead); + Entry = CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + Entry->pServiceSink->lpVtbl->Release(Entry->pServiceSink); + ExFreePoolWithTag(Entry, TAG_PORTCLASS); + } + KeWaitForSingleObject(&This->DpcEvent, Executive, KernelMode, FALSE, NULL); + KeCancelTimer(&This->Timer); + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + + +//--------------------------------------------------------------- +// IServiceSink methods +// + +VOID +NTAPI +IServiceGroup_fnRequestService( + IN IServiceGroup * iface) +{ + PLIST_ENTRY CurEntry; + PGROUP_ENTRY Entry; + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + CurEntry = This->ServiceSinkHead.Flink; + while (CurEntry != &This->ServiceSinkHead) + { + Entry = CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + Entry->pServiceSink->lpVtbl->RequestService(Entry->pServiceSink); + CurEntry = CurEntry->Flink; + } +} + +//--------------------------------------------------------------- +// IServiceGroup methods +// + +NTSTATUS +NTAPI +IServiceGroup_fnAddMember( + IN IServiceGroup * iface, + IN PSERVICESINK pServiceSink) +{ + PGROUP_ENTRY Entry; + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + Entry = ExAllocatePoolWithTag(NonPagedPool, sizeof(GROUP_ENTRY), TAG_PORTCLASS); + if (!Entry) + return STATUS_INSUFFICIENT_RESOURCES; + + Entry->pServiceSink = pServiceSink; + pServiceSink->lpVtbl->AddRef(pServiceSink); + + //FIXME + //check if Dpc is active + InsertTailList(&This->ServiceSinkHead, &Entry->Entry); + + return STATUS_SUCCESS; +} + +VOID +NTAPI +IServiceGroup_fnRemoveMember( + IN IServiceGroup * iface, + IN PSERVICESINK pServiceSink) +{ + PLIST_ENTRY CurEntry; + PGROUP_ENTRY Entry; + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + //FIXME + //check if Dpc is active + // + + CurEntry = This->ServiceSinkHead.Flink; + while (CurEntry != &This->ServiceSinkHead) + { + Entry = CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + if (Entry->pServiceSink == pServiceSink) + { + RemoveEntryList(&Entry->Entry); + pServiceSink->lpVtbl->Release(pServiceSink); + ExFreePoolWithTag(Entry, TAG_PORTCLASS); + return; + } + CurEntry = CurEntry->Flink; + } + +} + +VOID +NTAPI +IServiceGroupDpc( + IN struct _KDPC *Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2 + ) +{ + IServiceGroupImpl * This = (IServiceGroupImpl*)DeferredContext; + IServiceGroup_fnRequestService((IServiceGroup*)DeferredContext); + KeSetEvent(&This->DpcEvent, 0, FALSE); +} + + +VOID +NTAPI +IServiceGroup_fnSupportDelayedService( + IN IServiceGroup * iface) +{ + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + if (!This->Initialized) + { + KeInitializeEvent(&This->DpcEvent, NotificationEvent, FALSE); + KeInitializeTimerEx(&This->Timer, NotificationTimer); + KeInitializeDpc(&This->Dpc, IServiceGroupDpc, (PVOID)This); + This->Initialized = TRUE; + } +} + +VOID +NTAPI +IServiceGroup_fnRequestDelayedService( + IN IServiceGroup * iface, + IN ULONGLONG ullDelay) +{ + LARGE_INTEGER DueTime; + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + DueTime.QuadPart = ullDelay; + + if (This->Initialized) + { + KeSetTimer(&This->Timer, DueTime, &This->Dpc); + KeClearEvent(&This->DpcEvent); + } +} + +VOID +NTAPI +IServiceGroup_fnCancelDelayedService( + IN IServiceGroup * iface) +{ + IServiceGroupImpl * This = (IServiceGroupImpl*)iface; + + if (This->Initialized) + { + KeCancelTimer(&This->Timer); + } +} + +static IServiceGroupVtbl vt_IServiceGroup = +{ + /* IUnknown methods */ + IServiceGroup_fnQueryInterface, + IServiceGroup_fnAddRef, + IServiceGroup_fnRelease, + IServiceGroup_fnRequestService, + IServiceGroup_fnAddMember, + IServiceGroup_fnRemoveMember, + IServiceGroup_fnSupportDelayedService, + IServiceGroup_fnRequestDelayedService, + IServiceGroup_fnCancelDelayedService +}; + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcNewServiceGroup( + OUT PSERVICEGROUP* OutServiceGroup, + IN PUNKNOWN OuterUnknown OPTIONAL) +{ + IServiceGroupImpl * This; + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IServiceGroupImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IServiceGroup; + This->ref = 1; + InitializeListHead(&This->ServiceSinkHead); + This->Initialized = FALSE; + *OutServiceGroup = (PSERVICEGROUP)&This->lpVtbl; + + return STATUS_UNSUCCESSFUL; +} + + + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Dec 8 17:30:16 2008 @@ -27,19 +27,6 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcNewServiceGroup( - OUT PSERVICEGROUP* OutServiceGroup, - IN PUNKNOWN OuterUnknown OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - /* =============================================================== Power Management

1 0

[tkreuzer] 37949: partly implement x64 versions of _setjmp, _setjmpex and longjmp
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 16:51:29 2008 New Revision: 37949 URL: http://svn.reactos.org/svn/reactos?rev=37949&view=rev Log: partly implement x64 versions of _setjmp, _setjmpex and longjmp Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/ (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Dec 8 16:51:29 2008 @@ -282,6 +282,11 @@ <directory name="setjmp"> <if property="ARCH" value="i386"> <directory name="i386"> + <file>setjmp.s</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> <file>setjmp.s</file> </directory> </if> Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Dec 8 16:51:29 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Mon Dec 8 16:51:29 2008 @@ -1,0 +1,157 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of _setjmp/longjmp + * FILE: lib/sdk/crt/setjmp/amd64/setjmp.s + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/amd64/asm.h> +#include <ndk/amd64/asmmacro.S> + +.intel_syntax noprefix + +#define JUMP_BUFFER_Frame 0x00 +#define JUMP_BUFFER_Rbx 0x08 +#define JUMP_BUFFER_Rsp 0x10 +#define JUMP_BUFFER_Rbp 0x18 +#define JUMP_BUFFER_Rsi 0x20 +#define JUMP_BUFFER_Rdi 0x28 +#define JUMP_BUFFER_R12 0x30 +#define JUMP_BUFFER_R13 0x38 +#define JUMP_BUFFER_R14 0x40 +#define JUMP_BUFFER_R15 0x48 +#define JUMP_BUFFER_Rip 0x50 +#define JUMP_BUFFER_Spare 0x58 +#define JUMP_BUFFER_Xmm6 0x60 +#define JUMP_BUFFER_Xmm7 0x70 +#define JUMP_BUFFER_Xmm8 0x80 +#define JUMP_BUFFER_Xmm9 0x90 +#define JUMP_BUFFER_Xmm10 0xa0 +#define JUMP_BUFFER_Xmm11 0xb0 +#define JUMP_BUFFER_Xmm12 0xc0 +#define JUMP_BUFFER_Xmm13 0xd0 +#define JUMP_BUFFER_Xmm14 0xe0 +#define JUMP_BUFFER_Xmm15 0xf0 + + +/* FUNCTIONS ******************************************************************/ + +/* + * int _setjmp(jmp_buf env); + * + * Parameters: <rcx> - jmp_buf env + * Returns: 0 + * Notes: Sets up the jmp_buf + */ +.proc _setjmp + /* Load rsp as it was before the call into rax */ + lea rax, [rsp + 8] + /* Load return address into r8 */ + mov r8, [rsp] + mov qword ptr [rcx + JUMP_BUFFER_Frame], 0 + mov [rcx + JUMP_BUFFER_Rbx], rbx + mov [rcx + JUMP_BUFFER_Rbp], rbp + mov [rcx + JUMP_BUFFER_Rsi], rsi + mov [rcx + JUMP_BUFFER_Rdi], rdi + mov [rcx + JUMP_BUFFER_R12], r12 + mov [rcx + JUMP_BUFFER_R13], r13 + mov [rcx + JUMP_BUFFER_R14], r14 + mov [rcx + JUMP_BUFFER_R15], r15 + mov [rcx + JUMP_BUFFER_Rsp], rax + mov [rcx + JUMP_BUFFER_Rip], r8 + movdqa [rcx + JUMP_BUFFER_Xmm6], xmm6 + movdqa [rcx + JUMP_BUFFER_Xmm7], xmm7 + movdqa [rcx + JUMP_BUFFER_Xmm8], xmm8 + movdqa [rcx + JUMP_BUFFER_Xmm9], xmm9 + movdqa [rcx + JUMP_BUFFER_Xmm10], xmm10 + movdqa [rcx + JUMP_BUFFER_Xmm11], xmm11 + movdqa [rcx + JUMP_BUFFER_Xmm12], xmm12 + movdqa [rcx + JUMP_BUFFER_Xmm13], xmm13 + movdqa [rcx + JUMP_BUFFER_Xmm14], xmm14 + movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 + xor rax, rax + ret +.endproc + +/* + * int _setjmpex(jmp_buf _Buf,void *_Ctx); + * + * Parameters: <rcx> - jmp_buf env + * <rdx> - frame + * Returns: 0 + * Notes: Sets up the jmp_buf + */ +.proc _setjmpex + /* Load rsp as it was before the call into rax */ + lea rax, [rsp + 8] + /* Load return address into r8 */ + mov r8, [rsp] + mov [rcx + JUMP_BUFFER_Frame], rdx + mov [rcx + JUMP_BUFFER_Rbx], rbx + mov [rcx + JUMP_BUFFER_Rbp], rbp + mov [rcx + JUMP_BUFFER_Rsi], rsi + mov [rcx + JUMP_BUFFER_Rdi], rdi + mov [rcx + JUMP_BUFFER_R12], r12 + mov [rcx + JUMP_BUFFER_R13], r13 + mov [rcx + JUMP_BUFFER_R14], r14 + mov [rcx + JUMP_BUFFER_R15], r15 + mov [rcx + JUMP_BUFFER_Rsp], rax + mov [rcx + JUMP_BUFFER_Rip], r8 + movdqa [rcx + JUMP_BUFFER_Xmm6], xmm6 + movdqa [rcx + JUMP_BUFFER_Xmm7], xmm7 + movdqa [rcx + JUMP_BUFFER_Xmm8], xmm8 + movdqa [rcx + JUMP_BUFFER_Xmm9], xmm9 + movdqa [rcx + JUMP_BUFFER_Xmm10], xmm10 + movdqa [rcx + JUMP_BUFFER_Xmm11], xmm11 + movdqa [rcx + JUMP_BUFFER_Xmm12], xmm12 + movdqa [rcx + JUMP_BUFFER_Xmm13], xmm13 + movdqa [rcx + JUMP_BUFFER_Xmm14], xmm14 + movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 + xor rax, rax + ret +.endproc + + +/* + * void longjmp(jmp_buf env, int value); + * + * Parameters: <rcx> - jmp_buf setup by _setjmp + * <rdx> - int value to return + * Returns: Doesn't return + * Notes: Non-local goto + */ +.proc longjmp + + // FIXME: handle frame + + mov rbx, [rcx + JUMP_BUFFER_Rbx] + mov rbp, [rcx + JUMP_BUFFER_Rbp] + mov rsi, [rcx + JUMP_BUFFER_Rsi] + mov rdi, [rcx + JUMP_BUFFER_Rdi] + mov r12, [rcx + JUMP_BUFFER_R12] + mov r13, [rcx + JUMP_BUFFER_R13] + mov r14, [rcx + JUMP_BUFFER_R14] + mov r15, [rcx + JUMP_BUFFER_R15] + mov rsp, [rcx + JUMP_BUFFER_Rsp] + mov r8, [rcx + JUMP_BUFFER_Rip] + movdqa xmm6, [rcx + JUMP_BUFFER_Xmm6] + movdqa xmm7, [rcx + JUMP_BUFFER_Xmm7] + movdqa xmm8, [rcx + JUMP_BUFFER_Xmm8] + movdqa xmm9, [rcx + JUMP_BUFFER_Xmm9] + movdqa xmm10, [rcx + JUMP_BUFFER_Xmm10] + movdqa xmm11, [rcx + JUMP_BUFFER_Xmm11] + movdqa xmm12, [rcx + JUMP_BUFFER_Xmm12] + movdqa xmm13, [rcx + JUMP_BUFFER_Xmm13] + movdqa xmm14, [rcx + JUMP_BUFFER_Xmm14] + movdqa xmm15, [rcx + JUMP_BUFFER_Xmm15] + + /* return param2 or 1 if it was 0 */ + mov rax, rdx + test rax, rax + jnz 2f + inc rax +2: jmp r8 +.endproc Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 37948: undef _ftime before implementing it
by tkreuzer＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: tkreuzer Date: Mon Dec 8 16:31:27 2008 New Revision: 37948 URL: http://svn.reactos.org/svn/reactos?rev=37948&view=rev Log: undef _ftime before implementing it Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ftime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] Mon Dec 8 16:31:27 2008 @@ -17,6 +17,7 @@ /* * @implemented */ +#undef _ftime void _ftime( struct _timeb *tm ) { int ret = 0;

1 0

[cfinck] 37947: Revert r37916 and add some correct tests for WC_NO_BEST_FIT_CHARS, which pass under Windows XP SP3. They show that our implementation still has some bugs here and there.
by cfinck＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: cfinck Date: Mon Dec 8 16:18:50 2008 New Revision: 37947 URL: http://svn.reactos.org/svn/reactos?rev=37947&view=rev Log: Revert r37916 and add some correct tests for WC_NO_BEST_FIT_CHARS, which pass under Windows XP SP3. They show that our implementation still has some bugs here and there. Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] (original) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] Mon Dec 8 16:18:50 2008 @@ -79,7 +79,7 @@ OK(ret == 1, "ret is %d", ret); OK(mbc == 0, "mbc is %d", mbc); - /* msvcr80.dll changes mbc in the following call back to 0, msvcrt.dll from WinXP SP2 leaves it untouched */ + /* msvcr80.dll and later versions of CRT change mbc in the following call back to 0, msvcrt.dll from WinXP SP2 leaves it untouched */ mbc = 84; ret = wctomb(&mbc, dbwcs[0]); OK(ret == -1, "ret is %d", ret); @@ -193,46 +193,64 @@ void Win32_Tests(LPBOOL bUsedDefaultChar) { - /*int i;*/ - SetLastError(0xdeadbeef); puts("Win32-Tests"); puts("-----------"); - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == -28, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == 63, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(1251, WC_NO_BEST_FIT_CHARS, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == -16, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* The behaviour for this character is different when WC_NO_BEST_FIT_CHARS is used */ ret = WideCharToMultiByte(1251, WC_NO_BEST_FIT_CHARS, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); - OK(mbc == 97, "mbc is %d", mbc); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(mbc == 63, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "??"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + ZeroMemory(mbs, 5); + + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "??"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* This call triggers the last Win32 error */ - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(mbc == 84, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); @@ -241,7 +259,7 @@ /* WideCharToMultiByte mustn't add any null character automatically. So in this case, we should get the same string again, even if we only copied the first three bytes. */ - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 3, "ret is %d", ret); OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); @@ -249,71 +267,86 @@ ZeroMemory(mbs, 5); /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 3, "ret is %d", ret); OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + /* Chinese codepage tests + Swapping the WC_NO_BEST_FIT_CHARS and 0 tests causes bUsedDefaultChar to be set to TRUE in the following test, which quits with ERROR_INSUFFICIENT_BUFFER. + But as it isn't documented whether all other variables are undefined if ERROR_INSUFFICIENT_BUFFER is set, we skip this behaviour. */ + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 63, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + /* Double-byte tests */ - ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); - OK(ret == 0, "ret is %d", ret); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar == FALSE"); + ret = WideCharToMultiByte(950, 0, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); ZeroMemory(mbs, 5); - ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 2, "ret is %d", ret); OK(!strcmp(mbs, "µH"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* Length-only tests */ - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); - OK(ret == 1, "ret is %d", ret); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); - OK(ret == 5, "ret is %d", ret); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - - ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); OK(ret == 2, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, 0, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* Abnormal uses of WideCharToMultiByte */ - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(0, WC_NO_BEST_FIT_CHARS, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(0, 0, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "??"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef);

1 0

[janderwald] 37946: - Partly implement PcRegisterIoTimeout, PcUnregisterIoTimeout
by janderwald＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: janderwald Date: Mon Dec 8 15:42:44 2008 New Revision: 37946 URL: http://svn.reactos.org/svn/reactos?rev=37946&view=rev Log: - Partly implement PcRegisterIoTimeout, PcUnregisterIoTimeout Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Mon Dec 8 15:42:44 2008 @@ -30,3 +30,46 @@ return (CurrentTime.QuadPart - Since); } +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcRegisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + NTSTATUS Status; + + + /* FIXME + * check if timer is already used + */ + + Status = IoInitializeTimer(pDeviceObject, pTimerRoutine, pContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoInitializeTimer failed with %x\n", Status); + return Status; + } + + IoStartTimer(pDeviceObject); + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcUnregisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + /* FIXME + * check if timer is already used + */ + + IoStopTimer(pDeviceObject); + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Dec 8 15:42:44 2008 @@ -86,38 +86,6 @@ return STATUS_UNSUCCESSFUL; } - -/* =============================================================== - I/O Timeouts -*/ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterIoTimeout( - IN PDEVICE_OBJECT pDeviceObject, - IN PIO_TIMER_ROUTINE pTimerRoutine, - IN PVOID pContext) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcUnregisterIoTimeout( - IN PDEVICE_OBJECT pDeviceObject, - IN PIO_TIMER_ROUTINE pTimerRoutine, - IN PVOID pContext) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - /* =============================================================== Physical Connections */

1 0

[janderwald] 37945: - Implement IResourceList_AddEntryFromParent - Implement PcNewResourceSublist
by janderwald＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: janderwald Date: Mon Dec 8 14:18:02 2008 New Revision: 37945 URL: http://svn.reactos.org/svn/reactos?rev=37945&view=rev Log: - Implement IResourceList_AddEntryFromParent - Implement PcNewResourceSublist Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Mon Dec 8 14:18:02 2008 @@ -225,6 +225,27 @@ IN CM_RESOURCE_TYPE Type, IN ULONG Index) { + PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated; + PCM_RESOURCE_LIST NewTranslatedResources; + ULONG NewTranslatedSize; + IResourceListImpl * This = (IResourceListImpl*)iface; + + Translated = Parent->lpVtbl->FindTranslatedEntry(Parent, Type, Index); + if (!Translated) + return STATUS_INVALID_PARAMETER; + + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewTranslatedResources = ExAllocatePoolWithTag(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); + if (!NewTranslatedResources) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + ExFreePoolWithTag(This->TranslatedResourceList, TAG_PORTCLASS); + This->TranslatedResourceList = NewTranslatedResources; + NewTranslatedResources->List[0].PartialResourceList.Count++; + return STATUS_SUCCESS; } @@ -281,7 +302,7 @@ IN PCM_RESOURCE_LIST TranslatedResources, IN PCM_RESOURCE_LIST UntranslatedResources) { - IResourceListImpl* NewList = NULL; + IResourceListImpl* NewList; /* TODO: Validate parameters */ @@ -317,5 +338,53 @@ IN PRESOURCELIST ParentList, IN ULONG MaximumEntries) { - return STATUS_UNSUCCESSFUL; -} + IResourceListImpl* NewList, *Parent; + + if (!OuterUnknown || !ParentList || !MaximumEntries) + return STATUS_INVALID_PARAMETER; + + Parent = (IResourceListImpl*)ParentList; + + + if (!Parent->TranslatedResourceList->List->PartialResourceList.Count || + !Parent->UntranslatedResourceList->List->PartialResourceList.Count) + { + /* parent list can't be empty */ + return STATUS_INVALID_PARAMETER; + } + + NewList = ExAllocatePoolWithTag(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS); + if (!NewList) + return STATUS_INSUFFICIENT_RESOURCES; + + NewList->TranslatedResourceList = ExAllocatePoolWithTag(PoolType, sizeof(CM_RESOURCE_LIST), TAG_PORTCLASS); + if (!NewList->TranslatedResourceList) + { + ExFreePoolWithTag(NewList, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewList->UntranslatedResourceList = ExAllocatePoolWithTag(PoolType, sizeof(CM_RESOURCE_LIST), TAG_PORTCLASS); + if (!NewList->UntranslatedResourceList) + { + ExFreePoolWithTag(NewList->TranslatedResourceList, TAG_PORTCLASS); + ExFreePoolWithTag(NewList, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(NewList->TranslatedResourceList, Parent->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); + RtlCopyMemory(NewList->UntranslatedResourceList, Parent->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST)); + + /* mark list as empty */ + NewList->TranslatedResourceList->List->PartialResourceList.Count = 0; + NewList->UntranslatedResourceList->List->PartialResourceList.Count = 0; + + NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; + NewList->ref = 1; + NewList->OuterUnknown = OuterUnknown; + NewList->PoolType = PoolType; + + *OutResourceList = (IResourceList*)&NewList->lpVtbl; + + return STATUS_SUCCESS; +}

1 0

[gschneider] 37944: - IntGetDeviceGammaRamp: remove unneeded code, i * 256 is always smaller than 65535 (255*256=65280 is the biggest value), CID 35 - IntSetDeviceGammaRamp: don't copy data to NULL buffer, CID 195
by gschneider＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: gschneider Date: Mon Dec 8 13:44:13 2008 New Revision: 37944 URL: http://svn.reactos.org/svn/reactos?rev=37944&view=rev Log: - IntGetDeviceGammaRamp: remove unneeded code, i * 256 is always smaller than 65535 (255*256=65280 is the biggest value), CID 35 - IntSetDeviceGammaRamp: don't copy data to NULL buffer, CID 195 Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Mon Dec 8 13:44:13 2008 @@ -118,7 +118,6 @@ for(i=0; i<256; i++ ) { int NewValue = i * 256; - if (NewValue > 65535) NewValue = 65535; Ramp->Red[i] = Ramp->Green[i] = Ramp->Blue[i] = ((WORD)NewValue); } @@ -350,7 +349,8 @@ pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); pGDev->flFlags |= PDEV_GAMMARAMP_TABLE; } - RtlCopyMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)); + if (pGDev->pvGammaRamp) + RtlCopyMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)); Ret = UpdateDeviceGammaRamp(hPDev);

1 0

[janderwald] 37943: - Experimental IInterrupt object implementation
by janderwald＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: janderwald Date: Mon Dec 8 13:08:07 2008 New Revision: 37943 URL: http://svn.reactos.org/svn/reactos?rev=37943&view=rev Log: - Experimental IInterrupt object implementation Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Mon Dec 8 13:08:07 2008 @@ -1,0 +1,336 @@ +#include "private.h" + +typedef struct +{ + LIST_ENTRY ListEntry; + PINTERRUPTSYNCROUTINE SyncRoutine; + PVOID DynamicContext; +}SYNC_ENTRY, *PSYNC_ENTRY; + +typedef struct +{ + IInterruptSyncVtbl *lpVtbl; + + LONG ref; + KSPIN_LOCK Lock; + LIST_ENTRY ServiceRoutines; + PKINTERRUPT Interrupt; + INTERRUPTSYNCMODE Mode; + PRESOURCELIST ResourceList; + ULONG ResourceIndex; + + PINTERRUPTSYNCROUTINE SyncRoutine; + PVOID DynamicContext; +}IInterruptSyncImpl; + + +//--------------------------------------------------------------- +// IUnknown methods +// + +const GUID IID_IInterruptSync; + +NTSTATUS +NTAPI +IInterruptSync_fnQueryInterface( + IInterruptSync * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IInterruptSync)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IInterruptSync_fnAddRef( + IInterruptSync * iface) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + DPRINT("IInterruptSync_AddRef: This %p\n", This); + + return _InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IInterruptSync_fnRelease( + IInterruptSync* iface) +{ + PLIST_ENTRY CurEntry; + PSYNC_ENTRY Entry; + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + _InterlockedDecrement(&This->ref); + + DPRINT("IInterruptSync_Release: This %p new ref %u\n", This, This->ref); + + if (This->ref == 0) + { + if (This->Interrupt) + { + DPRINT1("Interrupt not disconnected! %p\n", This->Interrupt); + IoDisconnectInterrupt(This->Interrupt); + } + while(!IsListEmpty(&This->ServiceRoutines)) + { + CurEntry = RemoveHeadList(&This->ServiceRoutines); + Entry = CONTAINING_RECORD(CurEntry, SYNC_ENTRY, ListEntry); + ExFreePoolWithTag(Entry, TAG_PORTCLASS); + } + + This->ResourceList->lpVtbl->Release(This->ResourceList); + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +//--------------------------------------------------------------- +// IInterruptSync methods +// + + +BOOLEAN +NTAPI +IInterruptSynchronizedRoutine( + IN PVOID ServiceContext) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; + + return This->SyncRoutine((IInterruptSync*)This, This->DynamicContext); +} + +NTSTATUS +NTAPI +IInterruptSync_fnCallSynchronizedRoutine( + IN IInterruptSync * iface, + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + if (!This->Interrupt) + { + DPRINT("IInterruptSync_CallSynchronizedRoutine %p no interrupt connected\n", This); + return STATUS_UNSUCCESSFUL; + } + + This->SyncRoutine = Routine; + This->DynamicContext = DynamicContext; + + return KeSynchronizeExecution(This->Interrupt, IInterruptSynchronizedRoutine, (PVOID)This); +} + +NTAPI +PKINTERRUPT +IInterruptSync_fnGetKInterrupt( + IN IInterruptSync * iface) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + return This->Interrupt; +} + +BOOLEAN +NTAPI +IInterruptServiceRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) +{ + PLIST_ENTRY CurEntry; + PSYNC_ENTRY Entry; + NTSTATUS Status; + BOOL Success; + IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; + + if (This->Mode == InterruptSyncModeNormal) + { + CurEntry = This->ServiceRoutines.Flink; + while (CurEntry != &This->ServiceRoutines) + { + Entry = CONTAINING_RECORD(CurEntry, SYNC_ENTRY, ListEntry); + Status = Entry->SyncRoutine((IInterruptSync*)This, Entry->DynamicContext); + if (NT_SUCCESS(Status)) + { + return TRUE; + } + CurEntry = CurEntry->Flink; + } + return FALSE; + } + else if (This->Mode == InterruptSyncModeAll) + { + CurEntry = This->ServiceRoutines.Flink; + while (CurEntry != &This->ServiceRoutines) + { + Entry = CONTAINING_RECORD(CurEntry, SYNC_ENTRY, ListEntry); + Status = Entry->SyncRoutine((IInterruptSync*)This, Entry->DynamicContext); + CurEntry = CurEntry->Flink; + } + DPRINT("Returning TRUE with mode InterruptSyncModeAll\n"); + return TRUE; //FIXME + } + else if (This->Mode == InterruptSyncModeRepeat) + { + do + { + Success = FALSE; + CurEntry = This->ServiceRoutines.Flink; + while (CurEntry != &This->ServiceRoutines) + { + Entry = CONTAINING_RECORD(CurEntry, SYNC_ENTRY, ListEntry); + Status = Entry->SyncRoutine((IInterruptSync*)This, Entry->DynamicContext); + if (NT_SUCCESS(Status)) + Success = TRUE; + CurEntry = CurEntry->Flink; + } + }while(Success); + DPRINT("Returning TRUE with mode InterruptSyncModeRepeat\n"); + return TRUE; //FIXME + } + else + { + DPRINT("Unknown mode %u\n", This->Mode); + return FALSE; //FIXME + } +} + + +NTSTATUS +NTAPI +IInterruptSync_fnConnect( + IN IInterruptSync * iface) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + NTSTATUS Status; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + + Descriptor = This->ResourceList->lpVtbl->FindTranslatedEntry(This->ResourceList, CmResourceTypeInterrupt, This->ResourceIndex); + if (!Descriptor) + return STATUS_UNSUCCESSFUL; + + if (IsListEmpty(&This->ServiceRoutines)) + return STATUS_UNSUCCESSFUL; + + Status = IoConnectInterrupt(&This->Interrupt, + IInterruptServiceRoutine, + (PVOID)This, + &This->Lock, Descriptor->u.Interrupt.Vector, + Descriptor->u.Interrupt.Level, + Descriptor->u.Interrupt.Level, //FIXME + LevelSensitive, //FIXME + TRUE, //FIXME + Descriptor->u.Interrupt.Affinity, + FALSE); + + return Status; +} + + +VOID +NTAPI +IInterruptSync_fnDisconnect( + IN IInterruptSync * iface) +{ + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + if (!This->Interrupt) + { + DPRINT("IInterruptSync_Disconnect %p no interrupt connected\n", This); + return; + } + + IoDisconnectInterrupt(This->Interrupt); + This->Interrupt = NULL; +} + +NTSTATUS +NTAPI +IInterruptSync_fnRegisterServiceRoutine( + IN IInterruptSync * iface, + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext, + IN BOOLEAN First) +{ + PSYNC_ENTRY NewEntry; + IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; + + NewEntry = ExAllocatePoolWithTag(NonPagedPool, sizeof(SYNC_ENTRY), TAG_PORTCLASS); + if (!NewEntry) + return STATUS_INSUFFICIENT_RESOURCES; + + NewEntry->SyncRoutine = Routine; + NewEntry->DynamicContext = DynamicContext; + + if (First) + InsertHeadList(&This->ServiceRoutines, &NewEntry->ListEntry); + else + InsertTailList(&This->ServiceRoutines, &NewEntry->ListEntry); + + return STATUS_SUCCESS; +} + +static IInterruptSyncVtbl vt_IInterruptSyncVtbl = +{ + /* IUnknown methods */ + IInterruptSync_fnQueryInterface, + IInterruptSync_fnAddRef, + IInterruptSync_fnRelease, + /* IInterruptSync methods */ + IInterruptSync_fnCallSynchronizedRoutine, + IInterruptSync_fnGetKInterrupt, + IInterruptSync_fnConnect, + IInterruptSync_fnDisconnect, + IInterruptSync_fnRegisterServiceRoutine +}; + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcNewInterruptSync( + OUT PINTERRUPTSYNC* OutInterruptSync, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN PRESOURCELIST ResourceList, + IN ULONG ResourceIndex, + IN INTERRUPTSYNCMODE Mode) +{ + IInterruptSyncImpl * This; + + + if (!OutInterruptSync || !ResourceList || Mode > InterruptSyncModeRepeat || Mode < 0) + return STATUS_INVALID_PARAMETER; + + if (ResourceIndex > ResourceList->lpVtbl->NumberOfEntriesOfType(ResourceList, CmResourceTypeInterrupt)) + return STATUS_INVALID_PARAMETER; + + ResourceList->lpVtbl->AddRef(ResourceList); + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IInterruptSyncImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IInterruptSyncVtbl; + This->ref = 1; + This->Mode = Mode; + This->Interrupt = NULL; + This->ResourceIndex = ResourceIndex; + This->ResourceList = ResourceList; + InitializeListHead(&This->ServiceRoutines); + KeInitializeSpinLock(&This->Lock); + + *OutInterruptSync = (PINTERRUPTSYNC)&This->lpVtbl; + return STATUS_UNSUCCESSFUL; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Dec 8 13:08:07 2008 @@ -15,6 +15,7 @@ <file>dma_slave.c</file> <file>adapter.c</file> <file>irp.c</file> + <file>interrupt.c</file> <file>drm.c</file> <file>stubs.c</file> <file>undoc.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Dec 8 13:08:07 2008 @@ -23,21 +23,6 @@ IN POOL_TYPE PoolType, IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcNewInterruptSync( - OUT PINTERRUPTSYNC* OUtInterruptSync, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN PRESOURCELIST ResourceList, - IN ULONG ResourceIndex, - IN INTERRUPTSYNCMODE Mode) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL;

1 0

[janderwald] 37942: - Add IID_IInterruptSync
by janderwald＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: janderwald Date: Mon Dec 8 13:06:15 2008 New Revision: 37942 URL: http://svn.reactos.org/svn/reactos?rev=37942&view=rev Log: - Add IID_IInterruptSync Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Dec 8 13:06:15 2008 @@ -694,7 +694,7 @@ IN BOOLEAN WriteToDevice) PURE; \ \ STDMETHOD_(NTSTATUS, Stop)( THIS ) PURE; \ - STDMETHOD_(NTSTATUS, ReadCounter)( THIS ) PURE; \ + STDMETHOD_(ULONG, ReadCounter)( THIS ) PURE; \ \ STDMETHOD_(NTSTATUS, WaitForTC)( THIS_ \ ULONG Timeout) PURE; @@ -705,16 +705,19 @@ IN BOOLEAN WriteToDevice); \ \ STDMETHODIMP_(NTSTATUS) Stop(void); \ - STDMETHODIMP_(NTSTATUS) ReadCounter)(void); \ + STDMETHODIMP_(ULONG) ReadCounter)(void); \ \ STDMETHODIMP_(NTSTATUS, WaitForTC)( \ ULONG Timeout); +#undef INTERFACE +#define INTERFACE IDmaChannelSlave + DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) { - DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_DMACHANNEL() - DEFINE_ABSTRACT_DMACHANNELSLAVE() + DEFINE_ABSTRACT_UNKNOWN(); + DEFINE_ABSTRACT_DMACHANNEL(); + DEFINE_ABSTRACT_DMACHANNELSLAVE(); }; typedef IDmaChannelSlave *PDMACHANNELSLAVE; @@ -737,6 +740,9 @@ IN struct IInterruptSync* InterruptSync, IN PVOID DynamicContext); +#undef INTERFACE +#define INTERFACE IInterruptSync + DECLARE_INTERFACE_(IInterruptSync, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -754,6 +760,8 @@ IN PVOID DynamicContext, IN BOOLEAN First) PURE; }; + +DEFINE_GUID(IID_IInterruptSync, 0x22C6AC63L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); #define IMP_IInterruptSync \ STDMETHODIMP_(NTSTATUS, CallSynchronizedRoutine)( \

1 0

[gschneider] 37941: Fix two duplicate checks - obviously copy/pasted, CIDs 74 and 75
by gschneider＠svn.reactos.org 08 Dec '08

08 Dec '08

Author: gschneider Date: Mon Dec 8 11:02:19 2008 New Revision: 37941 URL: http://svn.reactos.org/svn/reactos?rev=37941&view=rev Log: Fix two duplicate checks - obviously copy/pasted, CIDs 74 and 75 Modified: trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Mon Dec 8 11:02:19 2008 @@ -1044,7 +1044,7 @@ 0, 0, 0); - if (hMapping == 0) + if (BaseAddress == NULL) { CloseHandle(hMapping); CloseHandle(hFile); @@ -1110,7 +1110,7 @@ 0, 0, 0); - if (hMapping == 0) + if (BaseAddress == NULL) { CloseHandle(hMapping); CloseHandle(hFile);

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