Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 52659: [APITESTS] - Add some more tests to NtFreeVirtualMemory
by jgardou＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: jgardou Date: Tue Jul 12 17:55:20 2011 New Revision: 52659 URL: http://svn.reactos.org/svn/reactos?rev=52659&view=rev Log: [APITESTS] - Add some more tests to NtFreeVirtualMemory Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtFreeVirt… ============================================================================== --- trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] Tue Jul 12 17:55:20 2011 @@ -111,6 +111,38 @@ ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); ok(Buffer2 == (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE), "The buffer is not aligned to PAGE_SIZE.\n"); + /* Same, but try to free the second page before the first one */ + Length = 2*PAGE_SIZE; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Buffer, + 0, + &Length, + MEM_RESERVE, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); + + Buffer2 = (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE); + Length = PAGE_SIZE; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Buffer2, + &Length, + MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(Buffer2 == (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE), "The buffer is not aligned to PAGE_SIZE.\n"); + + Buffer2 = Buffer; + Length = PAGE_SIZE; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Buffer2, + &Length, + MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08x\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); + /* Now allocate two pages and try to free them in the middle */ Length = 2*PAGE_SIZE; Status = NtAllocateVirtualMemory(NtCurrentProcess(),

1 0

[jgardou] 52658: [APITEST] - add one more test to NtFreeVirtualMemory
by jgardou＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: jgardou Date: Tue Jul 12 17:36:52 2011 New Revision: 52658 URL: http://svn.reactos.org/svn/reactos?rev=52658&view=rev Log: [APITEST] - add one more test to NtFreeVirtualMemory Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtFreeVirt… ============================================================================== --- trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] Tue Jul 12 17:36:52 2011 @@ -110,6 +110,28 @@ ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08x\n", Status); ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); ok(Buffer2 == (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE), "The buffer is not aligned to PAGE_SIZE.\n"); + + /* Now allocate two pages and try to free them in the middle */ + Length = 2*PAGE_SIZE; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Buffer, + 0, + &Length, + MEM_RESERVE, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); + + Buffer2 = (PVOID)((ULONG_PTR)Buffer+1); + Length = PAGE_SIZE; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Buffer2, + &Length, + MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); } START_TEST(NtFreeVirtualMemory)

1 0

[nyadav] 52657: [AUDSRV] Finally a working audio mixer :)
by nyadav＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: nyadav Date: Tue Jul 12 16:45:52 2011 New Revision: 52657 URL: http://svn.reactos.org/svn/reactos?rev=52657&view=rev Log: [AUDSRV] Finally a working audio mixer :) Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -120,7 +120,7 @@ long WriteBuffer(LONG streamid, LONG length, - LPVOID buffer); + char * buffer); /*mixer.c*/ void * MixS8(MixerEngine * mixer, int buffer); Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -82,9 +82,9 @@ long AUDPlayBuffer( IN RPC_BINDING_HANDLE hBinding, LONG streamid, LONG length, - LPVOID buffer) + char* buffer) { - WriteBuffer(streamid,length,NULL); + WriteBuffer(streamid,length,buffer); return 0; } /*************************************************************************/ Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -198,10 +198,8 @@ long WriteBuffer(LONG streamid, LONG length, - LPVOID buffer) -{ - int i =0; - PSHORT tempbuf; + char * buffer) +{ ServerStream * localstream = pengine->serverstreamlist; while(localstream!=NULL) { @@ -216,16 +214,12 @@ if(localstream->state == 0) { - localstream->length_genuine = localstream->freq * localstream->channels * localstream->bitspersample / 8; - localstream->genuinebuf = tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), + localstream->length_genuine = length; + localstream->genuinebuf = (PSHORT) HeapAlloc(GetProcessHeap(), 0, - localstream->length_genuine); - - while (i < localstream->length_genuine / 2) - { - tempbuf[i+1] = tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); - i+=2; - } + length); + + memcpy(localstream->genuinebuf,buffer,length); localstream->state = 1; } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -8,6 +8,7 @@ */ #include "audsrvapi.h" +#include <math.h> /*All the wrappers for Remote Function should be here*/ int status = 0; @@ -75,6 +76,10 @@ WINAPI PlayAudio ( ClientStream * clientstream ) { + /******************************************/ + int i =0; + PSHORT tempbuf; + /******************************************/ /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); @@ -90,26 +95,39 @@ if(clientstream->dead) break; - /*Check Connection Status If not connected call Connect()*/ - /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ - RpcTryExcept - { - AUDPlayBuffer (audsrv_v0_0_c_ifspec, - clientstream->stream, - 0, - NULL); - } - RpcExcept(1) - { - status = RpcExceptionCode(); - } - RpcEndExcept - - clientstream->callbacks.BufferCopied(0); + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ + tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), + 0, + 44100); + + for(i = 0;i<22050;i+=2) + { + tempbuf[i+1] = tempbuf[i] = 0x7FFF * sin( i * 500 * 3.14 / clientstream->wavefreq); + } + + RpcTryExcept + { + AUDPlayBuffer (audsrv_v0_0_c_ifspec, + clientstream->stream, + 44100, + (char *)tempbuf); + } + RpcExcept(1) + { + status = RpcExceptionCode(); + } + RpcEndExcept + + HeapFree(GetProcessHeap(), + 0, + tempbuf); + + clientstream->callbacks.BufferCopied(0); } clientstream->callbacks.PlayComplete(0); -/*Audio Thread Ended*/ + /*Audio Thread Ended*/ return 0; } Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -58,8 +58,8 @@ DWORD dwID; HANDLE audiothread = NULL; char input='\0'; - printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); - //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); + printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\nPlease Enter the frequency of the sinusoidal wave [Hz] : "); + scanf("%ld",&(clientstream.wavefreq)); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ error = InitStream ( &clientstream , Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -2,7 +2,7 @@ * Event Log RPC interface definition */ -#include <ms-dtyp.idl> +#include <wtypes.idl> cpp_quote("#if !defined(__AUDSRV_H__) ") @@ -40,5 +40,5 @@ { long AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in]int datatype,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); - long AUDPlayBuffer([in] handle_t h1,[in]LONG streamid,[in]LONG length,[in]LPVOID buffer); + long AUDPlayBuffer([in] handle_t h1,[in]LONG streamid,[in]LONG length,[in, size_is(length)]char* buffer); } Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Tue Jul 12 16:45:52 2011 @@ -21,6 +21,9 @@ int dead; HANDLE ClientEventPool[1]; struct CallBacks callbacks; + + /*Just for the time being when we dont have any audio source*/ + long wavefreq; } ClientStream; /********************API Functions******************/

1 0

[tkreuzer] 52656: [WIN32K] Fix MIN_SYSCALL_NUMBER and MAX_SYSCALL_NUMBER
by tkreuzer＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: tkreuzer Date: Tue Jul 12 15:39:24 2011 New Revision: 52656 URL: http://svn.reactos.org/svn/reactos?rev=52656&view=rev Log: [WIN32K] Fix MIN_SYSCALL_NUMBER and MAX_SYSCALL_NUMBER Modified: trunk/reactos/subsystems/win32/win32k/include/napi.h Modified: trunk/reactos/subsystems/win32/win32k/include/napi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] Tue Jul 12 15:39:24 2011 @@ -16,7 +16,7 @@ #include "w32ksvc.h" }; -#define MIN_SYSCALL_NUMBER 0 +#define MIN_SYSCALL_NUMBER 0x1000 #define NUMBER_OF_SYSCALLS (sizeof(Win32kSSPT) / sizeof(Win32kSSPT[0])) -#define MAX_SYSCALL_NUMBER (NUMBER_OF_SYSCALLS - 1) +#define MAX_SYSCALL_NUMBER 0x1000 + (NUMBER_OF_SYSCALLS - 1) ULONG Win32kNumberOfSysCalls = NUMBER_OF_SYSCALLS;

1 0

[cmihail] 52655: [lwIP] - Upgrade to the latest version of lwIP (1.40)
by cmihail＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: cmihail Date: Tue Jul 12 14:06:50 2011 New Revision: 52655 URL: http://svn.reactos.org/svn/reactos?rev=52655&view=rev Log: [lwIP] - Upgrade to the latest version of lwIP (1.40) Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/api_lib.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/api_msg.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/err.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/sockets.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/tcpip.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/dhcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/dns.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/init.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/autoip.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/icmp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/igmp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip_addr.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/raw.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/snmp/mib2.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_out.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/timers.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/udp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/ipv4/lwip/ip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/api.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/api_msg.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/debug.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/dhcp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/dns.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/err.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/init.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/mem.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/netdb.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/opt.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/sockets.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp_impl.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwipopts.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/netif/etharp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/etharp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/auth.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/auth.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chap.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chap.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chpms.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/fsm.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/fsm.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ipcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ipcp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/lcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/lcp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/magic.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/magic.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/md5.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pap.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pap.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp_oe.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pppdebug.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/randm.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/vj.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/vj.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/slipif.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/api_lib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/api_msg.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/err.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/sockets.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/api/tcpip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/dhcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/dns.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/init.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/autoip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/igmp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip_addr.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/raw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/snmp/mib2.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_out.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/timers.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/udp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/ipv4/lwip/ip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/api.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/api_msg.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/debug.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/dhcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/dns.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/err.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/init.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/mem.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/netdb.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/opt.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/sockets.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp_impl.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/netif/etharp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/etharp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/auth.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/auth.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chap.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chap.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/chpms.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/fsm.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/fsm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ipcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ipcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/lcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/lcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/magic.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/magic.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/md5.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pap.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pap.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/ppp_oe.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/pppdebug.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/randm.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/vj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/ppp/vj.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/netif/slipif.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive…

1 0

[tkreuzer] 52654: [NTDLL/LDR] Hey Arch, stop corrupting the stack!
by tkreuzer＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: tkreuzer Date: Tue Jul 12 12:55:03 2011 New Revision: 52654 URL: http://svn.reactos.org/svn/reactos?rev=52654&view=rev Log: [NTDLL/LDR] Hey Arch, stop corrupting the stack! Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Tue Jul 12 12:55:03 2011 @@ -681,9 +681,9 @@ DPRINT("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry); /* Set up the Act Ctx */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); /* Check if we have a manifest prober routine */ if (LdrpManifestProberRoutine)

1 0

[nyadav] 52653: [AUDSRV] server ready to accept actual buffer from client
by nyadav＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: nyadav Date: Tue Jul 12 10:50:31 2011 New Revision: 52653 URL: http://svn.reactos.org/svn/reactos?rev=52653&view=rev Log: [AUDSRV] server ready to accept actual buffer from client Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -44,7 +44,8 @@ /*Balance from -1.0 to 1.0*/ float balance; - BOOL ready; + /*state cycle 0->buffer write -> 1 -> filtering -> 2 ->playback -> 0*/ + char state; /*This buffer is filled by the client using RPC calls*/ PVOID genuinebuf; int length_genuine; @@ -56,6 +57,7 @@ PVOID maxsamplevalue; HANDLE stream_played_event; + HANDLE buffer_write_event; HANDLE threadready; HANDLE thread; CRITICAL_SECTION CriticalSection; @@ -116,6 +118,9 @@ int mute, float balance); +long WriteBuffer(LONG streamid, + LONG length, + LPVOID buffer); /*mixer.c*/ void * MixS8(MixerEngine * mixer, int buffer); Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -4,7 +4,6 @@ * FILE: services/mixer.c * PURPOSE: Audio Server * COPYRIGHT: Copyright 2011 Neeraj Yadav - */ #include "audsrv.h" @@ -32,7 +31,7 @@ length = stream->length_filtered; while(stream->next != NULL) { - if(stream->length_filtered > length && stream->ready == TRUE ) + if(stream->length_filtered > length && stream->state == 2 ) length = stream->length_filtered; stream = stream->next; } @@ -47,11 +46,11 @@ minsamplevalue = 0; maxsamplevalue = 0; - while( stream != NULL) + while(stream != NULL) { EnterCriticalSection(&(stream->CriticalSection)); - if(stream->ready == TRUE && *(short *) stream->minsamplevalue != 0 && *(short *) stream->minsamplevalue != 0) + if(stream->state == 2 && *(short *) stream->minsamplevalue != 0 && *(short *) stream->minsamplevalue != 0) { coefficient = 1.0; @@ -78,12 +77,14 @@ localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); } + stream->state = 0; + HeapFree(GetProcessHeap(), + 0, + stream->filteredbuf); + + SetEvent(stream->stream_played_event); } - //stream->ready = 0; /*TODO Enable it when actual filter thread starts working*/ - //HeapFree(GetProcessHeap(), - // 0, - // stream->filteredbuf); - SetEvent(stream->stream_played_event); + LeaveCriticalSection(&(stream->CriticalSection)); streamcount++; Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -79,6 +79,14 @@ return stream; } +long AUDPlayBuffer( IN RPC_BINDING_HANDLE hBinding, + LONG streamid, + LONG length, + LPVOID buffer) +{ + WriteBuffer(streamid,length,NULL); + return 0; +} /*************************************************************************/ void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) { Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -4,7 +4,6 @@ * FILE: services/stream.c * PURPOSE: Audio Server * COPYRIGHT: Copyright 2011 Neeraj Yadav - */ #include "audsrv.h" @@ -15,92 +14,53 @@ pengine->streamidpool += 1; return streamid; } +BOOL FilterAudio(LPVOID param) +{ + ServerStream * localstream = (ServerStream *) param; + + EnterCriticalSection(&(localstream->CriticalSection)); + + if(localstream->state == 1) + { + /*Fake Filter,Simply gives the genuine buffer as filtered buffer*/ + /*minsamplevalue and maxsamplevalue must be calculated during filtering*/ + /*Filter must ensure that all the samples are distributed evenly about 0 in case of signed samples*/ + localstream->length_filtered = localstream->length_genuine; + localstream->filteredbuf = HeapAlloc(GetProcessHeap(), + 0, + localstream->length_filtered); + + memcpy(localstream->filteredbuf,localstream->genuinebuf,localstream->length_filtered); + + HeapFree(GetProcessHeap(), + 0, + localstream->genuinebuf); + + *((int *)localstream->minsamplevalue) = -32766; + *((int *)localstream->maxsamplevalue) = 32766; + + localstream->state = 2; + + LeaveCriticalSection(&(localstream->CriticalSection)); + return TRUE; + } + else + { + LeaveCriticalSection(&(localstream->CriticalSection)); + return FALSE; + } +} DWORD WINAPI RunStreamThread(LPVOID param) { - UINT i = 0; ServerStream * localstream = (ServerStream *) param; -/*UGLY HACK--WILL be removed soon-- fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ -/******************************************************/ - BOOL initmin=FALSE,initmax = FALSE; - short minimum=0,maximum = 0; - PSHORT tempbuf; - - - localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; - tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), - 0, - localstream->length_filtered); - - while (i < localstream->length_filtered / 2) - { - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); - - if((localstream->streamid %2) == 0) - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); - - if(initmin) - { - if(tempbuf[i]<minimum) - minimum = tempbuf[i]; - }else - minimum = tempbuf[i]; - if(initmax) - { - if(tempbuf[i]>maximum) - maximum = tempbuf[i]; - }else - maximum = tempbuf[i]; - - if(initmin == FALSE || initmax == FALSE ) - { - initmin = TRUE; - initmax = TRUE; - } - i++; - - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); - - if((localstream->streamid %2) == 0) - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); - - - if(initmin) - { - if(tempbuf[i]<minimum) - minimum = tempbuf[i]; - } - else - minimum = tempbuf[i]; - - if(initmax) - { - if(tempbuf[i]>maximum) - maximum = tempbuf[i]; - }else - maximum = tempbuf[i]; - i++; - } - - *((int *)localstream->minsamplevalue) = minimum; - *((int *)localstream->maxsamplevalue) = maximum; - localstream->filteredbuf = tempbuf; - localstream->ready =TRUE; - -/******************************************************/ -/*Do Some Initialization If needed.Only After these Initialization remaining system will be told that stream is ready*/ SetEvent(localstream->threadready); while (TRUE) { - /*Wait For Data Write Event,currently NO Wait considering Data has always been written*/ - - EnterCriticalSection(&(localstream->CriticalSection)); - - LeaveCriticalSection(&(localstream->CriticalSection)); - /*Wait For Stream Played Event*/ - WaitForSingleObject(localstream->stream_played_event,INFINITE); + if(FilterAudio(param) == TRUE ) + WaitForSingleObject(localstream->stream_played_event,INFINITE); } /*Clean Stream's data*/ } @@ -157,7 +117,7 @@ newstream->channels = channels; /*TODO validation*/ newstream->channelmask = channelmask; /*TODO validation*/ - newstream->ready = FALSE; + newstream->state = 0; newstream->length_genuine = 0; newstream->genuinebuf = NULL; newstream->length_filtered = 0; @@ -177,6 +137,11 @@ FALSE, NULL); + newstream->buffer_write_event = CreateEvent(NULL, + FALSE, + FALSE, + NULL); + newstream->threadready = CreateEvent(NULL, FALSE, FALSE, @@ -231,5 +196,43 @@ return 0; } +long WriteBuffer(LONG streamid, + LONG length, + LPVOID buffer) +{ + int i =0; + PSHORT tempbuf; + ServerStream * localstream = pengine->serverstreamlist; + while(localstream!=NULL) + { + if(localstream->streamid == streamid) break; + localstream = localstream->next; + } + + if(localstream == NULL) + return -1; + + EnterCriticalSection(&(localstream->CriticalSection)); + + if(localstream->state == 0) + { + localstream->length_genuine = localstream->freq * localstream->channels * localstream->bitspersample / 8; + localstream->genuinebuf = tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), + 0, + localstream->length_genuine); + + while (i < localstream->length_genuine / 2) + { + tempbuf[i+1] = tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); + i+=2; + } + + localstream->state = 1; + } + + LeaveCriticalSection(&(localstream->CriticalSection)); + + return 0; +} /*Dont forget to clean ServerStream's minsamplevalue and maxsamplevalue while removing the stream*/ /*Delete Critical Section while cleaning Stream*/ Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -92,7 +92,19 @@ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ - Sleep(1000); + RpcTryExcept + { + AUDPlayBuffer (audsrv_v0_0_c_ifspec, + clientstream->stream, + 0, + NULL); + } + RpcExcept(1) + { + status = RpcExceptionCode(); + } + RpcEndExcept + clientstream->callbacks.BufferCopied(0); } clientstream->callbacks.PlayComplete(0); Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -40,5 +40,5 @@ { long AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in]int datatype,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); - + long AUDPlayBuffer([in] handle_t h1,[in]LONG streamid,[in]LONG length,[in]LPVOID buffer); }

1 0

[gadamopoulos] 52652: [win32k] - Call UserUnregisterUserApiHook from the process cleanup routine if the process has registered the user api hook
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 09:24:16 2011 New Revision: 52652 URL: http://svn.reactos.org/svn/reactos?rev=52652&view=rev Log: [win32k] - Call UserUnregisterUserApiHook from the process cleanup routine if the process has registered the user api hook Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Jul 12 09:24:16 2011 @@ -382,6 +382,18 @@ } while (pti); } + + /* Do now some process cleanup that requires a valid win32 thread */ + if(Win32Thread->ppi->cThreads == 0) + { + /* Check if we have registered the user api hook */ + if(Win32Thread->ppi == ppiUahServer) + { + /* Unregister the api hook without blocking */ + UserUnregisterUserApiHook(FALSE); + } + } + DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); EVENT_DestroyThreadEvents(Thread);

1 0

[gadamopoulos] 52651: [user32] - Implement UnregisterUserApiHook - Fix a warning
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 09:14:24 2011 New Revision: 52651 URL: http://svn.reactos.org/svn/reactos?rev=52651&view=rev Log: [user32] - Implement UnregisterUserApiHook - Fix a warning Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] Tue Jul 12 09:14:24 2011 @@ -259,7 +259,7 @@ RtlEnterCriticalSection(&gcsUserApiHook); - if (!pfn(uahLoadInit,(ULONG_PTR)&uah) || // Swap data, User32 to and Uxtheme from! + if (!pfn(uahLoadInit,&uah) || // Swap data, User32 to and Uxtheme from! uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook || uah.size <= 0 ) { @@ -391,7 +391,5 @@ */ BOOL WINAPI UnregisterUserApiHook(VOID) { - // Direct call to Win32k! Here only as a prototype..... - UNIMPLEMENTED; - return FALSE; -} + return NtUserUnregisterUserApiHook(); +}

1 0

[gadamopoulos] 52650: [win32k] - Implement NtUserRegisterUserApiHook and NtUserUnregisterUserApiHook
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 08:43:43 2011 New Revision: 52650 URL: http://svn.reactos.org/svn/reactos?rev=52650&view=rev Log: [win32k] - Implement NtUserRegisterUserApiHook and NtUserUnregisterUserApiHook Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -4,6 +4,13 @@ #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) #define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks & HOOKID_TO_FLAG(HookId)) + +/* NOTE: the following definition is not a real hook but + a pseudo-id that will be used only for + injecting user api hook module to all processes. + It is used internally in win32k */ +#define WH_APIHOOK WH_MAX + 1 + typedef struct tagEVENTHOOK { @@ -43,4 +50,10 @@ LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); BOOL FASTCALL IntUnhookWindowsHook(int,HOOKPROC); +BOOL FASTCALL UserLoadApiHook(); +BOOL IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload); +BOOL FASTCALL UserUnregisterUserApiHook(BOOL Block); + +extern PPROCESSINFO ppiUahServer; + /* EOF */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -7,6 +7,7 @@ #define MSQ_NORMAL 0 #define MSQ_ISHOOK 1 #define MSQ_ISEVENT 2 +#define MSQ_INJECTMODULE 3 #define QSIDCOUNTS 6 Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -30,6 +30,7 @@ #define W32PF_NOWINDOWGHOSTING (0x01000000) #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) +#define W32PF_APIHOOKLOADED (0x08000000) extern BOOL ClientPfnInit; extern HINSTANCE hModClient; Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -24,7 +24,219 @@ PVOID pHookStructs; } HOOKPACK, *PHOOKPACK; +UNICODE_STRING strUahModule; +UNICODE_STRING strUahInitFunc; +PPROCESSINFO ppiUahServer; + /* PRIVATE FUNCTIONS *********************************************************/ + +/* Calls ClientLoadLibrary in user32 in order to load or unload a module */ +BOOL +IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload) +{ + PPROCESSINFO ppi; + HMODULE hmod; + + ppi = PsGetCurrentProcessWin32Process(); + + DPRINT("IntLoadHookModule. Client PID: %d\n", PsGetProcessId(ppi->peProcess)); + + /* Check if this is the api hook */ + if(iHookID == WH_APIHOOK) + { + if(!Unload && !(ppi->W32PF_flags & W32PF_APIHOOKLOADED)) + { + /* Call ClientLoadLibrary in user32 */ + hmod = co_IntClientLoadLibrary(&strUahModule, &strUahInitFunc, Unload, TRUE); + if(hmod != 0) + { + ppi->W32PF_flags |= W32PF_APIHOOKLOADED; + return TRUE; + } + return FALSE; + } + else if(Unload && (ppi->W32PF_flags & W32PF_APIHOOKLOADED)) + { + /* Call ClientLoadLibrary in user32 */ + hmod = co_IntClientLoadLibrary(NULL, NULL, Unload, TRUE); + if(hmod != 0) + { + ppi->W32PF_flags &= ~W32PF_APIHOOKLOADED; + return TRUE; + } + return FALSE; + } + + return TRUE; + } + + UNIMPLEMENTED; + + return FALSE; +} + +/* +IntHookModuleUnloaded: +Sends a internal message to all threads of the requested desktop +and notifies them that a global hook was destroyed +and an injected module must be unloaded. +As a result, IntLoadHookModule will be called for all the threads that +will receive the special purpose internal message. +*/ +BOOL +IntHookModuleUnloaded(PDESKTOP pdesk, int iHookID, HHOOK hHook, BOOL Block) +{ + PTHREADINFO ptiCurrent; + PLIST_ENTRY ListEntry; + ULONG_PTR Result; + PPROCESSINFO ppiCsr; + + DPRINT("IntHookModuleUnloaded: iHookID=%d\n", iHookID); + + ppiCsr = PsGetProcessWin32Process(CsrProcess); + + ListEntry = pdesk->PtiList.Flink; + while(ListEntry != &pdesk->PtiList) + { + ptiCurrent = CONTAINING_RECORD(ListEntry, THREADINFO, PtiLink); + + /* FIXME: do some more security checks here */ + + /* FIXME: the first check is a reactos specific hack for system threads */ + if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && + ptiCurrent->ppi != ppiCsr) + { + if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) + { + DPRINT("IntHookModuleUnloaded: sending message to PID %d, ppi=0x%x\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi); + co_MsqSendMessage( ptiCurrent->MessageQueue, + 0, + iHookID, + TRUE, + (LPARAM)hHook, + 0, + Block, + MSQ_INJECTMODULE, + &Result); + } + } + ListEntry = ListEntry->Flink; + } + + return TRUE; +} + +BOOL +FASTCALL +UserLoadApiHook() +{ + return IntLoadHookModule(WH_APIHOOK, 0, FALSE); +} + +BOOL +FASTCALL +UserRegisterUserApiHook( + PUNICODE_STRING pstrDllName, + PUNICODE_STRING pstrFuncName) +{ + PTHREADINFO pti, ptiCurrent; + HWND *List; + PWND DesktopWindow, pwndCurrent; + ULONG i; + ULONG_PTR Result; + PPROCESSINFO ppiCsr; + + pti = PsGetCurrentThreadWin32Thread(); + ppiCsr = PsGetProcessWin32Process(CsrProcess); + + /* Fail if the api hook is already registered */ + if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) + { + return FALSE; + } + + DPRINT("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + + /* Register the api hook */ + gpsi->dwSRVIFlags |= SRVINFO_APIHOOK; + + strUahModule = *pstrDllName; + strUahInitFunc = *pstrFuncName; + ppiUahServer = pti->ppi; + + /* Broadcast an internal message to every top level window */ + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(DesktopWindow); + + if (List != NULL) + { + for (i = 0; List[i]; i++) + { + pwndCurrent = UserGetWindowObject(List[i]); + if(pwndCurrent == NULL) + { + continue; + } + ptiCurrent = pwndCurrent->head.pti; + + /* FIXME: the first check is a reactos specific hack for system threads */ + if(PsIsSystemProcess(ptiCurrent->ppi->peProcess) || + ptiCurrent->ppi == ppiCsr) + { + continue; + } + + co_MsqSendMessage( ptiCurrent->MessageQueue, + 0, + WH_APIHOOK, + FALSE, /* load the module */ + 0, + 0, + TRUE, + MSQ_INJECTMODULE, + &Result); + if(Result == FALSE) + { + DPRINT1("Failed to inject module to process %d\n", PsGetProcessId(ptiCurrent->ppi->peProcess)); + } + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + + return TRUE; +} + +BOOL +FASTCALL +UserUnregisterUserApiHook(BOOL Block) +{ + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + + /* Fail if the api hook is not registered */ + if(!(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)) + { + return FALSE; + } + + /* Only the process that registered the api hook can uregister it */ + if(ppiUahServer != PsGetCurrentProcessWin32Process()) + { + return FALSE; + } + + DPRINT1("UserUnregisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + + /* Unregister the api hook */ + gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK; + ppiUahServer = NULL; + ReleaseCapturedUnicodeString(&strUahModule, UserMode); + ReleaseCapturedUnicodeString(&strUahInitFunc, UserMode); + + /* Notify all applications that the api hook module must be unloaded */ + return IntHookModuleUnloaded(pti->rpdesk, WH_APIHOOK, 0, TRUE); +} static LRESULT @@ -1527,4 +1739,64 @@ END_CLEANUP; } +BOOL +APIENTRY +NtUserRegisterUserApiHook( + PUNICODE_STRING m_dllname1, + PUNICODE_STRING m_funname1, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + BOOL ret; + UNICODE_STRING strDllNameSafe; + UNICODE_STRING strFuncNameSafe; + NTSTATUS Status; + + /* Probe and capture parameters */ + Status = ProbeAndCaptureUnicodeString(&strDllNameSafe, UserMode, m_dllname1); + if(!NT_SUCCESS(Status)) + { + EngSetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + Status = ProbeAndCaptureUnicodeString(&strFuncNameSafe, UserMode, m_funname1); + if(!NT_SUCCESS(Status)) + { + ReleaseCapturedUnicodeString(&strDllNameSafe, UserMode); + EngSetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + UserEnterExclusive(); + + /* Call internal function */ + ret = UserRegisterUserApiHook(&strDllNameSafe, &strFuncNameSafe); + + UserLeave(); + + /* Cleanup only in case of failure */ + if(ret == FALSE) + { + ReleaseCapturedUnicodeString(&strDllNameSafe, UserMode); + ReleaseCapturedUnicodeString(&strFuncNameSafe, UserMode); + } + + return ret; +} + +BOOL +APIENTRY +NtUserUnregisterUserApiHook(VOID) +{ + BOOL ret; + + UserEnterExclusive(); + ret = UserUnregisterUserApiHook(TRUE); + UserLeave(); + + return ret; +} + + /* EOF */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -811,6 +811,12 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if(Message->HookMessage == MSQ_INJECTMODULE) + { + Result = IntLoadHookModule(Message->Msg.message, + (HHOOK)Message->Msg.lParam, + Message->Msg.wParam); + } else if ((Message->CompletionCallback) && (Message->CallBackSenderQueue == MessageQueue)) { /* Call the callback routine */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -891,20 +891,6 @@ BOOL APIENTRY -NtUserRegisterUserApiHook( - PUNICODE_STRING m_dllname1, - PUNICODE_STRING m_funname1, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - UserEnterExclusive(); - UNIMPLEMENTED; - UserLeave(); - return 0; -} - -BOOL -APIENTRY NtUserRegisterRawInputDevices( IN PCRAWINPUTDEVICE pRawInputDevices, IN UINT uiNumDevices, @@ -1038,14 +1024,6 @@ BOOL APIENTRY -NtUserUnregisterUserApiHook(VOID) -{ - UNIMPLEMENTED; - return 0; -} - -BOOL -APIENTRY NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *pcrKey, Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -121,6 +121,9 @@ case NOPARAM_ROUTINE_RELEASECAPTURE: RETURN( (DWORD_PTR)IntReleaseCapture()); + + case NOPARAM_ROUTINE_LOADUSERAPIHOOK: + RETURN(UserLoadApiHook()); default: DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);

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