Ros-diffs

ros-diffs@reactos.org

81390 discussions

[nyadav] 52005: [AUDSRV] connect audio server and client
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 11:32:19 2011 New Revision: 52005 URL: http://svn.reactos.org/svn/reactos?rev=52005&view=rev Log: [AUDSRV] connect audio server and client Added: branches/nyadav-audio-branch/base/services/testc/ (with props) branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt (with props) branches/nyadav-audio-branch/base/services/testc/Hello.h (with props) branches/nyadav-audio-branch/base/services/testc/Hello_c.c (with props) branches/nyadav-audio-branch/base/services/testc/Helloc.c (with props) branches/nyadav-audio-branch/base/services/tests/ (with props) branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt (with props) branches/nyadav-audio-branch/base/services/tests/Hello.h (with props) branches/nyadav-audio-branch/base/services/tests/Hello_s.c (with props) branches/nyadav-audio-branch/base/services/tests/Hellop.c (with props) branches/nyadav-audio-branch/base/services/tests/Hellos.c (with props) Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -7,6 +7,8 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) +add_subdirectory(tests) +add_subdirectory(testc) #add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -460,7 +460,7 @@ /*For Temporary Debug purpose, If there is any argument it acts as simple command line app,otherwise it is a NTSERVICE*/ if(argc==1) { -printf("Under Construction.Please User audsrv.exe -n to start as normal command line application.\n"); +printf("Under Construction.Please Use audsrv.exe -n to start as normal command line application.\n"); MyHeap = HeapCreate(0, 1024 * 256, 0); if (!MyHeap) 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] Mon May 30 11:32:19 2011 @@ -19,25 +19,24 @@ RPC_STATUS Status; InitializeListHead(&LogHandleListHead); -printf("reached\n"); - Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\EventLog", NULL); + Status = RpcServerUseProtseqEp(L"ncacn_np", 20, L"\\pipe\\audsrv", NULL); if (Status != RPC_S_OK) { - DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + printf("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return 0; } - Status = RpcServerRegisterIf(audsrv_v0_0_s_ifspec, NULL, NULL); + Status = RpcServerRegisterIfEx(audsrv_v0_0_s_ifspec, NULL, NULL, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL ); if (Status != RPC_S_OK) { - DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + printf("RpcServerRegisterIf() failed (Status %lx)\n", Status); return 0; } - Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + Status = RpcServerListen(1, 20, FALSE); if (Status != RPC_S_OK) { - DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + printf("RpcServerListen() failed (Status %lx)\n", Status); } return 0; @@ -46,9 +45,10 @@ /*************************RPC Functions**********************************/ -NTSTATUS AUDInitStream( AUDSRV_HANDLE *streamthread) +NTSTATUS AUDInitStream( IN RPC_BINDING_HANDLE hBinding) { UNIMPLEMENTED;/*Coolest Macro I have ever seen*/ + printf("Client Connected and called server's procedure\n"); return STATUS_NOT_IMPLEMENTED; } /*************************************************************************/ Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 30 11:32:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/testc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,13 @@ + +set_unicode() + +list(APPEND SOURCE + Helloc.c + hello_c.c) + +add_executable(testc ${SOURCE}) +add_definitions(-D__USE_CRTIMP) +target_link_libraries(testc ${PSEH_LIB}) +set_module_type(testc win32cui) +add_importlibs(testc advapi32 rpcrt4 msvcrt kernel32 ntdll user32 ksuser setupapi) +add_cab_target(testc 1) Propchange: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Hello.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Hello.h (added) +++ branches/nyadav-audio-branch/base/services/testc/Hello.h [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,45 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef __WIDL_HELLO_H +#define __WIDL_HELLO_H + +/* Forward declarations */ + +/* Headers for imported files */ + + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * hello interface (v1.0) + */ +#ifndef __hello_INTERFACE_DEFINED__ +#define __hello_INTERFACE_DEFINED__ + +extern RPC_IF_HANDLE hello_v1_0_c_ifspec; +extern RPC_IF_HANDLE hello_v1_0_s_ifspec; +void HelloProc( + handle_t h1, + unsigned char *pszString); + +void Shutdown( + handle_t h1); + + +#endif /* __hello_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WIDL_HELLO_H */ Propchange: branches/nyadav-audio-branch/base/services/testc/Hello.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Hello.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Hello_c.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Hello_c.c (added) +++ branches/nyadav-audio-branch/base/services/testc/Hello_c.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,679 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ +#include <string.h> +#ifdef _ALPHA_ +#include <stdarg.h> +#endif + +#include "Hello.h" + +#ifndef DECLSPEC_HIDDEN +#define DECLSPEC_HIDDEN +#endif + +#ifndef _WIN64 + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static const RPC_CLIENT_INTERFACE hello___RpcClientInterface = +{ + sizeof(RPC_CLIENT_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + 0, + 0, + 0, + 0, + 0, + 0, +}; +RPC_IF_HANDLE hello_v1_0_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcClientInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +static RPC_BINDING_HANDLE hello__MIDL_AutoBindHandle; + +struct __frame_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_HelloProc( struct __frame_HelloProc *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void HelloProc( + handle_t h1, + unsigned char *pszString) +{ + struct __frame_HelloProc __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_HelloProc ); + if (!pszString) + { + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } + + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 0); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrConformantStringBufferSize( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrConformantStringMarshall( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_HelloProc( __frame ); + } + RpcEndFinally +} + +struct __frame_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_Shutdown( struct __frame_Shutdown *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void Shutdown( + handle_t h1) +{ + struct __frame_Shutdown __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_Shutdown ); + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 1); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_Shutdown( __frame ); + } + RpcEndFinally +} + +#if !defined(__RPC_WIN32__) +#error Invalid build platform for this stub. +#endif + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcClientInterface, + MIDL_user_allocate, + MIDL_user_free, + { + &hello__MIDL_AutoBindHandle, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#else /* _WIN64 */ + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static const RPC_CLIENT_INTERFACE hello___RpcClientInterface = +{ + sizeof(RPC_CLIENT_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + 0, + 0, + 0, + 0, + 0, + 0, +}; +RPC_IF_HANDLE hello_v1_0_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcClientInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +static RPC_BINDING_HANDLE hello__MIDL_AutoBindHandle; + +struct __frame_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_HelloProc( struct __frame_HelloProc *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void HelloProc( + handle_t h1, + unsigned char *pszString) +{ + struct __frame_HelloProc __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_HelloProc ); + if (!pszString) + { + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } + + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 0); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrConformantStringBufferSize( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrConformantStringMarshall( + &__frame->_StubMsg, + (unsigned char *)pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4]); + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_HelloProc( __frame ); + } + RpcEndFinally +} + +struct __frame_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + RPC_BINDING_HANDLE _Handle; +}; + +static void __finally_Shutdown( struct __frame_Shutdown *__frame ) +{ + NdrFreeBuffer(&__frame->_StubMsg); +} + +void Shutdown( + handle_t h1) +{ + struct __frame_Shutdown __f, * const __frame = &__f; + RPC_MESSAGE _RpcMessage; + __frame->_Handle = 0; + + RpcExceptionInit( 0, __finally_Shutdown ); + RpcTryFinally + { + NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &hello_StubDesc, 1); + __frame->_Handle = h1; + + __frame->_StubMsg.BufferLength = 0; + + NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, __frame->_Handle); + + + NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer); + + __frame->_StubMsg.BufferStart = _RpcMessage.Buffer; + __frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength; + + } + RpcFinally + { + __finally_Shutdown( __frame ); + } + RpcEndFinally +} + +#if !defined(__RPC_WIN64__) +#error Invalid build platform for this stub. +#endif + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcClientInterface, + MIDL_user_allocate, + MIDL_user_free, + { + &hello__MIDL_AutoBindHandle, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#endif /* _WIN64 */ Propchange: branches/nyadav-audio-branch/base/services/testc/Hello_c.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Hello_c.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/testc/Helloc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/testc/Helloc.c (added) +++ branches/nyadav-audio-branch/base/services/testc/Helloc.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,63 @@ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include "hello.h" // header file generated by MIDL compiler + +void __cdecl wmain(int argc, char **argv) +{ + RPC_STATUS status; + + unsigned char * pszStringBinding = NULL; + unsigned char * pszString = "hello, world"; + + // Use a convenience function to concatenate the elements of + // the string binding into the proper sequence. + status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv",NULL,&pszStringBinding); + printf("RpcStringBindingCompose returned 0x%x\n", status); +printf("**%s**\n",pszStringBinding); + // Set the binding handle that will be used to bind to the server. + status = RpcBindingFromStringBinding(pszStringBinding, + &hello_v1_0_c_ifspec); + printf("RpcBindingFromStringBinding returned 0x%x\n", status); + + + printf("Calling the remote procedure 'HelloProc'\n"); + printf("Print the string '%s' on the server\n", pszString); + + RpcTryExcept { + HelloProc(hello_v1_0_c_ifspec,pszString); // make call with user message + printf("Calling the remote procedure 'Shutdown'\n"); + Shutdown(hello_v1_0_c_ifspec); // shut down the server side + } + RpcExcept(1) { + status = RpcExceptionCode(); + printf("Runtime reported exception 0x%lx = %ld\n", status, status); + + + } + RpcEndExcept + + // The calls to the remote procedures are complete. + // Free the string and the binding handle + status = RpcStringFree(&pszStringBinding); // remote calls done; unbind + printf("RpcStringFree returned 0x%x\n", status); + + status = RpcBindingFree(&hello_v1_0_c_ifspec); // remote calls done; unbind + printf("RpcBindingFree returned 0x%x\n", status); + if (status) { + printf("4Error %d",status); + } + + exit(0); + +} // end main() + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); +} Propchange: branches/nyadav-audio-branch/base/services/testc/Helloc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/testc/Helloc.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 30 11:32:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/tests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,15 @@ + +set_unicode() + +list(APPEND SOURCE + Hellos.c + Hellop.c + hello_s.c) + +add_executable(tests ${SOURCE}) +add_definitions(-D__USE_CRTIMP) +target_link_libraries(tests ${PSEH_LIB}) + +set_module_type(tests win32cui) +add_importlibs(tests advapi32 rpcrt4 msvcrt kernel32 ntdll user32 ksuser setupapi) +add_cab_target(tests 1) Propchange: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hello.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hello.h (added) +++ branches/nyadav-audio-branch/base/services/tests/Hello.h [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,45 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef __WIDL_HELLO_H +#define __WIDL_HELLO_H + +/* Forward declarations */ + +/* Headers for imported files */ + + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * hello interface (v1.0) + */ +#ifndef __hello_INTERFACE_DEFINED__ +#define __hello_INTERFACE_DEFINED__ + +extern RPC_IF_HANDLE hello_v1_0_c_ifspec; +extern RPC_IF_HANDLE hello_v1_0_s_ifspec; +void HelloProc( + handle_t h1, + unsigned char *pszString); + +void Shutdown( + handle_t h1); + + +#endif /* __hello_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WIDL_HELLO_H */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hello.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hello.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hello_s.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hello_s.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hello_s.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,824 @@ +/*** Autogenerated by WIDL 0.4-SVN from Hello.idl - Do not edit ***/ +#include <string.h> + +#include "Hello.h" + +#ifndef DECLSPEC_HIDDEN +#define DECLSPEC_HIDDEN +#endif + +#ifndef _WIN64 + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +struct __server_frame +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; +}; + +static int __server_filter( struct __server_frame *__frame ) +{ + return (__frame->code == STATUS_ACCESS_VIOLATION) || + (__frame->code == STATUS_DATATYPE_MISALIGNMENT) || + (__frame->code == RPC_X_BAD_STUB_DATA) || + (__frame->code == RPC_S_INVALID_BOUND); +} + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable; +static const MIDL_SERVER_INFO hello_ServerInfo; + +static const RPC_SERVER_INTERFACE hello___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &hello_v1_0_DispatchTable, + 0, + 0, + 0, + &hello_ServerInfo, + 0, +}; +RPC_IF_HANDLE hello_v1_0_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcServerInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +struct __frame_hello_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; + unsigned char * pszString; +}; + +static void __finally_hello_HelloProc( struct __frame_hello_HelloProc *__frame ) +{ + + NdrPointerFree( + &__frame->_StubMsg, + (unsigned char *)__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[2]); + +} + +void __RPC_STUB hello_HelloProc( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_HelloProc __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_HelloProc ); + __frame->pszString = 0; + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[0]); + + + NdrConformantStringUnmarshall( + &__frame->_StubMsg, + (unsigned char **)&__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4], + 0); + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + HelloProc( + __frame->h1, + __frame->pszString); + } + RpcFinally + { + __finally_hello_HelloProc( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +struct __frame_hello_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; +}; + +static void __finally_hello_Shutdown( struct __frame_hello_Shutdown *__frame ) +{ + +} + +void __RPC_STUB hello_Shutdown( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_Shutdown __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_Shutdown ); + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[8]); + + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + Shutdown( + __frame->h1); + } + RpcFinally + { + __finally_hello_Shutdown( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +#if !defined(__RPC_WIN32__) +#error Invalid build platform for this stub. +#endif + +static const unsigned short hello_FormatStringOffsetTable[] = +{ + 0, /* HelloProc */ + 8, /* Shutdown */ +}; + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcServerInterface, + MIDL_user_allocate, + MIDL_user_free, + { + 0, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + +static RPC_DISPATCH_FUNCTION hello_table[] = +{ + hello_HelloProc, + hello_Shutdown, + 0 +}; +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable = +{ + 2, + hello_table +}; + +static const SERVER_ROUTINE hello_ServerRoutineTable[] = +{ + (SERVER_ROUTINE)HelloProc, + (SERVER_ROUTINE)Shutdown, +}; + +static const MIDL_SERVER_INFO hello_ServerInfo = +{ + &hello_StubDesc, + hello_ServerRoutineTable, + __MIDL_ProcFormatString.Format, + hello_FormatStringOffsetTable, + 0, + 0, + 0, + 0 +}; + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#else /* _WIN64 */ + +#ifndef USE_COMPILER_EXCEPTIONS + +#include "wine/exception.h" +#undef RpcTryExcept +#undef RpcExcept +#undef RpcEndExcept +#undef RpcTryFinally +#undef RpcFinally +#undef RpcEndFinally +#undef RpcExceptionCode +#undef RpcAbnormalTermination + +struct __exception_frame; +typedef int (*__filter_func)(struct __exception_frame *); +typedef void (*__finally_func)(struct __exception_frame *); + +#define __DECL_EXCEPTION_FRAME \ + EXCEPTION_REGISTRATION_RECORD frame; \ + __filter_func filter; \ + __finally_func finally; \ + sigjmp_buf jmp; \ + DWORD code; \ + unsigned char abnormal_termination; \ + unsigned char filter_level; \ + unsigned char finally_level; + +struct __exception_frame +{ + __DECL_EXCEPTION_FRAME +}; + +static inline void __widl_unwind_target(void) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame(); + if (exc_frame->finally_level > exc_frame->filter_level) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + __wine_pop_frame( &exc_frame->frame ); + } + exc_frame->filter_level = 0; + siglongjmp( exc_frame->jmp, 1 ); +} + +static DWORD __widl_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + struct __exception_frame *exc_frame = (struct __exception_frame *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + { + if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + { + exc_frame->abnormal_termination = 1; + exc_frame->finally( exc_frame ); + } + return ExceptionContinueSearch; + } + exc_frame->code = record->ExceptionCode; + if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER) + __wine_rtl_unwind( frame, record, __widl_unwind_target ); + return ExceptionContinueSearch; +} + +#define RpcTryExcept \ + if (!sigsetjmp( __frame->jmp, 0 )) \ + { \ + if (!__frame->finally_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->filter_level = __frame->finally_level + 1; + +#define RpcExcept(expr) \ + if (!__frame->finally_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->filter_level = 0; \ + } \ + else \ + +#define RpcEndExcept + +#define RpcExceptionCode() (__frame->code) + +#define RpcTryFinally \ + if (!__frame->filter_level) \ + __wine_push_frame( &__frame->frame ); \ + __frame->finally_level = __frame->filter_level + 1; + +#define RpcFinally \ + if (!__frame->filter_level) \ + __wine_pop_frame( &__frame->frame ); \ + __frame->finally_level = 0; + +#define RpcEndFinally + +#define RpcAbnormalTermination() (__frame->abnormal_termination) + +#define RpcExceptionInit(filter_func,finally_func) \ + do { \ + __frame->frame.Handler = __widl_exception_handler; \ + __frame->filter = (__filter_func)(filter_func); \ + __frame->finally = (__finally_func)(finally_func); \ + __frame->abnormal_termination = 0; \ + __frame->filter_level = 0; \ + __frame->finally_level = 0; \ + } while (0) + +#else /* USE_COMPILER_EXCEPTIONS */ + +#define RpcExceptionInit(filter_func,finally_func) \ + do { (void)(filter_func); } while(0) + +#define __DECL_EXCEPTION_FRAME \ + DWORD code; + +#endif /* USE_COMPILER_EXCEPTIONS */ + +struct __server_frame +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; +}; + +static int __server_filter( struct __server_frame *__frame ) +{ + return (__frame->code == STATUS_ACCESS_VIOLATION) || + (__frame->code == STATUS_DATATYPE_MISALIGNMENT) || + (__frame->code == RPC_X_BAD_STUB_DATA) || + (__frame->code == RPC_S_INVALID_BOUND); +} + +#define TYPE_FORMAT_STRING_SIZE 7 +#define PROC_FORMAT_STRING_SIZE 13 + +typedef struct _MIDL_TYPE_FORMAT_STRING +{ + short Pad; + unsigned char Format[TYPE_FORMAT_STRING_SIZE]; +} MIDL_TYPE_FORMAT_STRING; + +typedef struct _MIDL_PROC_FORMAT_STRING +{ + short Pad; + unsigned char Format[PROC_FORMAT_STRING_SIZE]; +} MIDL_PROC_FORMAT_STRING; + + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; + +/***************************************************************************** + * hello interface + */ + +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable; +static const MIDL_SERVER_INFO hello_ServerInfo; + +static const RPC_SERVER_INTERFACE hello___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x906b0ce0,0xc70b,0x1067,{0xb3,0x17,0x00,0xdd,0x01,0x06,0x62,0xda}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &hello_v1_0_DispatchTable, + 0, + 0, + 0, + &hello_ServerInfo, + 0, +}; +RPC_IF_HANDLE hello_v1_0_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& hello___RpcServerInterface; + +static const MIDL_STUB_DESC hello_StubDesc; + +struct __frame_hello_HelloProc +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; + unsigned char * pszString; +}; + +static void __finally_hello_HelloProc( struct __frame_hello_HelloProc *__frame ) +{ + + NdrPointerFree( + &__frame->_StubMsg, + (unsigned char *)__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[2]); + +} + +void __RPC_STUB hello_HelloProc( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_HelloProc __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_HelloProc ); + __frame->pszString = 0; + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[0]); + + + NdrConformantStringUnmarshall( + &__frame->_StubMsg, + (unsigned char **)&__frame->pszString, + (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[4], + 0); + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + HelloProc( + __frame->h1, + __frame->pszString); + } + RpcFinally + { + __finally_hello_HelloProc( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +struct __frame_hello_Shutdown +{ + __DECL_EXCEPTION_FRAME + MIDL_STUB_MESSAGE _StubMsg; + handle_t h1; +}; + +static void __finally_hello_Shutdown( struct __frame_hello_Shutdown *__frame ) +{ + +} + +void __RPC_STUB hello_Shutdown( PRPC_MESSAGE _pRpcMessage ) +{ + struct __frame_hello_Shutdown __f, * const __frame = &__f; + + NdrServerInitializeNew( + _pRpcMessage, + &__frame->_StubMsg, + &hello_StubDesc); + + RpcExceptionInit( __server_filter, __finally_hello_Shutdown ); + + __frame->h1 = _pRpcMessage->Handle; + + RpcTryFinally + { + RpcTryExcept + { + if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[8]); + + + if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + } + RpcExcept(RPC_BAD_STUB_DATA_EXCEPTION_FILTER) + { + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + RpcEndExcept + + Shutdown( + __frame->h1); + } + RpcFinally + { + __finally_hello_Shutdown( __frame ); + } + RpcEndFinally + + _pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer; +} + +#if !defined(__RPC_WIN64__) +#error Invalid build platform for this stub. +#endif + +static const unsigned short hello_FormatStringOffsetTable[] = +{ + 0, /* HelloProc */ + 8, /* Shutdown */ +}; + +static const MIDL_STUB_DESC hello_StubDesc = +{ + (void *)& hello___RpcServerInterface, + MIDL_user_allocate, + MIDL_user_free, + { + 0, + }, + 0, + 0, + 0, + 0, + __MIDL_TypeFormatString.Format, + 1, /* -error bounds_check flag */ + 0x10001, /* Ndr library version */ + 0, + 0x50100a4, /* MIDL Version 5.1.164 */ + 0, + 0, + 0, /* notify & notify_flag routine table */ + 1, /* Flags */ + 0, /* Reserved3 */ + 0, /* Reserved4 */ + 0 /* Reserved5 */ +}; + +static RPC_DISPATCH_FUNCTION hello_table[] = +{ + hello_HelloProc, + hello_Shutdown, + 0 +}; +static RPC_DISPATCH_TABLE hello_v1_0_DispatchTable = +{ + 2, + hello_table +}; + +static const SERVER_ROUTINE hello_ServerRoutineTable[] = +{ + (SERVER_ROUTINE)HelloProc, + (SERVER_ROUTINE)Shutdown, +}; + +static const MIDL_SERVER_INFO hello_ServerInfo = +{ + &hello_StubDesc, + hello_ServerRoutineTable, + __MIDL_ProcFormatString.Format, + hello_FormatStringOffsetTable, + 0, + 0, + 0, + 0 +}; + +static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = +{ + 0, + { +/* 0 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 2 (parameter pszString) */ + 0x4d, /* FC_IN_PARAM */ + 0x01, + NdrFcShort(0x2), /* type offset = 2 */ +/* 6 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ +/* 8 (parameter h1) */ + 0x4e, /* FC_IN_PARAM_BASETYPE */ + 0x0f, /* FC_IGNORE */ +/* 10 (void) */ + 0x5b, /* FC_END */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + +static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = +{ + 0, + { + NdrFcShort(0x0), +/* 2 (unsigned char *) */ + 0x11, 0x8, /* FC_RP [simple_pointer] */ +/* 4 */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + 0x0 + } +}; + + +#endif /* _WIN64 */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hello_s.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hello_s.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hellop.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hellop.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hellop.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,58 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. + + +/**************************************************************************** + Microsoft RPC + + Hello Example + + FILE: hellop.c + + PURPOSE: Remote procedures that are linked with the server + side of RPC distributed application + + FUNCTIONS: HelloProc() - prints "hello, world" or other string + sent by client to server + + COMMENTS: This version of the distributed application that prints + "hello, world" (or other string) on the server features + a client that manages its connection to the server. + It uses the binding handle hello_IfHandle, defined in + the file hello.h. + +****************************************************************************/ + +#include <stdlib.h> +#include <stdio.h> +#include "hello.h" // header file generated by MIDL compiler + +void HelloProc(IN RPC_BINDING_HANDLE hBinding,unsigned char * pszString) +{ + printf("%s\n", pszString); +} + +void Shutdown(IN RPC_BINDING_HANDLE hBinding) +{ + RPC_STATUS status; + + printf("Calling RpcMgmtStopServerListening\n"); + status = RpcMgmtStopServerListening(NULL); + printf("RpcMgmtStopServerListening returned: 0x%x\n", status); + if (status) { + exit(status); + } + + printf("Calling RpcServerUnregisterIf\n"); + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + printf("RpcServerUnregisterIf returned 0x%x\n", status); + if (status) { + exit(status); + } +} + +/* end file hellop.c */ Propchange: branches/nyadav-audio-branch/base/services/tests/Hellop.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hellop.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/tests/Hellos.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/tests/Hellos.c (added) +++ branches/nyadav-audio-branch/base/services/tests/Hellos.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,0 +1,33 @@ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include "hello.h" // header file generated by MIDL compiler +#include "string.h" + +void __cdecl wmain(int argc, char * argv[]) +{ + RPC_STATUS status; + + status = RpcServerUseProtseqEp(L"ncacn_np", 20, L"\\pipe\\audsrv", NULL); + printf("RpcServerUseProtseqEp returned 0x%x\n", status); + + status = RpcServerRegisterIfEx(hello_v1_0_s_ifspec, NULL, NULL, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL ); + printf("RpcServerRegisterIfEx returned 0x%x\n", status); + + printf("Calling RpcServerListen\n"); + + status = RpcServerListen(1,20,FALSE); + printf("RpcServerListen returned: 0x%x\n", status); + + +} + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); +} Propchange: branches/nyadav-audio-branch/base/services/tests/Hellos.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/tests/Hellos.c ------------------------------------------------------------------------------ svn:mime-type = text/plain 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] Mon May 30 11:32:19 2011 @@ -1,19 +1,44 @@ #include "audsrvapi.h" /*All the wrappers for Remote Function should be here*/ -int status = 0; /*There can be any structure which can hold the connection status*/ -/*Every Function should ensure connection*/ - +int status = 0; /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { + RPC_STATUS status; + unsigned char * pszStringBinding = NULL; + + if(clientstream == NULL ) return -1; if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; /*Validity of all other data will be checked at server*/ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_initstream() function*/ + status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + + status = RpcBindingFromStringBinding(pszStringBinding, &audsrv_v0_0_c_ifspec); + + if (status) printf("Connection Problem p %d \n",status); + + status = RpcStringFree(&pszStringBinding); + + if (status) printf("Problem Freeing String : %d \n",status); + + + RpcTryExcept + { + AUDInitStream (&audsrv_v0_0_c_ifspec); + } + RpcExcept(1) + { + status = RpcExceptionCode(); + printf("Runtime reported exception 0x%lx = %ld\n", status, status); + } + RpcEndExcept + status = RpcBindingFree(&audsrv_v0_0_c_ifspec); + if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",status); /*Analyse the return by the function*/ /*Currently Suppose the return is 0 and a valid streamid is returned*/ clientstream->stream = &status; @@ -24,7 +49,7 @@ return 0; } -WINAPI int playaudio ( ClientStream * clientstream) +WINAPI int playaudio ( ClientStream * clientstream ) { /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); @@ -47,7 +72,6 @@ WINAPI int stopaudio (ClientStream * clientstream ) { /*Server Side termination is remaining*/ - /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_stop() function*/ clientstream->dead = 1; /*Client Side termination*/ } @@ -67,4 +91,19 @@ } WINAPI int GetBalance(ClientStream * clientstream ,float * balance) { +} + + +/******************************************************/ +/* MIDL allocate and free */ +/******************************************************/ + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return(malloc(len)); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + free(ptr); } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Mon May 30 11:32:19 2011 @@ -1,18 +1,20 @@ #include "audsrvapi.h" + BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) -{ +{ + switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: - break; + break; } return TRUE; } Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt [iso-8859-1] Mon May 30 11:32:19 2011 @@ -8,3 +8,4 @@ set_module_type(audclient win32cui) add_importlibs(audclient audsrvapi advapi32 user32 ksuser setupapi msvcrt kernel32) add_cab_target(audclient 1) +add_dependencies(audclient audsrvapi) 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] Mon May 30 11:32:19 2011 @@ -37,6 +37,6 @@ interface audsrv { - NTSTATUS AUDInitStream([in] AUDSRV_HANDLE *streamthread); + NTSTATUS AUDInitStream([in] handle_t h1); }

1 0

[janderwald] 52004: [USBOHCI] - More traces to fix isochronous problem - Fix broken assert found by mjmartin
by janderwald＠svn.reactos.org 30 May '11

30 May '11

Author: janderwald Date: Mon May 30 06:55:32 2011 New Revision: 52004 URL: http://svn.reactos.org/svn/reactos?rev=52004&view=rev Log: [USBOHCI] - More traces to fix isochronous problem - Fix broken assert found by mjmartin Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -545,12 +545,15 @@ // ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + DPRINT1("Control %x\n", Control); // // get frame interval // - FrameInterval = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)) & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE; + FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; + DPRINT1("FrameInterval %x\n", FrameInterval); // // write frame interval @@ -562,7 +565,7 @@ // Periodic = OHCI_PERIODIC(m_IntervalValue); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); - + DPRINT1("Periodic Start %x\n", Periodic); // // read descriptor @@ -918,6 +921,8 @@ // store interval value for later // m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + + DPRINT1("FrameInterval %x Interval %x\n", FrameInterval, m_IntervalValue); // // now reset controller @@ -1206,10 +1211,30 @@ CUSBHardwareDevice::GetCurrentFrameNumber( PULONG FrameNumber) { + ULONG Control; + ULONG Number; + + + Number = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_NUMBER_OFFSET)); + DPRINT1("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber); + + // + // remove reserved bits + // + Number &= 0xFFFF; + // // store frame number // - *FrameNumber = m_HCCA->CurrentFrameNumber; + *FrameNumber = Number; + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + + } VOID @@ -1339,7 +1364,7 @@ // // defer processing // - DPRINT("Status %x Acknowledge %x\n", Status, Acknowledge); + DPRINT1("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); KeInsertQueueDpc(&This->m_IntDpcObject, (PVOID)Status, (PVOID)(DoneHead & ~1)); // Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Mon May 30 06:55:32 2011 @@ -99,6 +99,11 @@ #define OHCI_FRAME_INTERVAL_TOGGLE 0x80000000 // +// frame interval +// +#define OHCI_FRAME_INTERVAL_NUMBER_OFFSET 0x3C + +// // periodic start register // #define OHCI_PERIODIC_START_OFFSET 0x40 Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -278,6 +278,16 @@ // CurrentDescriptor = CurrentDescriptor->NextLogicalDescriptor; } + + // + // get current frame number + // + m_Hardware->GetCurrentFrameNumber(&FrameNumber); + + DPRINT1("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); + ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); + + PrintEndpointList(m_IsoHeadEndpointDescriptor); } // @@ -699,7 +709,7 @@ // // sanity check // - ASSERT(InterruptInterval < OHCI_BIGGEST_INTERVAL); + ASSERT(InterruptInterval <= OHCI_BIGGEST_INTERVAL); // // find interrupt index Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon May 30 06:55:32 2011 @@ -628,7 +628,7 @@ // // initialize descriptor, hardware part // - Descriptor->Flags = OHCI_ITD_SET_FRAME_COUNT(FrameCount) | OHCI_ITD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED); + Descriptor->Flags = OHCI_ITD_SET_FRAME_COUNT(FrameCount) | OHCI_ITD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE);// | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED); Descriptor->BufferPhysical = 0; Descriptor->NextPhysicalDescriptor = 0; Descriptor->LastPhysicalByteAddress = 0; @@ -661,6 +661,7 @@ PVOID Buffer; PIO_STACK_LOCATION IoStack; PURB Urb; + PHYSICAL_ADDRESS Address; // // get current irp stack location @@ -704,6 +705,10 @@ // ASSERT(ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(m_TransferBufferMDL), MmGetMdlByteCount(m_TransferBufferMDL)) <= 2); + Status = m_DmaManager->Allocate(m_TransferBufferLength, &Buffer, &Address); + ASSERT(Status == STATUS_SUCCESS); + + while(Index < Urb->UrbIsochronousTransfer.NumberOfPackets) { // @@ -732,7 +737,7 @@ // // get page offset // - PageOffset = MmGetMdlByteOffset(m_TransferBufferMDL); + PageOffset = BYTE_OFFSET(Page); // // initialize descriptor @@ -935,6 +940,8 @@ Descriptor->Flags |= OHCI_ENDPOINT_SET_DEVICE_ADDRESS(GetDeviceAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); + + DPRINT1("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); // // is there an endpoint descriptor

1 0

[cgutman] 52003: [NTOSKRNL] - Implement sending GUID_TARGET_DEVICE_QUERY_REMOVE and GUID_TARGET_DEVICE_REMOVE_COMPLETE notifications - Fix sending EventCategoryTargetDeviceChange notifications - Re...
by cgutman＠svn.reactos.org 30 May '11

30 May '11

Author: cgutman Date: Mon May 30 04:15:27 2011 New Revision: 52003 URL: http://svn.reactos.org/svn/reactos?rev=52003&view=rev Log: [NTOSKRNL] - Implement sending GUID_TARGET_DEVICE_QUERY_REMOVE and GUID_TARGET_DEVICE_REMOVE_COMPLETE notifications - Fix sending EventCategoryTargetDeviceChange notifications - Remove some incorrect checks (IRP_MN_START_DEVICE CAN be called for a device that is already "started") - Check the final status of the IRP_MN_START_DEVICE request sent after resource rebalancing and send IRP_MN_REMOVE_DEVICE if it fails Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon May 30 04:15:27 2011 @@ -160,12 +160,21 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; + NTSTATUS Status; RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; - - return IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_TARGET_DEVICE_QUERY_REMOVE, + NULL, + NULL); + + return Status; } NTSTATUS @@ -195,6 +204,12 @@ /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_TARGET_DEVICE_REMOVE_COMPLETE, + NULL, + NULL); } VOID @@ -239,9 +254,6 @@ DeviceNode->ResourceListTranslated; } - /* I don't think we set this flag yet */ - ASSERT(!(DeviceNode->Flags & DNF_STOPPED)); - /* Do the call */ Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); if (!NT_SUCCESS(Status)) @@ -258,6 +270,7 @@ /* Otherwise, mark us as started */ DeviceNode->Flags |= DNF_STARTED; + DeviceNode->Flags &= ~DNF_STOPPED; /* We now need enumeration */ DeviceNode->Flags |= DNF_NEED_ENUMERATION_ONLY; @@ -276,9 +289,6 @@ ASSERT((DeviceNode->Flags & (DNF_RESOURCE_ASSIGNED | DNF_RESOURCE_REPORTED | DNF_NO_RESOURCE_REQUIRED))); - ASSERT((!(DeviceNode->Flags & (DNF_HAS_PROBLEM | - DNF_STARTED | - DNF_START_REQUEST_PENDING)))); /* Get the device object */ DeviceObject = DeviceNode->PhysicalDeviceObject; @@ -327,12 +337,6 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; - - if (((DeviceNode->Flags & DNF_STARTED) && !(DeviceNode->Flags & DNF_HAS_PROBLEM)) || - (DeviceNode->Flags & DNF_START_REQUEST_PENDING)) - { - return STATUS_SUCCESS; - } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) @@ -3623,6 +3627,9 @@ if (NT_SUCCESS(IopQueryStopDevice(PhysicalDeviceObject))) { IopSendStopDevice(PhysicalDeviceObject); + + DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); + DeviceNode->Flags |= DNF_STOPPED; } } @@ -3665,7 +3672,15 @@ } /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */ - IopStartDevice(DeviceNode); + if (IopStartDevice(DeviceNode) != STATUS_SUCCESS) + { + DPRINT1("Restart after resource rebalance failed\n"); + + DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); + DeviceNode->Flags |= DNF_START_FAILED; + + IopSendRemoveDevice(PhysicalDeviceObject); + } } } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Mon May 30 04:15:27 2011 @@ -119,7 +119,6 @@ NotificationInfos->Version = 1; NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - NotificationInfos->FileObject = (PFILE_OBJECT)EventCategoryData1; } else { @@ -177,22 +176,21 @@ } case EventCategoryTargetDeviceChange: { - if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) - { - if (ChangeEntry->FileObject == (PFILE_OBJECT)EventCategoryData1) - CallCurrentEntry = TRUE; - } - else - { - Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); - if (NT_SUCCESS(Status)) - { - if (DeviceObject == EntryDeviceObject) - { - ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - CallCurrentEntry = TRUE; - } - } + Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); + if (NT_SUCCESS(Status)) + { + if (DeviceObject == EntryDeviceObject) + { + if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) + { + ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + else + { + ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + CallCurrentEntry = TRUE; + } } } default:

1 0

[rmessiant] 52002: [NTOSKRNL] - Simplify remove lock tracking block list handling. - Correct check for unlimited locking time being allowed. - Eliminate use-after-free after removing a tracking block.
by rmessiant＠svn.reactos.org 29 May '11

29 May '11

Author: rmessiant Date: Sun May 29 22:29:10 2011 New Revision: 52002 URL: http://svn.reactos.org/svn/reactos?rev=52002&view=rev Log: [NTOSKRNL] - Simplify remove lock tracking block list handling. - Correct check for unlimited locking time being allowed. - Eliminate use-after-free after removing a tracking block. Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Sun May 29 22:29:10 2011 @@ -16,7 +16,7 @@ typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK { - SINGLE_LIST_ENTRY BlockEntry; + PIO_REMOVE_LOCK_TRACKING_BLOCK Next; PVOID Tag; LARGE_INTEGER LockMoment; LPCSTR File; @@ -114,7 +114,8 @@ /* Queue the block */ KeAcquireSpinLock(&(Lock->Dbg.Spin), &OldIrql); - PushEntryList((PSINGLE_LIST_ENTRY)&(Lock->Dbg.Blocks), &(TrackingBlock->BlockEntry)); + TrackingBlock->Next = Lock->Dbg.Blocks; + Lock->Dbg.Blocks = TrackingBlock; KeReleaseSpinLock(&(Lock->Dbg.Spin), OldIrql); } } @@ -149,8 +150,8 @@ LONG LockValue; BOOLEAN TagFound; LARGE_INTEGER CurrentMoment; - PSINGLE_LIST_ENTRY ListEntry; PIO_REMOVE_LOCK_TRACKING_BLOCK TrackingBlock; + PIO_REMOVE_LOCK_TRACKING_BLOCK *TrackingBlockLink; PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; /* Check what kind of lock this is */ @@ -164,12 +165,12 @@ /* Start browsing tracking blocks to find a block that would match given tag */ TagFound = FALSE; - for (ListEntry = ((PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks)->Next; ListEntry; ListEntry = ListEntry->Next) - { - TrackingBlock = CONTAINING_RECORD(ListEntry, IO_REMOVE_LOCK_TRACKING_BLOCK, BlockEntry); - + TrackingBlock = Lock->Dbg.Blocks; + TrackingBlockLink = &(Lock->Dbg.Blocks); + while (TrackingBlock != NULL) + { /* First of all, check if the lock was locked for too long */ - if (CurrentMoment.QuadPart && + if (TrackingBlock->LockMoment.QuadPart && CurrentMoment.QuadPart - TrackingBlock->LockMoment.QuadPart > Lock->Dbg.MaxLockedTicks) { DPRINT("Lock %#08lx (with tag %#08lx) was supposed to be held at max %I64d ticks but lasted longer\n", @@ -178,29 +179,23 @@ ASSERT(FALSE); } - /* If no tracking was found yet */ - if (TagFound == FALSE) - { - /* Check if the current one could match */ - if (TrackingBlock->Tag == Tag) - { - /* Yes, then remove it from the queue and free it */ - TagFound = TRUE; - if (ListEntry == ((PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks)->Next) - { - /* Here it is head, remove it using macro */ - PopEntryList((PSINGLE_LIST_ENTRY)&(Lock->Dbg.Blocks)); - ExFreePoolWithTag(TrackingBlock, Lock->Dbg.AllocateTag); - } - else - { - /* It's not head, remove it "manually */ - ListEntry->Next = TrackingBlock->BlockEntry.Next; - ExFreePoolWithTag(TrackingBlock, Lock->Dbg.AllocateTag); - } - } - } - } + /* Check if this is the first matching tracking block */ + if ((TagFound == FALSE) && (TrackingBlock->Tag == Tag)) + { + /* Unlink this tracking block, and free it */ + TagFound = TRUE; + *TrackingBlockLink = TrackingBlock->Next; + ExFreePoolWithTag(TrackingBlock, Lock->Dbg.AllocateTag); + TrackingBlock = *TrackingBlockLink; + } + else + { + /* Go to the next tracking block */ + TrackingBlockLink = &(TrackingBlock->Next); + TrackingBlock = TrackingBlock->Next; + } + } + /* We're done, release queue lock */ KeReleaseSpinLock(&(Lock->Dbg.Spin), OldIrql); @@ -271,7 +266,7 @@ ASSERT(Lock->Dbg.Blocks); /* Get it */ - TrackingBlock = CONTAINING_RECORD(Lock->Dbg.Blocks, IO_REMOVE_LOCK_TRACKING_BLOCK, BlockEntry); + TrackingBlock = Lock->Dbg.Blocks; /* Tag should match */ if (TrackingBlock->Tag != Tag) {

1 0

[tkreuzer] 52001: [WIN32K] - Implement RFONT_vXlateGlpyhs
by tkreuzer＠svn.reactos.org 29 May '11

29 May '11

Author: tkreuzer Date: Sun May 29 22:02:52 2011 New Revision: 52001 URL: http://svn.reactos.org/svn/reactos?rev=52001&view=rev Log: [WIN32K] - Implement RFONT_vXlateGlpyhs Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c [iso-8859-1] Sun May 29 22:02:52 2011 @@ -77,6 +77,53 @@ return 0; } +VOID +NTAPI +RFONT_vXlateGlpyhs( + PRFONT prfnt, + ULONG cwc, + WCHAR *pwc, + HGLYPH *phg, + HGLYPH hgDefault) +{ + FD_GLYPHSET *pfdg = prfnt->ppfe->pfdg; + WCRUN *pwcrun; + HGLYPH hg; + WCHAR wc; + ULONG idx; + + /* Loop all WCHARs */ + while (cwc--) + { + wc = *pwc++; + hg = hgDefault; + + /* Loop all WCHAR runs */ + for (pwcrun = &pfdg->awcrun[0]; + pwcrun < &pfdg->awcrun[pfdg->cRuns]; + pwcrun++) + { + /* Check if the char is below the current run */ + if (wc < pwcrun->wcLow) + { + /* We couldn't find it, use default */ + break; + } + + /* Calculate index into the current run */ + idx = wc - pwcrun->wcLow; + if (idx < pwcrun->cGlyphs) + { + hg = pwcrun->phg[idx]; + break; + } + } + + *phg++ = hg; + } +} + + W32KAPI DWORD APIENTRY

1 0

[osiejka] 52000: Converting POLISH localisation strings to UTF-8. Part 3/4: - dll/win32 and dll/shellext converted - currently, only shell32 is left, due to incoming change to new version, and kern...
by osiejka＠svn.reactos.org 29 May '11

29 May '11

Author: osiejka Date: Sun May 29 21:43:37 2011 New Revision: 52000 URL: http://svn.reactos.org/svn/reactos?rev=52000&view=rev Log: Converting POLISH localisation strings to UTF-8. Part 3/4: - dll/win32 and dll/shellext converted - currently, only shell32 is left, due to incoming change to new version, and kernel32 - need to research how it should be done. Tested on rbuild/cmake Added: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc (with props) trunk/reactos/dll/win32/msports/lang/pl-PL.rc (with props) Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/lang/pl-PL.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/modemui/lang/pl-PL.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/newdev/lang/pl-PL.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/serialui/lang/pl-PL.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/user32/lang/pl-PL.rc trunk/reactos/dll/win32/user32/lang/sk-SK.rc trunk/reactos/dll/win32/userenv/lang/pl-PL.rc trunk/reactos/dll/win32/userenv/userenv.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… Modified: trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… Modified: trunk/reactos/dll/shellext/slayer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/p… Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… Modified: trunk/reactos/dll/win32/modemui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/pl-… Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/pl-… Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Modified: trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/pl-P… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Modified: trunk/reactos/dll/win32/serialui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/pl… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pl… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/pl-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/pl-P… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Modified: trunk/reactos/dll/win32/user32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/pl-P… Modified: trunk/reactos/dll/win32/user32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/sk-S… Modified: trunk/reactos/dll/win32/userenv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/pl-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.…

1 0

[tkreuzer] 51999: [WIN32K] - Refactor EngLoadFontFile and EngLoadFontFileFD - Implement more driver support code to query IFIMETRICS and FD_GLYPHSET from the driver
by tkreuzer＠svn.reactos.org 29 May '11

29 May '11

Author: tkreuzer Date: Sun May 29 20:14:40 2011 New Revision: 51999 URL: http://svn.reactos.org/svn/reactos?rev=51999&view=rev Log: [WIN32K] - Refactor EngLoadFontFile and EngLoadFontFileFD - Implement more driver support code to query IFIMETRICS and FD_GLYPHSET from the driver Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Sun May 29 20:14:40 2011 @@ -11,21 +11,6 @@ #define NDEBUG #include <debug.h> -BOOL gbAttachedCSRSS; - -HSEMAPHORE ghsemFontDriver; -LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; - - -BOOL FASTCALL -InitFontSupport(VOID) -{ - ghsemFontDriver = EngCreateSemaphore(); - if (!ghsemFontDriver) return FALSE; - return TRUE; -} - - typedef struct _FONTDEV { LIST_ENTRY leLink; @@ -40,7 +25,26 @@ C_ASSERT(sizeof(GDIINFO) == 0x130); -//static +BOOL gbAttachedCSRSS; + +HSEMAPHORE ghsemFontDriver; +LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; + +HSEMAPHORE ghsemPFFList; +LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; + + +BOOL FASTCALL +InitFontSupport(VOID) +{ + ghsemFontDriver = EngCreateSemaphore(); + if (!ghsemFontDriver) return FALSE; + ghsemPFFList = EngCreateSemaphore(); + if (!ghsemPFFList) return FALSE; + return TRUE; +} + +static VOID AttachCSRSS(KAPC_STATE *pApcState) { @@ -49,7 +53,7 @@ gbAttachedCSRSS = TRUE; } -//static +static VOID DetachCSRSS(KAPC_STATE *pApcState) { @@ -85,19 +89,18 @@ if (hff == 0) return 0; return hff; - -} - +} + +static HFF -NTAPI EngLoadFontFileFD( ULONG cFiles, - PULONG_PTR piFiles, + PFONTFILEVIEW *ppffv, DESIGNVECTOR *pdv, ULONG ulCheckSum, - HDEV *phdev) -{ - KAPC_STATE ApcState; + PFONTDEV *ppfntdev) +{ + PULONG_PTR piFiles = (PULONG_PTR)ppffv; PVOID apvView[FD_MAX_FILES]; ULONG acjView[FD_MAX_FILES]; ULONG i, ulLangID = 0; @@ -115,10 +118,7 @@ } } - /* Attach to CSRSS */ - AttachCSRSS(&ApcState); - - /* Acquire font friver list lock */ + /* Acquire font driver list lock */ EngAcquireSemaphore(ghsemFontDriver); /* Loop all installed font drivers */ @@ -139,7 +139,7 @@ ulCheckSum); if (hff) { - *phdev = (HDEV)pfntdev; + *ppfntdev = pfntdev; break; } } @@ -147,10 +147,193 @@ /* Release font friver list lock */ EngReleaseSemaphore(ghsemFontDriver); + return hff; +} + +static +BOOL +PFF_bCompareFiles( + PPFF ppff, + ULONG cFiles, + PFONTFILEVIEW pffv[]) +{ + ULONG i; + + /* Check if number of files matches */ + if (ppff->cFiles != cFiles) return FALSE; + + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Check if the files match */ + if (pffv[i] != ppff->apffv[i]) return FALSE; + } + + return TRUE; +} + +static PPFF +EngFindPFF(ULONG cFiles, PFONTFILEVIEW *ppffv) +{ + PLIST_ENTRY ple; + PPFF ppff; + ASSERT(cFiles >= 1 && cFiles <= FD_MAX_FILES); + + /* Acquire PFF list lock */ + EngAcquireSemaphore(ghsemPFFList); + + /* Loop all physical font files (PFF) */ + for (ple = glePFFList.Flink; ple != &glePFFList; ple = ple->Flink) + { + ppff = CONTAINING_RECORD(ple, PFF, leLink); + + /* Check if the files are already loaded */ + if (PFF_bCompareFiles(ppff, cFiles, ppffv)) break; + } + + /* Release PFF list lock */ + EngReleaseSemaphore(ghsemPFFList); + + return ple != &glePFFList ? ppff : NULL; +} + +static void +PFE_vInitialize( + PPFE ppfe, + PPFF ppff, + ULONG iFace) +{ + PFONTDEV pfntdev = (PFONTDEV)ppff->hdev; + PLDEVOBJ pldev = pfntdev->pldev; + ppfe->pPFF = ppff; + ppfe->iFont = iFace; + ppfe->flPFE = 0; + + ppfe->pid = HandleToUlong(PsGetCurrentProcessId()); + ppfe->tid = HandleToUlong(PsGetCurrentThreadId()); + + /* Query IFIMETRICS */ + ppfe->pifi = pldev->pfn.QueryFont(pfntdev->dhpdev, + ppff->hff, + iFace, + &ppfe->idifi); + + /* Query FD_GLYPHSET */ + ppfe->pfdg = pldev->pfn.QueryFontTree(pfntdev->dhpdev, + ppff->hff, + iFace, + QFT_GLYPHSET, + &ppfe->idfdg); + + /* No kerning pairs for now */ + ppfe->pkp = NULL; + ppfe->idkp = 0; + ppfe->ckp = 0; + + ppfe->iOrientation = 0; + ppfe->cjEfdwPFE = 0; + //ppfe->pgiset = 0; + ppfe->ulTimeStamp = 0; + //ppfe->ufi = 0; + //ppfe->ql; + ppfe->pFlEntry = 0; + ppfe->cAlt = 0; + ppfe->cPfdgRef = 0; + //ppfe->aiFamilyName[]; + +} + +PPFF +NTAPI +EngLoadFontFile( + IN ULONG cFiles, + IN PWCHAR apwszFiles[], + IN DESIGNVECTOR *pdv) +{ + PFONTFILEVIEW apffv[FD_MAX_FILES]; + KAPC_STATE ApcState; + PPFF ppff = NULL; + ULONG i, cjSize, cFaces, ulChecksum = 0; + PFONTDEV pfntdev = NULL; + HFF hff; + + /* Loop the files */ + for (i = 0; i < cFiles; i++) + { + /* Try to load the file */ + apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); + if (!apffv[i]) + { + /* Cleanup and return */ + while (i--) EngFreeModule(apffv[i]); + return NULL; + } + } + + /* Try to find an existing PFF */ + ppff = EngFindPFF(cFiles, apffv); + if (ppff) + { + /* Cleanup loaded files, we don't need them anymore */ + for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); + return ppff; + } + + /* Attach to CSRSS */ + AttachCSRSS(&ApcState); + + /* Try to load the font with any of the font drivers */ + hff = EngLoadFontFileFD(cFiles, apffv, pdv, ulChecksum, &pfntdev); + if (!hff) + { + DPRINT1("File format is not supported by any font driver\n"); + goto leave; + } + + /* Query the number of faces in the font file */ + cFaces = pfntdev->pldev->pfn.QueryFontFile(hff, QFF_NUMFACES, 0, NULL); + + /* Allocate a new PFF */ + cjSize = FIELD_OFFSET(PFF, apfe[cFaces]); + ppff = EngAllocMem(FL_ZERO_MEMORY, cjSize, 'ffpG'); + if (!ppff) + { + DPRINT1("Failed to allocate %ld bytes\n", cjSize); + goto leave; + } + + /* Fill the structure */ + ppff->sizeofThis = cjSize; + ppff->cFiles = cFiles; + ppff->cFonts = cFaces; + ppff->hdev = (HDEV)pfntdev; + ppff->hff = hff; + + /* Copy the FONTFILEVIEW pointers */ + for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; + + /* Loop all faces in the font file */ + for (i = 0; i < cFaces; i++) + { + /* Initialize the face */ + PFE_vInitialize(&ppff->apfe[i], ppff, i + 1); + } + + /* Insert the PFF into the list */ + EngAcquireSemaphore(ghsemPFFList); + InsertTailList(&glePFFList, &ppff->leLink); + EngReleaseSemaphore(ghsemPFFList); + +leave: + if (!ppff) + { + for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); + } + /* Detach from CSRSS */ DetachCSRSS(&ApcState); - return hff; + return ppff; } BOOL Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Sun May 29 20:14:40 2011 @@ -10,112 +10,6 @@ #define NDEBUG #include <debug.h> - -HSEMAPHORE ghsemPFFList; -LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; - - -static -BOOL -ComparePFF( - PPFF ppff, - ULONG cFiles, - PFONTFILEVIEW pffv[]) -{ - ULONG i; - ASSERT(cFiles >= 1 && cFiles <= FD_MAX_FILES); - - /* Check if number of files matches */ - if (ppff->cFiles != cFiles) return FALSE; - - /* Loop all files */ - for (i = 0; i < cFiles; i++) - { - /* Check if the files match */ - if (pffv[i] != ppff->apffv[i]) return FALSE; - } - - return TRUE; -} - -PPFF -NTAPI -EngLoadFontFile( - IN ULONG cFiles, - IN PWCHAR apwszFiles[], - IN DESIGNVECTOR *pdv) -{ - PFONTFILEVIEW apffv[FD_MAX_FILES]; - PLIST_ENTRY ple; - PPFF ppff = NULL; - ULONG i, cjSize, ulChecksum = 0; - HDEV hdev; - HFF hff; - - /* Loop the files */ - for (i = 0; i < cFiles; i++) - { - /* Try to load the file */ - apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); - if (!apffv[i]) - { - /* Cleanup and return */ - while (i--) EngFreeModule(apffv[i]); - return NULL; - } - } - - /* Acquire PFF list lock */ - EngAcquireSemaphore(ghsemPFFList); - - /* Loop all physical font files (PFF) */ - for (ple = glePFFList.Flink; ple != &glePFFList; ple = ple->Flink) - { - ppff = CONTAINING_RECORD(ple, PFF, leLink); - - /* Check if the files are already loaded */ - if (ComparePFF(ppff, cFiles, apffv)) - { - /* Unload the loaded files */ - while (i--) EngFreeModule(apffv[i]); - goto leave; - } - } - - /* Load the font with any of the font drivers */ - hff = EngLoadFontFileFD(cFiles, (PULONG_PTR)apffv, pdv, ulChecksum, &hdev); - if (!hff) - { - DPRINT1("File format is not supported by any font driver\n"); - while (i--) EngFreeModule(apffv[i]); - goto leave; - } - - /* Allocate a new PFF */ - cjSize = sizeof(PFF); - ppff = EngAllocMem(0, cjSize, 'ffpG'); - if (!ppff) - { - goto leave; - } - - ppff->sizeofThis = cjSize; - ppff->cFiles = cFiles; - ppff->hdev = hdev; - ppff->hff = hff; - - /* Copy the FONTFILEVIEWs */ - for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; - - /* Insert the PFF into the list */ - InsertTailList(&glePFFList, &ppff->leLink); - -leave: - /* Release PFF list lock */ - EngReleaseSemaphore(ghsemPFFList); - - return ppff; -} INT NTAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Sun May 29 20:14:40 2011 @@ -14,6 +14,32 @@ } POINTEF, *PPOINTEF; typedef struct _RFONT *PRFONT; + +typedef struct _PFE +{ + struct _PFF * pPFF; + ULONG_PTR iFont; + FLONG flPFE; + FD_GLYPHSET *pfdg; + ULONG_PTR idfdg; + IFIMETRICS * pifi; + ULONG_PTR idifi; + FD_KERNINGPAIR *pkp; + ULONG_PTR idkp; + ULONG ckp; + ULONG iOrientation; + ULONG cjEfdwPFE; + //GISET * pgiset; + ULONG ulTimeStamp; + UNIVERSAL_FONT_ID ufi; + DWORD pid; + DWORD tid; + LIST_ENTRY ql; + void * pFlEntry; + ULONG cAlt; + ULONG cPfdgRef; + ULONG aiFamilyName[1]; +} PFE, *PPFE; typedef struct _PFF { @@ -38,33 +64,8 @@ ULONG cFonts; void *pPvtDataHead; PFONTFILEVIEW apffv[FD_MAX_FILES]; + PFE apfe[1]; } PFF, *PPFF; - -typedef struct _PFE -{ - PFF * pPFF; - ULONG_PTR iFont; - FLONG flPFE; - FD_GLYPHSET * pfdg; - ULONG_PTR ulpId; - IFIMETRICS * pifi; - ULONG_PTR idifi; - FD_KERNINGPAIR *pkp; - ULONG_PTR idkp; - ULONG ckp; - ULONG iOrieintation; - ULONG cjEfdwPFE; - //GISET * pgiset; - ULONG ulTimeStamp; - UNIVERSAL_FONT_ID ufi; - DWORD pid; - DWORD tid; - LIST_ENTRY ql; - void * pFlEntry; - ULONG cAlt; - ULONG cPfdgRef; - ULONG aiFamilyName[1]; -} PFE, *PPFE; typedef struct { @@ -219,11 +220,4 @@ NTAPI DC_prfnt(PDC pdc); -HFF -NTAPI -EngLoadFontFileFD( - ULONG cFiles, - PULONG_PTR piFiles, - DESIGNVECTOR *pdv, - ULONG ulCheckSum, - HDEV *phdev); +

1 0

[janderwald] 51998: [USBOHCI] - Fix OHCI_ISO_TD structure. Fixes host system crashes in Windows XP - Fix multiple bugs in isochronous transfer implementation - Still not yet working, as the interru...
by janderwald＠svn.reactos.org 29 May '11

29 May '11

Author: janderwald Date: Sun May 29 19:54:55 2011 New Revision: 51998 URL: http://svn.reactos.org/svn/reactos?rev=51998&view=rev Log: [USBOHCI] - Fix OHCI_ISO_TD structure. Fixes host system crashes in Windows XP - Fix multiple bugs in isochronous transfer implementation - Still not yet working, as the interrupt completion is not fired yet Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Sun May 29 19:54:55 2011 @@ -310,12 +310,21 @@ ULONG BufferPhysical; // Physical page number of byte 0 ULONG NextPhysicalDescriptor; // Next isochronous transfer descriptor ULONG LastPhysicalByteAddress; // Physical buffer end - ULONG Offset[OHCI_ITD_NOFFSET]; // Buffer offsets + USHORT Offset[OHCI_ITD_NOFFSET]; // Buffer offsets // Software part PHYSICAL_ADDRESS PhysicalAddress; // Physical address of this descriptor struct _OHCI_ISO_TD_ * NextLogicalDescriptor; // Logical pointer next descriptor }OHCI_ISO_TD, *POHCI_ISO_TD; + +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, Flags) == 0); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, BufferPhysical) == 4); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, NextPhysicalDescriptor) == 8); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, LastPhysicalByteAddress) == 12); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, Offset) == 16); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, PhysicalAddress) == 32); +C_ASSERT(FIELD_OFFSET(OHCI_ISO_TD, NextLogicalDescriptor) == 40); +C_ASSERT(sizeof(OHCI_ISO_TD) == 48); #define OHCI_ITD_GET_STARTING_FRAME(x) ((x) & 0x0000ffff) #define OHCI_ITD_SET_STARTING_FRAME(x) ((x) & 0xffff) Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Sun May 29 19:54:55 2011 @@ -43,8 +43,10 @@ // local functions BOOLEAN IsTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress); + BOOLEAN IsTransferDescriptorInIsoEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress); NTSTATUS FindTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor); NTSTATUS FindTransferDescriptorInInterruptHeadEndpoints(IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor); + NTSTATUS FindTransferDescriptorInIsochronousHeadEndpoints(IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor); VOID CleanupEndpointDescriptor(POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, POHCI_ENDPOINT_DESCRIPTOR PreviousEndpointDescriptor); POHCI_ENDPOINT_DESCRIPTOR FindInterruptEndpointDescriptor(UCHAR InterruptInterval); @@ -102,6 +104,8 @@ Hardware->GetControlHeadEndpointDescriptor(&m_ControlHeadEndpointDescriptor); // + // get isochronous endpoint + // Hardware->GetIsochronousHeadEndpointDescriptor(&m_IsoHeadEndpointDescriptor); // @@ -170,6 +174,7 @@ POHCI_ENDPOINT_DESCRIPTOR Descriptor; POHCI_ISO_TD CurrentDescriptor; ULONG FrameNumber; + USHORT Frame; DPRINT("CUSBQueue::AddUSBRequest\n"); @@ -244,9 +249,9 @@ m_Hardware->GetCurrentFrameNumber(&FrameNumber); // - // increment frame number - // - FrameNumber++; + // FIXME: increment frame number + // + FrameNumber += 300; // // apply frame number to iso transfer descriptors @@ -254,18 +259,19 @@ CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; DPRINT1("ISO: NextFrameNumber %x\n", FrameNumber); + Frame = (FrameNumber & 0xFFFF); while(CurrentDescriptor) { // // set current frame number // - CurrentDescriptor->Flags |= OHCI_ITD_SET_STARTING_FRAME(FrameNumber); + CurrentDescriptor->Flags |= OHCI_ITD_SET_STARTING_FRAME(Frame); // // move to next frame number // - FrameNumber++; + Frame += OHCI_ITD_GET_FRAME_COUNT(CurrentDescriptor->Flags); // // move to next descriptor @@ -275,14 +281,14 @@ } // + // set descriptor active + // + Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; + + // // insert endpoint at end // LinkEndpoint(HeadDescriptor, Descriptor); - - // - // set descriptor active - // - Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; if (Type == USB_ENDPOINT_TYPE_CONTROL || Type == USB_ENDPOINT_TYPE_BULK) { @@ -402,6 +408,97 @@ return STATUS_NOT_FOUND; } +NTSTATUS +CUSBQueue::FindTransferDescriptorInIsochronousHeadEndpoints( + IN ULONG TransferDescriptorLogicalAddress, + OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, + OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor) +{ + POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; + POHCI_ENDPOINT_DESCRIPTOR LastDescriptor = m_IsoHeadEndpointDescriptor; + + + // + // skip first endpoint head + // + EndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)m_IsoHeadEndpointDescriptor->NextDescriptor; + + while(EndpointDescriptor) + { + // + // check if the transfer descriptor is inside the list + // + if (IsTransferDescriptorInIsoEndpoint(EndpointDescriptor, TransferDescriptorLogicalAddress)) + { + // + // found endpoint + // + *OutEndpointDescriptor = EndpointDescriptor; + *OutPreviousEndpointDescriptor = LastDescriptor; + + // + // done + // + return STATUS_SUCCESS; + } + + // + // store last endpoint + // + LastDescriptor = EndpointDescriptor; + + // + // move to next + // + EndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)EndpointDescriptor->NextDescriptor; + } + + // + // failed to endpoint + // + return STATUS_NOT_FOUND; +} + +BOOLEAN +CUSBQueue::IsTransferDescriptorInIsoEndpoint( + IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN ULONG TransferDescriptorLogicalAddress) +{ + POHCI_ISO_TD Descriptor; + + // + // get first general transfer descriptor + // + Descriptor = (POHCI_ISO_TD)EndpointDescriptor->HeadLogicalDescriptor; + + // + // sanity check + // + ASSERT(Descriptor); + + do + { + if (Descriptor->PhysicalAddress.LowPart == TransferDescriptorLogicalAddress) + { + // + // found descriptor + // + return TRUE; + } + + // + // move to next + // + Descriptor = (POHCI_ISO_TD)Descriptor->NextLogicalDescriptor; + }while(Descriptor); + + // + // no descriptor found + // + return FALSE; +} + + BOOLEAN CUSBQueue::IsTransferDescriptorInEndpoint( IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, @@ -476,6 +573,8 @@ // //ASSERT(Request->IsRequestComplete()); + Request->FreeEndpointDescriptor(EndpointDescriptor); + // // release request // @@ -511,7 +610,7 @@ POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, PreviousEndpointDescriptor; NTSTATUS Status; - DPRINT("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); + DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); // // find transfer descriptor in control list @@ -564,13 +663,30 @@ return; } + // + // last try: find the descriptor in isochronous list + // + Status = FindTransferDescriptorInIsochronousHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + DPRINT1("ISO endpoint complete\n"); +ASSERT(FALSE); + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + return; + } // // hardware reported dead endpoint completed // - DPRINT("CUSBQueue::TransferDescriptorCompletionCallback invalid transfer descriptor %x\n", TransferDescriptorLogicalAddress); + DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback invalid transfer descriptor %x\n", TransferDescriptorLogicalAddress); ASSERT(FALSE); - } POHCI_ENDPOINT_DESCRIPTOR Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Sun May 29 19:54:55 2011 @@ -299,7 +299,7 @@ m_TransferBufferMDL = Urb->UrbIsochronousTransfer.TransferBufferMDL; } } - + // // save buffer length // @@ -656,13 +656,12 @@ { POHCI_ISO_TD FirstDescriptor, PreviousDescriptor = NULL, CurrentDescriptor; POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; - ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset; + ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset, Page; NTSTATUS Status; PVOID Buffer; PIO_STACK_LOCATION IoStack; PURB Urb; - DPRINT1("cp\n"); // // get current irp stack location // @@ -690,23 +689,27 @@ // // failed to create setup descriptor // + ASSERT(FALSE); return Status; } - DPRINT1("cp\n"); + // // get buffer // Buffer = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); ASSERT(Buffer); - DPRINT1("cp\n"); + // + // FIXME: support requests which spans serveral pages + // + ASSERT(ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(m_TransferBufferMDL), MmGetMdlByteCount(m_TransferBufferMDL)) <= 2); + while(Index < Urb->UrbIsochronousTransfer.NumberOfPackets) { // // get number of packets remaining // NumberOfPackets = min(Urb->UrbIsochronousTransfer.NumberOfPackets - Index, OHCI_ITD_NOFFSET); - DPRINT1("cp Number Packets %lu\n", NumberOfPackets); // // allocate iso descriptor // @@ -720,23 +723,29 @@ ASSERT(FALSE); return Status; } - DPRINT1("cp\n"); + + // + // get physical page + // + Page = MmGetPhysicalAddress(Buffer).LowPart; + + // + // get page offset + // + PageOffset = MmGetMdlByteOffset(m_TransferBufferMDL); + // // initialize descriptor // - CurrentDescriptor->BufferPhysical = (MmGetPhysicalAddress(Buffer).LowPart & ~ (PAGE_SIZE - 1)); - - // - // get page offset - // - PageOffset = BYTE_OFFSET(MmGetPhysicalAddress(Buffer).LowPart); - DPRINT1("cp\n"); + CurrentDescriptor->BufferPhysical = Page - PageOffset; + for(SubIndex = 0; SubIndex < NumberOfPackets; SubIndex++) { // // store buffer offset // - CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset + PageOffset; + CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset + PageOffset; + DPRINT1("Index %lu PacketOffset %lu FinalOffset %lu\n", SubIndex+Index, Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset, CurrentDescriptor->Offset[SubIndex]); } // @@ -752,19 +761,14 @@ // // end of transfer // - CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + m_TransferBufferLength - 1; + CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + PageOffset + m_TransferBufferLength - 1; } else { // // use start address of next packet - 1 // - CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + PageOffset + Urb->UrbIsochronousTransfer.IsoPacket[Index + 1].Offset - 1; - - // - // move buffer to next address - // - Buffer = (PVOID)((ULONG_PTR)Buffer + Urb->UrbIsochronousTransfer.IsoPacket[Index + 1].Offset); + CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + PageOffset + Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset - 1; } // @@ -790,8 +794,13 @@ // store as previous descriptor // PreviousDescriptor = CurrentDescriptor; - } - DPRINT1("cp\n"); + DPRINT1("Current Descriptor %p Logical %lx StartAddress %x EndAddress %x\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress); + + // + // fire interrupt as soon transfer is finished + // + CurrentDescriptor->Flags |= OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); + } // // clear interrupt mask for last transfer descriptor @@ -814,7 +823,7 @@ EndpointDescriptor->HeadPhysicalDescriptor = FirstDescriptor->PhysicalAddress.LowPart; EndpointDescriptor->TailPhysicalDescriptor = CurrentDescriptor->PhysicalAddress.LowPart; EndpointDescriptor->HeadLogicalDescriptor = FirstDescriptor; - DPRINT1("cp\n"); + // // store result // @@ -1451,48 +1460,95 @@ struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) { POHCI_GENERAL_TD TransferDescriptor, NextTransferDescriptor; + POHCI_ISO_TD IsoTransferDescriptor, IsoNextTransferDescriptor; + ULONG Index, PacketCount; DPRINT("CUSBRequest::FreeEndpointDescriptor EndpointDescriptor %p Logical %x\n", OutDescriptor, OutDescriptor->PhysicalAddress.LowPart); - // - // get first general transfer descriptor - // - TransferDescriptor = (POHCI_GENERAL_TD)OutDescriptor->HeadLogicalDescriptor; - - // - // release endpoint descriptor - // - m_DmaManager->Release(OutDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); - - while(TransferDescriptor) - { - // - // get next - // - NextTransferDescriptor = (POHCI_GENERAL_TD)TransferDescriptor->NextLogicalDescriptor; - - // - // is there a buffer associated - // - if (TransferDescriptor->BufferSize) - { - // - // release buffer - // - m_DmaManager->Release(TransferDescriptor->BufferLogical, TransferDescriptor->BufferSize); - } - - DPRINT("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x\n", TransferDescriptor, TransferDescriptor->PhysicalAddress.LowPart, TransferDescriptor->BufferPhysical, TransferDescriptor->LastPhysicalByteAddress); - - // - // release descriptor - // - m_DmaManager->Release(TransferDescriptor, sizeof(OHCI_GENERAL_TD)); - - // - // move to next - // - TransferDescriptor = NextTransferDescriptor; + if (OutDescriptor->Flags & OHCI_ENDPOINT_ISOCHRONOUS_FORMAT) + { + // + // get first iso transfer descriptor + // + IsoTransferDescriptor = (POHCI_ISO_TD)OutDescriptor->HeadLogicalDescriptor; + + // + // release endpoint descriptor + // + m_DmaManager->Release(OutDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + + while(IsoTransferDescriptor) + { + // + // get next + // + IsoNextTransferDescriptor = IsoTransferDescriptor->NextLogicalDescriptor; + + // + // get packet count + // + PacketCount = OHCI_ITD_GET_FRAME_COUNT(IsoTransferDescriptor->Flags); + + DPRINT1("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x PacketCount %lu\n", IsoTransferDescriptor, IsoTransferDescriptor->PhysicalAddress.LowPart, IsoTransferDescriptor->BufferPhysical, IsoTransferDescriptor->LastPhysicalByteAddress, PacketCount); + + for(Index = 0; Index < PacketCount; Index++) + { + DPRINT1("PSW Index %lu Value %x\n", Index, IsoTransferDescriptor->Offset[Index]); + } + + // + // release descriptor + // + m_DmaManager->Release(IsoTransferDescriptor, sizeof(OHCI_ISO_TD)); + + // + // move to next + // + IsoTransferDescriptor = IsoNextTransferDescriptor; + } + } + else + { + // + // get first general transfer descriptor + // + TransferDescriptor = (POHCI_GENERAL_TD)OutDescriptor->HeadLogicalDescriptor; + + // + // release endpoint descriptor + // + m_DmaManager->Release(OutDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + + while(TransferDescriptor) + { + // + // get next + // + NextTransferDescriptor = (POHCI_GENERAL_TD)TransferDescriptor->NextLogicalDescriptor; + + // + // is there a buffer associated + // + if (TransferDescriptor->BufferSize) + { + // + // release buffer + // + m_DmaManager->Release(TransferDescriptor->BufferLogical, TransferDescriptor->BufferSize); + } + + DPRINT("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x\n", TransferDescriptor, TransferDescriptor->PhysicalAddress.LowPart, TransferDescriptor->BufferPhysical, TransferDescriptor->LastPhysicalByteAddress); + + // + // release descriptor + // + m_DmaManager->Release(TransferDescriptor, sizeof(OHCI_GENERAL_TD)); + + // + // move to next + // + TransferDescriptor = NextTransferDescriptor; + } } }

1 0

[cgutman] 51997: [NTOSKRNL] - Fix a reference leak which prevented driver objects passed to IoRegisterPlugPlayNotification from being able to unload after the notification was unregistered - Fix a ...
by cgutman＠svn.reactos.org 29 May '11

29 May '11

Author: cgutman Date: Sun May 29 16:44:34 2011 New Revision: 51997 URL: http://svn.reactos.org/svn/reactos?rev=51997&view=rev Log: [NTOSKRNL] - Fix a reference leak which prevented driver objects passed to IoRegisterPlugPlayNotification from being able to unload after the notification was unregistered - Fix a non-paged pool leak Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Sun May 29 16:44:34 2011 @@ -23,6 +23,7 @@ PVOID Context; UNICODE_STRING Guid; PFILE_OBJECT FileObject; + PDRIVER_OBJECT DriverObject; PDRIVER_NOTIFICATION_CALLBACK_ROUTINE PnpNotificationProc; } PNP_NOTIFY_ENTRY, *PPNP_NOTIFY_ENTRY; @@ -319,6 +320,7 @@ Entry->PnpNotificationProc = CallbackRoutine; Entry->EventCategory = EventCategory; Entry->Context = Context; + Entry->DriverObject = DriverObject; switch (EventCategory) { case EventCategoryDeviceInterfaceChange: @@ -377,9 +379,14 @@ DPRINT("__FUNCTION__(NotificationEntry %p) called\n", Entry); KeAcquireGuardedMutex(&PnpNotifyListLock); - RtlFreeUnicodeString(&Entry->Guid); RemoveEntryList(&Entry->PnpNotifyList); KeReleaseGuardedMutex(&PnpNotifyListLock); + RtlFreeUnicodeString(&Entry->Guid); + + ObDereferenceObject(Entry->DriverObject); + + ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); + return STATUS_SUCCESS; }

1 0

[ekohl] 51996: [SETUPAPI] - Add stubs for CM_Set_Class_Registry_PropertyA/W. - Add support for missing properties to CM_Set_DevNode_Registry_Property_ExA/W.
by ekohl＠svn.reactos.org 29 May '11

29 May '11

Author: ekohl Date: Sun May 29 16:18:22 2011 New Revision: 51996 URL: http://svn.reactos.org/svn/reactos?rev=51996&view=rev Log: [SETUPAPI] - Add stubs for CM_Set_Class_Registry_PropertyA/W. - Add support for missing properties to CM_Set_DevNode_Registry_Property_ExA/W. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun May 29 16:18:22 2011 @@ -5001,6 +5001,32 @@ /*********************************************************************** + * CM_Set_Class_Registry_PropertyA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( + LPGUID ClassGuid, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, + ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %lx %p %lu %lx %p\n", + ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_Set_Class_Registry_PropertyW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( + LPGUID ClassGuid, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, + ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %lx %p %lu %lx %p\n", + ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Set_DevNode_Problem [SETUPAPI.@] */ CONFIGRET WINAPI CM_Set_DevNode_Problem( @@ -5178,6 +5204,30 @@ case CM_DRP_LOWERFILTERS: ulType = REG_MULTI_SZ; + break; + + case CM_DRP_SECURITY: + ulType = REG_BINARY; + break; + + case CM_DRP_DEVTYPE: + ulType = REG_DWORD; + break; + + case CM_DRP_EXCLUSIVE: + ulType = REG_DWORD; + break; + + case CM_DRP_CHARACTERISTICS: + ulType = REG_DWORD; + break; + + case CM_DRP_UI_NUMBER_DESC_FORMAT: + ulType = REG_SZ; + break; + + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + ulType = REG_DWORD; break; default: @@ -5332,6 +5382,30 @@ ulType = REG_MULTI_SZ; break; + case CM_DRP_SECURITY: + ulType = REG_BINARY; + break; + + case CM_DRP_DEVTYPE: + ulType = REG_DWORD; + break; + + case CM_DRP_EXCLUSIVE: + ulType = REG_DWORD; + break; + + case CM_DRP_CHARACTERISTICS: + ulType = REG_DWORD; + break; + + case CM_DRP_UI_NUMBER_DESC_FORMAT: + ulType = REG_SZ; + break; + + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + ulType = REG_DWORD; + break; + default: return CR_INVALID_PROPERTY; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun May 29 16:18:22 2011 @@ -184,8 +184,8 @@ @ stdcall CM_Request_Eject_PC_Ex(long) @ stdcall CM_Run_Detection(long) @ stdcall CM_Run_Detection_Ex(long long) -@ stub CM_Set_Class_Registry_PropertyA -@ stub CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stdcall CM_Set_DevNode_Problem(long long long) @ stdcall CM_Set_DevNode_Problem_Ex(long long long long) @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long)

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