Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 61541: [WIN32K] - Implement NtGdiSwapBuffers
by jgardou＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: jgardou Date: Sun Jan 5 20:57:51 2014 New Revision: 61541 URL: http://svn.reactos.org/svn/reactos?rev=61541&view=rev Log: [WIN32K] - Implement NtGdiSwapBuffers Modified: trunk/reactos/win32ss/gdi/ntgdi/wingl.c Modified: trunk/reactos/win32ss/gdi/ntgdi/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/wingl.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] Sun Jan 5 20:57:51 2014 @@ -128,7 +128,8 @@ return FALSE; } - if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + if (!pdc->ipfdDevMax) + IntGetipfdDevMax(pdc); if ( ipfd < 1 || ipfd > pdc->ipfdDevMax ) @@ -182,10 +183,59 @@ BOOL APIENTRY NtGdiSwapBuffers( - _In_ HDC hDC) -{ - UNIMPLEMENTED; - return FALSE; + _In_ HDC hdc) +{ + PDC pdc; + PPDEVOBJ ppdev; + HWND hWnd; + PWNDOBJ pWndObj; + SURFOBJ *pso = NULL; + BOOL Ret = FALSE; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + UserEnterExclusive(); + hWnd = UserGethWnd(hdc, &pWndObj); + UserLeave(); + + if (!hWnd) + { + EngSetLastError(ERROR_INVALID_WINDOW_STYLE); + goto Exit; + } + + ppdev = pdc->ppdev; + + /* + WndObj is needed so exit on NULL pointer. + */ + if (pWndObj) + pso = pWndObj->psoOwner; + else + { + EngSetLastError(ERROR_INVALID_PIXEL_FORMAT); + goto Exit; + } + + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } + + if (ppdev->DriverFunctions.SwapBuffers) + { + Ret = ppdev->DriverFunctions.SwapBuffers(pso, pWndObj); + } + +Exit: + DC_UnlockDc(pdc); + return Ret; } /* EOF */

1 0

[jgardou] 61540: [WIN32K] - Formatting only, no code change
by jgardou＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: jgardou Date: Sun Jan 5 20:50:09 2014 New Revision: 61540 URL: http://svn.reactos.org/svn/reactos?rev=61540&view=rev Log: [WIN32K] - Formatting only, no code change Modified: trunk/reactos/win32ss/gdi/ntgdi/wingl.c Modified: trunk/reactos/win32ss/gdi/ntgdi/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/wingl.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/wingl.c [iso-8859-1] Sun Jan 5 20:50:09 2014 @@ -16,29 +16,29 @@ FASTCALL IntGetipfdDevMax(PDC pdc) { - INT Ret = 0; - PPDEVOBJ ppdev = pdc->ppdev; + INT Ret = 0; + PPDEVOBJ ppdev = pdc->ppdev; - if (ppdev->flFlags & PDEV_META_DEVICE) - { - return 0; - } + if (ppdev->flFlags & PDEV_META_DEVICE) + { + return 0; + } - if (ppdev->DriverFunctions.DescribePixelFormat) - { - Ret = ppdev->DriverFunctions.DescribePixelFormat( + if (ppdev->DriverFunctions.DescribePixelFormat) + { + Ret = ppdev->DriverFunctions.DescribePixelFormat( ppdev->dhpdev, 1, 0, NULL); - } + } - if (Ret) pdc->ipfdDevMax = Ret; + if (Ret) pdc->ipfdDevMax = Ret; - return Ret; + return Ret; } - _Success_(return != 0) +_Success_(return != 0) INT APIENTRY NtGdiDescribePixelFormat( @@ -47,142 +47,145 @@ _In_ UINT cjpfd, _When_(cjpfd != 0, _Out_) PPIXELFORMATDESCRIPTOR ppfd) { - PDC pdc; - PPDEVOBJ ppdev; - INT Ret = 0; - PIXELFORMATDESCRIPTOR pfdSafe; + PDC pdc; + PPDEVOBJ ppdev; + INT Ret = 0; + PIXELFORMATDESCRIPTOR pfdSafe; - if ((ppfd == NULL) && (cjpfd != 0)) return 0; + if ((ppfd == NULL) && (cjpfd != 0)) return 0; - pdc = DC_LockDc(hdc); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } - if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + if (!pdc->ipfdDevMax) + IntGetipfdDevMax(pdc); - if ((ipfd < 1) || (ipfd > pdc->ipfdDevMax)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } + if ((ipfd < 1) || (ipfd > pdc->ipfdDevMax)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } - ppdev = pdc->ppdev; + ppdev = pdc->ppdev; - if (ppdev->flFlags & PDEV_META_DEVICE) - { - UNIMPLEMENTED; - goto Exit; - } + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } - if (ppdev->DriverFunctions.DescribePixelFormat) - { - Ret = ppdev->DriverFunctions.DescribePixelFormat( - ppdev->dhpdev, - ipfd, - sizeof(pfdSafe), - &pfdSafe); - } + if (ppdev->DriverFunctions.DescribePixelFormat) + { + Ret = ppdev->DriverFunctions.DescribePixelFormat( + ppdev->dhpdev, + ipfd, + sizeof(pfdSafe), + &pfdSafe); + } - if (Ret && cjpfd) - { - _SEH2_TRY - { - cjpfd = min(cjpfd, sizeof(PIXELFORMATDESCRIPTOR)); - ProbeForWrite(ppfd, cjpfd, 1); - RtlCopyMemory(ppfd, &pfdSafe, cjpfd); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; - } + if (Ret && cjpfd) + { + _SEH2_TRY + { + cjpfd = min(cjpfd, sizeof(PIXELFORMATDESCRIPTOR)); + ProbeForWrite(ppfd, cjpfd, 1); + RtlCopyMemory(ppfd, &pfdSafe, cjpfd); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; + } Exit: - DC_UnlockDc(pdc); - return Ret; + DC_UnlockDc(pdc); + return Ret; } BOOL APIENTRY NtGdiSetPixelFormat( - IN HDC hdc, - IN INT ipfd) + _In_ HDC hdc, + _In_ INT ipfd) { - PDC pdc; - PPDEVOBJ ppdev; - HWND hWnd; - PWNDOBJ pWndObj; - SURFOBJ *pso = NULL; - BOOL Ret = FALSE; + PDC pdc; + PPDEVOBJ ppdev; + HWND hWnd; + PWNDOBJ pWndObj; + SURFOBJ *pso = NULL; + BOOL Ret = FALSE; - pdc = DC_LockDc(hdc); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); - if ( ipfd < 1 || - ipfd > pdc->ipfdDevMax ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } + if ( ipfd < 1 || + ipfd > pdc->ipfdDevMax ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } - UserEnterExclusive(); - hWnd = UserGethWnd(hdc, &pWndObj); - UserLeave(); + UserEnterExclusive(); + hWnd = UserGethWnd(hdc, &pWndObj); + UserLeave(); - if (!hWnd) - { - EngSetLastError(ERROR_INVALID_WINDOW_STYLE); - goto Exit; - } + if (!hWnd) + { + EngSetLastError(ERROR_INVALID_WINDOW_STYLE); + goto Exit; + } - ppdev = pdc->ppdev; + ppdev = pdc->ppdev; - /* - WndObj is needed so exit on NULL pointer. - */ - if (pWndObj) pso = pWndObj->psoOwner; - else - { - EngSetLastError(ERROR_INVALID_PIXEL_FORMAT); - goto Exit; - } + /* + WndObj is needed so exit on NULL pointer. + */ + if (pWndObj) + pso = pWndObj->psoOwner; + else + { + EngSetLastError(ERROR_INVALID_PIXEL_FORMAT); + goto Exit; + } - if (ppdev->flFlags & PDEV_META_DEVICE) - { - UNIMPLEMENTED; - goto Exit; - } + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } - if (ppdev->DriverFunctions.SetPixelFormat) - { - Ret = ppdev->DriverFunctions.SetPixelFormat( + if (ppdev->DriverFunctions.SetPixelFormat) + { + Ret = ppdev->DriverFunctions.SetPixelFormat( pso, ipfd, hWnd); - } + } Exit: - DC_UnlockDc(pdc); - return Ret; + DC_UnlockDc(pdc); + return Ret; } BOOL APIENTRY -NtGdiSwapBuffers(HDC hDC) +NtGdiSwapBuffers( + _In_ HDC hDC) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } /* EOF */

1 0

[ekohl] 61539: [LSASRV][MSV1_0] - Add all groups, of which the user is a member, to the token group list. - Remove the hard-coded administrators group and users group from the token group list. Thi...
by ekohl＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: ekohl Date: Sun Jan 5 16:06:16 2014 New Revision: 61539 URL: http://svn.reactos.org/svn/reactos?rev=61539&view=rev Log: [LSASRV][MSV1_0] - Add all groups, of which the user is a member, to the token group list. - Remove the hard-coded administrators group and users group from the token group list. This patch enables us to create ordinary user accounts which are not members of the administrator group and which do not have administrator privileges. Now we can start to test and fix the security components! Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/utils.c trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Jan 5 16:06:16 2014 @@ -98,6 +98,60 @@ NTAPI LsaIFree_LSAPR_PRIVILEGE_SET(IN PLSAPR_PRIVILEGE_SET Ptr); +typedef wchar_t *PSAMPR_SERVER_NAME; +typedef void *SAMPR_HANDLE; + +typedef struct _SAMPR_ULONG_ARRAY +{ + unsigned long Count; + unsigned long *Element; +} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; + +typedef struct _SAMPR_SID_INFORMATION +{ + PRPC_SID SidPointer; +} SAMPR_SID_INFORMATION, *PSAMPR_SID_INFORMATION; + +typedef struct _SAMPR_PSID_ARRAY +{ + unsigned long Count; + PSAMPR_SID_INFORMATION Sids; +} SAMPR_PSID_ARRAY, *PSAMPR_PSID_ARRAY; + +NTSTATUS +NTAPI +SamIConnect( + PSAMPR_SERVER_NAME ServerName, + SAMPR_HANDLE *ServerHandle, + ACCESS_MASK DesiredAccess, + BOOLEAN Trusted); + +VOID +NTAPI +SamIFree_SAMPR_ULONG_ARRAY( + PSAMPR_ULONG_ARRAY Ptr); + +NTSTATUS +__stdcall +SamrCloseHandle( + SAMPR_HANDLE *SamHandle); + +NTSTATUS +__stdcall +SamrOpenDomain( + SAMPR_HANDLE ServerHandle, + ACCESS_MASK DesiredAccess, + PRPC_SID DomainId, + SAMPR_HANDLE *DomainHandle); + +NTSTATUS +__stdcall +SamrGetAliasMembership( + SAMPR_HANDLE DomainHandle, + PSAMPR_PSID_ARRAY SidArray, + PSAMPR_ULONG_ARRAY Membership); + + /* GLOBALS *****************************************************************/ static LIST_ENTRY PackageListHead; @@ -852,6 +906,223 @@ FIXME("TokenInformationType %d is not supported!\n", TokenInformationType); return STATUS_NOT_IMPLEMENTED; } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +LsapAppendSidToGroups( + IN PTOKEN_GROUPS *TokenGroups, + IN PSID DomainSid, + IN ULONG RelativeId) +{ + PTOKEN_GROUPS Groups; + PSID Sid; + ULONG Length; + ULONG i; + + Sid = LsapAppendRidToSid(DomainSid, RelativeId); + if (Sid == NULL) + { + ERR("Group SID creation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (*TokenGroups == NULL) + { + Length = sizeof(TOKEN_GROUPS) + + (1 - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Groups->GroupCount = 1; + + Groups->Groups[0].Sid = Sid; + Groups->Groups[0].Attributes = + SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + + *TokenGroups = Groups; + } + else + { + for (i = 0; i < (*TokenGroups)->GroupCount; i++) + { + if (RtlEqualSid((*TokenGroups)->Groups[i].Sid, Sid)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); + return STATUS_SUCCESS; + } + } + + Length = sizeof(TOKEN_GROUPS) + + ((*TokenGroups)->GroupCount + 1 - ANYSIZE_ARRAY) * sizeof(SID_AND_ATTRIBUTES); + + Groups = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (Groups == NULL) + { + ERR("Group buffer allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Groups->GroupCount = (*TokenGroups)->GroupCount; + + for (i = 0; i < (*TokenGroups)->GroupCount; i++) + { + Groups->Groups[i].Sid = (*TokenGroups)->Groups[i].Sid; + Groups->Groups[i].Attributes = (*TokenGroups)->Groups[i].Attributes; + } + + Groups->Groups[Groups->GroupCount].Sid = Sid; + Groups->Groups[Groups->GroupCount].Attributes = + SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + + Groups->GroupCount++; + + RtlFreeHeap(RtlGetProcessHeap(), 0, *TokenGroups); + + *TokenGroups = Groups; + } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +LsapAddSamGroups( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + SAMPR_HANDLE ServerHandle = NULL; + SAMPR_HANDLE BuiltinDomainHandle = NULL; + SAMPR_HANDLE AccountDomainHandle = NULL; + SAMPR_PSID_ARRAY SidArray; + SAMPR_ULONG_ARRAY BuiltinMembership; + SAMPR_ULONG_ARRAY AccountMembership; + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + if (TokenInformationType != LsaTokenInformationV1) + return STATUS_SUCCESS; + + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + SidArray.Count = TokenInfo1->Groups->GroupCount + 1; + SidArray.Sids = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + (TokenInfo1->Groups->GroupCount + 1) * sizeof(PRPC_SID)); + if (SidArray.Sids == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + SidArray.Sids[0].SidPointer = TokenInfo1->User.User.Sid; + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + SidArray.Sids[i + 1].SidPointer = TokenInfo1->Groups->Groups[i].Sid; + + Status = SamIConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + FALSE); + if (!NT_SUCCESS(Status)) + { + TRACE("SamIConnect failed (Status %08lx)\n", Status); + goto done; + } + + Status = SamrOpenDomain(ServerHandle, + DOMAIN_GET_ALIAS_MEMBERSHIP, + BuiltinDomainSid, + &BuiltinDomainHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenDomain failed (Status %08lx)\n", Status); + goto done; + } + + Status = SamrOpenDomain(ServerHandle, + DOMAIN_GET_ALIAS_MEMBERSHIP, + AccountDomainSid, + &AccountDomainHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenDomain failed (Status %08lx)\n", Status); + goto done; + } + + BuiltinMembership.Element = NULL; + Status = SamrGetAliasMembership(BuiltinDomainHandle, + &SidArray, + &BuiltinMembership); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrGetAliasMembership failed (Status %08lx)\n", Status); + goto done; + } + + AccountMembership.Element = NULL; + Status = SamrGetAliasMembership(AccountDomainHandle, + &SidArray, + &AccountMembership); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrGetAliasMembership failed (Status %08lx)\n", Status); + goto done; + } + + TRACE("Builtin Memberships: %lu\n", BuiltinMembership.Count); + for (i = 0; i < BuiltinMembership.Count; i++) + { + TRACE("RID %lu: %lu (0x%lx)\n", i, BuiltinMembership.Element[i], BuiltinMembership.Element[i]); + Status = LsapAppendSidToGroups(&TokenInfo1->Groups, + BuiltinDomainSid, + BuiltinMembership.Element[i]); + if (!NT_SUCCESS(Status)) + { + TRACE("LsapAppendSidToGroups failed (Status %08lx)\n", Status); + goto done; + } + } + + TRACE("Account Memberships: %lu\n", AccountMembership.Count); + for (i = 0; i < AccountMembership.Count; i++) + { + TRACE("RID %lu: %lu (0x%lx)\n", i, AccountMembership.Element[i], AccountMembership.Element[i]); + Status = LsapAppendSidToGroups(&TokenInfo1->Groups, + AccountDomainSid, + AccountMembership.Element[i]); + if (!NT_SUCCESS(Status)) + { + TRACE("LsapAppendSidToGroups failed (Status %08lx)\n", Status); + goto done; + } + } + +done: + RtlFreeHeap(RtlGetProcessHeap(), 0, SidArray.Sids); + + if (AccountMembership.Element != NULL) + SamIFree_SAMPR_ULONG_ARRAY(&AccountMembership); + + if (BuiltinMembership.Element != NULL) + SamIFree_SAMPR_ULONG_ARRAY(&BuiltinMembership); + + if (AccountDomainHandle != NULL) + SamrCloseHandle(&AccountDomainHandle); + + if (BuiltinDomainHandle != NULL) + SamrCloseHandle(&BuiltinDomainHandle); + + if (ServerHandle != NULL) + SamrCloseHandle(&ServerHandle); + +// return Status; return STATUS_SUCCESS; } @@ -1231,6 +1502,14 @@ goto done; } + Status = LsapAddSamGroups(TokenInformation, + TokenInformationType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapAddSamGroups() failed (Status 0x%08lx)\n", Status); + goto done; + } + Status = LsapSetTokenOwner(TokenInformation, TokenInformationType); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Jan 5 16:06:16 2014 @@ -415,4 +415,9 @@ LPWSTR lpBuffer, INT nBufferMax); +PSID +LsapAppendRidToSid( + PSID SrcSid, + ULONG Rid); + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] Sun Jan 5 16:06:16 2014 @@ -57,4 +57,40 @@ return i; } + +PSID +LsapAppendRidToSid( + PSID SrcSid, + ULONG Rid) +{ + ULONG Rids[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + UCHAR RidCount; + PSID DstSid; + ULONG i; + + RidCount = *RtlSubAuthorityCountSid(SrcSid); + if (RidCount >= 8) + return NULL; + + for (i = 0; i < RidCount; i++) + Rids[i] = *RtlSubAuthoritySid(SrcSid, i); + + Rids[RidCount] = Rid; + RidCount++; + + RtlAllocateAndInitializeSid(RtlIdentifierAuthoritySid(SrcSid), + RidCount, + Rids[0], + Rids[1], + Rids[2], + Rids[3], + Rids[4], + Rids[5], + Rids[6], + Rids[7], + &DstSid); + + return DstSid; +} + /* EOF */ Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Jan 5 16:06:16 2014 @@ -291,7 +291,7 @@ { SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; PTOKEN_GROUPS TokenGroups; -#define MAX_GROUPS 4 +#define MAX_GROUPS 2 DWORD GroupCount = 0; PSID Sid; NTSTATUS Status = STATUS_SUCCESS; @@ -310,45 +310,6 @@ } /* Member of the domain */ - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - GroupCount++; - - -#if 1 - /* Member of 'Administrators' */ - RtlAllocateAndInitializeSid(&SystemAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - TokenGroups->Groups[GroupCount].Sid = Sid; - TokenGroups->Groups[GroupCount].Attributes = - SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - GroupCount++; -#else - TRACE("Not adding user to Administrators group\n"); -#endif - - /* Member of 'Users' */ - RtlAllocateAndInitializeSid(&SystemAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_USERS, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); TokenGroups->Groups[GroupCount].Sid = Sid; TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;

1 0

[hbelusca] 61538: [NTVDM] Fix changing console size when entering a given text-mode. Inspired from our telnet console tconsole.cpp!SetWindowSize function. Part 1/2
by hbelusca＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: hbelusca Date: Sun Jan 5 14:14:26 2014 New Revision: 61538 URL: http://svn.reactos.org/svn/reactos?rev=61538&view=rev Log: [NTVDM] Fix changing console size when entering a given text-mode. Inspired from our telnet console tconsole.cpp!SetWindowSize function. Part 1/2 Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sun Jan 5 14:14:26 2014 @@ -171,6 +171,9 @@ #endif +static HANDLE VgaSavedConsoleHandle = NULL; +static CONSOLE_SCREEN_BUFFER_INFO VgaSavedConsoleInfo; + static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; static LPVOID ConsoleFramebuffer = NULL; static HANDLE TextConsoleBuffer = NULL; @@ -605,11 +608,11 @@ static VOID VgaLeaveGraphicsMode(VOID) { - /* Release the console framebuffer mutex if needed */ + /* Release the console framebuffer mutex */ ReleaseMutex(ConsoleMutex); - /* Switch back to the text buffer */ - SetConsoleActiveScreenBuffer(TextConsoleBuffer); + /* Switch back to the default console buffer */ + // SetConsoleActiveScreenBuffer(VgaSavedConsoleHandle); /* Cleanup the video data */ CloseHandle(ConsoleMutex); @@ -621,8 +624,29 @@ static BOOL VgaEnterTextMode(PCOORD Resolution) { + SMALL_RECT ConRect; + + /* Switch to the text buffer */ + SetConsoleActiveScreenBuffer(TextConsoleBuffer); + /* Resize the console */ + ConRect.Left = 0; // VgaSavedConsoleInfo.srWindow.Left; + ConRect.Top = VgaSavedConsoleInfo.srWindow.Top; + ConRect.Right = ConRect.Left + Resolution->X - 1; + ConRect.Bottom = ConRect.Top + Resolution->Y - 1; + /* + * Use this trick to effectively resize the console buffer and window, + * because: + * - SetConsoleScreenBufferSize fails if the new console screen buffer size + * is smaller than the current console window size, and: + * - SetConsoleWindowInfo fails if the new console window size is larger + * than the current console screen buffer size. + */ SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + /* Update the saved console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &VgaSavedConsoleInfo); /* Allocate a framebuffer */ ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), @@ -693,7 +717,7 @@ } else { - /* Enter 8-bit graphics mode */ + /* Enter graphics mode */ if (!VgaEnterGraphicsMode(&Resolution)) { DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode."); @@ -1478,12 +1502,24 @@ DWORD Address = 0; DWORD CurrentAddr; + /* Save the console information */ + if (TextHandle == INVALID_HANDLE_VALUE) return FALSE; + VgaSavedConsoleHandle = TextHandle; + if (!GetConsoleScreenBufferInfo(VgaSavedConsoleHandle, + &VgaSavedConsoleInfo)) + { + return FALSE; + } + /* Initialize the VGA palette and fail if it isn't successfully created */ if (!VgaInitializePalette()) return FALSE; /***/ VgaResetPalette(); /***/ - /* Set the global handle */ + /* Save the default text-mode console output handle */ TextConsoleBuffer = TextHandle; + + /* Clear the VGA memory */ + VgaClearMemory(); /* Register the I/O Ports */ RegisterIoPort(0x3CC, VgaReadPort, NULL); // VGA_MISC_READ @@ -1500,9 +1536,6 @@ RegisterIoPort(0x3CE, VgaReadPort, VgaWritePort); // VGA_GC_INDEX RegisterIoPort(0x3CF, VgaReadPort, VgaWritePort); // VGA_GC_DATA - /* Clear the VGA memory */ - VgaClearMemory(); - /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); VgaChangeMode(); @@ -1512,7 +1545,7 @@ CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; AddressSize = VgaGetAddressSize(); ScreenRect.Left = ScreenRect.Top = 0; - ScreenRect.Right = Resolution.X; + ScreenRect.Right = Resolution.X; ScreenRect.Bottom = Resolution.Y; ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2;

1 0

[akhaldi] 61537: [SHELL32] * Move shell file operations to background threads to prevent the shell from hanging during long copies, deletes, and moves. * Improve drag and drop functionality. * Add ...
by akhaldi＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: akhaldi Date: Sun Jan 5 12:48:42 2014 New Revision: 61537 URL: http://svn.reactos.org/svn/reactos?rev=61537&view=rev Log: [SHELL32] * Move shell file operations to background threads to prevent the shell from hanging during long copies, deletes, and moves. * Improve drag and drop functionality. * Add a partial drop handler to the recycle bin. * Brought to you by Huw Campbell. CORE-3760 Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -1037,7 +1037,6 @@ } SHSimulateDrop(pdrop, pda, dwKey, NULL, NULL); - NotifyShellViewWindow(lpcmi, TRUE); TRACE("CP result %x\n", hr); return S_OK; @@ -1104,73 +1103,24 @@ ERR("no IDropTarget Interface\n"); return hr; } - //DWORD link = DROPEFFECT_LINK; SHSimulateDrop(pDT, pDataObj, MK_CONTROL|MK_SHIFT, NULL, NULL); - NotifyShellViewWindow(lpcmi, TRUE); return S_OK; } -HRESULT -CDefaultContextMenu::DoDelete( - LPCMINVOKECOMMANDINFO lpcmi) -{ - STRRET strTemp; - HRESULT hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strTemp); - if(hr != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr); - return hr; - } - - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strTemp, m_Dcm.apidl[0], wszPath, _countof(wszPath)); - if (hr != S_OK) - { - ERR("StrRetToBufW failed with %x\n", hr); - return hr; - } - - /* Only keep the base path */ - LPWSTR pwszFilename = PathFindFileNameW(wszPath); - *pwszFilename = L'\0'; - - /* Build paths list */ - LPWSTR pwszPaths = BuildPathsList(wszPath, m_Dcm.cidl, m_Dcm.apidl); - if (!pwszPaths) +HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) { + TRACE("(%p) Deleting\n", this); + + LPDATAOBJECT pDataObj; + + if (SUCCEEDED(SHCreateDataObject(m_Dcm.pidlFolder, m_Dcm.cidl, m_Dcm.apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) + { + pDataObj->AddRef(); + SHCreateThread(DoDeleteThreadProc, pDataObj, NULL, NULL); + pDataObj->Release(); + } + else return E_FAIL; - - /* Delete them */ - SHFILEOPSTRUCTW FileOp; - ZeroMemory(&FileOp, sizeof(FileOp)); - FileOp.hwnd = GetActiveWindow(); - FileOp.wFunc = FO_DELETE; - FileOp.pFrom = pwszPaths; - FileOp.fFlags = FOF_ALLOWUNDO; - - if (SHFileOperationW(&FileOp) != 0) - { - ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); - return S_OK; - } - - /* Get the active IShellView */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB) - { - /* Is the treeview focused */ - HWND hwnd; - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) - { - /* Remove selected items from treeview */ - HTREEITEM hItem = TreeView_GetSelection(hwnd); - if (hItem) - (void)TreeView_DeleteItem(hwnd, hItem); - } - } - NotifyShellViewWindow(lpcmi, TRUE); - - HeapFree(GetProcessHeap(), 0, pwszPaths); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -1419,6 +1419,27 @@ { TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); + _DoDropData *data = reinterpret_cast<_DoDropData*> (HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData))); + data->This = this; + // Need to maintain this class in case the window is closed or the class exists temporarily (when dropping onto a folder). + data->This->AddRef(); + data->pDataObject = pDataObject; + // Also keep the data object in case it gets freed elsewhere. + data->pDataObject->AddRef(); + data->dwKeyState = dwKeyState; + data->pt = pt; + // Need to dereference as pdweffect is freed. + data->pdwEffect = *pdwEffect; + + SHCreateThread(reinterpret_cast<LPTHREAD_START_ROUTINE> (CFSFolder::_DoDropThreadProc), reinterpret_cast<void *> (data), NULL, NULL); + return S_OK; +} + +HRESULT WINAPI CFSFolder::_DoDrop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); + HRESULT hr; bool bCopy = TRUE; bool bLinking = FALSE; @@ -1451,9 +1472,9 @@ if (pdwEffect) { TRACE("Current drop effect flag %i\n", *pdwEffect); - if (*pdwEffect & DROPEFFECT_MOVE) + if ((*pdwEffect & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) bCopy = FALSE; - if (*pdwEffect & DROPEFFECT_LINK) + if ((*pdwEffect & DROPEFFECT_LINK) == DROPEFFECT_LINK) bLinking = TRUE; } @@ -1631,5 +1652,12 @@ } DWORD CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { + _DoDropData *data = reinterpret_cast<_DoDropData*>(lpParameter); + data->This->_DoDrop(data->pDataObject, data->dwKeyState, data->pt, &data->pdwEffect); + //Release the CFSFolder and data object holds in the copying thread. + data->pDataObject->Release(); + data->This->Release(); + //Release the parameter from the heap. + HeapFree(GetProcessHeap(), 0, data); return 0; } Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -46,7 +46,8 @@ BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); void SF_RegisterClipFmt(); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); - DWORD _DoDropThreadProc(LPVOID lpParameter); + static DWORD _DoDropThreadProc(LPVOID lpParameter); + virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); public: CFSFolder(); @@ -116,4 +117,12 @@ END_COM_MAP() }; +struct _DoDropData { + CFSFolder *This; + IDataObject *pDataObject; + DWORD dwKeyState; + POINTL pt; + DWORD pdwEffect; +}; + #endif // _CFSFOLDER_H_ Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -429,10 +429,24 @@ return S_OK; } +/************************************************************************** +* registers clipboardformat once +*/ +void CRecycleBin::SF_RegisterClipFmt() +{ + TRACE ("(%p)\n", this); + + if (!cfShellIDList) + cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); +} + CRecycleBin::CRecycleBin() { pidl = NULL; iIdEmpty = 0; + cfShellIDList = 0; + SF_RegisterClipFmt(); + fAcceptFmt = FALSE; } CRecycleBin::~CRecycleBin() @@ -556,8 +570,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - WARN ("IDropTarget not implemented\n"); - hr = E_NOTIMPL; + hr = this->QueryInterface (IID_IDropTarget, ppv); } else if (IsEqualIID (riid, IID_IContextMenu) || IsEqualIID (riid, IID_IContextMenu2)) { @@ -605,7 +618,7 @@ { hr = CRecycleBinItemContextMenuConstructor(riid, apidl[0], (void **)&pObj); } - else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) + else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) { hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); } @@ -1372,3 +1385,214 @@ return S_OK; } + +/**************************************************************************** + * IDropTarget implementation + */ +BOOL CRecycleBin::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +{ + /* TODO on shift we should delete, we should update the cursor manager to show this. */ + + DWORD dwEffect = DROPEFFECT_COPY; + + *pdwEffect = DROPEFFECT_NONE; + + if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ + *pdwEffect = KeyStateToDropEffect (dwKeyState); + + if (*pdwEffect == DROPEFFECT_NONE) + *pdwEffect = dwEffect; + + /* ... matches the desired effect ? */ + if (dwEffect & *pdwEffect) { + return TRUE; + } + } + return FALSE; +} + +HRESULT WINAPI CRecycleBin::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + FIXME("Recycle bin drag over (%p)\n", this); + /* The recycle bin accepts pretty much everything, and sets a CSIDL flag. */ + fAcceptFmt = TRUE; + + QueryDrop(dwKeyState, pdwEffect); + return S_OK; +} + +HRESULT WINAPI CRecycleBin::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + if (!pdwEffect) + return E_INVALIDARG; + + QueryDrop(dwKeyState, pdwEffect); + + return S_OK; +} + +HRESULT WINAPI CRecycleBin::DragLeave() +{ + TRACE("(%p)\n", this); + + fAcceptFmt = FALSE; + + return S_OK; +} + +HRESULT WINAPI CRecycleBin::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + FIXME("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); + + /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */ + + FORMATETC fmt; + TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); + InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + + /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */ + if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) { + pDataObject->AddRef(); + SHCreateThread(DoDeleteThreadProc, pDataObject, NULL, NULL); + } + else + { + /* + * TODO call SetData on the data object with format CFSTR_TARGETCLSID + * set to the Recycle Bin's class identifier CLSID_RecycleBin. + */ + } + return S_OK; +} + +DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) +{ + IDataObject *pda = (IDataObject*) lpParameter; + DoDeleteDataObject(pda); + //Release the data object + pda->Release(); + return 0; +} + +HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) +{ + TRACE("performing delete"); + HRESULT hr; + + STGMEDIUM medium; + FORMATETC formatetc; + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + hr = pda->GetData(&formatetc, &medium); + if (FAILED(hr)) + return hr; + + /* lock the handle */ + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the data into pidl */ + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (!apidl) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfFrom = NULL; + + /* Grab the desktop shell folder */ + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + { + ERR("SHGetDesktopFolder failed\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* Find source folder, this is where the clipboard data was copied from */ + if (_ILIsDesktop(pidl)) + { + psfFrom = psfDesktop; + } + else + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + if (FAILED(hr)) + { + ERR("no IShellFolder\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + } + + STRRET strTemp; + hr = psfFrom->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strTemp); + if (FAILED(hr)) + { + ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return hr; + } + + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strTemp, apidl[0], wszPath, _countof(wszPath)); + if (FAILED(hr)) + { + ERR("StrRetToBufW failed with %x\n", hr); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return hr; + } + + /* Only keep the base path */ + LPWSTR pwszFilename = PathFindFileNameW(wszPath); + *pwszFilename = L'\0'; + + /* Build paths list */ + LPWSTR pwszPaths = BuildPathsList(wszPath, lpcida->cidl, (LPCITEMIDLIST*) apidl); + if (!pwszPaths) + { + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* Delete them */ + SHFILEOPSTRUCTW FileOp; + ZeroMemory(&FileOp, sizeof(FileOp)); + FileOp.wFunc = FO_DELETE; + FileOp.pFrom = pwszPaths; + FileOp.fFlags = FOF_ALLOWUNDO; + + if (SHFileOperationW(&FileOp) != 0) + { + ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); + hr = E_FAIL; + } + + HeapFree(GetProcessHeap(), 0, pwszPaths); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + + return hr; +} Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -22,6 +22,9 @@ #ifndef _SHFLDR_RECYCLEBIN_H_ #define _SHFLDR_RECYCLEBIN_H_ +DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter); +HRESULT WINAPI DoDeleteDataObject(IDataObject *pda); + class CRecycleBin : public CComCoClass<CRecycleBin, &CLSID_RecycleBin>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -29,11 +32,16 @@ public IPersistFolder2, public IContextMenu, public IShellPropSheetExt, + public IDropTarget, public IShellExtInit { private: LPITEMIDLIST pidl; INT iIdEmpty; + UINT cfShellIDList; + void SF_RegisterClipFmt(); + BOOL fAcceptFmt; /* flag for pending Drop */ + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); public: CRecycleBin(); @@ -75,6 +83,12 @@ // IShellPropSheetExt virtual HRESULT WINAPI AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); virtual HRESULT WINAPI ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam); + + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); @@ -91,6 +105,7 @@ COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Jan 5 12:48:42 2014 @@ -1691,8 +1691,6 @@ { DWORD dwEffect2; DoDragDrop(pda, pds, dwEffect, &dwEffect2); - if ((dwEffect2 & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) - this->Refresh(); } pda->Release(); }

1 0

[ekohl] 61536: [SAMSRV] SamrGetAliasMembership: Do not overwrite enties of the RID array.
by ekohl＠svn.reactos.org 05 Jan '14

05 Jan '14

Author: ekohl Date: Sun Jan 5 12:00:16 2014 New Revision: 61536 URL: http://svn.reactos.org/svn/reactos?rev=61536&view=rev Log: [SAMSRV] SamrGetAliasMembership: Do not overwrite enties of the RID array. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jan 5 12:00:16 2014 @@ -3250,6 +3250,7 @@ ULONG ValueCount; ULONG DataLength; ULONG i, j; + ULONG RidIndex; NTSTATUS Status; WCHAR NameBuffer[9]; @@ -3334,6 +3335,7 @@ goto done; } + RidIndex = 0; for (i = 0; i < SidArray->Count; i++) { ConvertSidToStringSid(SidArray->Sids[i].SidPointer, &MemberSidString); @@ -3365,7 +3367,9 @@ NULL); if (NT_SUCCESS(Status)) { - RidArray[j] = wcstoul(NameBuffer, NULL, 16); + /* FIXME: Do not return each RID more than once. */ + RidArray[RidIndex] = wcstoul(NameBuffer, NULL, 16); + RidIndex++; } } }

1 0

[aandrejevic] 61535: [NTVDM] Fix the interleaved shift mode. Don't halve the vertical resolution twice.
by aandrejevic＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: aandrejevic Date: Sat Jan 4 22:33:05 2014 New Revision: 61535 URL: http://svn.reactos.org/svn/reactos?rev=61535&view=rev Log: [NTVDM] Fix the interleaved shift mode. Don't halve the vertical resolution twice. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sat Jan 4 22:33:05 2014 @@ -797,9 +797,9 @@ * then 2 bits shifted from plane 1 and 3 for the next 4 */ BYTE LowPlaneData = VgaMemory[((j / 4) % 2) * VGA_BANK_SIZE - + (Address + (j / 4)) * AddressSize]; + + (Address + (j / 8)) * AddressSize]; BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 2) * VGA_BANK_SIZE - + (Address + (j / 4)) * AddressSize]; + + (Address + (j / 8)) * AddressSize]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; @@ -1032,9 +1032,11 @@ /* Halve the vertical resolution */ Resolution.Y >>= 1; } - - /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ - Resolution.Y /= MaximumScanLine; + else + { + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine; + } /* Return the resolution */ return Resolution;

1 0

[akhaldi] 61534: [SPIDER] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Dedicated to Daniel Reimer. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:12:53 2014 New Revision: 61534 URL: http://svn.reactos.org/svn/reactos?rev=61534&view=rev Log: [SPIDER] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Dedicated to Daniel Reimer. CORE-7716 Modified: trunk/reactos/base/applications/games/spider/spider.cpp trunk/reactos/base/applications/games/spider/spider.h Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Sat Jan 4 15:12:53 2014 @@ -7,6 +7,9 @@ */ #include "spider.h" + +#include <commctrl.h> +#include <tchar.h> TCHAR szHelpPath[MAX_PATH]; Modified: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] Sat Jan 4 15:12:53 2014 @@ -1,10 +1,3 @@ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> -#include <tchar.h> #include <cardlib.h> #include "resource.h"

1 0

[akhaldi] 61533: [CARDLIB] * Fix build.
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:07:36 2014 New Revision: 61533 URL: http://svn.reactos.org/svn/reactos?rev=61533&view=rev Log: [CARDLIB] * Fix build. Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] Sat Jan 4 15:07:36 2014 @@ -19,6 +19,7 @@ // count.Clear(); // +#include "cardlib.h" #include "cardcount.h" CardCount::CardCount() Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] Sat Jan 4 15:07:36 2014 @@ -5,7 +5,7 @@ // Copyright J Brown 2001 // -#include "cardstack.h" +#include "cardlib.h" Card &CardStack::operator[] (size_t index) {

1 0

[akhaldi] 61532: [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:01:58 2014 New Revision: 61532 URL: http://svn.reactos.org/svn/reactos?rev=61532&view=rev Log: [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/lib/3rdparty/cardlib/card.h trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp trunk/reactos/lib/3rdparty/cardlib/cardbutton.h trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp trunk/reactos/lib/3rdparty/cardlib/cardcolor.h trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp trunk/reactos/lib/3rdparty/cardlib/cardcount.h trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp trunk/reactos/lib/3rdparty/cardlib/cardlib.h trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp trunk/reactos/lib/3rdparty/cardlib/cardregion.h trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.h trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp trunk/reactos/lib/3rdparty/cardlib/cardwindow.h trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp trunk/reactos/lib/3rdparty/cardlib/dropzone.h trunk/reactos/lib/3rdparty/cardlib/globals.h Modified: trunk/reactos/lib/3rdparty/cardlib/card.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/card.… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/card.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/card.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -102,4 +102,4 @@ bool fFaceUp; }; -#endif +#endif /* _CARD_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -5,16 +5,7 @@ // Copyright J Brown 2001 // -//#include <windows.h> -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - -#include "globals.h" -#include "cardcolor.h" +#include "cardlib.h" #ifndef __REACTOS__ #pragma comment( lib, "..\\CardLib\\cards16.lib" ) Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,16 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> -//#include <tchar.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardwindow.h" -//#include "cardbutton.h" -#include "cardcolor.h" HPALETTE UseNicePalette(HDC, HPALETTE); void RestorePalette(HDC, HPALETTE); Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -2,8 +2,6 @@ #define CARDBUTTON_INCLUDED #define MAXBUTTONTEXT 64 - -//#include "cardlib.h" class CardButton { @@ -98,4 +96,4 @@ pButtonProc ButtonCallback; }; -#endif +#endif /* CARDBUTTON_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,11 +1,8 @@ // // Colour support // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> -#include <wingdi.h> + +#include "cardlib.h" #define MakeRGB RGB Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcolor.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,3 +1,4 @@ +#pragma once COLORREF ColorScaleRGB( const COLORREF Col1, const COLORREF Col2, Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -18,6 +18,7 @@ // // count.Clear(); // + #include "cardcount.h" CardCount::CardCount() Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,17 +1,5 @@ #ifndef _CARDCOUNT_INCLUDED #define _CARDCOUNT_INCLUDED - -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <stdlib.h> - -#include "cardstack.h" class CardCount { @@ -36,4 +24,4 @@ //(ace,2,3,4,5,6,7,8,9,10,J,Q,K) }; -#endif +#endif /* _CARDCOUNT_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,13 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "globals.h" void LoadCardBitmaps(void); Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -2,11 +2,13 @@ #define CARDLIB_INCLUDED #include <stdarg.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winuser.h> #define CARDLIBPROC __stdcall @@ -91,12 +93,13 @@ typedef void (CARDLIBPROC *pButtonProc) (CardButton &pButton); - -//#include "card.h" +#include "globals.h" +#include "card.h" #include "cardbutton.h" -//#include "cardstack.h" +#include "cardcolor.h" +#include "cardstack.h" #include "cardregion.h" -#include "cardcount.h" +#include "dropzone.h" #include "cardwindow.h" #ifdef _DEBUG @@ -104,5 +107,4 @@ void CardLib_SetStackClickProc(pDebugClickProc proc); #endif - -#endif +#endif /* CARDLIB_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardregion.h" -//#include "cardwindow.h" -//#include "cardcolor.h" HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height); Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardregion.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardregion.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,9 +1,5 @@ #ifndef CARDREGION_INCLUDED #define CARDREGION_INCLUDED - -#include "globals.h" -#include "cardstack.h" -//#include "cardlib.h" class CardWindow; @@ -215,5 +211,4 @@ HANDLE mxlock; }; -#endif - +#endif /* CARDREGION_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> - -//#include <stdlib.h> + #include "cardlib.h" -//#include "cardregion.h" -//#include "cardcolor.h" HPALETTE UseNicePalette(HDC hdc, HPALETTE hPalette); void PaintRect(HDC hdc, RECT *rect, COLORREF colour); Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,17 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> + +#include "cardlib.h" #include <math.h> -//#include <stdio.h> - -#include "cardlib.h" -//#include "cardwindow.h" -//#include "cardregion.h" #if 1 #define TRACE(s) Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,12 +4,6 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> - -#include <stdlib.h> #include "cardstack.h" Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,7 +1,5 @@ #ifndef CARDSTACK_INCLUDED #define CARDSTACK_INCLUDED - -#include "card.h" #define MAX_CARDSTACK_SIZE 128 @@ -50,4 +48,5 @@ int nNumCards; }; -#endif +#endif /* CARDSTACK_INCLUDED */ + Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,20 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> + +#include "cardlib.h" #include <tchar.h> -//#include <stdlib.h> - -//#include "globals.h" -#include "cardlib.h" -//#include "cardbutton.h" -//#include "cardregion.h" -//#include "cardwindow.h" -#include "cardcolor.h" extern HPALETTE __holdplacepal; Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,9 +4,6 @@ #define MAXBUTTONS 32 #define MAXCARDSTACKS 32 #define MAXDROPZONES 8 - -#include "dropzone.h" -//#include "cardlib.h" class CardRegion; class CardButton; @@ -116,5 +113,4 @@ }; - -#endif +#endif /* CARDBOARD_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,14 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardwindow.h" -//#include "dropzone.h" bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc) { Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/dropzone.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/dropzone.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -36,4 +36,4 @@ pDropZoneProc DropZoneCallback; }; -#endif +#endif /* DROPZONE_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/globa… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/globals.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/globals.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -12,4 +12,4 @@ extern HPALETTE __hPalette; -#endif +#endif /* GLOBALS_INCLUDED */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs