Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[dreimer] 47935: Some more psdk updates needed for winetests.
by dreimer＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: dreimer Date: Sun Jul 4 00:30:37 2010 New Revision: 47935 URL: http://svn.reactos.org/svn/reactos?rev=47935&view=rev Log: Some more psdk updates needed for winetests. Modified: trunk/reactos/include/psdk/docobj.idl trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/docobj.idl?re… ============================================================================== --- trunk/reactos/include/psdk/docobj.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/docobj.idl [iso-8859-1] Sun Jul 4 00:30:37 2010 @@ -274,7 +274,8 @@ OLECMDID_OPTICAL_ZOOM = 63, OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, - OLECMDID_ACTIVEXINSTALLSCOPE = 66 + OLECMDID_ACTIVEXINSTALLSCOPE = 66, + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 } OLECMDID; HRESULT QueryStatus( Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Sun Jul 4 00:30:37 2010 @@ -1508,6 +1508,38 @@ #define SE_CREATE_GLOBAL_PRIVILEGE 30L #define SE_MAX_WELL_KNOWN_PRIVILEGE SE_CREATE_GLOBAL_PRIVILEGE +/* NtGlobalFlag bits */ +#define FLG_STOP_ON_EXCEPTION 0x00000001 +#define FLG_SHOW_LDR_SNAPS 0x00000002 +#define FLG_DEBUG_INITIAL_COMMAND 0x00000004 +#define FLG_STOP_ON_HUNG_GUI 0x00000008 +#define FLG_HEAP_ENABLE_TAIL_CHECK 0x00000010 +#define FLG_HEAP_ENABLE_FREE_CHECK 0x00000020 +#define FLG_HEAP_VALIDATE_PARAMETERS 0x00000040 +#define FLG_HEAP_VALIDATE_ALL 0x00000080 +#define FLG_APPLICATION_VERIFIER 0x00000100 +#define FLG_POOL_ENABLE_TAGGING 0x00000400 +#define FLG_HEAP_ENABLE_TAGGING 0x00000800 +#define FLG_USER_STACK_TRACE_DB 0x00001000 +#define FLG_KERNEL_STACK_TRACE_DB 0x00002000 +#define FLG_MAINTAIN_OBJECT_TYPELIST 0x00004000 +#define FLG_HEAP_ENABLE_TAG_BY_DLL 0x00008000 +#define FLG_DISABLE_STACK_EXTENSION 0x00010000 +#define FLG_ENABLE_CSRDEBUG 0x00020000 +#define FLG_ENABLE_KDEBUG_SYMBOL_LOAD 0x00040000 +#define FLG_DISABLE_PAGE_KERNEL_STACKS 0x00080000 +#define FLG_ENABLE_SYSTEM_CRIT_BREAKS 0x00100000 +#define FLG_HEAP_DISABLE_COALESCING 0x00200000 +#define FLG_ENABLE_CLOSE_EXCEPTIONS 0x00400000 +#define FLG_ENABLE_EXCEPTION_LOGGING 0x00800000 +#define FLG_ENABLE_HANDLE_TYPE_TAGGING 0x01000000 +#define FLG_HEAP_PAGE_ALLOCS 0x02000000 +#define FLG_DEBUG_INITIAL_COMMAND_EX 0x04000000 +#define FLG_DISABLE_DBGPRINT 0x08000000 +#define FLG_CRITSEC_EVENT_CREATION 0x10000000 +#define FLG_LDR_TOP_DOWN 0x20000000 +#define FLG_ENABLE_HANDLE_EXCEPTIONS 0x40000000 +#define FLG_DISABLE_PROTDLLS 0x80000000 /* Rtl*Registry* functions structs and defines */ #define RTL_REGISTRY_ABSOLUTE 0

1 0

[ekohl] 47934: [ADVAPI32/LSASRV] - Implement LookupPrivilegeValueW and LsaLookupPrivilegeValue. - Move lookup code from LookupPrivilegeValueW to LsarLookupPrivilegeValue.
by ekohl＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: ekohl Date: Sat Jul 3 22:51:44 2010 New Revision: 47934 URL: http://svn.reactos.org/svn/reactos?rev=47934&view=rev Log: [ADVAPI32/LSASRV] - Implement LookupPrivilegeValueW and LsaLookupPrivilegeValue. - Move lookup code from LookupPrivilegeValueW to LsarLookupPrivilegeValue. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Jul 3 22:51:44 2010 @@ -374,7 +374,7 @@ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stub LsaLookupPrivilegeDisplayName @ stub LsaLookupPrivilegeName -@ stub LsaLookupPrivilegeValue +@ stdcall LsaLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsaLookupSids(ptr long ptr ptr ptr) @ stdcall LsaNtStatusToWinError(long) @ stub LsaOpenAccount 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] Sat Jul 3 22:51:44 2010 @@ -397,6 +397,37 @@ } /* + * @implemented + */ +NTSTATUS +WINAPI +LsaLookupPrivilegeValue(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING Name, + OUT PLUID Value) +{ + LUID Luid; + NTSTATUS Status; + + FIXME("(%p,%p,%p) stub\n", PolicyHandle, Name, Value); + + RpcTryExcept + { + Status = LsarLookupPrivilegeValue(PolicyHandle, + (PRPC_UNICODE_STRING)Name, + &Luid); + if (Status == STATUS_SUCCESS) + *Value = Luid; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + +/* * @unimplemented */ NTSTATUS Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sat Jul 3 22:51:44 2010 @@ -1409,81 +1409,51 @@ /********************************************************************** - * LookupPrivilegeValueW EXPORTED - * - * @unimplemented - */ -BOOL -WINAPI -LookupPrivilegeValueW(LPCWSTR SystemName, - LPCWSTR PrivName, - PLUID Luid) -{ - static const WCHAR * const DefaultPrivNames[] = - { - L"SeCreateTokenPrivilege", - L"SeAssignPrimaryTokenPrivilege", - L"SeLockMemoryPrivilege", - L"SeIncreaseQuotaPrivilege", - L"SeMachineAccountPrivilege", - L"SeTcbPrivilege", - L"SeSecurityPrivilege", - L"SeTakeOwnershipPrivilege", - L"SeLoadDriverPrivilege", - L"SeSystemProfilePrivilege", - L"SeSystemtimePrivilege", - L"SeProfileSingleProcessPrivilege", - L"SeIncreaseBasePriorityPrivilege", - L"SeCreatePagefilePrivilege", - L"SeCreatePermanentPrivilege", - L"SeBackupPrivilege", - L"SeRestorePrivilege", - L"SeShutdownPrivilege", - L"SeDebugPrivilege", - L"SeAuditPrivilege", - L"SeSystemEnvironmentPrivilege", - L"SeChangeNotifyPrivilege", - L"SeRemoteShutdownPrivilege", - L"SeUndockPrivilege", - L"SeSyncAgentPrivilege", - L"SeEnableDelegationPrivilege", - L"SeManageVolumePrivilege", - L"SeImpersonatePrivilege", - L"SeCreateGlobalPrivilege" - }; - unsigned Priv; - - if (!ADVAPI_IsLocalComputer(SystemName)) - { - SetLastError(RPC_S_SERVER_UNAVAILABLE); - return FALSE; - } - if (!PrivName) - { - SetLastError(ERROR_NO_SUCH_PRIVILEGE); - return FALSE; - } - - if (NULL != SystemName && L'\0' != *SystemName) - { - FIXME("LookupPrivilegeValueW: not implemented for remote system\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - - for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) - { - if (0 == _wcsicmp(PrivName, DefaultPrivNames[Priv])) - { - Luid->LowPart = Priv + SE_MIN_WELL_KNOWN_PRIVILEGE; - Luid->HighPart = 0; - return TRUE; - } - } - - WARN("LookupPrivilegeValueW: no such privilege %S\n", PrivName); - SetLastError(ERROR_NO_SUCH_PRIVILEGE); - return FALSE; + * LookupPrivilegeValueW + * + * @implemented + */ +BOOL +WINAPI +LookupPrivilegeValueW(LPCWSTR lpSystemName, + LPCWSTR lpPrivilegeName, + PLUID lpLuid) +{ + LSA_OBJECT_ATTRIBUTES ObjectAttributes = {0}; + LSA_UNICODE_STRING SystemName; + LSA_UNICODE_STRING PrivilegeName; + LSA_HANDLE PolicyHandle = NULL; + NTSTATUS Status; + + RtlInitUnicodeString(&SystemName, + lpSystemName); + + Status = LsaOpenPolicy(lpSystemName ? &SystemName : NULL, + &ObjectAttributes, + POLICY_LOOKUP_NAMES, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + RtlInitUnicodeString(&PrivilegeName, + lpPrivilegeName); + + Status = LsaLookupPrivilegeValue(PolicyHandle, + &PrivilegeName, + lpLuid); + + LsaClose(PolicyHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Jul 3 22:51:44 2010 @@ -10,12 +10,19 @@ #include <wine/debug.h> +typedef enum _LSA_DB_HANDLE_TYPE +{ + LsaDbIgnoreHandle, + LsaDbPolicyHandle, + LsaDbAccountHandle +} LSA_DB_HANDLE_TYPE, *PLSA_DB_HANDLE_TYPE; + typedef struct _LSA_DB_HANDLE { ULONG Signature; - ULONG Type; + LSA_DB_HANDLE_TYPE HandleType; LONG RefCount; - ACCESS_MASK AccessGranted; + ACCESS_MASK Access; } LSA_DB_HANDLE, *PLSA_DB_HANDLE; #define LSAP_DB_SIGNATURE 0x12345678 @@ -28,7 +35,8 @@ /* FUNCTIONS ***************************************************************/ static LSAPR_HANDLE -LsapCreateDbHandle(ULONG Type) +LsapCreateDbHandle(LSA_DB_HANDLE_TYPE HandleType, + ACCESS_MASK DesiredAccess) { PLSA_DB_HANDLE DbHandle; @@ -41,7 +49,8 @@ { DbHandle->Signature = LSAP_DB_SIGNATURE; DbHandle->RefCount = 1; - DbHandle->Type = Type; + DbHandle->HandleType = HandleType; + DbHandle->Access = DesiredAccess; } // RtlLeaveCriticalSection(&PolicyHandleTableLock); @@ -51,7 +60,8 @@ static BOOL -LsapValidateDbHandle(LSAPR_HANDLE Handle) +LsapValidateDbHandle(LSAPR_HANDLE Handle, + LSA_DB_HANDLE_TYPE HandleType) { PLSA_DB_HANDLE DbHandle = (PLSA_DB_HANDLE)Handle; BOOL bValid = FALSE; @@ -59,7 +69,12 @@ _SEH2_TRY { if (DbHandle->Signature == LSAP_DB_SIGNATURE) - bValid = TRUE; + { + if (HandleType == LsaDbIgnoreHandle) + bValid = TRUE; + else if (DbHandle->HandleType == HandleType) + bValid = TRUE; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -81,7 +96,7 @@ RtlInitializeCriticalSection(&PolicyHandleTableLock); - TRACE("LsarStartRpcServer() called"); + TRACE("LsarStartRpcServer() called\n"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -129,7 +144,7 @@ // RtlEnterCriticalSection(&PolicyHandleTableLock); - if (LsapValidateDbHandle(*ObjectHandle)) + if (LsapValidateDbHandle(*ObjectHandle, LsaDbIgnoreHandle)) { RtlFreeHeap(RtlGetProcessHeap(), 0, *ObjectHandle); *ObjectHandle = NULL; @@ -213,7 +228,8 @@ RtlEnterCriticalSection(&PolicyHandleTableLock); - *PolicyHandle = LsapCreateDbHandle(0); + *PolicyHandle = LsapCreateDbHandle(LsaDbPolicyHandle, + DesiredAccess); if (*PolicyHandle == NULL) Status = STATUS_INSUFFICIENT_RESOURCES; @@ -504,8 +520,63 @@ PRPC_UNICODE_STRING Name, PLUID Value) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + static const WCHAR * const DefaultPrivNames[] = + { + L"SeCreateTokenPrivilege", + L"SeAssignPrimaryTokenPrivilege", + L"SeLockMemoryPrivilege", + L"SeIncreaseQuotaPrivilege", + L"SeMachineAccountPrivilege", + L"SeTcbPrivilege", + L"SeSecurityPrivilege", + L"SeTakeOwnershipPrivilege", + L"SeLoadDriverPrivilege", + L"SeSystemProfilePrivilege", + L"SeSystemtimePrivilege", + L"SeProfileSingleProcessPrivilege", + L"SeIncreaseBasePriorityPrivilege", + L"SeCreatePagefilePrivilege", + L"SeCreatePermanentPrivilege", + L"SeBackupPrivilege", + L"SeRestorePrivilege", + L"SeShutdownPrivilege", + L"SeDebugPrivilege", + L"SeAuditPrivilege", + L"SeSystemEnvironmentPrivilege", + L"SeChangeNotifyPrivilege", + L"SeRemoteShutdownPrivilege", + L"SeUndockPrivilege", + L"SeSyncAgentPrivilege", + L"SeEnableDelegationPrivilege", + L"SeManageVolumePrivilege", + L"SeImpersonatePrivilege", + L"SeCreateGlobalPrivilege" + }; + ULONG Priv; + + + TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n", + PolicyHandle, Name, Value); + + if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) + { + ERR("Invalid handle\n"); + return STATUS_INVALID_HANDLE; + } + + for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) + { + if (0 == _wcsicmp(Name->Buffer, DefaultPrivNames[Priv])) + { + Value->LowPart = Priv + SE_MIN_WELL_KNOWN_PRIVILEGE; + Value->HighPart = 0; + return STATUS_SUCCESS; + } + } + + WARN("LsarLookupPrivilegeValue: no such privilege %wZ\n", Name); + + return STATUS_NO_SUCH_PRIVILEGE; } @@ -562,7 +633,7 @@ { FIXME("(%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights); - if (!LsapValidateDbHandle(PolicyHandle)) + if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) return STATUS_INVALID_HANDLE; UserRights->Entries = 0; Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sat Jul 3 22:51:44 2010 @@ -698,6 +698,7 @@ PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); +NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE, PLSA_UNICODE_STRING, PLUID); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS);

1 0

[dreimer] 47933: Update libxml to 2.7.7 Resync zlib to 1.2.5. Patch by Samuel Serapion and some lil includes cleanup by me.
by dreimer＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: dreimer Date: Sat Jul 3 22:34:05 2010 New Revision: 47933 URL: http://svn.reactos.org/svn/reactos?rev=47933&view=rev Log: Update libxml to 2.7.7 Resync zlib to 1.2.5. Patch by Samuel Serapion and some lil includes cleanup by me. Modified: trunk/reactos/include/reactos/libs/libxml/HTMLparser.h trunk/reactos/include/reactos/libs/libxml/Makefile.in trunk/reactos/include/reactos/libs/libxml/encoding.h trunk/reactos/include/reactos/libs/libxml/parser.h trunk/reactos/include/reactos/libs/libxml/xmlexports.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/INSTALL trunk/reactos/lib/3rdparty/libxml2/Makefile.am trunk/reactos/lib/3rdparty/libxml2/Makefile.in trunk/reactos/lib/3rdparty/libxml2/SAX2.c trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 trunk/reactos/lib/3rdparty/libxml2/config.guess trunk/reactos/lib/3rdparty/libxml2/config.h trunk/reactos/lib/3rdparty/libxml2/config.sub trunk/reactos/lib/3rdparty/libxml2/configure trunk/reactos/lib/3rdparty/libxml2/configure.in trunk/reactos/lib/3rdparty/libxml2/error.c trunk/reactos/lib/3rdparty/libxml2/globals.c trunk/reactos/lib/3rdparty/libxml2/include/Makefile.in trunk/reactos/lib/3rdparty/libxml2/install-sh trunk/reactos/lib/3rdparty/libxml2/libxml-2.0.pc.in trunk/reactos/lib/3rdparty/libxml2/libxml2.spec trunk/reactos/lib/3rdparty/libxml2/ltmain.sh trunk/reactos/lib/3rdparty/libxml2/missing trunk/reactos/lib/3rdparty/libxml2/mkinstalldirs trunk/reactos/lib/3rdparty/libxml2/nanohttp.c trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/lib/3rdparty/libxml2/relaxng.c trunk/reactos/lib/3rdparty/libxml2/runtest.c trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xinclude.c trunk/reactos/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c trunk/reactos/lib/3rdparty/libxml2/xpath.c trunk/reactos/lib/3rdparty/zlib/deflate.h trunk/reactos/lib/3rdparty/zlib/gzguts.h trunk/reactos/lib/3rdparty/zlib/gzlib.c trunk/reactos/lib/3rdparty/zlib/inffast.c trunk/reactos/lib/3rdparty/zlib/inffast.h trunk/reactos/lib/3rdparty/zlib/inftrees.c trunk/reactos/lib/3rdparty/zlib/inftrees.h trunk/reactos/lib/3rdparty/zlib/trees.c trunk/reactos/lib/3rdparty/zlib/trees.h trunk/reactos/lib/3rdparty/zlib/zutil.c trunk/reactos/lib/3rdparty/zlib/zutil.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/libs/libxml/HTMLparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/encoding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlexports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… Modified: trunk/reactos/lib/3rdparty/libxml2/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/INSTA… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX2.… Modified: trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/acloc… Modified: trunk/reactos/lib/3rdparty/libxml2/config.guess URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.sub URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/error… Modified: trunk/reactos/lib/3rdparty/libxml2/globals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/globa… Modified: trunk/reactos/lib/3rdparty/libxml2/include/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/inclu… Modified: trunk/reactos/lib/3rdparty/libxml2/install-sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/insta… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml-2.0.pc.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/ltmain.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/ltmai… Modified: trunk/reactos/lib/3rdparty/libxml2/missing URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/missi… Modified: trunk/reactos/lib/3rdparty/libxml2/mkinstalldirs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/mkins… Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoh… Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/relax… Modified: trunk/reactos/lib/3rdparty/libxml2/runtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runte… Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… Modified: trunk/reactos/lib/3rdparty/libxml2/xinclude.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xincl… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlIO… Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath… Modified: trunk/reactos/lib/3rdparty/zlib/deflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/deflate.… Modified: trunk/reactos/lib/3rdparty/zlib/gzguts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzguts.h… Modified: trunk/reactos/lib/3rdparty/zlib/gzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzlib.c?… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/trees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/trees.c?… Modified: trunk/reactos/lib/3rdparty/zlib/trees.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/trees.h?… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.c?… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.h?…

1 0

[fireball] 47932: - Pass window styles to SWM when adding a window. - Fix a debug print showing wrong previous hwnd value in SwmWindowPosChanged.
by fireball＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: fireball Date: Sat Jul 3 20:56:49 2010 New Revision: 47932 URL: http://svn.reactos.org/svn/reactos?rev=47932&view=rev Log: - Pass window styles to SWM when adding a window. - Fix a debug print showing wrong previous hwnd value in SwmWindowPosChanged. Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Sat Jul 3 20:56:49 2010 @@ -73,6 +73,7 @@ struct ntdrv_win_data *NTDRV_create_win_data( HWND hwnd ) { struct ntdrv_win_data *data; + DWORD style, ex_style; HWND parent; if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop */ @@ -99,8 +100,11 @@ hwnd, wine_dbgstr_rect( &data->window_rect ), wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + /* Inform window manager about window rect in screen coords */ - SwmAddWindow(hwnd, &data->window_rect); + SwmAddWindow(hwnd, &data->window_rect, style, ex_style); data->whole_window = (PVOID)1; } Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Jul 3 20:56:49 2010 @@ -168,7 +168,7 @@ RosUserConnectCsrss(VOID); VOID NTAPI -SwmAddWindow(HWND hWnd, RECT *WindowRect); +SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style); VOID NTAPI SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sat Jul 3 20:56:49 2010 @@ -338,15 +338,19 @@ VOID NTAPI -SwmAddWindow(HWND hWnd, RECT *WindowRect) +SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style) { PSWM_WINDOW Win; DPRINT("SwmAddWindow %x\n", hWnd); - DPRINT("rect (%d,%d)-(%d,%d)\n", WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); + DPRINT("rect (%d,%d)-(%d,%d), style %x, ex_style %x\n", + WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom, + style, ex_style); /* Acquire the lock */ SwmAcquire(); + + if (ex_style & WS_EX_TOPMOST) DPRINT1("Creating a topmost window, ignoring\n"); /* Allocate entry */ Win = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); @@ -667,7 +671,10 @@ if (hWndAfter && !(SwpFlags & SWP_NOZORDER)) { /* Get the previous window */ - SwmPrev = CONTAINING_RECORD(SwmWin->Entry.Blink, SWM_WINDOW, Entry); + if (SwmWin->Entry.Blink != &SwmWindows) + SwmPrev = CONTAINING_RECORD(SwmWin->Entry.Blink, SWM_WINDOW, Entry); + else + SwmPrev = SwmWin; /* Check if they are different */ if (SwmPrev->hwnd != hWndAfter) Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Jul 3 20:56:49 2010 @@ -84,7 +84,7 @@ RosUserToUnicodeEx 7 RosUserMapVirtualKeyEx 4 RosUserGetAsyncKeyState 1 -SwmAddWindow 2 +SwmAddWindow 4 SwmAddDesktopWindow 3 SwmRemoveWindow 1 SwmSetForeground 1

1 0

[dreimer] 47931: Sync advapi32, comctl32, crypt32, cryptui, cryptnet, fusion, gdi32, gdiplus, hlink, imm32, jscript, kernel32, localspl, msacm32, mscms, msi, mstask, msvcrtd, msxml3, ntdll, ole32, pdh, psapi, quartz, rasapi32, riched20 AND rsaenh Winetests. TBD mshtml, shell32, oleaut32 which still fail to build here
by dreimer＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: dreimer Date: Sat Jul 3 12:45:23 2010 New Revision: 47931 URL: http://svn.reactos.org/svn/reactos?rev=47931&view=rev Log: Sync advapi32, comctl32, crypt32, cryptui, cryptnet, fusion, gdi32, gdiplus, hlink, imm32, jscript, kernel32, localspl, msacm32, mscms, msi, mstask, msvcrtd, msxml3, ntdll, ole32, pdh, psapi, quartz, rasapi32, riched20 AND rsaenh Winetests. TBD mshtml, shell32, oleaut32 which still fail to build here Added: trunk/rostests/winetests/msi/patch.c (with props) trunk/rostests/winetests/quartz/dsoundrender.c (with props) Modified: trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/rebar.c trunk/rostests/winetests/comctl32/resources.h trunk/rostests/winetests/comctl32/rsrc.rc trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/encode.c trunk/rostests/winetests/crypt32/store.c trunk/rostests/winetests/cryptnet/cryptnet.c trunk/rostests/winetests/cryptui/cryptui.c trunk/rostests/winetests/fusion/asmcache.c trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/generated.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/path.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/hlink/browse_ctx.c trunk/rostests/winetests/hlink/hlink.c trunk/rostests/winetests/imm32/imm32.c trunk/rostests/winetests/jscript/api.js trunk/rostests/winetests/jscript/lang.js trunk/rostests/winetests/jscript/regexp.js trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/localspl/localmon.c trunk/rostests/winetests/msacm32/msacm.c trunk/rostests/winetests/mscms/profile.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/msi/testlist.c trunk/rostests/winetests/mstask/task.c trunk/rostests/winetests/msvcrtd/debug.c trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/xmlelem.c trunk/rostests/winetests/ntdll/atom.c trunk/rostests/winetests/ntdll/error.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/path.c trunk/rostests/winetests/ntdll/port.c trunk/rostests/winetests/ntdll/rtlstr.c trunk/rostests/winetests/ntdll/string.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/hglobalstream.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/stg_prop.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c trunk/rostests/winetests/pdh/pdh.c trunk/rostests/winetests/psapi/psapi_main.c trunk/rostests/winetests/quartz/quartz.rbuild trunk/rostests/winetests/quartz/referenceclock.c trunk/rostests/winetests/rasapi32/rasapi.c trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/rsaenh/rsaenh.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… Modified: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… Modified: trunk/rostests/winetests/comctl32/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/resour… Modified: trunk/rostests/winetests/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rsrc.r… Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… Modified: trunk/rostests/winetests/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/store.c… Modified: trunk/rostests/winetests/cryptnet/cryptnet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… Modified: trunk/rostests/winetests/cryptui/cryptui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/generated… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… Modified: trunk/rostests/winetests/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/browse_ct… Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… Modified: trunk/rostests/winetests/jscript/api.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/api.js?… Modified: trunk/rostests/winetests/jscript/lang.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js… Modified: trunk/rostests/winetests/jscript/regexp.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/localm… Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=47… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=4… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Added: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?… Modified: trunk/rostests/winetests/mstask/task.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task.c?r… Modified: trunk/rostests/winetests/msvcrtd/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/debug.c… Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… Modified: trunk/rostests/winetests/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlelem.… Modified: trunk/rostests/winetests/ntdll/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/atom.c?re… Modified: trunk/rostests/winetests/ntdll/error.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/error.c?r… Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… Modified: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… Modified: trunk/rostests/winetests/ntdll/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/path.c?re… Modified: trunk/rostests/winetests/ntdll/port.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?re… Modified: trunk/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlstr.c?… Modified: trunk/rostests/winetests/ntdll/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… Modified: trunk/rostests/winetests/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/hglobalst… Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… Modified: trunk/rostests/winetests/pdh/pdh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/pdh.c?rev=4… Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… Added: trunk/rostests/winetests/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre… Modified: trunk/rostests/winetests/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/quartz.r… Modified: trunk/rostests/winetests/quartz/referenceclock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/referenc… Modified: trunk/rostests/winetests/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/rasapi… Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c…

1 0

[dreimer] 47930: Sync aclui, advapi32, atl, authz, kernel32, msi, oledlg, powrprof, qmgr, riched20, samlib to Wine 1.2rc5 Update some psdk Headers to get some more synched winetests build
by dreimer＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: dreimer Date: Sat Jul 3 12:42:55 2010 New Revision: 47930 URL: http://svn.reactos.org/svn/reactos?rev=47930&view=rev Log: Sync aclui, advapi32, atl, authz, kernel32, msi, oledlg, powrprof, qmgr, riched20, samlib to Wine 1.2rc5 Update some psdk Headers to get some more synched winetests build Added: trunk/reactos/dll/win32/oledlg/oledlg_Ro.rc (with props) trunk/reactos/include/psdk/winsafer.h (with props) Removed: trunk/reactos/dll/win32/oledlg/oledlg_ros.diff Modified: trunk/reactos/dll/win32/aclui/aclui.spec trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt.h trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/misc/shutdown.c trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/dll/win32/advapi32/misc/trace.c trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/token/token.c trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/atl_main.c trunk/reactos/dll/win32/atl/atlwin.h trunk/reactos/dll/win32/atl/registrar.c trunk/reactos/dll/win32/authz/authz.spec trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi_Ko.rc trunk/reactos/dll/win32/msi/msi_Pt.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/where.c trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/oledlg_It.rc trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc trunk/reactos/dll/win32/oledlg/rsrc.rc trunk/reactos/dll/win32/powrprof/powrprof.c trunk/reactos/dll/win32/powrprof/powrprof.spec trunk/reactos/dll/win32/qmgr/qmgr.inf trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/psdk/corerror.h trunk/reactos/include/psdk/winerror.h trunk/reactos/include/psdk/winnt.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/aclui/aclui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.spec… Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… Modified: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… Modified: trunk/reactos/dll/win32/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atlwin.h?rev… Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… Modified: trunk/reactos/dll/win32/authz/authz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.spec… Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=47… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=4… Modified: trunk/reactos/dll/win32/msi/msi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ko.rc?re… Modified: trunk/reactos/dll/win32/msi/msi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Pt.rc?re… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu… Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt… Added: trunk/reactos/dll/win32/oledlg/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ro… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ru… Modified: trunk/reactos/dll/win32/oledlg/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Uk… Removed: trunk/reactos/dll/win32/oledlg/oledlg_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ro… Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… Modified: trunk/reactos/dll/win32/powrprof/powrprof.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… Modified: trunk/reactos/dll/win32/qmgr/qmgr.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.inf?re… Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… Modified: trunk/reactos/include/psdk/corerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/corerror.h?re… Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… Added: trunk/reactos/include/psdk/winsafer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsafer.h?re…

1 0

[mjmartin] 47929: [win32k] - Remove old win32k timer code.
by mjmartin＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: mjmartin Date: Sat Jul 3 12:37:51 2010 New Revision: 47929 URL: http://svn.reactos.org/svn/reactos?rev=47929&view=rev Log: [win32k] - Remove old win32k timer code. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Jul 3 12:37:51 2010 @@ -42,16 +42,6 @@ LIST_ENTRY ListEntry; } USER_SENT_MESSAGE_NOTIFY, *PUSER_SENT_MESSAGE_NOTIFY; -typedef struct _TIMER_ENTRY{ - LIST_ENTRY ListEntry; - LARGE_INTEGER ExpiryTime; - HWND Wnd; - UINT_PTR IDEvent; - UINT Period; - TIMERPROC TimerFunc; - UINT Msg; -} TIMER_ENTRY, *PTIMER_ENTRY; - typedef struct _USER_MESSAGE_QUEUE { /* Reference counter, only access this variable with interlocked functions! */ @@ -67,8 +57,6 @@ LIST_ENTRY NotifyMessagesListHead; /* Queue for hardware messages for the queue. */ LIST_ENTRY HardwareMessagesListHead; - /* List of timers, sorted on expiry time (earliest first) */ - LIST_ENTRY TimerListHead; /* Lock for the hardware message list. */ KMUTEX HardwareLock; /* Pointer to the current WM_MOUSEMOVE message */ @@ -280,24 +268,6 @@ BOOL FASTCALL IntMsqClearWakeMask(VOID); -BOOLEAN FASTCALL -MsqSetTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc, - UINT Msg); -BOOLEAN FASTCALL -MsqKillTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Msg); -BOOLEAN FASTCALL -MsqGetTimerMessage(PUSER_MESSAGE_QUEUE MessageQueue, - PWINDOW_OBJECT WindowFilter, UINT MsgFilterMin, UINT MsgFilterMax, - MSG *Msg, BOOLEAN Restart); -BOOLEAN FASTCALL -MsqGetFirstTimerExpiry(PUSER_MESSAGE_QUEUE MessageQueue, - PWINDOW_OBJECT WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, - PLARGE_INTEGER FirstTimerExpiry); -VOID FASTCALL -MsqRemoveTimersWindow(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd); - static __inline LONG MsqCalculateMessageTime(IN PLARGE_INTEGER TickCount) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Jul 3 12:37:51 2010 @@ -50,7 +50,6 @@ static KEVENT HardwareMessageEvent; static PAGED_LOOKASIDE_LIST MessageLookasideList; -static PAGED_LOOKASIDE_LIST TimerLookasideList; #define IntLockSystemMessageQueue(OldIrql) \ KeAcquireSpinLock(&SystemMessageQueueLock, &OldIrql) @@ -157,13 +156,6 @@ sizeof(USER_MESSAGE), TAG_USRMSG, 256); - ExInitializePagedLookasideList(&TimerLookasideList, - NULL, - NULL, - 0, - sizeof(TIMER_ENTRY), - TAG_TIMER, - 64); return(STATUS_SUCCESS); } @@ -1427,7 +1419,6 @@ InitializeListHead(&MessageQueue->PostedMessagesListHead); InitializeListHead(&MessageQueue->SentMessagesListHead); InitializeListHead(&MessageQueue->HardwareMessagesListHead); - InitializeListHead(&MessageQueue->TimerListHead); InitializeListHead(&MessageQueue->DispatchingMessagesHead); InitializeListHead(&MessageQueue->LocalDispatchingMessagesHead); KeInitializeMutex(&MessageQueue->HardwareLock, 0); @@ -1466,7 +1457,6 @@ { PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; - PTIMER_ENTRY CurrentTimer; PUSER_SENT_MESSAGE CurrentSentMessage; /* cleanup posted messages */ @@ -1516,14 +1506,6 @@ /* free the message */ ExFreePool(CurrentSentMessage); - } - - /* cleanup timers */ - while (! IsListEmpty(&MessageQueue->TimerListHead)) - { - CurrentEntry = RemoveHeadList(&MessageQueue->TimerListHead); - CurrentTimer = CONTAINING_RECORD(CurrentEntry, TIMER_ENTRY, ListEntry); - ExFreeToPagedLookasideList(&TimerLookasideList, CurrentTimer); } /* notify senders of dispatching messages. This needs to be cleaned up if e.g. @@ -1712,290 +1694,4 @@ return NULL; } -#ifndef NDEBUG -static VOID FASTCALL -DumpTimerList(PUSER_MESSAGE_QUEUE MessageQueue) -{ - PLIST_ENTRY Current; - PTIMER_ENTRY Timer; - - Current = MessageQueue->TimerListHead.Flink; - if (Current == &MessageQueue->TimerListHead) - { - DPRINT("timer list is empty for queue %p\n", MessageQueue); - } - while (Current != &MessageQueue->TimerListHead) - { - Timer = CONTAINING_RECORD(Current, TIMER_ENTRY, ListEntry); - DPRINT("queue %p timer %p expiry %I64d wnd %x id %p period %u timerproc %p msg %u\n", - MessageQueue, Timer, Timer->ExpiryTime.QuadPart, Timer->Wnd, Timer->IDEvent, - Timer->Period, Timer->TimerFunc, Timer->Msg); - Current = Current->Flink; - } -} -#endif /* ! defined(NDEBUG) */ - -/* Must have the message queue locked while calling this */ -static VOID FASTCALL -InsertTimer(PUSER_MESSAGE_QUEUE MessageQueue, PTIMER_ENTRY NewTimer) -{ - PLIST_ENTRY Current; - - Current = MessageQueue->TimerListHead.Flink; - while (Current != &MessageQueue->TimerListHead) - { - if (NewTimer->ExpiryTime.QuadPart < - CONTAINING_RECORD(Current, TIMER_ENTRY, ListEntry)->ExpiryTime.QuadPart) - { - break; - } - Current = Current->Flink; - } - - InsertTailList(Current, &NewTimer->ListEntry); -} - -/* Must have the message queue locked while calling this */ -static PTIMER_ENTRY FASTCALL -RemoveTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT_PTR IDEvent, UINT Msg) -{ - PTIMER_ENTRY Timer; - PLIST_ENTRY EnumEntry; - - /* Remove timer if already in the queue */ - EnumEntry = MessageQueue->TimerListHead.Flink; - while (EnumEntry != &MessageQueue->TimerListHead) - { - Timer = CONTAINING_RECORD(EnumEntry, TIMER_ENTRY, ListEntry); - EnumEntry = EnumEntry->Flink; - - if (Timer->Wnd == Wnd && - Timer->IDEvent == IDEvent && - Timer->Msg == Msg) - { - RemoveEntryList(&Timer->ListEntry); - return Timer; - } - } - - return NULL; -} - -BOOLEAN FASTCALL -MsqSetTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc, - UINT Msg) -{ - PTIMER_ENTRY Timer; - LARGE_INTEGER CurrentTime; - - DPRINT("MsqSetTimer queue %p wnd %x id %p period %u timerproc %p msg %d\n", - MessageQueue, Wnd, IDEvent, Period, TimerFunc, Msg); - - Timer = RemoveTimer(MessageQueue, Wnd, IDEvent, Msg); - if (NULL == Timer) - { - Timer = ExAllocateFromPagedLookasideList(&TimerLookasideList); - if (NULL == Timer) - { - DPRINT1("Failed to allocate timer entry\n"); - return FALSE; - } - DPRINT("Allocated new timer entry %p\n", Timer); - Timer->Wnd = Wnd; - Timer->IDEvent = IDEvent; - Timer->Msg = Msg; - } - else - { - DPRINT("Updating existing timer entry %p\n", Timer); - } - - KeQuerySystemTime(&CurrentTime); - Timer->ExpiryTime.QuadPart = CurrentTime.QuadPart + - (ULONGLONG) Period * (ULONGLONG) 10000; - Timer->Period = Period; - Timer->TimerFunc = TimerFunc; - DPRINT("Insert timer now %I64d expiry %I64d\n", CurrentTime.QuadPart, - Timer->ExpiryTime.QuadPart); - - InsertTimer(MessageQueue, Timer); - -#ifndef NDEBUG - - DumpTimerList(MessageQueue); -#endif /* ! defined(NDEBUG) */ - - return TRUE; -} - -BOOLEAN FASTCALL -MsqKillTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Msg) -{ - PTIMER_ENTRY Timer; - - DPRINT("MsqKillTimer queue %p wnd %x id %p msg %d\n", - MessageQueue, Wnd, IDEvent, Msg); - - Timer = RemoveTimer(MessageQueue, Wnd, IDEvent, Msg); - - if (NULL == Timer) - { - DPRINT("Failed to remove timer from list, not found\n"); - } - else - { - ExFreeToPagedLookasideList(&TimerLookasideList, Timer); - } - -#ifndef NDEBUG - DumpTimerList(MessageQueue); -#endif /* ! defined(NDEBUG) */ - - return NULL != Timer; -} - -BOOLEAN FASTCALL -MsqGetTimerMessage(PUSER_MESSAGE_QUEUE MessageQueue, - PWINDOW_OBJECT WindowFilter, UINT MsgFilterMin, UINT MsgFilterMax, - MSG *Msg, BOOLEAN Restart) -{ - PTIMER_ENTRY Timer; - LARGE_INTEGER CurrentTime; - LARGE_INTEGER LargeTickCount; - PLIST_ENTRY EnumEntry; - BOOLEAN GotMessage; - - DPRINT("MsqGetTimerMessage queue %p msg %p restart %s\n", - MessageQueue, Msg, Restart ? "TRUE" : "FALSE"); - - KeQuerySystemTime(&CurrentTime); - DPRINT("Current time %I64d\n", CurrentTime.QuadPart); - EnumEntry = MessageQueue->TimerListHead.Flink; - GotMessage = FALSE; - while (EnumEntry != &MessageQueue->TimerListHead) - { - Timer = CONTAINING_RECORD(MessageQueue->TimerListHead.Flink, - TIMER_ENTRY, ListEntry); - DPRINT("Checking timer %p wnd %x expiry %I64d\n", Timer, Timer->Wnd, - Timer->ExpiryTime.QuadPart); - EnumEntry = EnumEntry->Flink; - if ((NULL == WindowFilter || Timer->Wnd == WindowFilter->hSelf) && - ((MsgFilterMin == 0 && MsgFilterMax == 0) || - (MsgFilterMin <= Timer->Msg && - Timer->Msg <= MsgFilterMax))) - { - if (Timer->ExpiryTime.QuadPart <= CurrentTime.QuadPart) - { - DPRINT("Timer is expired\n"); - GotMessage = TRUE; - break; - } - else - { - DPRINT("No need to check later timers\n"); - break; - } - } - else - { - DPRINT("timer %p (wnd %x msg %d) failed filter wnd %x msgmin %d msgmax %d\n", - Timer, Timer->Wnd, Timer->Msg, WindowFilter->hSelf, MsgFilterMin, MsgFilterMax); - } - } - - if (! GotMessage) - { - DPRINT("No timer pending\n"); - return FALSE; - } - - Msg->hwnd = Timer->Wnd; - Msg->message = Timer->Msg; - Msg->wParam = (WPARAM) Timer->IDEvent; - Msg->lParam = (LPARAM) Timer->TimerFunc; - KeQueryTickCount(&LargeTickCount); - Msg->time = MsqCalculateMessageTime(&LargeTickCount); - Msg->pt = gpsi->ptCursor; - - if (Restart) - { - RemoveEntryList(&Timer->ListEntry); - Timer->ExpiryTime.QuadPart = CurrentTime.QuadPart + - (ULONGLONG) Timer->Period * (ULONGLONG) 10000; - DPRINT("Restarting timer %p expires %I64d\n", Timer, Timer->ExpiryTime.QuadPart); - InsertTimer(MessageQueue, Timer); - -#ifndef NDEBUG - - DumpTimerList(MessageQueue); -#endif /* ! defined(NDEBUG) */ - - } - - DPRINT("Created message wnd %x msg %d wParam %u lParam %u\n", Msg->hwnd, Msg->message, - Msg->wParam, Msg->lParam); - - return TRUE; -} - -VOID FASTCALL -MsqRemoveTimersWindow(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd) -{ - PTIMER_ENTRY Timer; - PLIST_ENTRY EnumEntry; - - DPRINT("MsqRemoveTimersWindow queue %p wnd %x\n", MessageQueue, Wnd); - - EnumEntry = MessageQueue->TimerListHead.Flink; - while (EnumEntry != &MessageQueue->TimerListHead) - { - Timer = CONTAINING_RECORD(EnumEntry, TIMER_ENTRY, ListEntry); - EnumEntry = EnumEntry->Flink; - if (Timer->Wnd == Wnd) - { - DPRINT("Removing timer %p because its window is going away\n", Timer); - RemoveEntryList(&Timer->ListEntry); - ExFreeToPagedLookasideList(&TimerLookasideList, Timer); - } - } - -#ifndef NDEBUG - DumpTimerList(MessageQueue); -#endif /* ! defined(NDEBUG) */ - -} - -BOOLEAN FASTCALL -MsqGetFirstTimerExpiry(PUSER_MESSAGE_QUEUE MessageQueue, - PWINDOW_OBJECT WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, - PLARGE_INTEGER FirstTimerExpiry) -{ - PTIMER_ENTRY Timer; - PLIST_ENTRY EnumEntry; - - DPRINT("MsqGetFirstTimerExpiry queue %p wndfilter %x msgfiltermin %d msgfiltermax %d expiry %p\n", - MessageQueue, WndFilter, MsgFilterMin, MsgFilterMax, FirstTimerExpiry); - - EnumEntry = MessageQueue->TimerListHead.Flink; - while (EnumEntry != &MessageQueue->TimerListHead) - { - Timer = CONTAINING_RECORD(MessageQueue->TimerListHead.Flink, - TIMER_ENTRY, ListEntry); - EnumEntry = EnumEntry->Flink; - if ((NULL == WndFilter || PtrToInt(WndFilter) == 1 || Timer->Wnd == WndFilter->hSelf) && - ((MsgFilterMin == 0 && MsgFilterMax == 0) || - (MsgFilterMin <= Timer->Msg && - Timer->Msg <= MsgFilterMax))) - { - *FirstTimerExpiry = Timer->ExpiryTime; - DPRINT("First timer expires %I64d\n", Timer->ExpiryTime); - return TRUE; - } - } - - return FALSE; -} - /* EOF */

1 0

[fireball] 47928: - Properly pass antialiasing information to the kernelmode text output routine. - Delete unused code.
by fireball＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: fireball Date: Sat Jul 3 12:29:09 2010 New Revision: 47928 URL: http://svn.reactos.org/svn/reactos?rev=47928&view=rev Log: - Properly pass antialiasing information to the kernelmode text output routine. - Delete unused code. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -685,150 +685,8 @@ TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count), /*physDev->dc_rect.left +*/ x, /*physDev->dc_rect.top +*/ y); - RosGdiExtTextOut(physDev->hKernelDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry); - -#if 0 - { - INT offset = 0, xoff = 0, yoff = 0; - wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, textPixel ); - - if(aa_type == AA_None || physDev->depth == 1) - { - void (* sharp_glyph_fn)(X11DRV_PDEVICE *, INT, INT, void *, XGlyphInfo *); - - if(aa_type == AA_None) - sharp_glyph_fn = SharpGlyphMono; - else - sharp_glyph_fn = SharpGlyphGray; - - for(idx = 0; idx < count; idx++) { - sharp_glyph_fn(physDev, physDev->dc_rect.left + x + xoff, - physDev->dc_rect.top + y + yoff, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]]); - if(lpDx) { - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } else { - xoff += formatEntry->gis[wstr[idx]].xOff; - yoff += formatEntry->gis[wstr[idx]].yOff; - } - } - } else { - XImage *image; - int image_x, image_y, image_off_x, image_off_y, image_w, image_h; - RECT extents = {0, 0, 0, 0}; - POINT cur = {0, 0}; - int w = physDev->drawable_rect.right - physDev->drawable_rect.left; - int h = physDev->drawable_rect.bottom - physDev->drawable_rect.top; - - TRACE("drawable %dx%d\n", w, h); - - for(idx = 0; idx < count; idx++) { - if(extents.left > cur.x - formatEntry->gis[wstr[idx]].x) - extents.left = cur.x - formatEntry->gis[wstr[idx]].x; - if(extents.top > cur.y - formatEntry->gis[wstr[idx]].y) - extents.top = cur.y - formatEntry->gis[wstr[idx]].y; - if(extents.right < cur.x - formatEntry->gis[wstr[idx]].x + formatEntry->gis[wstr[idx]].width) - extents.right = cur.x - formatEntry->gis[wstr[idx]].x + formatEntry->gis[wstr[idx]].width; - if(extents.bottom < cur.y - formatEntry->gis[wstr[idx]].y + formatEntry->gis[wstr[idx]].height) - extents.bottom = cur.y - formatEntry->gis[wstr[idx]].y + formatEntry->gis[wstr[idx]].height; - if(lpDx) { - offset += lpDx[idx]; - cur.x = offset * cosEsc; - cur.y = offset * -sinEsc; - } else { - cur.x += formatEntry->gis[wstr[idx]].xOff; - cur.y += formatEntry->gis[wstr[idx]].yOff; - } - } - TRACE("glyph extents %d,%d - %d,%d drawable x,y %d,%d\n", extents.left, extents.top, - extents.right, extents.bottom, physDev->dc_rect.left + x, physDev->dc_rect.top + y); - - if(physDev->dc_rect.left + x + extents.left >= 0) { - image_x = physDev->dc_rect.left + x + extents.left; - image_off_x = 0; - } else { - image_x = 0; - image_off_x = physDev->dc_rect.left + x + extents.left; - } - if(physDev->dc_rect.top + y + extents.top >= 0) { - image_y = physDev->dc_rect.top + y + extents.top; - image_off_y = 0; - } else { - image_y = 0; - image_off_y = physDev->dc_rect.top + y + extents.top; - } - if(physDev->dc_rect.left + x + extents.right < w) - image_w = physDev->dc_rect.left + x + extents.right - image_x; - else - image_w = w - image_x; - if(physDev->dc_rect.top + y + extents.bottom < h) - image_h = physDev->dc_rect.top + y + extents.bottom - image_y; - else - image_h = h - image_y; - - if(image_w <= 0 || image_h <= 0) goto no_image; - - X11DRV_expect_error(gdi_display, XRenderErrorHandler, NULL); - image = XGetImage(gdi_display, physDev->drawable, - image_x, image_y, image_w, image_h, - AllPlanes, ZPixmap); - X11DRV_check_error(); - - TRACE("XGetImage(%p, %x, %d, %d, %d, %d, %lx, %x) depth = %d rets %p\n", - gdi_display, (int)physDev->drawable, image_x, image_y, - image_w, image_h, AllPlanes, ZPixmap, - physDev->depth, image); - if(!image) { - Pixmap xpm = XCreatePixmap(gdi_display, root_window, image_w, image_h, - physDev->depth); - GC gc; - XGCValues gcv; - - gcv.graphics_exposures = False; - gc = XCreateGC(gdi_display, xpm, GCGraphicsExposures, &gcv); - XCopyArea(gdi_display, physDev->drawable, xpm, gc, image_x, image_y, - image_w, image_h, 0, 0); - XFreeGC(gdi_display, gc); - X11DRV_expect_error(gdi_display, XRenderErrorHandler, NULL); - image = XGetImage(gdi_display, xpm, 0, 0, image_w, image_h, AllPlanes, - ZPixmap); - X11DRV_check_error(); - XFreePixmap(gdi_display, xpm); - } - if(!image) goto no_image; - - image->red_mask = visual->red_mask; - image->green_mask = visual->green_mask; - image->blue_mask = visual->blue_mask; - - offset = xoff = yoff = 0; - for(idx = 0; idx < count; idx++) { - SmoothGlyphGray(image, xoff + image_off_x - extents.left, - yoff + image_off_y - extents.top, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]], - physDev->textPixel); - if(lpDx) { - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } else { - xoff += formatEntry->gis[wstr[idx]].xOff; - yoff += formatEntry->gis[wstr[idx]].yOff; - } - } - XPutImage(gdi_display, physDev->drawable, physDev->gc, image, 0, 0, - image_x, image_y, image_w, image_h); - XDestroyImage(image); - } -no_image: - wine_tsx11_unlock(); - } -#endif + RosGdiExtTextOut(physDev->hKernelDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry, aa_type); + //LeaveCriticalSection(&xrender_cs); if (flags & ETO_CLIPPED) Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -155,7 +155,8 @@ UINT fillType ); BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry ); + const INT *lpDx, gsCacheEntryFormat *formatEntry, + AA_Type aa_type ); BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ); BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons); BOOL APIENTRY RosGdiPolyPolyline( HDC physDev, const POINT* pt, const DWORD* counts, DWORD polylines ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -53,7 +53,8 @@ BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry ) + const INT *lpDx, gsCacheEntryFormat *formatEntry, + AA_Type aa_type) { PDC pDC; @@ -61,7 +62,7 @@ pDC = DC_Lock(physDev); /* Call GRE routine */ - GreTextOut(pDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry); + GreTextOut(pDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry, aa_type); /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -196,10 +196,10 @@ VOID NTAPI GreTextOut(PDC pDC, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry) + const INT *lpDx, gsCacheEntryFormat *formatEntry, + AA_Type aa_type) { POINT offset = {0, 0}; - AA_Type aa_type = AA_None; INT idx; BRUSHGDI *pTextPen; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -191,7 +191,8 @@ VOID NTAPI GreTextOut(PDC pDC, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry); + const INT *lpDx, gsCacheEntryFormat *formatEntry, + AA_Type aa_type); /* lineto.c */ BOOLEAN NTAPI Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Jul 3 12:29:09 2010 @@ -50,7 +50,7 @@ RosGdiEllipse 5 RosGdiExtEscape 6 RosGdiExtFloodFill 5 -RosGdiExtTextOut 9 +RosGdiExtTextOut 10 RosGdiLineTo 5 RosGdiPolyPolygon 4 RosGdiPolyPolyline 4

1 0

[mjmartin] 47927: [win32k] - Forgotten in r47924. Change name of BOOL parameter for UserSetCursorPos to better describe its purpose as done in c source.
by mjmartin＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: mjmartin Date: Sat Jul 3 11:46:08 2010 New Revision: 47927 URL: http://svn.reactos.org/svn/reactos?rev=47927&view=rev Log: [win32k] - Forgotten in r47924. Change name of BOOL parameter for UserSetCursorPos to better describe its purpose as done in c source. Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sat Jul 3 11:46:08 2010 @@ -77,7 +77,7 @@ INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); -BOOL UserSetCursorPos( INT x, INT y, BOOL CallHooks); +BOOL UserSetCursorPos( INT x, INT y, BOOL SendMouseMoveMsg); int UserShowCursor(BOOL bShow);

1 0

[mjmartin] 47926: [usb/usbehci] - Implement FdoDispatchInternalDeviceControl and remove IrpStub as its no longer needed. - Implement Direct Call RemoveUsbDevice. - Implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE. - Use the port parameter in ExecuteControlRequest. - Windows now identifies my thumb drive as a mass storage device.
by mjmartin＠svn.reactos.org 03 Jul '10

03 Jul '10

Author: mjmartin Date: Sat Jul 3 11:40:58 2010 New Revision: 47926 URL: http://svn.reactos.org/svn/reactos?rev=47926&view=rev Log: [usb/usbehci] - Implement FdoDispatchInternalDeviceControl and remove IrpStub as its no longer needed. - Implement Direct Call RemoveUsbDevice. - Implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE. - Use the port parameter in ExecuteControlRequest. - Windows now identifies my thumb drive as a mass storage device. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/urbreq.c trunk/reactos/drivers/usb/usbehci/usbehci.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Sat Jul 3 11:40:58 2010 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbehci/fdo.c * PURPOSE: USB EHCI device driver. * PROGRAMMERS: - * Michael Martin + * Michael Martin (mjmartin(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -831,3 +831,283 @@ return STATUS_SUCCESS; } + +NTSTATUS NTAPI +FdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PIO_STACK_LOCATION Stack = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + ULONG_PTR Information = 0; + PUSB_DEVICE UsbDevice = NULL; + URB *Urb; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + ASSERT(FdoDeviceExtension->Common.IsFdo == TRUE); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_SUBMIT_URB); + + Urb = (PURB) Stack->Parameters.Others.Argument1; + DPRINT("Header Length %d\n", Urb->UrbHeader.Length); + DPRINT("Header Function %d\n", Urb->UrbHeader.Function); + + UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; + + switch (Urb->UrbHeader.Function) + { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); + break; + } + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + { + DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); + break; + } + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + switch(Urb->UrbControlDescriptorRequest.DescriptorType) + { + case USB_DEVICE_DESCRIPTOR_TYPE: + { + /* FIXNME: This probably not used for FDO and should be removed? */ + DPRINT1("USB DEVICE DESC\n"); + break; + } + case USB_CONFIGURATION_DESCRIPTOR_TYPE: + DPRINT1("USB CONFIG DESC\n"); + case USB_STRING_DESCRIPTOR_TYPE: + DPRINT1("Usb String Descriptor\n"); + { + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + BOOLEAN ResultOk; + + CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; + CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; + CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + if (Urb->UrbControlDescriptorRequest.DescriptorType == USB_STRING_DESCRIPTOR_TYPE) + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + else + CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + + ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, UsbDevice->Address, UsbDevice->Port, + Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength); + + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + Status = STATUS_SUCCESS; + + break; + } + default: + { + DPRINT1("Descriptor Type %x not supported!\n", Urb->UrbControlDescriptorRequest.DescriptorType); + } + } + break; + } + case URB_FUNCTION_SELECT_CONFIGURATION: + { + DPRINT1("Selecting Configuration\n"); + DPRINT1("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); + break; + } + case URB_FUNCTION_CLASS_DEVICE: + { + switch (Urb->UrbControlVendorClassRequest.Request) + { + case USB_REQUEST_GET_DESCRIPTOR: + { + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("Urb->UrbControlVendorClassRequest.Value %x\n", Urb->UrbControlVendorClassRequest.Value); + + switch (Urb->UrbControlVendorClassRequest.Value >> 8) + { + case USB_DEVICE_CLASS_AUDIO: + { + DPRINT1("USB_DEVICE_CLASS_AUDIO\n"); + break; + } + case USB_DEVICE_CLASS_COMMUNICATIONS: + { + DPRINT1("USB_DEVICE_CLASS_COMMUNICATIONS\n"); + break; + } + case USB_DEVICE_CLASS_HUMAN_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_HUMAN_INTERFACE\n"); + break; + } + case USB_DEVICE_CLASS_MONITOR: + { + DPRINT1("USB_DEVICE_CLASS_MONITOR\n"); + break; + } + case USB_DEVICE_CLASS_PHYSICAL_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_PHYSICAL_INTERFACE\n"); + break; + } + case USB_DEVICE_CLASS_POWER: + { + DPRINT1("USB_DEVICE_CLASS_POWER\n"); + break; + } + case USB_DEVICE_CLASS_PRINTER: + { + DPRINT1("USB_DEVICE_CLASS_PRINTER\n"); + break; + } + case USB_DEVICE_CLASS_STORAGE: + { + DPRINT1("USB_DEVICE_CLASS_STORAGE\n"); + break; + } + case USB_DEVICE_CLASS_RESERVED: + DPRINT1("Reserved!!!\n"); + case USB_DEVICE_CLASS_HUB: + { + DPRINT1("USB_DEVICE_CLASS_HUB request\n"); + break; + } + default: + { + DPRINT1("Unknown UrbControlVendorClassRequest Value\n"); + } + } + break; + } + case USB_REQUEST_GET_STATUS: + { + DPRINT1("DEVICE: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); + break; + } + default: + { + DPRINT1("Unhandled URB request for class device\n"); + //Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + } + break; + } + case URB_FUNCTION_CLASS_OTHER: + { + switch (Urb->UrbControlVendorClassRequest.Request) + { + case USB_REQUEST_GET_STATUS: + { + DPRINT1("OTHER: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); + break; + } + case USB_REQUEST_CLEAR_FEATURE: + { + DPRINT1("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, + Urb->UrbControlVendorClassRequest.Value); + switch (Urb->UrbControlVendorClassRequest.Value) + { + case C_PORT_CONNECTION: + DPRINT1("Clearing Connect\n"); + break; + case C_PORT_RESET: + DPRINT1("Clearing Reset\n"); + break; + default: + DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + break; + } + break; + } + case USB_REQUEST_SET_FEATURE: + { + DPRINT1("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, + Urb->UrbControlVendorClassRequest.Value); + + switch(Urb->UrbControlVendorClassRequest.Value) + { + case PORT_RESET: + { + DPRINT1("Port reset\n"); + break; + } + case PORT_ENABLE: + { + DPRINT1("Unhandled Set Feature\n"); + break; + } + default: + { + DPRINT1("Unknown Set Feature!\n"); + break; + } + } + break; + } + case USB_REQUEST_SET_ADDRESS: + { + DPRINT1("USB_REQUEST_SET_ADDRESS\n"); + break; + } + case USB_REQUEST_GET_DESCRIPTOR: + { + DPRINT1("USB_REQUEST_GET_DESCRIPTOR\n"); + break; + } + case USB_REQUEST_SET_DESCRIPTOR: + { + DPRINT1("USB_REQUEST_SET_DESCRIPTOR\n"); + break; + } + case USB_REQUEST_GET_CONFIGURATION: + { + DPRINT1("USB_REQUEST_GET_CONFIGURATION\n"); + break; + } + case USB_REQUEST_SET_CONFIGURATION: + { + DPRINT1("USB_REQUEST_SET_CONFIGURATION\n"); + break; + } + case USB_REQUEST_GET_INTERFACE: + { + DPRINT1("USB_REQUEST_GET_INTERFACE\n"); + break; + } + case USB_REQUEST_SET_INTERFACE: + { + DPRINT1("USB_REQUEST_SET_INTERFACE\n"); + break; + } + case USB_REQUEST_SYNC_FRAME: + { + DPRINT1("USB_REQUEST_SYNC_FRAME\n"); + break; + } + default: + { + DPRINT1("Unknown Function Class Unknown request\n"); + break; + } + } + break; + } + default: + { + DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); + //Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + } + + Irp->IoStatus.Information = Information; + + if (Status != STATUS_PENDING) + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Modified: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Sat Jul 3 11:40:58 2010 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbehci/urbreq.c * PURPOSE: URB Related Functions. * PROGRAMMERS: - * Michael Martin + * Michael Martin (mjmartin(a)reactos.org) */ #include "usbehci.h" @@ -135,6 +135,9 @@ (PVOID)&CtrlData, BufferLength); + QueueHead->EndPointCapabilities2.PortNumber = Port; + QueueHead->EndPointCapabilities1.DeviceAddress = Address; + CtrlSetup->bmRequestType._BM.Recipient = SetupPacket->bmRequestType._BM.Recipient; CtrlSetup->bmRequestType._BM.Type = SetupPacket->bmRequestType._BM.Type; CtrlSetup->bmRequestType._BM.Dir = SetupPacket->bmRequestType._BM.Dir; @@ -143,10 +146,6 @@ CtrlSetup->wValue.HiByte = SetupPacket->wValue.HiByte; CtrlSetup->wIndex.W = SetupPacket->wIndex.W; CtrlSetup->wLength = SetupPacket->wLength; - - - QueueHead->EndPointCapabilities1.DeviceAddress = Address; - //QueueHead->EndPointCapabilities2.PortNumber = Port; tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; Modified: trunk/reactos/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] Sat Jul 3 11:40:58 2010 @@ -4,32 +4,11 @@ * FILE: drivers/usb/usbehci/usbehci.c * PURPOSE: USB EHCI device driver. * PROGRAMMERS: - * Michael Martin + * Michael Martin (mjmartin(a)reactos.com) */ /* DEFINES *******************************************************************/ #include "usbehci.h" - -static NTSTATUS NTAPI -IrpStub(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - NTSTATUS Status; - - if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFdo) - { - DPRINT1("ehci: FDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - return ForwardIrpAndForget(DeviceObject, Irp); - } - - /* We are lower driver, So complete */ - DPRINT1("ehci: PDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - - Status = Irp->IoStatus.Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; -} NTSTATUS NTAPI DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -47,7 +26,9 @@ { DPRINT("DispatchInternalDeviceControl\n"); if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFdo) - return IrpStub(DeviceObject, Irp); + { + return FdoDispatchInternalDeviceControl(DeviceObject, Irp); + } else return PdoDispatchInternalDeviceControl(DeviceObject, Irp); } Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sat Jul 3 11:40:58 2010 @@ -9,7 +9,7 @@ #include <usbioctl.h> #include <usb.h> -#define USB_POOL_TAG (ULONG)'UsbR' +#define USB_POOL_TAG (ULONG)'ebsu' #define DEVICEINTIALIZED 0x01 #define DEVICESTARTED 0x02 @@ -463,6 +463,9 @@ NTSTATUS NTAPI PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI +FdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); + BOOLEAN ExecuteControlRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, UCHAR Address, ULONG Port, PVOID Buffer, ULONG BufferLength); Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Sat Jul 3 11:40:58 2010 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbehci/usbiffn.c * PURPOSE: Direct Call Interface Functions. * PROGRAMMERS: - * Michael Martin + * Michael Martin (mjmartin(a)reactos.org) */ #include "usbehci.h" @@ -98,10 +98,12 @@ PdoDeviceExtension->UsbDevices[i] = (PUSB_DEVICE)UsbDevice; PdoDeviceExtension->UsbDevices[i]->Address = i + 1; PdoDeviceExtension->UsbDevices[i]->Port = PortNumber; - break; + break; } i++; } + + PdoDeviceExtension->Ports[PortNumber - 1].PortStatus = PortStatus; /* Return it */ *NewDevice = UsbDevice; @@ -140,6 +142,7 @@ } Ptr = Buffer; + /* Set the device address */ CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; @@ -149,6 +152,7 @@ CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = 0; + DPRINT1("Setting Address to %x\n", UsbDevice->Address); ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, 0, 0, NULL, 0); /* Get the Device Descriptor */ @@ -161,11 +165,15 @@ CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); - ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, UsbDevice->Address, UsbDevice->Port, + DPRINT1("Requesting Descriptor\n"); + ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, UsbDevice->Address, UsbDevice->Port, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + DPRINT1("bLength %x\n", UsbDevice->DeviceDescriptor.bLength); DPRINT1("bDescriptorType %x\n", UsbDevice->DeviceDescriptor.bDescriptorType); + DPRINT1("idVendor %x\n", UsbDevice->DeviceDescriptor.idVendor); + DPRINT1("idProduct %x\n", UsbDevice->DeviceDescriptor.idProduct); DPRINT1("bNumDescriptors %x\n", UsbDevice->DeviceDescriptor.bNumConfigurations); if (UsbDevice->DeviceDescriptor.bNumConfigurations == 0) @@ -246,10 +254,10 @@ PULONG ConfigDescriptorBufferLength) { PUSB_DEVICE UsbDevice; - DPRINT1("GetUsbDescriptor %x, %d, %x, %d\n", DeviceDescriptorBuffer, DeviceDescriptorBufferLength, ConfigDescriptorBuffer, ConfigDescriptorBufferLength); + DPRINT1("GetUsbDescriptor %x, %x, %x, %x\n", DeviceDescriptorBuffer, *DeviceDescriptorBufferLength, ConfigDescriptorBuffer, *ConfigDescriptorBufferLength); UsbDevice = (PUSB_DEVICE) DeviceHandle; - + DPRINT1("DeviceHandle %x\n", UsbDevice); if ((DeviceDescriptorBuffer) && (DeviceDescriptorBufferLength)) { RtlCopyMemory(DeviceDescriptorBuffer, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); @@ -268,7 +276,59 @@ USB_BUSIFFN RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags) { - DPRINT1("RemoveUsbDevice called\n"); + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PUSB_DEVICE UsbDevice; + LONG i, j, k; + + DPRINT1("RemoveUsbDevice called, DeviceHandle %x, Flags %x\n", DeviceHandle, Flags); + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; + + /* FIXME: Implement DeviceHandleToUsbDevice to validate handles */ + //UsbDevice = DeviceHandleToUsbDevice(PdoDeviceExtension, DeviceHandle); + + UsbDevice = (PUSB_DEVICE) DeviceHandle; + + if (!UsbDevice) + return STATUS_DEVICE_NOT_CONNECTED; + + switch (Flags) + { + case 0: + DPRINT1("Number of Configurations %d\n", UsbDevice->DeviceDescriptor.bNumConfigurations); + for (i = 0; i < UsbDevice->DeviceDescriptor.bNumConfigurations; i++) + { + for (j = 0; j < UsbDevice->Configs[i]->ConfigurationDescriptor.bNumInterfaces; j++) + { + for (k = 0; k < UsbDevice->Configs[i]->Interfaces[j]->InterfaceDescriptor.bNumEndpoints; k++) + { + ExFreePool(UsbDevice->Configs[i]->Interfaces[j]->EndPoints[k]); + } + ExFreePool(UsbDevice->Configs[i]->Interfaces[j]); + } + ExFreePool(UsbDevice->Configs[i]); + } + + for (i = 0; i < 127; i++) + { + if (PdoDeviceExtension->UsbDevices[i] == UsbDevice) + PdoDeviceExtension->UsbDevices[i] = NULL; + } + + ExFreePool(UsbDevice); + + /* DeConfig Device */ + break; + case USBD_KEEP_DEVICE_DATA: + DPRINT("USBD_KEEP_DEVICE_DATA Not implemented!\n"); + break; + + case USBD_MARK_DEVICE_BUSY: + DPRINT("USBD_MARK_DEVICE_BUSY Not implemented!\n"); + break; + default: + DPRINT1("Unknown Remove Flags %x\n", Flags); + } return STATUS_SUCCESS; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010