Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[greatlrd] 21669: Bug 1345 : patch from w3seek Fixes for BuildTrusteeWithObjectsAndName, BuildTrusteeWithObjectsAndSid and GetTrusteeName A test apps exits also from w3seek not commited.
by greatlrd＠svn.reactos.org 20 Apr '06

20 Apr '06

Author: greatlrd Date: Thu Apr 20 08:28:47 2006 New Revision: 21669 URL: http://svn.reactos.ru/svn/reactos?rev=21669&view=rev Log: Bug 1345 : patch from w3seek Fixes for BuildTrusteeWithObjectsAndName, BuildTrusteeWithObjectsAndSid and GetTrusteeName A test apps exits also from w3seek not commited. Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/trus… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c Thu Apr 20 08:28:47 2006 @@ -198,14 +198,33 @@ SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName, LPSTR InheritedObjectTypeName, LPSTR Name) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = Name; + pTrustee->ptstrName = (LPSTR)pObjName; } @@ -217,14 +236,33 @@ SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName, LPWSTR InheritedObjectTypeName, LPWSTR Name) { - DPRINT("%p %p 0x%08x %p %p %S\n", pTrustee, pObjName, + DWORD ObjectsPresent = 0; + + DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = Name; + pTrustee->ptstrName = (LPWSTR)pObjName; } @@ -235,13 +273,42 @@ BuildTrusteeWithObjectsAndSidA(PTRUSTEEA pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR) pSid; + pTrustee->ptstrName = (LPSTR) pObjSid; } @@ -252,13 +319,42 @@ BuildTrusteeWithObjectsAndSidW(PTRUSTEEW pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid) { + DWORD ObjectsPresent = 0; + DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR) pSid; + pTrustee->ptstrName = (LPWSTR) pObjSid; } @@ -328,7 +424,7 @@ LPSTR WINAPI GetTrusteeNameA(PTRUSTEE_A pTrustee) { - return (pTrustee->TrusteeForm == TRUSTEE_IS_NAME) ? pTrustee->ptstrName : NULL; + return pTrustee->ptstrName; } @@ -338,7 +434,7 @@ LPWSTR WINAPI GetTrusteeNameW(PTRUSTEE_W pTrustee) { - return (pTrustee->TrusteeForm == TRUSTEE_IS_NAME) ? pTrustee->ptstrName : NULL; + return pTrustee->ptstrName; }

1 0

[gedmurphy] 21668: [AUDIT] reporterror This is a ReactOS application unrelated to Windows. However I've been through the code anyway and it comprises of modular code documented on MSDN.
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:56:44 2006 New Revision: 21668 URL: http://svn.reactos.ru/svn/reactos?rev=21668&view=rev Log: [AUDIT] reporterror This is a ReactOS application unrelated to Windows. However I've been through the code anyway and it comprises of modular code documented on MSDN. Modified: trunk/reactos/base/applications/reporterror/reporterror.c (props changed) trunk/reactos/base/applications/reporterror/reporterror.h (props changed) trunk/reactos/base/applications/reporterror/resources/header.bmp (props changed) trunk/reactos/base/applications/reporterror/resources/watermark.bmp (props changed) Propchange: trunk/reactos/base/applications/reporterror/reporterror.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/reporterror.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/resources/header.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/reporterror/resources/watermark.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21667: [AUDIT] sc I am the author and can verify this code is clean
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:21:43 2006 New Revision: 21667 URL: http://svn.reactos.ru/svn/reactos?rev=21667&view=rev Log: [AUDIT] sc I am the author and can verify this code is clean Modified: trunk/reactos/base/applications/sc/control.c (props changed) trunk/reactos/base/applications/sc/create.c (props changed) trunk/reactos/base/applications/sc/delete.c (props changed) trunk/reactos/base/applications/sc/query.c (props changed) trunk/reactos/base/applications/sc/sc.c (props changed) trunk/reactos/base/applications/sc/sc.h (props changed) trunk/reactos/base/applications/sc/start.c (props changed) trunk/reactos/base/applications/sc/usage.c (props changed) Propchange: trunk/reactos/base/applications/sc/control.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/create.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/delete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/query.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/sc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/sc.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/start.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sc/usage.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21666: [AUDIT] route currently a very basic app which uses simple iphlpapi functions.
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:19:51 2006 New Revision: 21666 URL: http://svn.reactos.ru/svn/reactos?rev=21666&view=rev Log: [AUDIT] route currently a very basic app which uses simple iphlpapi functions. Modified: trunk/reactos/base/applications/network/route/route.c (props changed) Propchange: trunk/reactos/base/applications/network/route/route.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21665: this was missed when netstat was unlocked originally
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:15:45 2006 New Revision: 21665 URL: http://svn.reactos.ru/svn/reactos?rev=21665&view=rev Log: this was missed when netstat was unlocked originally Modified: trunk/reactos/base/applications/network/netstat/netstat.h (props changed) Propchange: trunk/reactos/base/applications/network/netstat/netstat.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21664: [AUDIT] hostname it only calls GetComputerName. I think it's safe to assume this is clean :)
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:14:03 2006 New Revision: 21664 URL: http://svn.reactos.ru/svn/reactos?rev=21664&view=rev Log: [AUDIT] hostname it only calls GetComputerName. I think it's safe to assume this is clean :) Modified: trunk/reactos/base/applications/hostname/hostname.c (props changed) Propchange: trunk/reactos/base/applications/hostname/hostname.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21663: - Add functionality to output the remaining locked files to a log file. - Fixed a potential bug when we hit 100%
by gedmurphy＠svn.reactos.org 19 Apr '06

19 Apr '06

Author: gedmurphy Date: Thu Apr 20 00:05:23 2006 New Revision: 21663 URL: http://svn.reactos.ru/svn/reactos?rev=21663&view=rev Log: - Add functionality to output the remaining locked files to a log file. - Fixed a potential bug when we hit 100% Modified: trunk/web/reactos.org/scripts/audit_progress.pl Modified: trunk/web/reactos.org/scripts/audit_progress.pl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/scripts/audit_progr… ============================================================================== --- trunk/web/reactos.org/scripts/audit_progress.pl (original) +++ trunk/web/reactos.org/scripts/audit_progress.pl Thu Apr 20 00:05:23 2006 @@ -7,11 +7,13 @@ use strict; use warnings; -my $in_path = "/reactos"; # enter the local path of the main reactos folder -my $out_file = "/progress_bar.html"; # enter the html output path -my $log_file = "/audit_progress.log"; # enter the log file path +my $in_path = "/reactos"; # enter the local path of the main reactos folder +my $out_file = "/progress_bar.html"; # enter the html output path +my $log_file = "/audit_progress.log"; # enter the log file path +my $locked_files = "/locked_files.log"; # enter the locked files log path my $total_width = 200; -my ($unclean_files, $total_files, $todo_width, $done_width, $done_pct); +my $unclean_files = 0; +my (@locked_files, $total_files, $todo_width, $done_width, $done_pct); open HTML, "> $out_file" or die "couldn't open $out_file for writing: $!\n"; @@ -21,8 +23,10 @@ foreach (@files) { next if /\/$/; $total_files++; - if (/\sO\s/) { + my @fields = split /\s+/; + if( $fields[3] eq 'O' ) { $unclean_files++; + push @locked_files, "$fields[-1]\n"; } } @@ -36,13 +40,18 @@ $done_pct = 100; } +open LOCK, "> $locked_files" + or die "couldn't open $locked_files for writing: $!\n"; + +print LOCK "Number of locked files: $unclean_files\n\n"; +print LOCK @locked_files; + output_html(); open LOG, ">> $log_file" or die "couldn't open $log_file for writing: $!\n"; my $date = localtime; print LOG "$date : total files = $total_files\tfiles unaudited = $unclean_files\tcompleted $done_pct%\n"; -

1 0

[gedmurphy] 21662: cleaner, revamped speaker icon.
by gedmurphy＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: gedmurphy Date: Wed Apr 19 02:35:20 2006 New Revision: 21662 URL: http://svn.reactos.ru/svn/reactos?rev=21662&view=rev Log: cleaner, revamped speaker icon. Modified: trunk/reactos/base/shell/explorer/res/speaker.ico Modified: trunk/reactos/base/shell/explorer/res/speaker.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/res/spe… ============================================================================== Binary files - no diff available.

1 0

[cwittich] 21661: changed window caption to design proposal from #reactos channel
by cwittich＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: cwittich Date: Wed Apr 19 00:06:30 2006 New Revision: 21661 URL: http://svn.reactos.ru/svn/reactos?rev=21661&view=rev Log: changed window caption to design proposal from #reactos channel Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/no… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Wed Apr 19 00:06:30 2006 @@ -1150,7 +1150,7 @@ if (uFlags & DC_GRADIENT) { static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[3]; + TRIVERTEX vert[2]; COLORREF Colors[2]; LONG xx; @@ -1178,28 +1178,19 @@ vert[0].x = r.left; vert[0].y = 0; - vert[0].Red = GetRValue(Colors[1]) << 8; - vert[0].Green = GetGValue(Colors[1]) << 8; - vert[0].Blue = GetBValue(Colors[1]) << 8; + vert[0].Red = GetRValue(Colors[0]) << 8; + vert[0].Green = GetGValue(Colors[0]) << 8; + vert[0].Blue = GetBValue(Colors[0]) << 8; vert[0].Alpha = 0; vert[1].x = r.right; - vert[1].y = (lprc->bottom - lprc->top) / 2; - vert[1].Red = GetRValue(Colors[0]) << 8; - vert[1].Green = GetGValue(Colors[0]) << 8; - vert[1].Blue = GetBValue(Colors[0]) << 8; + vert[1].y = lprc->bottom - lprc->top; + vert[1].Red = GetRValue(Colors[1]) << 8; + vert[1].Green = GetGValue(Colors[1]) << 8; + vert[1].Blue = GetBValue(Colors[1]) << 8; vert[1].Alpha = 0; - vert[2].x = r.right; - vert[2].y = lprc->bottom - lprc->top; - vert[2].Red = GetRValue(Colors[1]) << 8; - vert[2].Green = GetGValue(Colors[1]) << 8; - vert[2].Blue = GetBValue(Colors[1]) << 8; - vert[2].Alpha = 0; - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); - vert[1].x = r.left; - GdiGradientFill(MemDC, &vert[1], 2, &gcap, 1, GRADIENT_FILL_RECT_V); if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) {

1 0

[cwittich] 21660: UI improvement (window captions)
by cwittich＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: cwittich Date: Tue Apr 18 23:29:47 2006 New Revision: 21660 URL: http://svn.reactos.ru/svn/reactos?rev=21660&view=rev Log: UI improvement (window captions) Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/no… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Tue Apr 18 23:29:47 2006 @@ -1150,7 +1150,7 @@ if (uFlags & DC_GRADIENT) { static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; + TRIVERTEX vert[3]; COLORREF Colors[2]; LONG xx; @@ -1160,64 +1160,69 @@ else ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - if (Style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if (! (uFlags & DC_SMALLCAP)) - { - if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else - r.right -= 2; - r.right -= 2; - } - } + //if (Style & WS_SYSMENU) + //{ + // r.right -= 3 + ButtonWidth; + // if (! (uFlags & DC_SMALLCAP)) + // { + // if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + // r.right -= 2 + 2 * ButtonWidth; + // else + // r.right -= 2; + // r.right -= 2; + // } + //} Colors[0] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); Colors[1] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + vert[0].x = r.left; + vert[0].y = 0; + vert[0].Red = GetRValue(Colors[1]) << 8; + vert[0].Green = GetGValue(Colors[1]) << 8; + vert[0].Blue = GetBValue(Colors[1]) << 8; + vert[0].Alpha = 0; + + vert[1].x = r.right; + vert[1].y = (lprc->bottom - lprc->top) / 2; + vert[1].Red = GetRValue(Colors[0]) << 8; + vert[1].Green = GetGValue(Colors[0]) << 8; + vert[1].Blue = GetBValue(Colors[0]) << 8; + vert[1].Alpha = 0; + + vert[2].x = r.right; + vert[2].y = lprc->bottom - lprc->top; + vert[2].Red = GetRValue(Colors[1]) << 8; + vert[2].Green = GetGValue(Colors[1]) << 8; + vert[2].Blue = GetBValue(Colors[1]) << 8; + vert[2].Alpha = 0; + + GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); + vert[1].x = r.left; + GdiGradientFill(MemDC, &vert[1], 2, &gcap, 1, GRADIENT_FILL_RECT_V); + if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); - if (!OldBrush) goto cleanup; - xx = GetSystemMetrics(SM_CXSIZE) + Padding; - /* draw icon background */ - PatBlt(MemDC, 0, 0, xx, lprc->bottom - lprc->top, PATCOPY); - /* For some reason the icon isn't centered correctly... */ r.top --; + SetBkMode( MemDC, TRANSPARENT ); + xx = GetSystemMetrics(SM_CXSIZE) + Padding; if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) r.left += xx; r.top ++; } - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; - vert[1].Alpha = 0; - - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); if(OldBrush) { SelectObject(MemDC, OldBrush); OldBrush = NULL; } - xx = lprc->right - lprc->left - r.right; - if(xx > 0) - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); - if (!OldBrush) goto cleanup; - PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); - } + //xx = lprc->right - lprc->left - r.right; + //if(xx > 0) + //{ + // OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); + // if (!OldBrush) goto cleanup; + // PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); + //} } else {

1 0

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

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 April 2006