Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49407: [CMAKE] set custom command to compile asm files for MSVC toolchain. They are being preprocessed first.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 1 16:40:30 2010 New Revision: 49407 URL: http://svn.reactos.org/svn/reactos?rev=49407&view=rev Log: [CMAKE] set custom command to compile asm files for MSVC toolchain. They are being preprocessed first. Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Nov 1 16:40:30 2010 @@ -34,6 +34,10 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /h <OBJECT> <SOURCE>") +SET(CMAKE_ASM_COMPILE_OBJECT + "<CMAKE_C_COMPILER> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")

13 years, 11 months

[jgardou] 49406: [CMAKE] - put advapi32.def into source files.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Nov 1 16:32:32 2010 New Revision: 49406 URL: http://svn.reactos.org/svn/reactos?rev=49406&view=rev Log: [CMAKE] - put advapi32.def into source files. Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Mon Nov 1 16:32:32 2010 @@ -40,7 +40,12 @@ token/privilege.c token/token.c advapi32_stubs.c - advapi32.rc) + advapi32.rc + advapi32.def) + +if(NOT MSVC) + set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(advapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch @@ -49,12 +54,11 @@ set_module_type(advapi32 win32dll) target_link_libraries(advapi32 - ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def svcctl_client lsa_client eventlogrpc_client wine - pseh) + ${PSEH_LIB}) add_importlibs(advapi32 rpcrt4 kernel32 ntdll)

13 years, 11 months

[tkreuzer] 49405: [CMAKE] When PreLoad.cmake is run, the CMAKE_CURRENT_SOURCE_DIR points to the directory, where the cmake command was executed (bug?). To get the root folder of reactos, use CMAKE_...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 1 15:15:02 2010 New Revision: 49405 URL: http://svn.reactos.org/svn/reactos?rev=49405&view=rev Log: [CMAKE] When PreLoad.cmake is run, the CMAKE_CURRENT_SOURCE_DIR points to the directory, where the cmake command was executed (bug?). To get the root folder of reactos, use CMAKE_CURRENT_LIST_FILE, which points to PreLoad.cmake in the root folder. Modified: branches/cmake-bringup/PreLoad.cmake Modified: branches/cmake-bringup/PreLoad.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/PreLoad.cmake?rev… ============================================================================== --- branches/cmake-bringup/PreLoad.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/PreLoad.cmake [iso-8859-1] Mon Nov 1 15:15:02 2010 @@ -1,7 +1,10 @@ -#message("PreLoad.cmake ...") +# small trick to get the real source directory at this stage +STRING(REPLACE "/PreLoad.cmake" "" REACTOS_HOME_DIR ${CMAKE_CURRENT_LIST_FILE}) -SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules" CACHE INTERNAL "") +#message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}") + +SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake/Modules" CACHE INTERNAL "") #message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")

13 years, 11 months

[fireball] 49404: - Stop abusing non paged pool in arwinss. - Fix different time units usage in message queue code. - My timeout implementation still s..ks b..ls. See issue #5222 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 1 14:36:45 2010 New Revision: 49404 URL: http://svn.reactos.org/svn/reactos?rev=49404&view=rev Log: - Stop abusing non paged pool in arwinss. - Fix different time units usage in message queue code. - My timeout implementation still s..ks b..ls. See issue #5222 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -129,11 +129,20 @@ KDPC Dpc; }; -enum timeout_t; typedef PKDEFERRED_ROUTINE timeout_callback; #define TICKS_PER_SEC 10000000 void remove_timeout_user( struct timeout_user *user ); struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); + +VOID FORCEINLINE +get_current_time(timeout_t *value) +{ + LARGE_INTEGER time; + KeQuerySystemTime(&time); + + *value = time.QuadPart / 10; +} + thread_id_t get_thread_id (PTHREADINFO Thread); process_id_t get_process_id(PPROCESSINFO Process); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -278,7 +278,7 @@ queue->timeout = NULL; queue->input = (struct thread_input *)grab_object( input ); queue->hooks = NULL; - KeQuerySystemTime((PLARGE_INTEGER)&queue->last_get_msg); + get_current_time(&queue->last_get_msg); list_init( &queue->send_result ); list_init( &queue->callback_result ); list_init( &queue->pending_timers ); @@ -585,7 +585,7 @@ struct msg_queue *recv_queue, struct message *msg, timeout_t timeout ) { - struct message_result *result = ExAllocatePool( NonPagedPool, sizeof(*result) ); + struct message_result *result = ExAllocatePool( PagedPool, sizeof(*result) ); if (result) { result->msg = msg; @@ -804,11 +804,11 @@ static int is_queue_hung( struct msg_queue *queue ) { //struct wait_queue_entry *entry; - LARGE_INTEGER current_time; - - KeQuerySystemTime(&current_time); - - if (current_time.QuadPart - queue->last_get_msg <= 5 * TICKS_PER_SEC) + timeout_t current_time; + + get_current_time(&current_time); + + if (current_time - queue->last_get_msg <= 5 * TICKS_PER_SEC) return 0; /* less than 5 seconds since last get message -> not hung */ #if 0 @@ -1097,8 +1097,6 @@ struct msg_queue *queue = Context; PQUEUE_WORKER_CONTEXT work_context; - ASSERT(queue); - /* Allocate memory for the work iteam */ work_context = ExAllocatePool(NonPagedPool, sizeof(QUEUE_WORKER_CONTEXT)); @@ -1133,11 +1131,11 @@ /* restart an expired timer */ static void restart_timer( struct msg_queue *queue, struct timer *timer ) { - LARGE_INTEGER current_time; - KeQuerySystemTime(&current_time); + timeout_t current_time; + get_current_time(&current_time); list_remove( &timer->entry ); - while (timer->when <= current_time.QuadPart) timer->when += (timeout_t)timer->rate * 10000; + while (timer->when <= current_time) timer->when += (timeout_t)timer->rate * 10000; link_timer( queue, timer ); set_next_timer( queue ); } @@ -1165,15 +1163,15 @@ /* add a timer */ static struct timer *set_timer( struct msg_queue *queue, unsigned int rate ) { - LARGE_INTEGER current_time; + timeout_t current_time; struct timer *timer; - KeQuerySystemTime(&current_time); + get_current_time(&current_time); timer = mem_alloc( sizeof(*timer) ); if (timer) { timer->rate = max( rate, 1 ); - timer->when = current_time.QuadPart + (timeout_t)timer->rate * 10000; + timer->when = current_time + (timeout_t)timer->rate * 10000; link_timer( queue, timer ); /* check if we replaced the next timer */ if (list_head( &queue->pending_timers ) == &timer->entry) set_next_timer( queue ); @@ -1564,7 +1562,7 @@ if (!thread) return; - if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = MSG_POSTED; msg->win = get_user_full_handle( win ); @@ -1591,7 +1589,7 @@ { struct message *msg; - if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { struct winevent_msg_data *data; @@ -1753,7 +1751,7 @@ return; } - if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if ((msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = req->type; msg->win = get_user_full_handle( req->win ); @@ -1844,7 +1842,7 @@ data->y = req->y; data->info = req->info; - if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if ((msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( req->win ); @@ -1878,7 +1876,7 @@ /* get a message from the current queue */ DECL_HANDLER(get_message) { - LARGE_INTEGER current_time; + timeout_t current_time; struct timer *timer; struct list *ptr; PPROCESSINFO process = PsGetCurrentProcessWin32Process(); @@ -1889,8 +1887,8 @@ reply->active_hooks = get_active_hooks(); if (!queue) return; - KeQuerySystemTime(&current_time); - queue->last_get_msg = current_time.QuadPart; + get_current_time(&current_time); + queue->last_get_msg = current_time; if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -54,12 +54,12 @@ LARGE_INTEGER DueTime; struct timeout_user *TimeoutUser; - DueTime.QuadPart = (LONGLONG)when; - - DPRINT("add_timeout_user(when %I64d, func %p)\n", when, func); + DueTime.QuadPart = (LONGLONG)when * 10; /* Allocate memory for timeout structure */ TimeoutUser = ExAllocatePool(NonPagedPool, sizeof(struct timeout_user)); + + //DPRINT1("add_timeout_user(%p when %I64d, diff %I64d msecs, func %p)\n", TimeoutUser, when, secs, func); /* Initialize timer and DPC objects */ KeInitializeTimer(&TimeoutUser->Timer); @@ -74,7 +74,7 @@ /* remove a timeout user */ void remove_timeout_user( struct timeout_user *user ) { - DPRINT("remove_timeout_user %p\n", user); + //DPRINT1("remove_timeout_user %p, current time %I64d\n", user, current_time); /* Cancel the timer */ KeCancelTimer(&user->Timer);

13 years, 11 months

[ekohl] 49403: [ADVAPI32] Implement LsaAddAccountRights(), LsaQueryTrustedDomainInfoByName() and LsaRemoveAccountRights().

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Nov 1 14:09:33 2010 New Revision: 49403 URL: http://svn.reactos.org/svn/reactos?rev=49403&view=rev Log: [ADVAPI32] Implement LsaAddAccountRights(), LsaQueryTrustedDomainInfoByName() and LsaRemoveAccountRights(). Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Mon Nov 1 14:09:33 2010 @@ -143,18 +143,37 @@ /* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaAddAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights) -{ - FIXME("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); - return STATUS_OBJECT_NAME_NOT_FOUND; + * @implemented + */ +NTSTATUS +WINAPI +LsaAddAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN PLSA_UNICODE_STRING UserRights, + IN ULONG CountOfRights) +{ + LSAPR_USER_RIGHT_SET UserRightSet; + NTSTATUS Status; + + TRACE("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + + UserRightSet.Entries = CountOfRights; + UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; + + RpcTryExcept + { + Status = LsarAddAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + &UserRightSet); + + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -265,6 +284,7 @@ return STATUS_SUCCESS; } + /* * @implemented */ @@ -291,16 +311,16 @@ return Status; } -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaEnumerateAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING *UserRights, - PULONG CountOfRights) + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaEnumerateAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + OUT PLSA_UNICODE_STRING *UserRights, + OUT PULONG CountOfRights) { LSAPR_USER_RIGHT_SET UserRightsSet; NTSTATUS Status; @@ -332,6 +352,7 @@ return Status; } + /* * @unimplemented @@ -385,16 +406,18 @@ return STATUS_SUCCESS; } -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaFreeMemory(PVOID Buffer) + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaFreeMemory(IN PVOID Buffer) { TRACE("(%p)\n", Buffer); return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } + /* * @implemented @@ -446,6 +469,7 @@ return Status; } + /* * @unimplemented */ @@ -470,8 +494,9 @@ return STATUS_NONE_MAPPED; } -/* - * @unmplemented + +/* + * @implemented */ NTSTATUS WINAPI @@ -503,6 +528,7 @@ return Status; } + /* * @implemented @@ -534,6 +560,7 @@ return Status; } + /* * @implemented @@ -591,6 +618,7 @@ return Status; } + /****************************************************************************** * LsaNtStatusToWinError * @@ -599,7 +627,8 @@ * * @implemented */ -ULONG WINAPI +ULONG +WINAPI LsaNtStatusToWinError(IN NTSTATUS Status) { TRACE("(%lx)\n", Status); @@ -747,6 +776,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* * @implemented */ @@ -782,20 +812,6 @@ return Status; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaQueryTrustedDomainInfoByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID *Buffer) -{ - FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); - return STATUS_OBJECT_NAME_NOT_FOUND; -} /* * @unimplemented @@ -812,21 +828,77 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaRemoveAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - BOOLEAN AllRights, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights) -{ - FIXME("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaQueryTrustedDomainInfoByName(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN TRUSTED_INFORMATION_CLASS InformationClass, + OUT PVOID *Buffer) +{ + NTSTATUS Status; + + TRACE("(%p,%p,%d,%p)\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + + if (InformationClass == TrustedDomainAuthInformationInternal || + InformationClass == TrustedDomainFullInformationInternal) + return STATUS_INVALID_INFO_CLASS; + + RpcTryExcept + { + Status = LsarQueryTrustedDomainInfoByName((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)TrustedDomainName, + InformationClass, + (unsigned long *)Buffer); // Shuld be: (PLSAPR_POLICY_INFORMATION *)Buffer + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaRemoveAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN BOOLEAN AllRights, + IN PLSA_UNICODE_STRING UserRights, + IN ULONG CountOfRights) +{ + LSAPR_USER_RIGHT_SET UserRightSet; + NTSTATUS Status; + + TRACE("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + + UserRightSet.Entries = CountOfRights; + UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; + + RpcTryExcept + { + Status = LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + AllRights, + &UserRightSet); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + return STATUS_SUCCESS; } + /* * @unimplemented

13 years, 11 months

[jgardou] 49402: [CMAKE] - fix build, sorry

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Nov 1 14:05:48 2010 New Revision: 49402 URL: http://svn.reactos.org/svn/reactos?rev=49402&view=rev Log: [CMAKE] - fix build, sorry Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Nov 1 14:05:48 2010 @@ -21,7 +21,7 @@ rtl/libsupp.c rtl/version.c def/ntdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/def/ntdll.def) + ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) if(ARCH MATCHES i386) list(APPEND SOURCE dispatch/i386/dispatch.S) @@ -55,4 +55,4 @@ add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) -add_importlib_target(ntdll) +add_importlib_target(ntdll)

13 years, 11 months

[janderwald] 49401: [PORTCLS] - Add license header

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 1 13:23:15 2010 New Revision: 49401 URL: http://svn.reactos.org/svn/reactos?rev=49401&view=rev Log: [PORTCLS] - Add license header Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Mon Nov 1 13:23:15 2010 @@ -1,6 +1,17 @@ +/***************************************************************************** + * miniport_dmus.cpp - UART miniport implementation + ***************************************************************************** + * Copyright (c) 1997-2000 Microsoft Corporation. All Rights Reserved. + * + * Feb 98 MartinP -- based on UART, began deltas for DirectMusic. + * + */ + + #include "private.hpp" // + for absolute / - for relative + #define kOneMillisec (10 * 1000) // @@ -272,13 +283,7 @@ friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream); }; -/***************************************************************************** - * miniport.cpp - UART miniport implementation - ***************************************************************************** - * Copyright (c) 1997-2000 Microsoft Corporation. All Rights Reserved. - * - * Feb 98 MartinP -- based on UART, began deltas for DirectMusic. - */ + #define STR_MODULENAME "DMusUART:Miniport: "

13 years, 11 months

[ekohl] 49400: [SETUPAPI] Implement CM_Get_Device_ID_List_ExW().

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Nov 1 12:39:51 2010 New Revision: 49400 URL: http://svn.reactos.org/svn/reactos?rev=49400&view=rev Log: [SETUPAPI] Implement CM_Get_Device_ID_List_ExW(). Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c 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] Mon Nov 1 12:39:51 2010 @@ -1987,10 +1987,47 @@ PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %ld %ld %lx\n", + RPC_BINDING_HANDLE BindingHandle = NULL; + CONFIGRET ret; + + TRACE("%p %p %ld %ld %lx\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); - memset(Buffer,0,2); - return CR_SUCCESS; + + if (Buffer == NULL || BufferLen == 0) + return CR_INVALID_POINTER; + + if (ulFlags & ~CM_GETIDLIST_FILTER_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + *Buffer = 0; + + RpcTryExcept + { + ret = PNP_GetDeviceList(BindingHandle, + pszFilter, + Buffer, + &BufferLen, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; }

13 years, 11 months

[tkreuzer] 49399: [RTL] Make asm files ML compatible

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 1 11:41:01 2010 New Revision: 49399 URL: http://svn.reactos.org/svn/reactos?rev=49399&view=rev Log: [RTL] Make asm files ML compatible Modified: branches/cmake-bringup/lib/rtl/i386/debug_asm.S branches/cmake-bringup/lib/rtl/i386/except_asm.s branches/cmake-bringup/lib/rtl/i386/interlck.S branches/cmake-bringup/lib/rtl/i386/res_asm.s branches/cmake-bringup/lib/rtl/i386/rtlmem.s Modified: branches/cmake-bringup/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/debu… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] Mon Nov 1 11:41:01 2010 @@ -6,43 +6,39 @@ * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) */ -.intel_syntax noprefix +#include <reactos/asm.h> /* GLOBALS ****************************************************************/ -.globl _DbgBreakPoint@0 -.globl _DbgBreakPointWithStatus@4 -.globl _DbgUserBreakPoint@0 -.globl _DebugService@20 -.globl _DebugService2@12 -.globl _DbgBreakPointNoBugCheck@0 -.globl _RtlpBreakWithStatusInstruction@0 +PUBLIC _DbgBreakPoint@0 +PUBLIC _DbgBreakPointWithStatus@4 +PUBLIC _DbgUserBreakPoint@0 +PUBLIC _DebugService@20 +PUBLIC _DebugService2@12 +PUBLIC _DbgBreakPointNoBugCheck@0 +PUBLIC _RtlpBreakWithStatusInstruction@0 /* FUNCTIONS ***************************************************************/ -.func DbgBreakPointNoBugCheck@0 +.code + _DbgBreakPointNoBugCheck@0: int 3 ret -.endfunc -.func DbgBreakPoint@0 _DbgBreakPoint@0: _DbgUserBreakPoint@0: int 3 ret -.endfunc -.func DbgBreakPointWithStatus@4 _DbgBreakPointWithStatus@4: mov eax, [esp+4] _RtlpBreakWithStatusInstruction@0: int 3 ret 4 -.endfunc -.func DebugService2@12 + _DebugService2@12: /* Setup the stack */ @@ -53,15 +49,14 @@ mov eax, [ebp+16] mov ecx, [ebp+8] mov edx, [ebp+12] - int 0x2D + int HEX(2D) int 3 /* Restore stack */ pop ebp ret 12 -.endfunc -.func DebugService@20 + _DebugService@20: /* Setup the stack */ @@ -78,7 +73,7 @@ mov edx, [ebp+16] mov ebx, [ebp+20] mov edi, [ebp+24] - int 0x2D + int HEX(2D) int 3 /* Restore registers */ @@ -88,4 +83,5 @@ /* Return */ pop ebp ret 20 -.endfunc + +END Modified: branches/cmake-bringup/lib/rtl/i386/except_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/exce… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] Mon Nov 1 11:41:01 2010 @@ -9,8 +9,13 @@ /* INCLUDES ******************************************************************/ +#include <reactos/asm.h> #include <ndk/asm.h> -.intel_syntax noprefix + +EXTERN _RtlpCheckForActiveDebugger@0:PROC +EXTERN _RtlDispatchException@8:PROC +EXTERN _ZwContinue@8:PROC +EXTERN _ZwRaiseException@12:PROC #define ExceptionContinueSearch 1 #define ExceptionNestedException 2 @@ -18,17 +23,17 @@ /* FUNCTIONS *****************************************************************/ -.func RtlpGetExceptionList@0 -.globl _RtlpGetExceptionList@0 +.code + +PUBLIC _RtlpGetExceptionList@0 _RtlpGetExceptionList@0: /* Return the exception list */ mov eax, fs:[TEB_EXCEPTION_LIST] ret -.endfunc - -.func RtlpSetExceptionList@4 -.globl _RtlpSetExceptionList@4 + + +PUBLIC _RtlpSetExceptionList@4 _RtlpSetExceptionList@4: /* Get the new list */ @@ -40,10 +45,9 @@ /* Return */ ret 4 -.endfunc - -.func RtlCaptureContext@4 -.globl _RtlCaptureContext@4 + + +PUBLIC _RtlCaptureContext@4 _RtlCaptureContext@4: /* Preserve EBX and put the context in it */ @@ -61,10 +65,9 @@ /* Capture the other regs */ jmp CaptureRest -.endfunc - -.func RtlpCaptureContext@4 -.globl _RtlpCaptureContext@4 + + +PUBLIC _RtlpCaptureContext@4 _RtlpCaptureContext@4: /* Preserve EBX and put the context in it */ @@ -107,10 +110,9 @@ /* Return to the caller */ pop ebx ret 4 -.endfunc - -.func RtlpExecuteHandlerForException@20 -.globl _RtlpExecuteHandlerForException@20 + + +PUBLIC _RtlpExecuteHandlerForException@20 _RtlpExecuteHandlerForException@20: /* Copy the routine in EDX */ @@ -118,16 +120,14 @@ /* Jump to common routine */ jmp _RtlpExecuteHandler@20 -.endfunc - -.func RtlpExecuteHandlerForUnwind@20 -.globl _RtlpExecuteHandlerForUnwind@20 + + +PUBLIC _RtlpExecuteHandlerForUnwind@20 _RtlpExecuteHandlerForUnwind@20: /* Copy the routine in EDX */ mov edx, offset _RtlpUnwindProtector -.endfunc - -.func RtlpExecuteHandler@20 + + _RtlpExecuteHandler@20: /* Save non-volatile */ @@ -142,22 +142,21 @@ xor edi, edi /* Call the 2nd-stage executer */ - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] + push [esp+32] + push [esp+32] + push [esp+32] + push [esp+32] + push [esp+32] call _RtlpExecuteHandler2@20 /* Restore non-volatile */ pop edi pop esi pop ebx - ret 0x14 -.endfunc - -.func RtlpExecuteHandler2@20 -.globl _RtlpExecuteHandler2@20 + ret 20 + + +PUBLIC _RtlpExecuteHandler2@20 _RtlpExecuteHandler2@20: /* Set up stack frame */ @@ -165,7 +164,7 @@ mov ebp, esp /* Save the Frame */ - push [ebp+0xC] + push [ebp+12] /* Push handler address */ push edx @@ -177,11 +176,11 @@ mov [fs:TEB_EXCEPTION_LIST], esp /* Call the handler */ - push [ebp+0x14] - push [ebp+0x10] - push [ebp+0xC] + push [ebp+20] + push [ebp+16] + push [ebp+12] push [ebp+8] - mov ecx, [ebp+0x18] + mov ecx, [ebp+24] call ecx /* Unlink us */ @@ -193,10 +192,9 @@ /* Undo stack frame and return */ mov esp, ebp pop ebp - ret 0x14 -.endfunc - -.func RtlpExceptionProtector + ret 20 + + _RtlpExceptionProtector: /* Assume we'll continue */ @@ -222,9 +220,8 @@ return: ret 16 -.endfunc - -.func RtlpUnwindProtector + + _RtlpUnwindProtector: /* Assume we'll continue */ @@ -250,10 +247,9 @@ .return: ret 16 -.endfunc - -.func RtlRaiseException@4 -.globl _RtlRaiseException@4 + + +PUBLIC _RtlRaiseException@4 _RtlRaiseException@4: /* Set up stack frame */ @@ -325,10 +321,9 @@ /* If we returned, raise a status */ push eax call _RtlRaiseStatus@4 -.endfunc - -.func RtlRaiseStatus@4 -.globl _RtlRaiseStatus@4 + + +PUBLIC _RtlRaiseStatus@4 _RtlRaiseStatus@4: /* Set up stack frame */ @@ -398,4 +393,5 @@ /* If we returned, raise a status */ push eax call _RtlRaiseStatus@4 -.endfunc + +END Modified: branches/cmake-bringup/lib/rtl/i386/interlck.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/inte… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] Mon Nov 1 11:41:01 2010 @@ -6,20 +6,20 @@ * PROGRAMMERS: Timo Kreuzer */ -.intel_syntax noprefix +#include <reactos/asm.h> /* FUNCTIONS ****************************************************************/ - +.code /* PSLIST_ENTRY * NTAPI * RtlInterlockedPopEntrySList( * IN PSLIST_HEADER ListHead); */ -.global _ExpInterlockedPopEntrySListResume@0 -.global _ExpInterlockedPopEntrySListEnd@0 -.global _ExpInterlockedPopEntrySListFault@0 -.global _RtlInterlockedPopEntrySList@4 +PUBLIC _ExpInterlockedPopEntrySListResume@0 +PUBLIC _ExpInterlockedPopEntrySListEnd@0 +PUBLIC _ExpInterlockedPopEntrySListFault@0 +PUBLIC _RtlInterlockedPopEntrySList@4 _RtlInterlockedPopEntrySList@4: /* Save registers */ @@ -35,10 +35,9 @@ /* Load ListHead->Depth and ListHead->Sequence into edx */ mov edx, [ebp + 4] -1: /* Check if ListHead->Next is NULL */ or eax, eax - jz 2f + jz _ExpInterlockedPopEntrySList2 /* Copy Depth and Sequence number and adjust Depth */ lea ecx, [edx - 1] @@ -54,7 +53,7 @@ jnz _ExpInterlockedPopEntrySListResume@0 /* Restore registers and return */ -2: +_ExpInterlockedPopEntrySList2: pop ebp pop ebx ret 4 @@ -66,7 +65,7 @@ * IN PSLIST_HEADER ListHead, * IN PSLIST_ENTRY ListEntry); */ -.global _RtlInterlockedPushEntrySList@8 +PUBLIC _RtlInterlockedPushEntrySList@8 _RtlInterlockedPushEntrySList@8: /* Save registers */ @@ -85,18 +84,18 @@ /* Load ListHead->Depth and ListHead->Sequence into edx */ mov edx, [ebp + 4] -1: +_RtlpInterlockedPushEntrySListResume: /* Set ListEntry->Next to ListHead->Next */ mov [ebx], eax /* Copy ListHead->Depth and ListHead->Sequence and adjust them */ - lea ecx, [edx + 0x10001] + lea ecx, [edx + HEX(10001)] /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ LOCK cmpxchg8b qword ptr [ebp] /* If not equal, retry with edx:eax, being the content of [ebp] now */ - jnz 1b + jnz _RtlpInterlockedPushEntrySListResume /* Restore registers and return */ pop ebp @@ -109,7 +108,7 @@ * RtlInterlockedFlushSList( * IN PSINGLE_LIST_ENTRY ListHead); */ -.global _RtlInterlockedFlushSList@4 +PUBLIC _RtlInterlockedFlushSList@4 _RtlInterlockedFlushSList@4: /* Save registers */ @@ -128,10 +127,10 @@ /* Load ListHead->Depth and ListHead->Sequence into edx */ mov edx, [ebp + 4] -1: +_RtlpInterlockedFlushSListResume: /* Check if ListHead->Next is NULL */ or eax, eax - jz 2f + jz _RtlpInterlockedFlushSListEnd /* Copy Depth and Sequence number to ecx */ mov ecx, edx @@ -143,10 +142,12 @@ LOCK cmpxchg8b qword ptr [ebp] /* If not equal, retry with edx:eax, being the content of [ebp] now */ - jnz 1b + jnz _RtlpInterlockedFlushSListResume /* Restore registers and return */ -2: +_RtlpInterlockedFlushSListEnd: pop ebp pop ebx ret 4 + +END Modified: branches/cmake-bringup/lib/rtl/i386/res_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/res_… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] Mon Nov 1 11:41:01 2010 @@ -1,11 +1,15 @@ + +#include <reactos/asm.h> #include <ndk/asm.h> -.intel_syntax noprefix + +EXTERN _LdrpAccessResource@16:PROC /* * On x86, Shrinker, an executable compressor, depends on the * "call access_resource" instruction being there. */ -.globl _LdrAccessResource@16 +.code +PUBLIC _LdrAccessResource@16 _LdrAccessResource@16: push ebp mov ebp, esp @@ -18,3 +22,5 @@ call _LdrpAccessResource@16 leave ret 16 + +END Modified: branches/cmake-bringup/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/rtlm… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] Mon Nov 1 11:41:01 2010 @@ -6,21 +6,21 @@ * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) */ -.intel_syntax noprefix +#include <reactos/asm.h> /* GLOBALS *******************************************************************/ -.globl _RtlCompareMemory@12 -.globl _RtlCompareMemoryUlong@12 -.globl _RtlFillMemory@12 -.globl _RtlFillMemoryUlong@12 -.globl _RtlMoveMemory@12 -.globl _RtlZeroMemory@8 -.globl @RtlPrefetchMemoryNonTemporal@8 +PUBLIC _RtlCompareMemory@12 +PUBLIC _RtlCompareMemoryUlong@12 +PUBLIC _RtlFillMemory@12 +PUBLIC _RtlFillMemoryUlong@12 +PUBLIC _RtlMoveMemory@12 +PUBLIC _RtlZeroMemory@8 +PUBLIC @RtlPrefetchMemoryNonTemporal@8 /* FUNCTIONS *****************************************************************/ - -.func RtlCompareMemory@12 +.code + _RtlCompareMemory@12: /* Save volatiles */ @@ -74,9 +74,8 @@ pop edi pop esi ret 12 -.endfunc - -.func RtlCompareMemoryUlong@12 + + _RtlCompareMemoryUlong@12: /* Get pointers and size in ULONGs */ @@ -97,9 +96,8 @@ mov eax, edi pop edi ret 12 -.endfunc - -.func RtlFillMemory@12 + + _RtlFillMemory@12: /* Get pointers and size */ @@ -134,9 +132,8 @@ rep stosb pop edi ret 12 -.endfunc - -.func RtlFillMemoryUlong@12 + + _RtlFillMemoryUlong@12: /* Get pointer, size and pattern */ @@ -150,9 +147,8 @@ rep stosd pop edi ret 12 -.endfunc - -.func RtlFillMemoryUlonglong@16 + + _RtlFillMemoryUlonglong@16: /* Save volatiles */ @@ -179,9 +175,8 @@ pop esi pop edi ret 16 -.endfunc - -.func RtlZeroMemory@8 + + _RtlZeroMemory@8: /* Get pointers and size */ @@ -212,9 +207,8 @@ rep stosb pop edi ret 8 -.endfunc - -.func RtlMoveMemory@12 + + _RtlMoveMemory@12: /* Save volatiles */ @@ -280,9 +274,8 @@ rep movsb cld jmp DoneMove -.endfunc - -.func @RtlPrefetchMemoryNonTemporal@8, @RtlPrefetchMemoryNonTemporal@8 + + @RtlPrefetchMemoryNonTemporal@8: /* @@ -306,8 +299,10 @@ /* Keep looping for the next line, or return if done */ ja FetchLine ret -.endfunc + /* FIXME: HACK */ _Ke386CacheAlignment: - .long 0x40 + .long 64 + +END

13 years, 11 months

[tkreuzer] 49398: [CMAKE] Add missing dependencies for MSVC add_importlibs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 1 09:39:53 2010 New Revision: 49398 URL: http://svn.reactos.org/svn/reactos?rev=49398&view=rev Log: [CMAKE] Add missing dependencies for MSVC add_importlibs Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=493… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 1 09:39:53 2010 @@ -96,6 +96,7 @@ macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) + add_dependencies(${MODULE} lib${LIB}) endforeach() endmacro()

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010