Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 57982: [PSEH] Add _SEH2_VOLATILE macro, that expands to volatile on gcc. This is to mark variables as volatile, if neccessary.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 23 21:33:48 2012 New Revision: 57982 URL: http://svn.reactos.org/svn/reactos?rev=57982&view=rev Log: [PSEH] Add _SEH2_VOLATILE macro, that expands to volatile on gcc. This is to mark variables as volatile, if neccessary. Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Dec 23 21:33:48 2012 @@ -35,6 +35,7 @@ #define _SEH2_AbnormalTermination() (AbnormalTermination()) #define _SEH2_YIELD(STMT_) STMT_ #define _SEH2_LEAVE __leave +#define _SEH2_VOLATILE #elif defined(_USE_DUMMY_PSEH) || defined (__arm__) || defined(__clang__) || defined(_M_AMD64) @@ -47,6 +48,7 @@ #define _SEH2_AbnormalTermination() #define _SEH2_YIELD(STMT_) STMT_ #define _SEH2_LEAVE +#define _SEH2_VOLATILE volatile #elif defined(_USE_PSEH3) @@ -62,6 +64,7 @@ #define _SEH2_AbnormalTermination _abnormal_termination #define _SEH2_LEAVE _SEH3_LEAVE #define _SEH2_YIELD(x) x +#define _SEH2_VOLATILE volatile #elif defined(__GNUC__) Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Dec 23 21:33:48 2012 @@ -290,3 +290,4 @@ #define _SEH3_LEAVE goto _SEH3$_l_AfterTry +#define _SEH3_VOLATILE volatile

11 years, 10 months

[ekohl] 57981: [NETAPI32] Ooops! These are needed too!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 23 18:59:40 2012 New Revision: 57981 URL: http://svn.reactos.org/svn/reactos?rev=57981&view=rev Log: [NETAPI32] Ooops! These are needed too! Modified: trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Dec 23 18:59:40 2012 @@ -187,6 +187,11 @@ #define USER_PARTIAL_SECRETS_ACCOUNT 0x00100000 #define USER_USE_AES_KEYS 0x00200000 +/* Constants uses by LOGON_HOURS.UnitsPerWeek */ +#define SAM_DAYS_PER_WEEK (7) +#define SAM_HOURS_PER_WEEK (24 * SAM_DAYS_PER_WEEK) +#define SAM_MINUTES_PER_WEEK (60 * SAM_HOURS_PER_WEEK) + typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; @@ -276,6 +281,12 @@ ULONG RelativeId; ULONG Attributes; } GROUP_MEMBERSHIP, *PGROUP_MEMBERSHIP; + +typedef struct _LOGON_HOURS +{ + USHORT UnitsPerWeek; + PUCHAR LogonHours; +} LOGON_HOURS, *PLOGON_HOURS; typedef enum _USER_INFORMATION_CLASS { @@ -310,11 +321,138 @@ UserLogonUIInformation, } USER_INFORMATION_CLASS, *PUSER_INFORMATION_CLASS; +typedef struct _USER_GENERAL_INFORMATION +{ + UNICODE_STRING UserName; + UNICODE_STRING FullName; + ULONG PrimaryGroupId; + UNICODE_STRING AdminComment; + UNICODE_STRING UserComment; +} USER_GENERAL_INFORMATION, *PUSER_GENERAL_INFORMATION; + +typedef struct _USER_PREFERENCES_INFORMATION +{ + UNICODE_STRING UserComment; + UNICODE_STRING Reserved1; + USHORT CountryCode; + USHORT CodePage; +} USER_PREFERENCES_INFORMATION, *PUSER_PREFERENCES_INFORMATION; + +#include "pshpack4.h" +typedef struct _USER_LOGON_INFORMATION +{ + UNICODE_STRING UserName; + UNICODE_STRING FullName; + ULONG UserId; + ULONG PrimaryGroupId; + UNICODE_STRING HomeDirectory; + UNICODE_STRING HomeDirectoryDrive; + UNICODE_STRING ScriptPath; + UNICODE_STRING ProfilePath; + UNICODE_STRING WorkStations; + LARGE_INTEGER LastLogon; + LARGE_INTEGER LastLogoff; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; + LOGON_HOURS LogonHours; + USHORT BadPasswordCount; + USHORT LogonCount; + ULONG UserAccountControl; +} USER_LOGON_INFORMATION, *PUSER_LOGON_INFORMATION; +#include "poppack.h" + +typedef struct _USER_LOGON_HOURS_INFORMATION +{ + LOGON_HOURS LogonHours; +} USER_LOGON_HOURS_INFORMATION, *PUSER_LOGON_HOURS_INFORMATION; + +#include "pshpack4.h" +typedef struct _USER_ACCOUNT_INFORMATION +{ + UNICODE_STRING UserName; + UNICODE_STRING FullName; + ULONG UserId; + ULONG PrimaryGroupId; + UNICODE_STRING HomeDirectory; + UNICODE_STRING HomeDirectoryDrive; + UNICODE_STRING ScriptPath; + UNICODE_STRING ProfilePath; + UNICODE_STRING AdminComment; + UNICODE_STRING WorkStations; + LARGE_INTEGER LastLogon; + LARGE_INTEGER LastLogoff; + LOGON_HOURS LogonHours; + USHORT BadPasswordCount; + USHORT LogonCount; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER AccountExpires; + ULONG UserAccountControl; +} USER_ACCOUNT_INFORMATION, *PUSER_ACCOUNT_INFORMATION; +#include "poppack.h" + +typedef struct _USER_NAME_INFORMATION +{ + UNICODE_STRING UserName; + UNICODE_STRING FullName; +} USER_NAME_INFORMATION, *PUSER_NAME_INFORMATION; + +typedef struct _USER_ACCOUNT_NAME_INFORMATION +{ + UNICODE_STRING UserName; +} USER_ACCOUNT_NAME_INFORMATION, *PUSER_ACCOUNT_NAME_INFORMATION; + +typedef struct _USER_FULL_NAME_INFORMATION +{ + UNICODE_STRING FullName; +} USER_FULL_NAME_INFORMATION, *PUSER_FULL_NAME_INFORMATION; + +typedef struct _USER_PRIMARY_GROUP_INFORMATION +{ + ULONG PrimaryGroupId; +} USER_PRIMARY_GROUP_INFORMATION, *PUSER_PRIMARY_GROUP_INFORMATION; + +typedef struct _USER_HOME_INFORMATION +{ + UNICODE_STRING HomeDirectory; + UNICODE_STRING HomeDirectoryDrive; +} USER_HOME_INFORMATION, *PUSER_HOME_INFORMATION; + +typedef struct _USER_SCRIPT_INFORMATION +{ + UNICODE_STRING ScriptPath; +} USER_SCRIPT_INFORMATION, *PUSER_SCRIPT_INFORMATION; + +typedef struct _USER_PROFILE_INFORMATION +{ + UNICODE_STRING ProfilePath; +} USER_PROFILE_INFORMATION, *PUSER_PROFILE_INFORMATION; + +typedef struct _USER_ADMIN_COMMENT_INFORMATION +{ + UNICODE_STRING AdminComment; +} USER_ADMIN_COMMENT_INFORMATION, *PUSER_ADMIN_COMMENT_INFORMATION; + +typedef struct _USER_WORKSTATIONS_INFORMATION +{ + UNICODE_STRING WorkStations; +} USER_WORKSTATIONS_INFORMATION, *PUSER_WORKSTATIONS_INFORMATION; + typedef struct _USER_SET_PASSWORD_INFORMATION { UNICODE_STRING Password; BOOLEAN PasswordExpired; } USER_SET_PASSWORD_INFORMATION, *PUSER_SET_PASSWORD_INFORMATION; + +typedef struct _USER_CONTROL_INFORMATION +{ + ULONG UserAccountControl; +} USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION; + + +#define SAM_SID_COMPATIBILITY_ALL 0 +#define SAM_SID_COMPATIBILITY_LAX 1 +#define SAM_SID_COMPATIBILITY_STRICT 2 NTSTATUS @@ -438,6 +576,11 @@ NTSTATUS NTAPI +SamGetCompatibilityMode(IN SAM_HANDLE ObjectHandle, + OUT PULONG Mode); + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Dec 23 18:59:40 2012 @@ -447,6 +447,7 @@ unsigned char Buffer[(256 * 2) + 4 + 16]; } SAMPR_ENCRYPTED_USER_PASSWORD_NEW, *PSAMPR_ENCRYPTED_USER_PASSWORD_NEW; +cpp_quote("#ifndef _NTSAM_") typedef struct _USER_PRIMARY_GROUP_INFORMATION { unsigned long PrimaryGroupId; @@ -456,6 +457,7 @@ { unsigned long UserAccountControl; } USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION; +cpp_quote("#endif") typedef struct _USER_EXPIRES_INFORMATION {

11 years, 10 months

[ekohl] 57980: [NETAPI32] - Implement NetUserEnum partially. - Move common code into a separate file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 23 18:56:13 2012 New Revision: 57980 URL: http://svn.reactos.org/svn/reactos?rev=57980&view=rev Log: [NETAPI32] - Implement NetUserEnum partially. - Move common code into a separate file. Added: trunk/reactos/dll/win32/netapi32/misc.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Dec 23 18:56:13 2012 @@ -11,6 +11,7 @@ ds.c group.c local_group.c + misc.c nbcmdqueue.c nbnamecache.c nbt.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sun Dec 23 18:56:13 2012 @@ -56,99 +56,6 @@ } ENUM_CONTEXT, *PENUM_CONTEXT; -static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - - -static -NTSTATUS -GetAccountDomainSid(PSID *AccountDomainSid) -{ - PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle = NULL; - ULONG Length = 0; - NTSTATUS Status; - - memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); - - Status = LsaOpenPolicy(NULL, - &ObjectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, - &PolicyHandle); - if (!NT_SUCCESS(Status)) - { - ERR("LsaOpenPolicy failed (Status %08lx)\n", Status); - return Status; - } - - Status = LsaQueryInformationPolicy(PolicyHandle, - PolicyAccountDomainInformation, - (PVOID *)&AccountDomainInfo); - if (!NT_SUCCESS(Status)) - { - ERR("LsaQueryInformationPolicy failed (Status %08lx)\n", Status); - goto done; - } - - Length = RtlLengthSid(AccountDomainInfo->DomainSid); - - *AccountDomainSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); - if (*AccountDomainSid == NULL) - { - ERR("Failed to allocate SID\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - memcpy(*AccountDomainSid, AccountDomainInfo->DomainSid, Length); - -done: - if (AccountDomainInfo != NULL) - LsaFreeMemory(AccountDomainInfo); - - LsaClose(PolicyHandle); - - return Status; -} - - -static -NTSTATUS -GetBuiltinDomainSid(PSID *BuiltinDomainSid) -{ - PSID Sid = NULL; - PULONG Ptr; - NTSTATUS Status = STATUS_SUCCESS; - - *BuiltinDomainSid = NULL; - - Sid = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - RtlLengthRequiredSid(1)); - if (Sid == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Status = RtlInitializeSid(Sid, - &NtAuthority, - 1); - if (!NT_SUCCESS(Status)) - goto done; - - Ptr = RtlSubAuthoritySid(Sid, 0); - *Ptr = SECURITY_BUILTIN_DOMAIN_RID; - - *BuiltinDomainSid = Sid; - -done: - if (!NT_SUCCESS(Status)) - { - if (Sid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); - } - - return Status; -} - /************************************************************ * NetLocalGroupAdd (NETAPI32.@) Added: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c (added) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Sun Dec 23 18:56:13 2012 @@ -1,0 +1,127 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/misc.c + * PURPOSE: Helper functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "ntsecapi.h" +#include "wine/debug.h" + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "ntsam.h" +#include "netapi32.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + + +/* GLOBALS *******************************************************************/ + +static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +GetAccountDomainSid(PSID *AccountDomainSid) +{ + PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + ULONG Length = 0; + NTSTATUS Status; + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaOpenPolicy failed (Status %08lx)\n", Status); + return Status; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&AccountDomainInfo); + if (!NT_SUCCESS(Status)) + { + ERR("LsaQueryInformationPolicy failed (Status %08lx)\n", Status); + goto done; + } + + Length = RtlLengthSid(AccountDomainInfo->DomainSid); + + *AccountDomainSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (*AccountDomainSid == NULL) + { + ERR("Failed to allocate SID\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(*AccountDomainSid, AccountDomainInfo->DomainSid, Length); + +done: + if (AccountDomainInfo != NULL) + LsaFreeMemory(AccountDomainInfo); + + LsaClose(PolicyHandle); + + return Status; +} + + +NTSTATUS +GetBuiltinDomainSid(PSID *BuiltinDomainSid) +{ + PSID Sid = NULL; + PULONG Ptr; + NTSTATUS Status = STATUS_SUCCESS; + + *BuiltinDomainSid = NULL; + + Sid = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + RtlLengthRequiredSid(1)); + if (Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = RtlInitializeSid(Sid, + &NtAuthority, + 1); + if (!NT_SUCCESS(Status)) + goto done; + + Ptr = RtlSubAuthoritySid(Sid, 0); + *Ptr = SECURITY_BUILTIN_DOMAIN_RID; + + *BuiltinDomainSid = Sid; + +done: + if (!NT_SUCCESS(Status)) + { + if (Sid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); + } + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netapi32/misc.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Sun Dec 23 18:56:13 2012 @@ -6,5 +6,12 @@ WINAPI NetpNtStatusToApiStatus(NTSTATUS Status); +/* misc.c */ + +NTSTATUS +GetAccountDomainSid(PSID *AccountDomainSid); + +NTSTATUS +GetBuiltinDomainSid(PSID *BuiltinDomainSid); #endif Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Dec 23 18:56:13 2012 @@ -35,7 +35,28 @@ #include "wine/unicode.h" #include "wine/list.h" +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "ntsam.h" +#include "netapi32.h" + WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + + +typedef struct _ENUM_CONTEXT +{ + SAM_HANDLE ServerHandle; + SAM_HANDLE BuiltinDomainHandle; + SAM_HANDLE AccountDomainHandle; + + SAM_ENUMERATE_HANDLE EnumerationContext; + PSAM_RID_ENUMERATION Buffer; + ULONG Returned; + ULONG Index; + BOOLEAN BuiltinDone; + +} ENUM_CONTEXT, *PENUM_CONTEXT; + /* NOTE: So far, this is implemented to support tests that require user logins, * but not designed to handle real user databases. Those should probably @@ -134,7 +155,7 @@ } /************************************************************ - * NetUserAdd (NETAPI32.@) + * NetUserAdd (NETAPI32.@) */ NET_API_STATUS WINAPI @@ -257,7 +278,7 @@ /************************************************************ - * NetUserDel (NETAPI32.@) + * NetUserDel (NETAPI32.@) */ NET_API_STATUS WINAPI @@ -287,7 +308,7 @@ /************************************************************ - * NetUserEnum (NETAPI32.@) + * NetUserEnum (NETAPI32.@) */ NET_API_STATUS WINAPI @@ -300,15 +321,466 @@ LPDWORD totalentries, LPDWORD resume_handle) { - FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level, - filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - - return ERROR_ACCESS_DENIED; + PSAM_RID_ENUMERATION CurrentUser; + PENUM_CONTEXT EnumContext = NULL; + LPVOID Buffer = NULL; + PSID DomainSid = NULL; + PUSER_INFO_0 UserInfo0; + PUSER_INFO_1 UserInfo1; + PUSER_INFO_20 UserInfo20; + + LPWSTR Ptr; + ULONG i; + ULONG Size; + + SAM_HANDLE UserHandle = NULL; + PUSER_ACCOUNT_INFORMATION UserInfo = NULL; + + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + FIXME("(%s %d 0x%d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, + filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + *entriesread = 0; + *totalentries = 0; + *bufptr = NULL; + + if (resume_handle != NULL && *resume_handle != 0) + { + EnumContext = (PENUM_CONTEXT)*resume_handle; + } + else + { + ApiStatus = NetApiBufferAllocate(sizeof(ENUM_CONTEXT), (PVOID*)&EnumContext); + if (ApiStatus != NERR_Success) + goto done; + + EnumContext->EnumerationContext = 0; + EnumContext->Buffer = NULL; + EnumContext->Returned = 0; + EnumContext->Index = 0; + EnumContext->BuiltinDone = FALSE; + + Status = SamConnect(NULL, + &EnumContext->ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = GetAccountDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamOpenDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + DomainSid, + &EnumContext->AccountDomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamOpenDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + DomainSid, + &EnumContext->BuiltinDomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + +// while (TRUE) +// { + TRACE("EnumContext->Index: %lu\n", EnumContext->Index); + TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); + + if (EnumContext->Index >= EnumContext->Returned) + { +// if (EnumContext->BuiltinDone == TRUE) +// { +// ApiStatus = NERR_Success; +// goto done; +// } + + TRACE("Calling SamEnumerateUsersInDomain\n"); + Status = SamEnumerateUsersInDomain(EnumContext->AccountDomainHandle, //BuiltinDomainHandle, + &EnumContext->EnumerationContext, + 0, + (PVOID *)&EnumContext->Buffer, + prefmaxlen, + &EnumContext->Returned); + + TRACE("SamEnumerateUsersInDomain returned (Status %08lx)\n", Status); + if (!NT_SUCCESS(Status)) + { + ERR("SamEnumerateUsersInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (Status == STATUS_MORE_ENTRIES) + { + ApiStatus = NERR_BufTooSmall; + goto done; + } + else + { + EnumContext->BuiltinDone = TRUE; + } + } + + TRACE("EnumContext: %lu\n", EnumContext); + TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); + TRACE("EnumContext->Buffer: %p\n", EnumContext->Buffer); + + /* Get a pointer to the current user */ + CurrentUser = &EnumContext->Buffer[EnumContext->Index]; + + TRACE("RID: %lu\n", CurrentUser->RelativeId); + + Status = SamOpenUser(EnumContext->AccountDomainHandle, //BuiltinDomainHandle, + USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, + CurrentUser->RelativeId, + &UserHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamQueryInformationUser(UserHandle, + UserAccountInformation, + (PVOID *)&UserInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryInformationUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + SamCloseHandle(UserHandle); + UserHandle = NULL; + + switch (level) + { + case 0: + Size = sizeof(USER_INFO_0) + + UserInfo->UserName.Length + sizeof(WCHAR); + break; + + case 1: + Size = sizeof(USER_INFO_1) + + UserInfo->UserName.Length + sizeof(WCHAR); + + if (UserInfo->HomeDirectory.Length > 0) + Size += UserInfo->HomeDirectory.Length + sizeof(WCHAR); + + if (UserInfo->AdminComment.Length > 0) + Size += UserInfo->AdminComment.Length + sizeof(WCHAR); + + if (UserInfo->ScriptPath.Length > 0) + Size = UserInfo->ScriptPath.Length + sizeof(WCHAR); + break; + +// case 2: +// case 3: +// case 10: +// case 11: + + case 20: + Size = sizeof(USER_INFO_20) + + UserInfo->UserName.Length + sizeof(WCHAR); + + if (UserInfo->FullName.Length > 0) + Size += UserInfo->FullName.Length + sizeof(WCHAR); + + if (UserInfo->AdminComment.Length > 0) + Size += UserInfo->AdminComment.Length + sizeof(WCHAR); + break; + +// case 23: + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + ApiStatus = NetApiBufferAllocate(Size, &Buffer); + if (ApiStatus != NERR_Success) + goto done; + + switch (level) + { + case 0: + UserInfo0 = (PUSER_INFO_0)Buffer; + + Ptr = (LPWSTR)((ULONG_PTR)UserInfo0 + sizeof(USER_INFO_0)); + UserInfo0->usri0_name = Ptr; + + memcpy(UserInfo0->usri0_name, + UserInfo->UserName.Buffer, + UserInfo->UserName.Length); + UserInfo0->usri0_name[UserInfo->UserName.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + + case 1: + UserInfo1 = (PUSER_INFO_1)Buffer; + + Ptr = (LPWSTR)((ULONG_PTR)UserInfo1 + sizeof(USER_INFO_1)); + + UserInfo1->usri1_name = Ptr; + + memcpy(UserInfo1->usri1_name, + UserInfo->UserName.Buffer, + UserInfo->UserName.Length); + UserInfo1->usri1_name[UserInfo->UserName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); + + UserInfo1->usri1_password = NULL; + + UserInfo1->usri1_password_age = 0; /* FIXME */ + + UserInfo1->usri1_priv = 0; /* FIXME */ + + if (UserInfo->HomeDirectory.Length > 0) + { + UserInfo1->usri1_home_dir = Ptr; + + memcpy(UserInfo1->usri1_home_dir, + UserInfo->HomeDirectory.Buffer, + UserInfo->HomeDirectory.Length); + UserInfo1->usri1_home_dir[UserInfo->HomeDirectory.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->HomeDirectory.Length + sizeof(WCHAR)); + } + + if (UserInfo->AdminComment.Length > 0) + { + UserInfo1->usri1_comment = Ptr; + + memcpy(UserInfo1->usri1_comment, + UserInfo->AdminComment.Buffer, + UserInfo->AdminComment.Length); + UserInfo1->usri1_comment[UserInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); + } + + UserInfo1->usri1_flags = UserInfo->UserAccountControl; + + if (UserInfo->ScriptPath.Length > 0) + { + UserInfo1->usri1_script_path = Ptr; + + memcpy(UserInfo1->usri1_script_path, + UserInfo->ScriptPath.Buffer, + UserInfo->ScriptPath.Length); + UserInfo1->usri1_script_path[UserInfo->ScriptPath.Length / sizeof(WCHAR)] = UNICODE_NULL; + } + break; + +// case 2: +// case 3: +// case 10: +// case 11: + + case 20: + UserInfo20 = (PUSER_INFO_20)Buffer; + + Ptr = (LPWSTR)((ULONG_PTR)UserInfo20 + sizeof(USER_INFO_20)); + + UserInfo20->usri20_name = Ptr; + + memcpy(UserInfo20->usri20_name, + UserInfo->UserName.Buffer, + UserInfo->UserName.Length); + UserInfo20->usri20_name[UserInfo->UserName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); + + if (UserInfo->FullName.Length > 0) + { + UserInfo20->usri20_full_name = Ptr; + + memcpy(UserInfo20->usri20_full_name, + UserInfo->FullName.Buffer, + UserInfo->FullName.Length); + UserInfo20->usri20_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); + } + + if (UserInfo->AdminComment.Length > 0) + { + UserInfo20->usri20_comment = Ptr; + + memcpy(UserInfo20->usri20_comment, + UserInfo->AdminComment.Buffer, + UserInfo->AdminComment.Length); + UserInfo20->usri20_comment[UserInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); + } + + UserInfo20->usri20_flags = UserInfo->UserAccountControl; + UserInfo20->usri20_user_id = CurrentUser->RelativeId; + break; + +// case 23: + } + + if (UserInfo != NULL) + { + if (UserInfo->UserName.Buffer != NULL) + SamFreeMemory(UserInfo->UserName.Buffer); + + if (UserInfo->FullName.Buffer != NULL) + SamFreeMemory(UserInfo->FullName.Buffer); + + if (UserInfo->HomeDirectory.Buffer != NULL) + SamFreeMemory(UserInfo->HomeDirectory.Buffer); + + if (UserInfo->HomeDirectoryDrive.Buffer != NULL) + SamFreeMemory(UserInfo->HomeDirectoryDrive.Buffer); + + if (UserInfo->ScriptPath.Buffer != NULL) + SamFreeMemory(UserInfo->ScriptPath.Buffer); + + if (UserInfo->ProfilePath.Buffer != NULL) + SamFreeMemory(UserInfo->ProfilePath.Buffer); + + if (UserInfo->AdminComment.Buffer != NULL) + SamFreeMemory(UserInfo->AdminComment.Buffer); + + if (UserInfo->WorkStations.Buffer != NULL) + SamFreeMemory(UserInfo->WorkStations.Buffer); + + if (UserInfo->LogonHours.LogonHours != NULL) + SamFreeMemory(UserInfo->LogonHours.LogonHours); + + SamFreeMemory(UserInfo); + UserInfo = NULL; + } + + EnumContext->Index++; + + (*entriesread)++; +// } + +done: + if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Returned) + ApiStatus = ERROR_MORE_DATA; + + if (EnumContext != NULL) + *totalentries = EnumContext->Returned; + + if (resume_handle == NULL || ApiStatus != ERROR_MORE_DATA) + { + if (EnumContext != NULL) + { + if (EnumContext->BuiltinDomainHandle != NULL) + SamCloseHandle(EnumContext->BuiltinDomainHandle); + + if (EnumContext->AccountDomainHandle != NULL) + SamCloseHandle(EnumContext->AccountDomainHandle); + + if (EnumContext->ServerHandle != NULL) + SamCloseHandle(EnumContext->ServerHandle); + + if (EnumContext->Buffer != NULL) + { + for (i = 0; i < EnumContext->Returned; i++) + { + SamFreeMemory(EnumContext->Buffer[i].Name.Buffer); + } + + SamFreeMemory(EnumContext->Buffer); + } + + NetApiBufferFree(EnumContext); + EnumContext = NULL; + } + } + + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (UserInfo != NULL) + { + if (UserInfo->UserName.Buffer != NULL) + SamFreeMemory(UserInfo->UserName.Buffer); + + if (UserInfo->FullName.Buffer != NULL) + SamFreeMemory(UserInfo->FullName.Buffer); + + if (UserInfo->HomeDirectory.Buffer != NULL) + SamFreeMemory(UserInfo->HomeDirectory.Buffer); + + if (UserInfo->HomeDirectoryDrive.Buffer != NULL) + SamFreeMemory(UserInfo->HomeDirectoryDrive.Buffer); + + if (UserInfo->ScriptPath.Buffer != NULL) + SamFreeMemory(UserInfo->ScriptPath.Buffer); + + if (UserInfo->ProfilePath.Buffer != NULL) + SamFreeMemory(UserInfo->ProfilePath.Buffer); + + if (UserInfo->AdminComment.Buffer != NULL) + SamFreeMemory(UserInfo->AdminComment.Buffer); + + if (UserInfo->WorkStations.Buffer != NULL) + SamFreeMemory(UserInfo->WorkStations.Buffer); + + if (UserInfo->LogonHours.LogonHours != NULL) + SamFreeMemory(UserInfo->LogonHours.LogonHours); + + SamFreeMemory(UserInfo); + } + + if (resume_handle != NULL) + *resume_handle = (DWORD_PTR)EnumContext; + + *bufptr = (LPBYTE)Buffer; + + TRACE("return %lu\n", ApiStatus); + + return ApiStatus; } /************************************************************ - * NetUserGetGroups (NETAPI32.@) + * NetUserGetGroups (NETAPI32.@) */ NET_API_STATUS WINAPI @@ -592,7 +1064,6 @@ } - /****************************************************************************** * NetUserSetInfo (NETAPI32.@) */

11 years, 10 months

[janderwald] 57979: [KS] - resource size parameter is optional according to documentation CORE-6555

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 23 16:47:06 2012 New Revision: 57979 URL: http://svn.reactos.org/svn/reactos?rev=57979&view=rev Log: [KS] - resource size parameter is optional according to documentation CORE-6555 Modified: trunk/reactos/drivers/ksfilter/ks/image.c Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Sun Dec 23 16:47:06 2012 @@ -52,7 +52,12 @@ RtlMoveMemory(Result, Data, Size); /* store result */ *Resource = Result; - *ResourceSize = Size; + + if (ResourceSize) + { + /* resource size is optional */ + *ResourceSize = Size; + } } else {

11 years, 10 months

[tfaber] 57978: [EXPLORER_NEW] - Add support for task bar theming - Add notification area support - Add support for window flashing - Hide minimized windows - Based on Andrew Green's GSoC branch (3/3)

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Dec 23 14:37:22 2012 New Revision: 57978 URL: http://svn.reactos.org/svn/reactos?rev=57978&view=rev Log: [EXPLORER_NEW] - Add support for task bar theming - Add notification area support - Add support for window flashing - Hide minimized windows - Based on Andrew Green's GSoC branch (3/3) Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Dec 23 14:37:22 2012 @@ -17,6 +17,19 @@ add_executable(explorer_new ${SOURCE}) target_link_libraries(explorer_new uuid) set_module_type(explorer_new win32gui UNICODE) -add_importlibs(explorer_new advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 shlwapi version msvcrt kernel32 ntdll) +add_importlibs(explorer_new + advapi32 + gdi32 + user32 + comctl32 + ole32 + oleaut32 + shell32 + shlwapi + version + uxtheme + msvcrt + kernel32 + ntdll) add_pch(explorer_new precomp.h) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sun Dec 23 14:37:22 2012 @@ -17,7 +17,9 @@ #include <tchar.h> #include <stdio.h> #include <stdlib.h> - +#include <uxtheme.h> + +#include "tmschema.h" #include "resource.h" #include "comcsup.h" #include "todo.h" @@ -384,6 +386,11 @@ CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock); +VOID +TrayNotify_NotifyMsg(IN HWND hwnd, + IN WPARAM wParam, + IN LPARAM lParam); + /* * taskswnd.c */ Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sun Dec 23 14:37:22 2012 @@ -20,10 +20,6 @@ #include <precomp.h> -/* By default we don't use DrawCaptionTemp() because it causes some minimal - drawing glitches with the toolbar custom painting code */ -#define TASK_USE_DRAWCAPTIONTEMP 1 - /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ #define DUMP_TASKS 0 @@ -47,14 +43,6 @@ struct { -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* DisplayTooltip is TRUE when the group button text didn't fit into - the button. */ - DWORD DisplayTooltip : 1; - -#endif - DWORD IsCollapsed : 1; }; }; @@ -65,26 +53,15 @@ HWND hWnd; PTASK_GROUP Group; INT Index; - -#if !(TASK_USE_DRAWCAPTIONTEMP != 0) - INT IconIndex; -#endif + union { DWORD dwFlags; struct { - -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* DisplayTooltip is TRUE when the window text didn't fit into the - button. */ - DWORD DisplayTooltip : 1; - -#endif /* IsFlashing is TRUE when the task bar item should be flashing. */ DWORD IsFlashing : 1; @@ -113,9 +90,11 @@ PTASK_ITEM TaskItems; PTASK_ITEM ActiveTaskItem; + HTHEME TaskBandTheme; HWND hWndToolbar; UINT TbButtonsPerLine; WORD ToolbarBtnCount; + HIMAGELIST TaskIcons; union { @@ -139,12 +118,6 @@ static VOID TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This, IN BOOL bRedrawDisabled); -#if TASK_USE_DRAWCAPTIONTEMP != 0 - -#define TaskSwitchWnd_GetWndTextFromTaskItem(a,b) NULL - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - static LPTSTR TaskSwitchWnd_GetWndTextFromTaskItem(IN OUT PTASK_SWITCH_WND This, IN PTASK_ITEM TaskItem) @@ -161,7 +134,6 @@ return NULL; } -#endif #if DUMP_TASKS != 0 static VOID @@ -408,19 +380,44 @@ /* FIXME: Implement */ } +static HICON +TaskSwitchWnd_GetWndIcon(HWND hwnd) +{ + HICON hIcon = 0; + + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); + + return hIcon; +} static INT TaskSwitchWnd_UpdateTaskItemButton(IN OUT PTASK_SWITCH_WND This, IN PTASK_ITEM TaskItem) { TBBUTTONINFO tbbi; + HICON icon; ASSERT(TaskItem->Index >= 0); tbbi.cbSize = sizeof(tbbi); - tbbi.dwMask = TBIF_BYINDEX | TBIF_STATE | TBIF_TEXT; + tbbi.dwMask = TBIF_BYINDEX | TBIF_STATE | TBIF_TEXT | TBIF_IMAGE; tbbi.fsState = TBSTATE_ENABLED; if (This->ActiveTaskItem == TaskItem) tbbi.fsState |= TBSTATE_CHECKED; + + if (TaskItem->RenderFlashed) + tbbi.fsState |= TBSTATE_MARKED; /* Check if we're updating a button that is the last one in the line. If so, we need to set the TBSTATE_WRAP flag! */ @@ -433,6 +430,10 @@ tbbi.pszText = TaskSwitchWnd_GetWndTextFromTaskItem(This, TaskItem); + icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); + TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons,TaskItem->IconIndex,icon); + tbbi.iImage = TaskItem->IconIndex; + if (!SendMessage(This->hWndToolbar, TB_SETBUTTONINFO, (WPARAM)TaskItem->Index, @@ -444,6 +445,39 @@ DbgPrint("Updated button %d for hwnd 0x%p\n", TaskItem->Index, TaskItem->hWnd); return TaskItem->Index; +} + +static VOID +TaskSwitchWnd_RemoveIcon(IN OUT PTASK_SWITCH_WND This, + IN PTASK_ITEM TaskItem) +{ + TBBUTTONINFO tbbi; + PTASK_ITEM currentTaskItem,LastItem; + + if (TaskItem->IconIndex==-1) + return; + + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_IMAGE; + + currentTaskItem = This->TaskItems; + LastItem = currentTaskItem + This->TaskItemCount; + while (currentTaskItem != LastItem) + { + if (currentTaskItem->IconIndex > TaskItem->IconIndex) + { + currentTaskItem->IconIndex--; + tbbi.iImage = currentTaskItem->IconIndex; + + SendMessage(This->hWndToolbar, + TB_SETBUTTONINFO, + currentTaskItem->Index, + (LPARAM)&tbbi); + } + currentTaskItem++; + } + + ImageList_Remove(This->TaskIcons, TaskItem->IconIndex); } static PTASK_ITEM @@ -541,6 +575,7 @@ { TBBUTTON tbBtn; INT iIndex; + HICON icon; if (TaskItem->Index >= 0) { @@ -556,7 +591,10 @@ TaskItem->Group); } - tbBtn.iBitmap = 0; + icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); + TaskItem->IconIndex = ImageList_AddIcon(This->TaskIcons, icon); + + tbBtn.iBitmap = TaskItem->IconIndex; tbBtn.fsState = TBSTATE_ENABLED | TBSTATE_ELLIPSES; tbBtn.fsStyle = BTNS_CHECK | BTNS_NOPREFIX | BTNS_SHOWTEXT; tbBtn.dwData = TaskItem->Index; @@ -612,6 +650,7 @@ { TaskSwitchWnd_BeginUpdate(This); + TaskSwitchWnd_RemoveIcon(This, TaskItem); iIndex = TaskItem->Index; if (SendMessage(This->hWndToolbar, TB_DELETEBUTTON, @@ -1107,7 +1146,9 @@ TaskSwitchWnd_FlashTaskItem(IN OUT PTASK_SWITCH_WND This, IN OUT PTASK_ITEM TaskItem) { - /* FIXME: Implement */ + TaskItem->RenderFlashed = 1; + TaskSwitchWnd_UpdateTaskItemButton(This, + TaskItem); } static BOOL @@ -1151,6 +1192,7 @@ else if (TaskItem->Index >= 0) { UpdateTaskItem: + TaskItem->RenderFlashed = 0; TaskSwitchWnd_UpdateTaskItemButton(This, TaskItem); } @@ -1384,6 +1426,18 @@ } return Ret; +} + +static VOID +TaskSwitchWnd_UpdateTheme(IN OUT PTASK_SWITCH_WND This) +{ + if (This->TaskBandTheme) + CloseThemeData(This->TaskBandTheme); + + if (IsThemeActive()) + This->TaskBandTheme = OpenThemeData(This->hWnd, L"TaskBand"); + else + This->TaskBandTheme = NULL; } static VOID @@ -1410,11 +1464,16 @@ HMODULE hShell32; SIZE BtnSize; + SetWindowTheme(This->hWndToolbar, L"TaskBand", NULL); + TaskSwitchWnd_UpdateTheme(This); /* Identify the version we're using */ SendMessage(This->hWndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + This->TaskIcons = ImageList_Create(16, 16, ILC_COLOR32, 0, 1000); + SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->TaskIcons); /* Calculate the default button size. Don't save this in This->ButtonSize.cx so that the actual button width gets updated correctly on the first recalculation */ @@ -1497,6 +1556,7 @@ } } + CloseThemeData(This->TaskBandTheme); TaskSwitchWnd_DeleteAllTasks(This); } @@ -1778,16 +1838,10 @@ TaskSwichWnd_HandleItemPaint(IN OUT PTASK_SWITCH_WND This, IN OUT NMTBCUSTOMDRAW *nmtbcd) { - HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; PTASK_GROUP TaskGroup; PTASK_ITEM TaskItem; -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - UINT uidctFlags = DC_TEXT | DC_ICON | DC_NOSENDMSG; - -#endif TaskItem = FindTaskItemByIndex(This, (INT)nmtbcd->nmcd.dwItemSpec); TaskGroup = FindTaskGroupByIndex(This, @@ -1798,97 +1852,32 @@ if (TaskItem != NULL && IsWindow(TaskItem->hWnd)) { - hCaptionFont = ITrayWindow_GetCaptionFonts(This->Tray, - &hBoldCaptionFont); - if (nmtbcd->nmcd.uItemState & CDIS_CHECKED) - hCaptionFont = hBoldCaptionFont; - -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* Make sure we don't draw on the button edges */ - InflateRect(&nmtbcd->nmcd.rc, - -GetSystemMetrics(SM_CXEDGE), - -GetSystemMetrics(SM_CYEDGE)); - - if ((nmtbcd->nmcd.uItemState & CDIS_MARKED) && TaskItem->RenderFlashed) - { - /* This is a slight glitch. We have to move the rectangle so that - the button content appears to be pressed. However, when flashing - is enabled, we can see a light line at the top and left inner - border. We need to fill that area with the flashing color. Note - that since we're using DrawCaptionTemp() the flashing color is - COLOR_ACTIVECAPTION, not COLOR_HIGHLIGHT! */ - FillRect(nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - (HBRUSH)(COLOR_ACTIVECAPTION + 1)); - - /* Make the button content appear pressed. This however draws a bit - into the right and bottom border of the button edge, making it - look a bit odd. However, selecting a clipping region to prevent - that from happening causes problems with DrawCaptionTemp()! */ - OffsetRect(&nmtbcd->nmcd.rc, - 1, - 1); - - /* Render flashed */ - uidctFlags |= DC_ACTIVE; - } - else - { - uidctFlags |= DC_INBUTTON; - if (nmtbcd->nmcd.uItemState & CDIS_CHECKED) - uidctFlags |= DC_ACTIVE; - } - - if (DrawCapTemp != NULL) - { - /* Draw the button content */ - TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, - nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - hCaptionFont, - NULL, - NULL, - uidctFlags); - } - - return CDRF_SKIPDEFAULT; - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - /* Make the entire button flashing if neccessary */ if (nmtbcd->nmcd.uItemState & CDIS_MARKED) { - if (TaskItem->RenderFlashed) + Ret = TBCDRF_NOBACKGROUND; + if (!This->TaskBandTheme) { - nmtbcd->hbrMonoDither = GetSysColorBrush(COLOR_HIGHLIGHT); - nmtbcd->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); - nmtbcd->nHLStringBkMode = TRANSPARENT; - - /* We don't really need to set clrMark because we set the - background mode to TRANSPARENT! */ - nmtbcd->clrMark = GetSysColor(COLOR_HIGHLIGHT); - - Ret |= TBCDRF_USECDCOLORS; + SelectObject(nmtbcd->nmcd.hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); + Rectangle(nmtbcd->nmcd.hdc, + nmtbcd->nmcd.rc.left, + nmtbcd->nmcd.rc.top, + nmtbcd->nmcd.rc.right, + nmtbcd->nmcd.rc.bottom); } else - Ret |= TBCDRF_NOMARK; - } - - /* Select the font we want to use */ - SelectObject(nmtbcd->nmcd.hdc, - hCaptionFont); - return Ret | CDRF_NEWFONT; - -#endif - + { + DrawThemeBackground(This->TaskBandTheme, nmtbcd->nmcd.hdc, TDP_FLASHBUTTON, 0, &nmtbcd->nmcd.rc, 0); + } + nmtbcd->clrText = GetSysColor(COLOR_HIGHLIGHTTEXT); + return Ret; + } } } else if (TaskGroup != NULL) { /* FIXME: Implement painting for task groups */ } - return Ret; } @@ -1907,22 +1896,7 @@ switch (nmtbcd->nmcd.dwDrawStage) { -#if TASK_USE_DRAWCAPTIONTEMP != 0 - case CDDS_ITEMPREPAINT: - /* We handle drawing in the post-paint stage so that we - don't have to draw the button edges, etc */ - Ret = CDRF_NOTIFYPOSTPAINT; - break; - - case CDDS_ITEMPOSTPAINT: - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - - case CDDS_ITEMPREPAINT: - -#endif - Ret = TaskSwichWnd_HandleItemPaint(This, nmtbcd); break; @@ -1940,6 +1914,16 @@ } return Ret; +} + +static VOID +TaskSwitchWnd_DrawBackground(HWND hwnd, + HDC hdc) +{ + RECT rect; + + GetClientRect(hwnd, &rect); + DrawThemeParentBackground(hwnd, hdc, &rect); } static LRESULT CALLBACK @@ -1961,6 +1945,12 @@ { switch (uMsg) { + case WM_THEMECHANGED: + TaskSwitchWnd_UpdateTheme(This); + break; + case WM_ERASEBKGND: + TaskSwitchWnd_DrawBackground(hwnd, (HDC)wParam); + break; case WM_SIZE: { SIZE szClient; Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sun Dec 23 14:37:22 2012 @@ -19,6 +19,669 @@ */ #include <precomp.h> +#include <docobj.h> + +/* + * SysPagerWnd + */ +static const TCHAR szSysPagerWndClass[] = TEXT("SysPager"); + +typedef struct _NOTIFY_ITEM +{ + struct _NOTIFY_ITEM *next; + INT Index; + INT IconIndex; + NOTIFYICONDATA iconData; +} NOTIFY_ITEM, *PNOTIFY_ITEM, **PPNOTIFY_ITEM; + +typedef struct _SYS_PAGER_DATA +{ + HWND hWnd; + HWND hWndToolbar; + HIMAGELIST SysIcons; + PNOTIFY_ITEM NotifyItems; + INT ButtonCount; + INT VisibleButtonCount; +} SYS_PAGER_WND_DATA, *PSYS_PAGER_WND_DATA; + + +static PNOTIFY_ITEM +SysPagerWnd_CreateNotifyItemData(IN OUT PSYS_PAGER_WND_DATA This) +{ + PNOTIFY_ITEM *findNotifyPointer = &This->NotifyItems; + PNOTIFY_ITEM notifyItem; + + notifyItem = malloc(sizeof(*notifyItem)); + if (notifyItem == NULL) + return NULL; + + ZeroMemory(notifyItem, sizeof(*notifyItem)); + notifyItem->next = NULL; + + while (*findNotifyPointer != NULL) + { + findNotifyPointer = &(*findNotifyPointer)->next; + } + + *findNotifyPointer = notifyItem; + + return notifyItem; +} + +static PPNOTIFY_ITEM +SysPagerWnd_FindPPNotifyItemByIconData(IN OUT PSYS_PAGER_WND_DATA This, + IN CONST NOTIFYICONDATA *iconData) +{ + PPNOTIFY_ITEM findNotifyPointer = &This->NotifyItems; + + while (*findNotifyPointer != NULL) + { + if ((*findNotifyPointer)->iconData.hWnd == iconData->hWnd && + (*findNotifyPointer)->iconData.uID == iconData->uID) + { + return findNotifyPointer; + } + findNotifyPointer = &(*findNotifyPointer)->next; + } + + return NULL; +} + +static PPNOTIFY_ITEM +SysPagerWnd_FindPPNotifyItemByIndex(IN OUT PSYS_PAGER_WND_DATA This, + IN WORD wIndex) +{ + PPNOTIFY_ITEM findNotifyPointer = &This->NotifyItems; + + while (*findNotifyPointer != NULL) + { + if ((*findNotifyPointer)->Index == wIndex) + { + return findNotifyPointer; + } + findNotifyPointer = &(*findNotifyPointer)->next; + } + + return NULL; +} + +static VOID +SysPagerWnd_UpdateButton(IN OUT PSYS_PAGER_WND_DATA This, + IN CONST NOTIFYICONDATA *iconData) +{ + TBBUTTONINFO tbbi; + PNOTIFY_ITEM notifyItem; + PPNOTIFY_ITEM NotifyPointer; + + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); + notifyItem = *NotifyPointer; + + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; + tbbi.idCommand = notifyItem->Index; + + if (iconData->uFlags & NIF_MESSAGE) + { + notifyItem->iconData.uCallbackMessage = iconData->uCallbackMessage; + } + + if (iconData->uFlags & NIF_ICON) + { + tbbi.dwMask |= TBIF_IMAGE; + notifyItem->IconIndex = tbbi.iImage = ImageList_AddIcon(This->SysIcons, iconData->hIcon); + } + + /* TODO: support NIF_TIP */ + + if (iconData->uFlags & NIF_STATE) + { + if (iconData->dwStateMask & NIS_HIDDEN && + (notifyItem->iconData.dwState & NIS_HIDDEN) != (iconData->dwState & NIS_HIDDEN)) + { + tbbi.dwMask |= TBIF_STATE; + if (iconData->dwState & NIS_HIDDEN) + { + tbbi.fsState |= TBSTATE_HIDDEN; + This->VisibleButtonCount--; + } + else + { + tbbi.fsState &= ~TBSTATE_HIDDEN; + This->VisibleButtonCount++; + } + } + + notifyItem->iconData.dwState &= ~iconData->dwStateMask; + notifyItem->iconData.dwState |= (iconData->dwState & iconData->dwStateMask); + } + + /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ + + SendMessage(This->hWndToolbar, + TB_SETBUTTONINFO, + (WPARAM)notifyItem->Index, + (LPARAM)&tbbi); +} + + +static VOID +SysPagerWnd_AddButton(IN OUT PSYS_PAGER_WND_DATA This, + IN CONST NOTIFYICONDATA *iconData) +{ + TBBUTTON tbBtn; + PNOTIFY_ITEM notifyItem; + TCHAR text[] = TEXT(""); + + notifyItem = SysPagerWnd_CreateNotifyItemData(This); + + notifyItem->next = NULL; + notifyItem->Index = This->ButtonCount; + This->ButtonCount++; + This->VisibleButtonCount++; + + notifyItem->iconData.hWnd = iconData->hWnd; + notifyItem->iconData.uID = iconData->uID; + + tbBtn.fsState = TBSTATE_ENABLED; + tbBtn.fsStyle = BTNS_NOPREFIX; + tbBtn.dwData = notifyItem->Index; + + tbBtn.iString = (INT_PTR)text; + tbBtn.idCommand=notifyItem->Index; + + if (iconData->uFlags & NIF_MESSAGE) + { + notifyItem->iconData.uCallbackMessage = iconData->uCallbackMessage; + } + + if (iconData->uFlags & NIF_ICON) + { + notifyItem->IconIndex = tbBtn.iBitmap = ImageList_AddIcon(This->SysIcons, iconData->hIcon); + } + + /* TODO: support NIF_TIP */ + + if (iconData->uFlags & NIF_STATE) + { + notifyItem->iconData.dwState &= ~iconData->dwStateMask; + notifyItem->iconData.dwState |= (iconData->dwState & iconData->dwStateMask); + if (notifyItem->iconData.dwState & NIS_HIDDEN) + { + tbBtn.fsState |= TBSTATE_HIDDEN; + This->VisibleButtonCount--; + } + + } + + /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ + + SendMessage(This->hWndToolbar, + TB_INSERTBUTTON, + notifyItem->Index, + (LPARAM)&tbBtn); + + SendMessage(This->hWndToolbar, + TB_SETBUTTONSIZE, + 0, + MAKELONG(16, 16)); +} + +static VOID +SysPagerWnd_RemoveButton(IN OUT PSYS_PAGER_WND_DATA This, + IN CONST NOTIFYICONDATA *iconData) +{ + PPNOTIFY_ITEM NotifyPointer; + + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); + if (NotifyPointer) + { + PNOTIFY_ITEM deleteItem; + PNOTIFY_ITEM updateItem; + deleteItem=*NotifyPointer; + + + SendMessage(This->hWndToolbar, + TB_DELETEBUTTON, + deleteItem->Index, + 0); + + *NotifyPointer=updateItem=deleteItem->next; + + if (!(deleteItem->iconData.dwState & NIS_HIDDEN)) + This->VisibleButtonCount--; + free(deleteItem); + This->ButtonCount--; + + while (updateItem != NULL) + { + TBBUTTONINFO tbbi; + updateItem->Index--; + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; + tbbi.idCommand = updateItem->Index; + + SendMessage(This->hWndToolbar, + TB_SETBUTTONINFO, + updateItem->Index, + (LPARAM)&tbbi); + + updateItem = updateItem->next; + } + } +} + +static VOID +SysPagerWnd_HandleButtonClick(IN OUT PSYS_PAGER_WND_DATA This, + IN WORD wIndex, + IN UINT uMsg, + IN WPARAM wParam) +{ + PPNOTIFY_ITEM NotifyPointer; + + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIndex(This, wIndex); + if (NotifyPointer) + { + PNOTIFY_ITEM notifyItem; + notifyItem = *NotifyPointer; + + if (IsWindow(notifyItem->iconData.hWnd)) + { + if (uMsg == WM_MOUSEMOVE || + uMsg == WM_LBUTTONDOWN || + uMsg == WM_MBUTTONDOWN || + uMsg == WM_RBUTTONDOWN) + { + PostMessage(notifyItem->iconData.hWnd, + notifyItem->iconData.uCallbackMessage, + notifyItem->iconData.uID, + uMsg); + } + else + { + DWORD pid; + GetWindowThreadProcessId(notifyItem->iconData.hWnd, &pid); + if (pid == GetCurrentProcessId()) + { + PostMessage(notifyItem->iconData.hWnd, + notifyItem->iconData.uCallbackMessage, + notifyItem->iconData.uID, + uMsg); + } + else + { + SendMessage(notifyItem->iconData.hWnd, + notifyItem->iconData.uCallbackMessage, + notifyItem->iconData.uID, + uMsg); + } + } + } + } +} + +static VOID +SysPagerWnd_DrawBackground(IN HWND hwnd, + IN HDC hdc) +{ + RECT rect; + + GetClientRect(hwnd, &rect); + DrawThemeParentBackground(hwnd, hdc, &rect); +} + +static LRESULT CALLBACK +SysPagerWnd_ToolbarSubclassedProc(IN HWND hWnd, + IN UINT msg, + IN WPARAM wParam, + IN LPARAM lParam, + IN UINT_PTR uIdSubclass, + IN DWORD_PTR dwRefData) +{ + if (msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) + { + HWND parent = GetParent(hWnd); + + if (!parent) + return 0; + + return SendMessage(parent, msg, wParam, lParam); + } + + return DefSubclassProc(hWnd, msg, wParam, lParam); +} + +static VOID +SysPagerWnd_Create(IN OUT PSYS_PAGER_WND_DATA This) +{ + This->hWndToolbar = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | + TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | + TBSTYLE_TRANSPARENT | + CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER, + 0, + 0, + 0, + 0, + This->hWnd, + NULL, + hExplorerInstance, + NULL); + if (This->hWndToolbar != NULL) + { + SIZE BtnSize; + SetWindowTheme(This->hWndToolbar, L"TrayNotify", NULL); + /* Identify the version we're using */ + SendMessage(This->hWndToolbar, + TB_BUTTONSTRUCTSIZE, + sizeof(TBBUTTON), + 0); + + This->SysIcons = ImageList_Create(16, 16, ILC_COLOR32, 0, 1000); + SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->SysIcons); + + BtnSize.cx = BtnSize.cy = 18; + //BtnSize.cx = GetSystemMetrics(SM_CXMINIMIZED); + //This->ButtonSize.cy = BtnSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); + SendMessage(This->hWndToolbar, + TB_SETBUTTONSIZE, + 0, + MAKELONG(BtnSize.cx, BtnSize.cy)); + /*SysPagerWnd_AddButton(This);*/ + + SetWindowSubclass(This->hWndToolbar, + SysPagerWnd_ToolbarSubclassedProc, + 2, + (DWORD_PTR)This); + } +} + +static VOID +SysPagerWnd_NCDestroy(IN OUT PSYS_PAGER_WND_DATA This) +{ + /* Free allocated resources */ + SetWindowLongPtr(This->hWnd, + 0, + 0); + HeapFree(hProcessHeap, + 0, + This); +} + +static VOID +SysPagerWnd_NotifyMsg(IN HWND hwnd, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PSYS_PAGER_WND_DATA This = (PSYS_PAGER_WND_DATA)GetWindowLongPtr(hwnd, 0); + + PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; + if (cpData->dwData == 1) + { + DWORD trayCommand; + NOTIFYICONDATA *iconData; + HWND parentHWND; + RECT windowRect; + parentHWND = GetParent(This->hWnd); + parentHWND = GetParent(parentHWND); + GetClientRect(parentHWND, &windowRect); + + trayCommand = *(DWORD *) (((BYTE *)cpData->lpData) + 4); + iconData = (NOTIFYICONDATA *) (((BYTE *)cpData->lpData) + 8); + + switch (trayCommand) + { + case NIM_ADD: + { + PPNOTIFY_ITEM NotifyPointer; + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, + iconData); + if (!NotifyPointer) + { + SysPagerWnd_AddButton(This, iconData); + } + break; + } + case NIM_MODIFY: + { + PPNOTIFY_ITEM NotifyPointer; + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, + iconData); + if(!NotifyPointer) + { + SysPagerWnd_AddButton(This, iconData); + } + else + { + SysPagerWnd_UpdateButton(This, iconData); + } + break; + } + case NIM_DELETE: + { + SysPagerWnd_RemoveButton(This, iconData); + break; + } + } + SendMessage(parentHWND, + WM_SIZE, + 0, + MAKELONG(windowRect.right - windowRect.left, + windowRect.bottom - windowRect.top)); + } +} + +static void +SysPagerWnd_GetSize(IN HWND hwnd, + IN WPARAM wParam, + IN PSIZE size) +{ + PSYS_PAGER_WND_DATA This = (PSYS_PAGER_WND_DATA)GetWindowLongPtr(hwnd, 0); + INT rows = 0; + TBMETRICS tbm; + + if (wParam) /* horizontal */ + { + rows = size->cy / 24; + if (rows == 0) + rows++; + size->cx = (This->VisibleButtonCount+rows - 1) / rows * 24; + } + else + { + rows = size->cx / 24; + if (rows == 0) + rows++; + size->cy = (This->VisibleButtonCount+rows - 1) / rows * 24; + } + + tbm.cbSize = sizeof(tbm); + tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; + tbm.cxBarPad = tbm.cyBarPad = 0; + tbm.cxButtonSpacing = 0; + tbm.cyButtonSpacing = 0; + + SendMessage(This->hWndToolbar, + TB_SETMETRICS, + 0, + (LPARAM)&tbm); +} + +static LRESULT CALLBACK +SysPagerWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PSYS_PAGER_WND_DATA This = NULL; + LRESULT Ret = FALSE; + + if (uMsg != WM_NCCREATE) + { + This = (PSYS_PAGER_WND_DATA)GetWindowLongPtr(hwnd, 0); + } + + if (This != NULL || uMsg == WM_NCCREATE) + { + switch (uMsg) + { + case WM_ERASEBKGND: + SysPagerWnd_DrawBackground(hwnd,(HDC)wParam); + return 0; + + case WM_NCCREATE: + { + LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; + This = CreateStruct->lpCreateParams; + This->hWnd = hwnd; + This->NotifyItems = NULL; + This->ButtonCount = 0; + This->VisibleButtonCount = 0; + + SetWindowLongPtr(hwnd, + 0, + (LONG_PTR)This); + + return TRUE; + } + case WM_CREATE: + SysPagerWnd_Create(This); + break; + case WM_NCDESTROY: + SysPagerWnd_NCDestroy(This); + break; + + case WM_SIZE: + { + SIZE szClient; + szClient.cx = LOWORD(lParam); + szClient.cy = HIWORD(lParam); + + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + + + if (This->hWndToolbar != NULL && This->hWndToolbar != hwnd) + { + SetWindowPos(This->hWndToolbar, + NULL, + 0, + 0, + szClient.cx, + szClient.cy, + SWP_NOZORDER); + } + } + + default: + if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) + { + POINT pt; + INT iBtn; + + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); + + iBtn = (INT)SendMessage(This->hWndToolbar, + TB_HITTEST, + 0, + (LPARAM)&pt); + + if (iBtn >= 0) + { + SysPagerWnd_HandleButtonClick(This,iBtn,uMsg,wParam); + } + + return 0; + } + + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} + +static HWND +CreateSysPagerWnd(IN HWND hWndParent, + IN BOOL bVisible) +{ + PSYS_PAGER_WND_DATA TcData; + DWORD dwStyle; + HWND hWnd = NULL; + + TcData = HeapAlloc(hProcessHeap, + 0, + sizeof(*TcData)); + if (TcData != NULL) + { + ZeroMemory(TcData, sizeof(*TcData)); + + /* Create the window. The tray window is going to move it to the correct + position and resize it as needed. */ + dwStyle = WS_CHILD | WS_CLIPSIBLINGS; + if (bVisible) + dwStyle |= WS_VISIBLE; + + hWnd = CreateWindowEx(0, + szSysPagerWndClass, + NULL, + dwStyle, + 0, + 0, + 0, + 0, + hWndParent, + NULL, + hExplorerInstance, + TcData); + + if (hWnd == NULL) + { + HeapFree(hProcessHeap, + 0, + TcData); + } + } + + SetWindowTheme(hWnd, L"TrayNotify", NULL); + + return hWnd; + +} + +static BOOL +RegisterSysPagerWndClass(VOID) +{ + WNDCLASS wcTrayClock; + + wcTrayClock.style = CS_DBLCLKS; + wcTrayClock.lpfnWndProc = SysPagerWndProc; + wcTrayClock.cbClsExtra = 0; + wcTrayClock.cbWndExtra = sizeof(PSYS_PAGER_WND_DATA); + wcTrayClock.hInstance = hExplorerInstance; + wcTrayClock.hIcon = NULL; + wcTrayClock.hCursor = LoadCursor(NULL, IDC_ARROW); + wcTrayClock.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wcTrayClock.lpszMenuName = NULL; + wcTrayClock.lpszClassName = szSysPagerWndClass; + + return RegisterClass(&wcTrayClock) != 0; +} + +static VOID +UnregisterSysPagerWndClass(VOID) +{ + UnregisterClass(szSysPagerWndClass, + hExplorerInstance); +} /* * TrayClockWnd @@ -92,6 +755,7 @@ HWND hWnd; HWND hWndNotify; HFONT hFont; + COLORREF textColor; RECT rcText; SYSTEMTIME LocalTime; @@ -112,6 +776,49 @@ SIZE LineSizes[CLOCKWND_FORMAT_COUNT]; TCHAR szLines[CLOCKWND_FORMAT_COUNT][48]; } TRAY_CLOCK_WND_DATA, *PTRAY_CLOCK_WND_DATA; + +static VOID +TrayClockWnd_SetFont(IN OUT PTRAY_CLOCK_WND_DATA This, + IN HFONT hNewFont, + IN BOOL bRedraw); + +static VOID +TrayClockWnd_UpdateTheme(IN OUT PTRAY_CLOCK_WND_DATA This) +{ + LOGFONTW clockFont; + HTHEME clockTheme; + HFONT hFont; + + clockTheme = OpenThemeData(This->hWnd, L"Clock"); + + if (clockTheme) + { + GetThemeFont(clockTheme, + NULL, + CLP_TIME, + 0, + TMT_FONT, + &clockFont); + + hFont = CreateFontIndirect(&clockFont); + + TrayClockWnd_SetFont(This, + hFont, + FALSE); + + GetThemeColor(clockTheme, + CLP_TIME, + 0, + TMT_TEXTCOLOR, + &This->textColor); + } + else + { + This->textColor = RGB(0,0,0); + } + + CloseThemeData(clockTheme); +} static BOOL TrayClockWnd_MeasureLines(IN OUT PTRAY_CLOCK_WND_DATA This) @@ -483,6 +1190,8 @@ iPrevBkMode = SetBkMode(hDC, TRANSPARENT); + SetTextColor(hDC, This->textColor); + hPrevFont = SelectObject(hDC, This->hFont); @@ -532,6 +1241,16 @@ } } +static VOID +TrayClockWnd_DrawBackground(IN HWND hwnd, + IN HDC hdc) +{ + RECT rect; + + GetClientRect(hwnd, &rect); + DrawThemeParentBackground(hwnd, hdc, &rect); +} + static LRESULT CALLBACK TrayClockWndProc(IN HWND hwnd, IN UINT uMsg, @@ -551,6 +1270,12 @@ { switch (uMsg) { + case WM_THEMECHANGED: + TrayClockWnd_UpdateTheme(This); + break; + case WM_ERASEBKGND: + TrayClockWnd_DrawBackground(hwnd, (HDC)wParam); + break; case WM_PAINT: case WM_PRINTCLIENT: { @@ -621,6 +1346,7 @@ SetWindowLongPtr(hwnd, 0, (LONG_PTR)This); + TrayClockWnd_UpdateTheme(This); return TRUE; } @@ -714,6 +1440,7 @@ TcData); } } + SetWindowTheme(hWnd, L"TrayNotify", NULL); return hWnd; @@ -760,9 +1487,13 @@ HWND hWnd; HWND hWndTrayClock; HWND hWndNotify; + HWND hWndSysPager; + HTHEME TrayTheme; SIZE szTrayClockMin; - SIZE szNonClient; + SIZE szTrayNotify; + MARGINS ContentMargin; ITrayWindow *TrayWindow; + HFONT hFontClock; union { DWORD dwFlags; @@ -775,22 +1506,43 @@ } TRAY_NOTIFY_WND_DATA, *PTRAY_NOTIFY_WND_DATA; static VOID -TrayNotifyWnd_UpdateStyle(IN OUT PTRAY_NOTIFY_WND_DATA This) -{ - RECT rcClient = { 0, 0, 0, 0 }; - - if (AdjustWindowRectEx(&rcClient, - GetWindowLongPtr(This->hWnd, - GWL_STYLE), - FALSE, - GetWindowLongPtr(This->hWnd, - GWL_EXSTYLE))) - { - This->szNonClient.cx = rcClient.right - rcClient.left; - This->szNonClient.cy = rcClient.bottom - rcClient.top; - } +TrayNotifyWnd_UpdateTheme(IN OUT PTRAY_NOTIFY_WND_DATA This) +{ + LONG_PTR style; + + if (This->TrayTheme) + CloseThemeData(This->TrayTheme); + + if (IsThemeActive()) + This->TrayTheme = OpenThemeData(This->hWnd, L"TrayNotify"); else - This->szNonClient.cx = This->szNonClient.cy = 0; + This->TrayTheme = 0; + + if (This->TrayTheme) + { + style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = style & ~WS_EX_STATICEDGE; + SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + + GetThemeMargins(This->TrayTheme, + NULL, + TNP_BACKGROUND, + 0, + TMT_CONTENTMARGINS, + NULL, + &This->ContentMargin); + } + else + { + style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = style | WS_EX_STATICEDGE; + SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + + This->ContentMargin.cxLeftWidth = 0; + This->ContentMargin.cxRightWidth = 0; + This->ContentMargin.cyTopHeight = 0; + This->ContentMargin.cyBottomHeight = 0; + } } static VOID @@ -799,7 +1551,10 @@ This->hWndTrayClock = CreateTrayClockWnd(This->hWnd, !This->HideClock); - TrayNotifyWnd_UpdateStyle(This); + This->hWndSysPager = CreateSysPagerWnd(This->hWnd, + !This->HideClock); + + TrayNotifyWnd_UpdateTheme(This); } static VOID @@ -818,21 +1573,26 @@ IN BOOL Horizontal, IN OUT PSIZE pSize) { + SIZE szClock = { 0, 0 }; + SIZE szTray = { 0, 0 }; + This->IsHorizontal = Horizontal; + if (This->IsHorizontal) + SetWindowTheme(This->hWnd, L"TrayNotifyHoriz", NULL); + else + SetWindowTheme(This->hWnd, L"TrayNotifyVert", NULL); if (!This->HideClock) { - SIZE szClock = { 0, 0 }; - if (Horizontal) { - szClock.cy = pSize->cy - This->szNonClient.cy - (2 * TRAY_NOTIFY_WND_SPACING_Y); + szClock.cy = pSize->cy - 2 * TRAY_NOTIFY_WND_SPACING_Y; if (szClock.cy <= 0) goto NoClock; } else { - szClock.cx = pSize->cx - This->szNonClient.cx - (2 * TRAY_NOTIFY_WND_SPACING_X); + szClock.cx = pSize->cx - 2 * TRAY_NOTIFY_WND_SPACING_X; if (szClock.cx <= 0) goto NoClock; } @@ -846,22 +1606,44 @@ } else NoClock: - This->szTrayClockMin = This->szNonClient; + This->szTrayClockMin = szClock; if (Horizontal) { - pSize->cx = This->szNonClient.cx + (2 * TRAY_NOTIFY_WND_SPACING_X); + szTray.cy = pSize->cy - 2 * TRAY_NOTIFY_WND_SPACING_Y; + } + else + { + szTray.cx = pSize->cx - 2 * TRAY_NOTIFY_WND_SPACING_X; + } + + SysPagerWnd_GetSize(This->hWndSysPager, + Horizontal, + &szTray); + + This->szTrayNotify = szTray; + + if (Horizontal) + { + pSize->cx = 2 * TRAY_NOTIFY_WND_SPACING_X; if (!This->HideClock) pSize->cx += TRAY_NOTIFY_WND_SPACING_X + This->szTrayClockMin.cx; + + pSize->cx += szTray.cx; } else { - pSize->cy = This->szNonClient.cy + (2 * TRAY_NOTIFY_WND_SPACING_Y); + pSize->cy = 2 * TRAY_NOTIFY_WND_SPACING_Y; if (!This->HideClock) pSize->cy += TRAY_NOTIFY_WND_SPACING_Y + This->szTrayClockMin.cy; - } + + pSize->cy += szTray.cy; + } + + pSize->cy += This->ContentMargin.cyTopHeight + This->ContentMargin.cyBottomHeight; + pSize->cx += This->ContentMargin.cxLeftWidth + This->ContentMargin.cxRightWidth; return TRUE; } @@ -897,6 +1679,55 @@ szClock.cx, szClock.cy, SWP_NOZORDER); + + if (This->IsHorizontal) + { + ptClock.x -= This->szTrayNotify.cx; + } + else + { + ptClock.y -= This->szTrayNotify.cy; + } + + SetWindowPos(This->hWndSysPager, + NULL, + ptClock.x, + ptClock.y, + This->szTrayNotify.cx, + This->szTrayNotify.cy, + SWP_NOZORDER); + } +} + +static LRESULT +TrayNotifyWnd_DrawBackground(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PTRAY_NOTIFY_WND_DATA This = (PTRAY_NOTIFY_WND_DATA)GetWindowLongPtr(hwnd, 0); + RECT rect; + HDC hdc = (HDC)wParam; + + GetClientRect(hwnd, &rect); + + DrawThemeParentBackground(hwnd, hdc, &rect); + DrawThemeBackground(This->TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0); + + return 0; +} + +VOID +TrayNotify_NotifyMsg(IN HWND hwnd, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PTRAY_NOTIFY_WND_DATA This = (PTRAY_NOTIFY_WND_DATA)GetWindowLongPtr(hwnd, 0); + if (This->hWndSysPager) + { + SysPagerWnd_NotifyMsg(This->hWndSysPager, + wParam, + lParam); } } @@ -919,6 +1750,14 @@ { switch (uMsg) { + case WM_THEMECHANGED: + TrayNotifyWnd_UpdateTheme(This); + return 0; + case WM_ERASEBKGND: + return TrayNotifyWnd_DrawBackground(hwnd, + uMsg, + wParam, + lParam); case TNWM_GETMINIMUMSIZE: { Ret = (LRESULT)TrayNotifyWnd_GetMinimumSize(This, @@ -1112,6 +1951,7 @@ UnregisterClass(szTrayNotifyWndClass, hExplorerInstance); } + RegisterSysPagerWndClass(); } return Ret; @@ -1122,6 +1962,8 @@ { UnregisterTrayClockWndClass(); + UnregisterSysPagerWndClass(); + UnregisterClass(szTrayNotifyWndClass, hExplorerInstance); } Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sun Dec 23 14:37:22 2012 @@ -43,6 +43,7 @@ const IShellDesktopTrayVtbl *lpVtblShellDesktopTray; LONG Ref; + HTHEME TaskbarTheme; HWND hWnd; HWND hWndDesktop; @@ -1025,6 +1026,12 @@ /* FIXME: Unload bands */ ITrayBandSite_Release(This->TrayBandSite); This->TrayBandSite = NULL; + } + + if (This->TaskbarTheme) + { + CloseThemeData(This->TaskbarTheme); + This->TaskbarTheme = NULL; } ITrayWindowImpl_Release(ITrayWindow_from_impl(This)); @@ -1113,6 +1120,7 @@ BOOL Horizontal; HDWP dwp; + ITrayWindowImpl_UpdateStartButton(This, NULL); if (prcClient != NULL) { rcClient = *prcClient; @@ -1402,9 +1410,24 @@ } static VOID +ITrayWindowImpl_UpdateTheme(IN OUT ITrayWindowImpl *This) +{ + if (This->TaskbarTheme) + CloseThemeData(This->TaskbarTheme); + + if (IsThemeActive()) + This->TaskbarTheme = OpenThemeData(This->hWnd, L"Taskbar"); + else + This->TaskbarTheme = 0; +} + +static VOID ITrayWindowImpl_Create(IN OUT ITrayWindowImpl *This) { TCHAR szStartCaption[32]; + + SetWindowTheme(This->hWnd, L"TaskBar", NULL); + ITrayWindowImpl_UpdateTheme(This); InterlockedIncrement(&TrayWndCount); @@ -1458,6 +1481,7 @@ NULL); if (This->hwndStart) { + SetWindowTheme(This->hwndStart, L"Start", NULL); SendMessage(This->hwndStart, WM_SETFONT, (WPARAM)This->hStartBtnFont, @@ -1538,6 +1562,7 @@ This->TrayBandSite = CreateTrayBandSite(ITrayWindow_from_impl(This), &This->hwndRebar, &This->hwndTaskSwitch); + SetWindowTheme(This->hwndRebar, L"TaskBar", NULL); /* Create the tray notification window */ This->hwndTrayNotify = CreateTrayNotifyWnd(ITrayWindow_from_impl(This), @@ -1883,6 +1908,74 @@ ITrayWindowImpl_Lock }; +static int +ITrayWindowImpl_DrawBackground(IN ITrayWindowImpl *This, + IN HDC dc) +{ + int backoundPart; + RECT rect; + + GetClientRect(This->hWnd, &rect); + switch (This->Position) + { + case ABE_LEFT: + backoundPart = TBP_BACKGROUNDLEFT; + break; + case ABE_TOP: + backoundPart = TBP_BACKGROUNDTOP; + break; + case ABE_RIGHT: + backoundPart = TBP_BACKGROUNDRIGHT; + break; + case ABE_BOTTOM: + default: + backoundPart = TBP_BACKGROUNDBOTTOM; + break; + } + DrawThemeBackground(This->TaskbarTheme, dc, backoundPart, 0, &rect, 0); + return 0; +} + +static int +ITrayWindowImpl_DrawSizer(IN ITrayWindowImpl *This, + IN HRGN hRgn) +{ + HDC hdc; + RECT rect; + int backoundPart; + + GetWindowRect(This->hWnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDCEx(This->hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + + switch (This->Position) + { + case ABE_LEFT: + backoundPart = TBP_SIZINGBARLEFT; + rect.left = rect.right - GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_TOP: + backoundPart = TBP_SIZINGBARTOP; + rect.top = rect.bottom - GetSystemMetrics(SM_CYSIZEFRAME); + break; + case ABE_RIGHT: + backoundPart = TBP_SIZINGBARRIGHT; + rect.right = rect.left + GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_BOTTOM: + default: + backoundPart = TBP_SIZINGBARBOTTOM; + rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZEFRAME); + break; + } + + DrawThemeBackground(This->TaskbarTheme, hdc, backoundPart, 0, &rect, 0); + + ReleaseDC(This->hWnd, hdc); + return 0; +} + static DWORD WINAPI RunFileDlgThread(IN OUT PVOID pParam) { @@ -1957,6 +2050,32 @@ switch (uMsg) { + case WM_COPYDATA: + { + if (This->hwndTrayNotify) + { + TrayNotify_NotifyMsg(This->hwndTrayNotify, + wParam, + lParam); + } + return TRUE; + } + case WM_THEMECHANGED: + ITrayWindowImpl_UpdateTheme(This); + return 0; + case WM_NCPAINT: + if (!This->TaskbarTheme) + goto DefHandler; + return ITrayWindowImpl_DrawSizer(This, + (HRGN)wParam); + case WM_ERASEBKGND: + if (!This->TaskbarTheme) + goto DefHandler; + return ITrayWindowImpl_DrawBackground(This, + (HDC)wParam); + case WM_CTLCOLORBTN: + SetBkMode((HDC)wParam, TRANSPARENT); + return (LRESULT)GetStockObject(HOLLOW_BRUSH); case WM_NCHITTEST: { RECT rcClient; @@ -1996,30 +2115,23 @@ if (pt.y > rcClient.bottom) return HTBOTTOM; break; - - case ABE_BOTTOM: - if (pt.y < rcClient.top) - return HTTOP; - break; - case ABE_LEFT: if (pt.x > rcClient.right) return HTRIGHT; break; - case ABE_RIGHT: if (pt.x < rcClient.left) return HTLEFT; break; - + case ABE_BOTTOM: default: + if (pt.y < rcClient.top) + return HTTOP; break; } } - return HTBORDER; } - case WM_MOVING: { POINT ptCursor; @@ -2072,7 +2184,7 @@ case WM_SIZE: { RECT rcClient; - + InvalidateRect(This->hWnd, NULL, TRUE); if (wParam == SIZE_RESTORED && lParam == 0) { ITrayWindowImpl_ResizeWorkArea(This);

11 years, 10 months

[tfaber] 57977: [EXPLORER_NEW] - Run file dialog in its own thread - Correctly check MapWindowPoints return value - Fix a warning - Based on Andrew Green's GSoC branch

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Dec 23 14:31:18 2012 New Revision: 57977 URL: http://svn.reactos.org/svn/reactos?rev=57977&view=rev Log: [EXPLORER_NEW] - Run file dialog in its own thread - Correctly check MapWindowPoints return value - Fix a warning - Based on Andrew Green's GSoC branch Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sun Dec 23 14:31:18 2012 @@ -401,7 +401,7 @@ { UINT uiDueTime; BOOL Ret; - int intWait1, intWait2; + UINT uiWait1, uiWait2; /* Kill the initialization timer */ KillTimer(This->hWnd, @@ -412,23 +412,23 @@ if (blShowSeconds == TRUE) { - intWait1 = 1000 - 200; - intWait2 = 1000; + uiWait1 = 1000 - 200; + uiWait2 = 1000; } else { - intWait1 = 60 * 1000 - 200; - intWait2 = 60 * 1000; - } - - if (uiDueTime > intWait1) + uiWait1 = 60 * 1000 - 200; + uiWait2 = 60 * 1000; + } + + if (uiDueTime > uiWait1) { /* The update of the clock will be up to 200 ms late, but that's acceptable. We're going to setup a timer that fires depending - intWait2. */ + uiWait2. */ Ret = SetTimer(This->hWnd, ID_TRAYCLOCK_TIMER, - intWait2, + uiWait2, NULL) != 0; This->IsTimerEnabled = Ret; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sun Dec 23 14:31:18 2012 @@ -1883,6 +1883,40 @@ ITrayWindowImpl_Lock }; +static DWORD WINAPI +RunFileDlgThread(IN OUT PVOID pParam) +{ + ITrayWindowImpl *This = pParam; + HANDLE hShell32; + RUNFILEDLG RunFileDlg; + HWND hwnd; + RECT posRect; + + GetWindowRect(This->hwndStart,&posRect); + + hwnd = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, + posRect.left, + posRect.top, + posRect.right - posRect.left, + posRect.bottom - posRect.top, + NULL, + NULL, + NULL, + NULL); + + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); + RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); + + RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + + DestroyWindow(hwnd); + + return 0; +} + static LRESULT CALLBACK TrayWndProc(IN HWND hwnd, IN UINT uMsg, @@ -1936,12 +1970,13 @@ return HTBORDER; } + SetLastError(ERROR_SUCCESS); if (GetClientRect(hwnd, &rcClient) && - MapWindowPoints(hwnd, - NULL, - (LPPOINT)&rcClient, - 2) != 0) + (MapWindowPoints(hwnd, + NULL, + (LPPOINT)&rcClient, + 2) != 0 || GetLastError() == ERROR_SUCCESS)) { pt.x = (SHORT)LOWORD(lParam); pt.y = (SHORT)HIWORD(lParam); @@ -2382,13 +2417,13 @@ case IDM_RUN: { - HANDLE hShell32; - RUNFILEDLG RunFileDlg; - - hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); - - RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + CloseHandle(CreateThread(NULL, + 0, + RunFileDlgThread, + This, + 0, + NULL)); + break; }

11 years, 10 months

[tfaber] 57976: [EXPLORER_NEW] - Add a manifest file to support theming - Formatting fixes - Based on Andrew Green's GSoC branch

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Dec 23 10:25:19 2012 New Revision: 57976 URL: http://svn.reactos.org/svn/reactos?rev=57976&view=rev Log: [EXPLORER_NEW] - Add a manifest file to support theming - Formatting fixes - Based on Andrew Green's GSoC branch Added: trunk/reactos/base/shell/explorer-new/explorer.exe.manifest (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c Added: trunk/reactos/base/shell/explorer-new/explorer.exe.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.exe.manifest (added) +++ trunk/reactos/base/shell/explorer-new/explorer.exe.manifest [iso-8859-1] Sun Dec 23 10:25:19 2012 @@ -1,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.Explorer" + type="win32" +/> +<description>This is ReactOS Explorer</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: trunk/reactos/base/shell/explorer-new/explorer.exe.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Sun Dec 23 10:25:19 2012 @@ -20,6 +20,7 @@ IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL BITMAP DISCARDABLE res/nolock_nogroup_noql.bmp IDB_TASKBARPROP_NOLOCK_NOGROUP_QL BITMAP DISCARDABLE res/nolock_nogroup_ql.bmp IDB_TASKBARPROP_NOLOCK_GROUP_QL BITMAP DISCARDABLE res/nolock_group_ql.bmp +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" // UTF-8 #pragma code_page(65001) Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sun Dec 23 10:25:19 2012 @@ -1729,7 +1729,7 @@ GetCursorPos(&pt); cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); if (cmd) { - SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed + SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); } } Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sun Dec 23 10:25:19 2012 @@ -22,7 +22,7 @@ /* * TrayClockWnd - */ + */ static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass"); static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); @@ -40,46 +40,46 @@ {TRUE, 0, NULL}, {FALSE, 0, TEXT("dddd")}, {FALSE, DATE_SHORTDATE, NULL} -}; - -HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) -{ - LONG lResult; - DWORD dwDataSize = sizeof(DWORD); - DWORD dwType = 0; - - // Check input parameters... - if (hKey == NULL || lpdwResult == NULL) return E_INVALIDARG; - - // Get dword value from the registry... - lResult = RegQueryValueEx(hKey, szValueName, 0, &dwType, (LPBYTE) lpdwResult, &dwDataSize ); - - // Check result and make sure the registry value is a DWORD(REG_DWORD)... - if (lResult != ERROR_SUCCESS) return HRESULT_FROM_WIN32(lResult); - else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; - - return NOERROR; +}; + +HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) +{ + LONG lResult; + DWORD dwDataSize = sizeof(DWORD); + DWORD dwType = 0; + + // Check input parameters... + if (hKey == NULL || lpdwResult == NULL) return E_INVALIDARG; + + // Get dword value from the registry... + lResult = RegQueryValueEx(hKey, szValueName, 0, &dwType, (LPBYTE) lpdwResult, &dwDataSize ); + + // Check result and make sure the registry value is a DWORD(REG_DWORD)... + if (lResult != ERROR_SUCCESS) return HRESULT_FROM_WIN32(lResult); + else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; + + return NOERROR; } void LoadSettings(void) { - HKEY hKey = NULL; - DWORD dwValue; - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); - if (dwValue == 1) - { - blShowSeconds = TRUE; - } - else - { - blShowSeconds = FALSE; - } - - RegCloseKey(hKey); - } + HKEY hKey = NULL; + DWORD dwValue; + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); + if (dwValue == 1) + { + blShowSeconds = TRUE; + } + else + { + blShowSeconds = FALSE; + } + + RegCloseKey(hKey); + } } #define CLOCKWND_FORMAT_COUNT (sizeof(ClockWndFormats) / sizeof(ClockWndFormats[0])) @@ -94,7 +94,7 @@ HFONT hFont; RECT rcText; SYSTEMTIME LocalTime; - + union { DWORD dwFlags; @@ -276,11 +276,11 @@ if (iRet != 0 && i == 0) { - if (blShowSeconds == FALSE) - { - (This->szLines[0][5] = '\0'); - }; - + if (blShowSeconds == FALSE) + { + This->szLines[0][5] = '\0'; + } + /* Set the window text to the time only */ SetWindowText(This->hWnd, This->szLines[i]); @@ -344,10 +344,10 @@ /* Calculate the due time */ GetLocalTime(&This->LocalTime); uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds; - if (blShowSeconds == TRUE) - uiDueTime += ( (UINT)This->LocalTime.wSecond) * 100; - else - uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; + if (blShowSeconds == TRUE) + uiDueTime += (UINT)This->LocalTime.wSecond * 100; + else + uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; if (uiDueTime < USER_TIMER_MINIMUM || uiDueTime > USER_TIMER_MAXIMUM) uiDueTime = 1000; @@ -401,7 +401,7 @@ { UINT uiDueTime; BOOL Ret; - int intWait1, intWait2; + int intWait1, intWait2; /* Kill the initialization timer */ KillTimer(This->hWnd, @@ -409,26 +409,26 @@ This->IsInitTimerEnabled = FALSE; uiDueTime = TrayClockWnd_CalculateDueTime(This); - - if (blShowSeconds == TRUE) - { - intWait1 = 1000-200; - intWait2 = 1000; - } - else - { - intWait1 = 60*1000-200; - intWait2 = 60*1000; - } + + if (blShowSeconds == TRUE) + { + intWait1 = 1000 - 200; + intWait2 = 1000; + } + else + { + intWait1 = 60 * 1000 - 200; + intWait2 = 60 * 1000; + } if (uiDueTime > intWait1) { /* The update of the clock will be up to 200 ms late, but that's acceptable. We're going to setup a timer that fires depending - intWait2. */ + intWait2. */ Ret = SetTimer(This->hWnd, ID_TRAYCLOCK_TIMER, - intWait2, + intWait2, NULL) != 0; This->IsTimerEnabled = Ret; @@ -677,7 +677,7 @@ PTRAY_CLOCK_WND_DATA TcData; DWORD dwStyle; HWND hWnd = NULL; - LoadSettings(); + LoadSettings(); TcData = HeapAlloc(hProcessHeap, 0,

11 years, 10 months

[cgutman] 57975: [AFD] - Fix a bug during socket closure that could cause buffered data to be lost [LWIP] - Only signal errors when the packet queue is empty to avoid dropping received data - Use p...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Dec 23 09:53:36 2012 New Revision: 57975 URL: http://svn.reactos.org/svn/reactos?rev=57975&view=rev Log: [AFD] - Fix a bug during socket closure that could cause buffered data to be lost [LWIP] - Only signal errors when the packet queue is empty to avoid dropping received data - Use pbuf_copy_partial to copy pbuf chains instead of doing it manually which had a bug CORE-6655 #resolve CORE-6741 #resolve Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -610,6 +610,7 @@ /* Signal complete connection closure immediately */ FCB->PollState |= AFD_EVENT_ABORT; FCB->PollStatus[FD_CLOSE_BIT] = Irp->IoStatus.Status; + FCB->LastReceiveStatus = STATUS_FILE_CLOSED; PollReeval(FCB->DeviceExt, FCB->FileObject); } @@ -708,8 +709,8 @@ /* Mark us as overread to complete future reads with an error */ FCB->Overread = TRUE; - /* Set a successful close status to indicate a shutdown on overread */ - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; + /* Set a successful receive status to indicate a shutdown on overread */ + FCB->LastReceiveStatus = STATUS_SUCCESS; /* Clear the receive event */ FCB->PollState &= ~AFD_EVENT_RECEIVE; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -52,11 +52,12 @@ static VOID HandleReceiveComplete( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) { + FCB->LastReceiveStatus = Status; + /* We got closed while the receive was in progress */ if (FCB->TdiReceiveClosed) { - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; + /* The received data is discarded */ } /* Receive successful */ else if (Status == STATUS_SUCCESS) @@ -67,30 +68,20 @@ /* Check for graceful closure */ if (Information == 0) { + /* Receive is closed */ FCB->TdiReceiveClosed = TRUE; - - /* Signal graceful receive shutdown */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - - /* Issue another receive IRP to keep the buffer well stocked */ - RefillSocketBuffer(FCB); + } + else + { + /* Issue another receive IRP to keep the buffer well stocked */ + RefillSocketBuffer(FCB); + } } /* Receive failed with no data (unexpected closure) */ else { - FCB->Recv.BytesUsed = 0; - FCB->Recv.Content = 0; + /* Previously received data remains intact */ FCB->TdiReceiveClosed = TRUE; - - /* Signal complete connection failure immediately */ - FCB->PollState |= AFD_EVENT_CLOSE; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); } } @@ -168,9 +159,6 @@ AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); - /* Kick the user that receive would be possible now */ - /* XXX Not implemented yet */ - AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", FCB, FCB->Recv.Content)); @@ -188,7 +176,7 @@ TotalBytesCopied)); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); - if (FCB->Overread && FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) + if (FCB->Overread && FCB->LastReceiveStatus == STATUS_SUCCESS) { /* Overread after a graceful disconnect so complete with an error */ Status = STATUS_FILE_CLOSED; @@ -196,7 +184,7 @@ else { /* Unexpected disconnect by the remote host or initial read after a graceful disconnnect */ - Status = FCB->PollStatus[FD_CLOSE_BIT]; + Status = FCB->LastReceiveStatus; } NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; @@ -260,6 +248,21 @@ FCB->PollState &= ~AFD_EVENT_RECEIVE; } + /* Signal FD_CLOSE if no buffered data remains and the socket can't receive any more */ + if (CantReadMore(FCB)) + { + if (FCB->LastReceiveStatus == STATUS_SUCCESS) + { + FCB->PollState |= AFD_EVENT_DISCONNECT; + } + else + { + FCB->PollState |= AFD_EVENT_CLOSE; + } + FCB->PollStatus[FD_CLOSE_BIT] = FCB->LastReceiveStatus; + PollReeval(FCB->DeviceExt, FCB->FileObject); + } + AFD_DbgPrint(MID_TRACE,("RetStatus for irp %x is %x\n", Irp, RetStatus)); /* Sometimes we're called with a NULL Irp */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -203,6 +203,7 @@ PVOID Context; DWORD PollState; NTSTATUS PollStatus[FD_MAX_EVENTS]; + NTSTATUS LastReceiveStatus; UINT ContextSize; PVOID ConnectData; UINT FilledConnectData; Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -278,6 +278,7 @@ /* Socket state */ BOOLEAN SendShutdown; BOOLEAN ReceiveShutdown; + NTSTATUS ReceiveShutdownStatus; struct _CONNECTION_ENDPOINT *Next; /* Next connection in address file list */ } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -260,61 +260,53 @@ VOID TCPFinEventHandler(void *arg, const err_t err) { - PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg, LastConnection; - const NTSTATUS Status = TCPTranslateError(err); - KIRQL OldIrql; - - ASSERT(Connection->AddressFile); - - /* Check if this was a partial socket closure */ - if (err == ERR_OK && Connection->SocketContext) - { - /* Just flush the receive queue and get out of here */ - FlushReceiveQueue(Connection, STATUS_SUCCESS, TRUE); - } - else - { - /* First off all, remove the PCB pointer */ - Connection->SocketContext = NULL; - - /* Complete all outstanding requests now */ - FlushAllQueues(Connection, Status); - - LockObject(Connection, &OldIrql); - - LockObjectAtDpcLevel(Connection->AddressFile); - - /* Unlink this connection from the address file */ - if (Connection->AddressFile->Connection == Connection) - { - Connection->AddressFile->Connection = Connection->Next; - DereferenceObject(Connection); - } - else if (Connection->AddressFile->Listener == Connection) - { - Connection->AddressFile->Listener = NULL; - DereferenceObject(Connection); - } - else - { - LastConnection = Connection->AddressFile->Connection; - while (LastConnection->Next != Connection && LastConnection->Next != NULL) - LastConnection = LastConnection->Next; - if (LastConnection->Next == Connection) - { - LastConnection->Next = Connection->Next; - DereferenceObject(Connection); - } - } - - UnlockObjectFromDpcLevel(Connection->AddressFile); - - /* Remove the address file from this connection */ - DereferenceObject(Connection->AddressFile); - Connection->AddressFile = NULL; - - UnlockObject(Connection, OldIrql); - } + PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg, LastConnection; + const NTSTATUS Status = TCPTranslateError(err); + KIRQL OldIrql; + + ASSERT(Connection->AddressFile); + ASSERT(err != ERR_OK); + + /* First off all, remove the PCB pointer */ + Connection->SocketContext = NULL; + + /* Complete all outstanding requests now */ + FlushAllQueues(Connection, Status); + + LockObject(Connection, &OldIrql); + + LockObjectAtDpcLevel(Connection->AddressFile); + + /* Unlink this connection from the address file */ + if (Connection->AddressFile->Connection == Connection) + { + Connection->AddressFile->Connection = Connection->Next; + DereferenceObject(Connection); + } + else if (Connection->AddressFile->Listener == Connection) + { + Connection->AddressFile->Listener = NULL; + DereferenceObject(Connection); + } + else + { + LastConnection = Connection->AddressFile->Connection; + while (LastConnection->Next != Connection && LastConnection->Next != NULL) + LastConnection = LastConnection->Next; + if (LastConnection->Next == Connection) + { + LastConnection->Next = Connection->Next; + DereferenceObject(Connection); + } + } + + UnlockObjectFromDpcLevel(Connection->AddressFile); + + /* Remove the address file from this connection */ + DereferenceObject(Connection->AddressFile); + Connection->AddressFile = NULL; + + UnlockObject(Connection, OldIrql); } VOID Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Dec 23 09:53:36 2012 @@ -31,6 +31,9 @@ extern NPAGED_LOOKASIDE_LIST MessageLookasideList; extern NPAGED_LOOKASIDE_LIST QueueEntryLookasideList; +/* Required for ERR_T to NTSTATUS translation in receive error handling */ +NTSTATUS TCPTranslateError(const err_t err); + static void LibTCPEmptyQueue(PCONNECTION_ENDPOINT Connection) @@ -84,9 +87,8 @@ PQUEUE_ENTRY qp; struct pbuf* p; NTSTATUS Status; - UINT ReadLength, PayloadLength; + UINT ReadLength, PayloadLength, Offset, Copied; KIRQL OldIrql; - PUCHAR Payload; (*Received) = 0; @@ -98,14 +100,14 @@ { p = qp->p; - /* Calculate the payload first */ - Payload = p->payload; - Payload += qp->Offset; - PayloadLength = p->len; + /* Calculate the payload length first */ + PayloadLength = p->tot_len; PayloadLength -= qp->Offset; + Offset = qp->Offset; /* Check if we're reading the whole buffer */ ReadLength = MIN(PayloadLength, RecvLen); + ASSERT(ReadLength != 0); if (ReadLength != PayloadLength) { /* Save this one for later */ @@ -116,10 +118,8 @@ UnlockObject(Connection, OldIrql); - /* Return to a lower IRQL because the receive buffer may be pageable memory */ - RtlCopyMemory(RecvBuffer, - Payload, - ReadLength); + Copied = pbuf_copy_partial(p, RecvBuffer, ReadLength, Offset); + ASSERT(Copied == ReadLength); LockObject(Connection, &OldIrql); @@ -141,6 +141,7 @@ ASSERT(RecvLen == 0); } + ASSERT((*Received) != 0); Status = STATUS_SUCCESS; if (!RecvLen) @@ -150,7 +151,7 @@ else { if (Connection->ReceiveShutdown) - Status = STATUS_SUCCESS; + Status = Connection->ReceiveShutdownStatus; else Status = STATUS_PENDING; } @@ -202,8 +203,6 @@ InternalRecvEventHandler(void *arg, PTCP_PCB pcb, struct pbuf *p, const err_t err) { PCONNECTION_ENDPOINT Connection = arg; - struct pbuf *pb; - ULONG RecvLen; /* Make sure the socket didn't get closed */ if (!arg) @@ -216,19 +215,9 @@ if (p) { - pb = p; - RecvLen = 0; - while (pb != NULL) - { - /* Enqueue this buffer */ - LibTCPEnqueuePacket(Connection, pb); - RecvLen += pb->len; - - /* Advance and unchain the buffer */ - pb = pbuf_dechain(pb);; - } - - tcp_recved(pcb, RecvLen); + LibTCPEnqueuePacket(Connection, p); + + tcp_recved(pcb, p->tot_len); TCPRecvEventHandler(arg); } @@ -239,7 +228,20 @@ * whole socket here (by calling tcp_close()) as that would violate TCP specs */ Connection->ReceiveShutdown = TRUE; - TCPFinEventHandler(arg, ERR_OK); + Connection->ReceiveShutdownStatus = STATUS_SUCCESS; + + /* This code path executes for both remotely and locally initiated closures, + * and we need to distinguish between them */ + if (Connection->SocketContext) + { + /* Remotely initiated close */ + TCPRecvEventHandler(arg); + } + else + { + /* Locally initated close */ + TCPFinEventHandler(arg, ERR_CLSD); + } } return ERR_OK; @@ -279,10 +281,31 @@ void InternalErrorEventHandler(void *arg, const err_t err) { + PCONNECTION_ENDPOINT Connection = arg; + KIRQL OldIrql; + /* Make sure the socket didn't get closed */ if (!arg) return; - TCPFinEventHandler(arg, err); + /* Check if data is left to be read */ + LockObject(Connection, &OldIrql); + if (IsListEmpty(&Connection->PacketQueue)) + { + UnlockObject(Connection, OldIrql); + + /* Deliver the error now */ + TCPFinEventHandler(arg, err); + } + else + { + UnlockObject(Connection, OldIrql); + + /* Defer the error delivery until all data is gone */ + Connection->ReceiveShutdown = TRUE; + Connection->ReceiveShutdownStatus = TCPTranslateError(err); + + TCPRecvEventHandler(arg); + } } static @@ -621,7 +644,10 @@ else { if (msg->Input.Shutdown.shut_rx) + { msg->Input.Shutdown.Connection->ReceiveShutdown = TRUE; + msg->Input.Shutdown.Connection->ReceiveShutdownStatus = STATUS_FILE_CLOSED; + } if (msg->Input.Shutdown.shut_tx) msg->Input.Shutdown.Connection->SendShutdown = TRUE; @@ -688,7 +714,7 @@ msg->Output.Close.Error = tcp_close(pcb); if (!msg->Output.Close.Error && msg->Input.Close.Callback) - TCPFinEventHandler(msg->Input.Close.Connection, ERR_OK); + TCPFinEventHandler(msg->Input.Close.Connection, ERR_CLSD); break; default:

11 years, 10 months

[tkreuzer] 57974: [WIN32K] Fix BRUSH_GetObject. Fixes 4 gdi32_apitests.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 22:34:50 2012 New Revision: 57974 URL: http://svn.reactos.org/svn/reactos?rev=57974&view=rev Log: [WIN32K] Fix BRUSH_GetObject. Fixes 4 gdi32_apitests. Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Sat Dec 22 22:34:50 2012 @@ -142,57 +142,56 @@ INT FASTCALL -BRUSH_GetObject(PBRUSH pbrush, INT Count, LPLOGBRUSH Buffer) -{ - if (Buffer == NULL) return sizeof(LOGBRUSH); - if (Count == 0) return 0; +BRUSH_GetObject(PBRUSH pbrush, INT cjSize, LPLOGBRUSH plogbrush) +{ + /* Check if only size is requested */ + if (plogbrush == NULL) return sizeof(LOGBRUSH); + + /* Check if size is ok */ + if (cjSize == 0) return 0; /* Set colour */ - Buffer->lbColor = pbrush->BrushAttr.lbColor; - - /* Set Hatch */ - if ((pbrush->flAttrs & BR_IS_HATCH)!=0) - { - /* FIXME: This is not the right value */ - Buffer->lbHatch = (LONG)pbrush->hbmPattern; + plogbrush->lbColor = pbrush->BrushAttr.lbColor; + + /* Default to 0 */ + plogbrush->lbHatch = 0; + + /* Get the type of style */ + if (pbrush->flAttrs & BR_IS_SOLID) + { + plogbrush->lbStyle = BS_SOLID; + } + else if (pbrush->flAttrs & BR_IS_NULL) + { + plogbrush->lbStyle = BS_NULL; // BS_HOLLOW + } + else if (pbrush->flAttrs & BR_IS_HATCH) + { + plogbrush->lbStyle = BS_HATCHED; + plogbrush->lbHatch = pbrush->ulStyle; + } + else if (pbrush->flAttrs & BR_IS_DIB) + { + plogbrush->lbStyle = BS_DIBPATTERN; + plogbrush->lbHatch = (ULONG_PTR)pbrush->hbmClient; + } + else if (pbrush->flAttrs & BR_IS_BITMAP) + { + plogbrush->lbStyle = BS_PATTERN; } else { - Buffer->lbHatch = 0; - } - - Buffer->lbStyle = 0; - - /* Get the type of style */ - if ((pbrush->flAttrs & BR_IS_SOLID)!=0) - { - Buffer->lbStyle = BS_SOLID; - } - else if ((pbrush->flAttrs & BR_IS_NULL)!=0) - { - Buffer->lbStyle = BS_NULL; // BS_HOLLOW - } - else if ((pbrush->flAttrs & BR_IS_HATCH)!=0) - { - Buffer->lbStyle = BS_HATCHED; - } - else if ((pbrush->flAttrs & BR_IS_BITMAP)!=0) - { - Buffer->lbStyle = BS_PATTERN; - } - else if ((pbrush->flAttrs & BR_IS_DIB)!=0) - { - Buffer->lbStyle = BS_DIBPATTERN; + plogbrush->lbStyle = 0; // ??? } /* FIXME - else if ((pbrush->flAttrs & )!=0) - { - Buffer->lbStyle = BS_INDEXED; - } - else if ((pbrush->flAttrs & )!=0) - { - Buffer->lbStyle = BS_DIBPATTERNPT; + else if (pbrush->flAttrs & ) + { + plogbrush->lbStyle = BS_INDEXED; + } + else if (pbrush->flAttrs & ) + { + plogbrush->lbStyle = BS_DIBPATTERNPT; } */ @@ -245,6 +244,7 @@ pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB; pbrush->hbmPattern = hPattern; + pbrush->hbmClient = (HBITMAP)PackedDIB; /* FIXME: Fill in the rest of fields!!! */ GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC);

11 years, 10 months

[tkreuzer] 57973: [WIN32K] Fix a bug in the GDI pool code that could lead to list corruption and a failed ASSERT, when an app allocated a large number of DCs or brushes, like AbiWord with more than...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 22:22:06 2012 New Revision: 57973 URL: http://svn.reactos.org/svn/reactos?rev=57973&view=rev Log: [WIN32K] Fix a bug in the GDI pool code that could lead to list corruption and a failed ASSERT, when an app allocated a large number of DCs or brushes, like AbiWord with more than 1 document open. Also add a few more ASSERTs. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdipool.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdipool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdipool.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdipool.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdipool.c [iso-8859-1] Sat Dec 22 22:22:06 2012 @@ -155,6 +155,8 @@ /* Yes, remove it from the empty list */ ple = RemoveHeadList(&pPool->leEmptyList); pSection = CONTAINING_RECORD(ple, GDI_POOL_SECTION, leInUseLink); + pPool->cEmptySections--; + ASSERT(pSection->cAllocCount == 0); } else { @@ -166,13 +168,11 @@ pvAlloc = NULL; goto done; } - - /* Insert it into the ready list */ - InsertHeadList(&pPool->leReadyList, &pSection->leReadyLink); } - /* Insert it into the in-use list */ + /* Insert it into the in-use and ready list */ InsertHeadList(&pPool->leInUseList, &pSection->leInUseLink); + InsertHeadList(&pPool->leReadyList, &pSection->leReadyLink); } /* Find and set a single bit */ @@ -203,6 +203,7 @@ /* Increase alloc count */ pSection->cAllocCount++; + ASSERT(RtlNumberOfSetBits(&pSection->bitmap) == pSection->cAllocCount); DBG_LOGEVENT(&pPool->slhLog, EVENT_ALLOCATE, pvAlloc); /* Check if section is now busy */ @@ -260,6 +261,7 @@ /* Decrease allocation count */ pSection->cAllocCount--; + ASSERT(RtlNumberOfSetBits(&pSection->bitmap) == pSection->cAllocCount); DBG_LOGEVENT(&pPool->slhLog, EVENT_FREE, pvAlloc); /* Check if the section got valid now */ @@ -275,7 +277,7 @@ RemoveEntryList(&pSection->leInUseLink); RemoveEntryList(&pSection->leReadyLink); - if (pPool->cEmptySections > 1) + if (pPool->cEmptySections >= 1) { /* Delete the section */ GdiPoolDeleteSection(pPool, pSection);

11 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2012