ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
September 2007
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
19 participants
589 discussions
Start a n
N
ew thread
[weiden] 29290: Display monitor number and various bug fixes
by weiden@svn.reactos.org
Author: weiden Date: Sat Sep 29 08:46:34 2007 New Revision: 29290 URL:
http://svn.reactos.org/svn/reactos?rev=29290&view=rev
Log: Display monitor number and various bug fixes Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/monslctl.c Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc…
============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Sat Sep 29 08:46:34 2007 @@ -101,7 +101,7 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to mach the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Display:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re…
============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Sat Sep 29 08:46:34 2007 @@ -1,4 +1,6 @@ #include <windows.h> +#include <tchar.h> +#include <stdio.h> #include "monslctl.h" static const TCHAR szMonitorSelWndClass[] = TEXT("MONITORSELWNDCLASS"); @@ -6,6 +8,8 @@ typedef struct _MONSL_MON { RECT rc; + HFONT hFont; + TCHAR szCaption[12]; } MONSL_MON, *PMONSL_MON; typedef struct _MONITORSELWND @@ -23,6 +27,7 @@ UINT Enabled : 1; UINT HasFocus : 1; UINT CanDisplay : 1; + UINT AllowSelectNone : 1; }; }; DWORD MonitorsCount; @@ -233,6 +238,22 @@ } static VOID +MonSelResetMonitors(IN OUT PMONITORSELWND infoPtr) +{ + DWORD Index; + + for (Index = 0; Index < infoPtr->MonitorsCount; Index++) + { + if (infoPtr->Monitors[Index].hFont != NULL) + { + DeleteObject(infoPtr->Monitors[Index].hFont); + infoPtr->Monitors[Index].hFont = NULL; + } + } +} + + +static VOID MonSelUpdateMonitorsInfo(IN OUT PMONITORSELWND infoPtr, IN BOOL bRepaint) { @@ -278,6 +299,8 @@ &infoPtr->Monitors[Index].rc); } + MonSelResetMonitors(infoPtr); + if (bRepaint) MonSelRepaint(infoPtr); } @@ -294,15 +317,15 @@ IN DWORD dwMonitors, IN const MONSL_MONINFO *MonitorsInfo) { - DWORD dwOldCount; + DWORD Index; BOOL Ret = TRUE; - - dwOldCount = infoPtr->MonitorsCount; if (infoPtr->MonitorInfo != NULL) { LocalFree((HLOCAL)infoPtr->MonitorInfo); infoPtr->MonitorInfo = NULL; + + MonSelResetMonitors(infoPtr); LocalFree((HLOCAL)infoPtr->Monitors); infoPtr->Monitors = NULL; @@ -326,11 +349,20 @@ ZeroMemory(infoPtr->Monitors, dwMonitors * sizeof(MONSL_MON)); + for (Index = 0; Index < dwMonitors; Index++) + { + _stprintf(infoPtr->Monitors[Index].szCaption, + _T("%u"), + Index + 1); + } + infoPtr->MonitorsCount = dwMonitors; if (infoPtr->SelectedMonitor >= (INT)infoPtr->MonitorsCount) infoPtr->SelectedMonitor = -1; - infoPtr->SelectedMonitor = 0; + + if (!infoPtr->AllowSelectNone && infoPtr->SelectedMonitor < 0) + infoPtr->SelectedMonitor = 0; MonSelUpdateMonitorsInfo(infoPtr, TRUE); @@ -427,31 +459,94 @@ NULL); } -static VOID -MonSelPaint(IN PMONITORSELWND infoPtr, +static HFONT +MonSelGetMonitorFont(IN OUT PMONITORSELWND infoPtr, + IN HDC hDC, + IN INT Index) +{ + TEXTMETRIC tm; + SIZE rcsize; + LOGFONT lf; + HFONT hPrevFont, hFont; + INT len; + + hFont = infoPtr->Monitors[Index].hFont; + if (hFont == NULL && + GetObject(infoPtr->hFont, + sizeof(LOGFONT), + &lf) != 0) + { + rcsize.cx = infoPtr->Monitors[Index].rc.right - infoPtr->Monitors[Index].rc.left - + (2 * infoPtr->SelectionFrame.cx) - 2; + rcsize.cy = infoPtr->Monitors[Index].rc.bottom - infoPtr->Monitors[Index].rc.top - + (2 * infoPtr->SelectionFrame.cy) - 2; + rcsize.cy = (rcsize.cy * 60) / 100; + + len = _tcslen(infoPtr->Monitors[Index].szCaption); + + hPrevFont = SelectObject(hDC, + infoPtr->hFont); + + if (GetTextMetrics(hDC, + &tm)) + { + lf.lfWeight = FW_SEMIBOLD; + lf.lfHeight = -MulDiv(rcsize.cy - tm.tmExternalLeading, + GetDeviceCaps(hDC, + LOGPIXELSY), + 72); + + hFont = CreateFontIndirect(&lf); + if (hFont != NULL) + infoPtr->Monitors[Index].hFont = hFont; + } + + SelectObject(hDC, + hPrevFont); + } + + return hFont; +} + +static VOID +MonSelPaint(IN OUT PMONITORSELWND infoPtr, IN HDC hDC, IN LPRECT prcUpdate) { + COLORREF crPrevText; + HFONT hFont, hPrevFont; HBRUSH hbBk, hbOldBk; HPEN hpFg, hpOldFg; DWORD Index; - RECT rc; + RECT rc, rctmp; + INT iPrevBkMode; hbBk = GetSysColorBrush(COLOR_BACKGROUND); hpFg = CreatePen(PS_SOLID, 0, - GetSysColor(COLOR_WINDOW)); + GetSysColor(COLOR_HIGHLIGHTTEXT)); hbOldBk = SelectObject(hDC, hbBk); hpOldFg = SelectObject(hDC, hpFg); + iPrevBkMode = SetBkMode(hDC, + TRANSPARENT); + crPrevText = SetTextColor(hDC, + GetSysColor(COLOR_HIGHLIGHTTEXT)); for (Index = 0; Index < infoPtr->MonitorsCount; Index++) { MonSelRectToScreen(infoPtr, &infoPtr->Monitors[Index].rc, &rc); + + if (!IntersectRect(&rctmp, + &rc, + prcUpdate)) + { + continue; + } if ((INT)Index == infoPtr->SelectedMonitor) { @@ -475,8 +570,34 @@ rc.top, rc.right, rc.bottom); - } - + + InflateRect(&rc, + -1, + -1); + + hFont = MonSelGetMonitorFont(infoPtr, + hDC, + Index); + if (hFont != NULL) + { + hPrevFont = SelectObject(hDC, + hFont); + + DrawText(hDC, + infoPtr->Monitors[Index].szCaption, + -1, + &rc, + DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + + SelectObject(hDC, + hPrevFont); + } + } + + SetTextColor(hDC, + crPrevText); + SetBkMode(hDC, + iPrevBkMode); SelectObject(hDC, hpOldFg); SelectObject(hDC, @@ -555,7 +676,7 @@ Index = MonSelHitTest(infoPtr, &pt); - if (Index >= 0) + if (Index >= 0 || infoPtr->AllowSelectNone) { MonSelSetCurSelMonitor(infoPtr, Index);
17 years, 2 months
1
0
0
0
[weiden] 29289: Add a (not yet functional) control to allow the user to arrange the monitors
by weiden@svn.reactos.org
Author: weiden Date: Sat Sep 29 06:32:14 2007 New Revision: 29289 URL:
http://svn.reactos.org/svn/reactos?rev=29289&view=rev
Log: Add a (not yet functional) control to allow the user to arrange the monitors Added: trunk/reactos/dll/cpl/desk/monslctl.c (with props) trunk/reactos/dll/cpl/desk/monslctl.h (with props) Modified: trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=29…
============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sat Sep 29 06:32:14 2007 @@ -15,10 +15,11 @@ static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); -extern INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -extern INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -extern INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -extern INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp); HINSTANCE hApplet = 0; @@ -47,7 +48,7 @@ } static BOOL -InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc, LPFNPSPCALLBACK pfnCallback) { HPROPSHEETPAGE hPage; PROPSHEETPAGE psp; @@ -57,9 +58,12 @@ ZeroMemory(&psp, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = PSP_DEFAULT; + if (pfnCallback != NULL) + psp.dwFlags |= PSP_USECALLBACK; psp.hInstance = hApplet; psp.pszTemplate = MAKEINTRESOURCE(idDlg); psp.pfnDlgProc = DlgProc; + psp.pfnCallback = pfnCallback; hPage = CreatePropertySheetPage(&psp); if (hPage != NULL) @@ -75,12 +79,13 @@ { WORD idDlg; DLGPROC DlgProc; + LPFNPSPCALLBACK Callback; } PropPages[] = { - { IDD_BACKGROUND, BackgroundPageProc }, - { IDD_SCREENSAVER, ScreenSaverPageProc }, - { IDD_APPEARANCE, AppearancePageProc }, - { IDD_SETTINGS, SettingsPageProc }, + { IDD_BACKGROUND, BackgroundPageProc, NULL }, + { IDD_SCREENSAVER, ScreenSaverPageProc, NULL }, + { IDD_APPEARANCE, AppearancePageProc, NULL }, + { IDD_SETTINGS, SettingsPageProc, SettingsPageCallbackProc }, }; /* Display Applet */ @@ -126,7 +131,7 @@ continue; } - InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc); + InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc, PropPages[i].Callback); } /* NOTE: Don;t call SHAddFromPropSheetExtArray here because this applet only allows Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r…
============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Sat Sep 29 06:32:14 2007 @@ -34,5 +34,6 @@ <file>screensaver.c</file> <file>advappdlg.c</file> <file>settings.c</file> + <file>monslctl.c</file> <file>desk.rc</file> </module> Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc…
============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Sat Sep 29 06:32:14 2007 @@ -101,6 +101,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to mach the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Display:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Screen area",1818,3,120,115,43 Added: trunk/reactos/dll/cpl/desk/monslctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re…
============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (added) +++ trunk/reactos/dll/cpl/desk/monslctl.c Sat Sep 29 06:32:14 2007 @@ -1,0 +1,790 @@ +#include <windows.h> +#include "monslctl.h" + +static const TCHAR szMonitorSelWndClass[] = TEXT("MONITORSELWNDCLASS"); + +typedef struct _MONSL_MON +{ + RECT rc; +} MONSL_MON, *PMONSL_MON; + +typedef struct _MONITORSELWND +{ + HWND hSelf; + HWND hNotify; + HFONT hFont; + SIZE ClientSize; + DWORD UIState; + union + { + DWORD dwFlags; + struct + { + UINT Enabled : 1; + UINT HasFocus : 1; + UINT CanDisplay : 1; + }; + }; + DWORD MonitorsCount; + INT SelectedMonitor; + PMONSL_MONINFO MonitorInfo; + PMONSL_MON Monitors; + RECT rcExtent; + RECT rcMonitors; + POINT ScrollPos; + SIZE Margin; + SIZE SelectionFrame; +} MONITORSELWND, *PMONITORSELWND; + +static HFONT +MonSelChangeFont(IN OUT PMONITORSELWND infoPtr, + IN HFONT hFont, + IN BOOL Redraw) +{ + HFONT hOldFont = infoPtr->hFont; + infoPtr->hFont = hFont; + + if (Redraw) + { + InvalidateRect(infoPtr->hSelf, + NULL, + TRUE); + } + + return hOldFont; +} + +static VOID +MonSelRectToScreen(IN PMONITORSELWND infoPtr, + IN const RECT *prc, + OUT PRECT prcOnScreen) +{ + *prcOnScreen = *prc; + OffsetRect(prcOnScreen, + -infoPtr->ScrollPos.x, + -infoPtr->ScrollPos.y); +} + +static VOID +MonSelScreenToPt(IN PMONITORSELWND infoPtr, + IN const POINT *pptOnScreen, + OUT PPOINT ppt) +{ + ppt->x = pptOnScreen->x + infoPtr->ScrollPos.x; + ppt->y = pptOnScreen->y + infoPtr->ScrollPos.y; +} + +static VOID +MonSelMonInfoToRect(IN const MONSL_MONINFO *pMonInfo, + OUT PRECT prc) +{ + prc->left = pMonInfo->Position.x; + prc->top = pMonInfo->Position.y; + prc->right = pMonInfo->Position.x + pMonInfo->Size.cx; + prc->bottom = pMonInfo->Position.y + pMonInfo->Size.cy; +} + +static INT +MonSelHitTest(IN PMONITORSELWND infoPtr, + IN const POINT *ppt) +{ + POINT pt; + INT Index, Ret = -1; + + if (infoPtr->CanDisplay) + { + MonSelScreenToPt(infoPtr, + ppt, + &pt); + + for (Index = 0; Index < (INT)infoPtr->MonitorsCount; Index++) + { + if (PtInRect(&infoPtr->Monitors[Index].rc, + pt)) + { + Ret = Index; + break; + } + } + } + + return Ret; +} + +static VOID +MonSelUpdateExtent(IN OUT PMONITORSELWND infoPtr) +{ + DWORD Index; + RECT rcMonitor; + + /* NOTE: This routine calculates the extent of all monitor coordinates. + These are not control coordinates! */ + if (infoPtr->MonitorsCount > 0) + { + MonSelMonInfoToRect(&infoPtr->MonitorInfo[0], + &infoPtr->rcExtent); + + for (Index = 1; Index < infoPtr->MonitorsCount; Index++) + { + MonSelMonInfoToRect(&infoPtr->MonitorInfo[Index], + &rcMonitor); + + UnionRect(&infoPtr->rcExtent, + &infoPtr->rcExtent, + &rcMonitor); + } + } + else + { + ZeroMemory(&infoPtr->rcExtent, + sizeof(infoPtr->rcExtent)); + } +} + +static VOID +MonSelScaleRectRelative(IN const RECT *prcBaseFrom, + IN const RECT *prcFrom, + IN const RECT *prcBaseTo, + OUT PRECT prcTo) +{ + SIZE BaseFrom, BaseTo, From; + + BaseFrom.cx = prcBaseFrom->right - prcBaseFrom->left; + BaseFrom.cy = prcBaseFrom->bottom - prcBaseFrom->top; + BaseTo.cx = prcBaseTo->right - prcBaseTo->left; + BaseTo.cy = prcBaseTo->bottom - prcBaseTo->top; + From.cx = prcFrom->right - prcFrom->left; + From.cy = prcFrom->bottom - prcFrom->top; + + prcTo->left = prcBaseTo->left + (((prcFrom->left - prcBaseFrom->left) * BaseTo.cx) / BaseFrom.cx); + prcTo->top = prcBaseTo->top + (((prcFrom->top - prcBaseFrom->top) * BaseTo.cy) / BaseFrom.cy); + prcTo->right = prcTo->left + ((From.cx * BaseTo.cx) / BaseFrom.cx); + prcTo->bottom = prcTo->top + ((From.cy * BaseTo.cy) / BaseFrom.cy); +} + +static VOID +ScaleRectSizeFit(IN const RECT *prcContainerRect, + IN OUT PRECT prcRectToScale) +{ + SIZE ContainerSize, RectSize; + + ContainerSize.cx = prcContainerRect->right - prcContainerRect->left; + ContainerSize.cy = prcContainerRect->bottom - prcContainerRect->top; + RectSize.cx = prcRectToScale->right - prcRectToScale->left; + RectSize.cy = prcRectToScale->bottom - prcRectToScale->top; + + if (((RectSize.cx * 0xFFF) / RectSize.cy) < ((ContainerSize.cx * 0xFFF) / ContainerSize.cy)) + { + RectSize.cx = (RectSize.cx * ((ContainerSize.cy * 0xFFF) / RectSize.cy)) / 0xFFF; + RectSize.cy = ContainerSize.cy; + } + else + { + RectSize.cy = (RectSize.cy * ((ContainerSize.cx * 0xFFF) / RectSize.cx)) / 0xFFF; + RectSize.cx = ContainerSize.cx; + } + + prcRectToScale->right = prcRectToScale->left + RectSize.cx; + prcRectToScale->bottom = prcRectToScale->top + RectSize.cy; + + OffsetRect(prcRectToScale, + prcContainerRect->left + ((ContainerSize.cx - RectSize.cx) / 2), + prcContainerRect->top + ((ContainerSize.cy - RectSize.cy) / 2)); +} + +static VOID +MonSelRepaint(IN PMONITORSELWND infoPtr) +{ + RECT rc; + + MonSelRectToScreen(infoPtr, + &infoPtr->rcMonitors, + &rc); + InvalidateRect(infoPtr->hSelf, + &rc, + TRUE); +} + +static VOID +MonSelRepaintMonitor(IN PMONITORSELWND infoPtr, + IN DWORD Index) +{ + RECT rc; + + if (Index < infoPtr->MonitorsCount) + { + MonSelRectToScreen(infoPtr, + &infoPtr->Monitors[Index].rc, + &rc); + InvalidateRect(infoPtr->hSelf, + &rc, + TRUE); + } +} + +static VOID +MonSelRepaintSelected(IN PMONITORSELWND infoPtr) +{ + if (infoPtr->SelectedMonitor >= 0) + { + MonSelRepaintMonitor(infoPtr, + (DWORD)infoPtr->SelectedMonitor); + } +} + +static VOID +MonSelUpdateMonitorsInfo(IN OUT PMONITORSELWND infoPtr, + IN BOOL bRepaint) +{ + RECT rcExtSurface, rcExtDisplay; + DWORD Index; + + /* Recalculate rcExtent */ + MonSelUpdateExtent(infoPtr); + + infoPtr-> CanDisplay = infoPtr->MonitorsCount != 0 && + (infoPtr->ClientSize.cx > (2 * (infoPtr->Margin.cx + infoPtr->SelectionFrame.cx))) && + (infoPtr->ClientSize.cy > (2 * (infoPtr->Margin.cy + infoPtr->SelectionFrame.cy))); + + if (infoPtr->CanDisplay) + { + /* Calculate the rectangle on the control in which may be painted */ + rcExtSurface.left = infoPtr->Margin.cx; + rcExtSurface.top = infoPtr->Margin.cy; + rcExtSurface.right = rcExtSurface.left + infoPtr->ClientSize.cx - (2 * infoPtr->Margin.cx); + rcExtSurface.bottom = rcExtSurface.top + infoPtr->ClientSize.cy - (2 * infoPtr->Margin.cy); + + /* Calculate the rectangle on the control that is actually painted on */ + rcExtDisplay.left = rcExtDisplay.top = 0; + rcExtDisplay.right = infoPtr->rcExtent.right - infoPtr->rcExtent.left; + rcExtDisplay.bottom = infoPtr->rcExtent.bottom - infoPtr->rcExtent.top; + + ScaleRectSizeFit(&rcExtSurface, + &rcExtDisplay); + + infoPtr->rcMonitors = rcExtDisplay; + + /* Now that we know in which area all monitors are located, + calculate the monitors selection rectangles on the screen */ + + for (Index = 0; Index < infoPtr->MonitorsCount; Index++) + { + MonSelMonInfoToRect(&infoPtr->MonitorInfo[Index], + &rcExtDisplay); + + MonSelScaleRectRelative(&infoPtr->rcExtent, + &rcExtDisplay, + &infoPtr->rcMonitors, + &infoPtr->Monitors[Index].rc); + } + + if (bRepaint) + MonSelRepaint(infoPtr); + } + else if (bRepaint) + { + InvalidateRect(infoPtr->hSelf, + NULL, + TRUE); + } +} + +static BOOL +MonSelSetMonitorInfo(IN OUT PMONITORSELWND infoPtr, + IN DWORD dwMonitors, + IN const MONSL_MONINFO *MonitorsInfo) +{ + DWORD dwOldCount; + BOOL Ret = TRUE; + + dwOldCount = infoPtr->MonitorsCount; + + if (infoPtr->MonitorInfo != NULL) + { + LocalFree((HLOCAL)infoPtr->MonitorInfo); + infoPtr->MonitorInfo = NULL; + + LocalFree((HLOCAL)infoPtr->Monitors); + infoPtr->Monitors = NULL; + + infoPtr->MonitorsCount = 0; + } + + if (dwMonitors != 0) + { + infoPtr->MonitorInfo = (PMONSL_MONINFO)LocalAlloc(LMEM_FIXED, + dwMonitors * sizeof(MONSL_MONINFO)); + if (infoPtr->MonitorInfo != NULL) + { + infoPtr->Monitors = (PMONSL_MON)LocalAlloc(LMEM_FIXED, + dwMonitors * sizeof(MONSL_MON)); + if (infoPtr->Monitors != NULL) + { + CopyMemory(infoPtr->MonitorInfo, + MonitorsInfo, + dwMonitors * sizeof(MONSL_MONINFO)); + ZeroMemory(infoPtr->Monitors, + dwMonitors * sizeof(MONSL_MON)); + + infoPtr->MonitorsCount = dwMonitors; + + if (infoPtr->SelectedMonitor >= (INT)infoPtr->MonitorsCount) + infoPtr->SelectedMonitor = -1; + infoPtr->SelectedMonitor = 0; + + MonSelUpdateMonitorsInfo(infoPtr, + TRUE); + } + else + { + LocalFree((HLOCAL)infoPtr->MonitorInfo); + infoPtr->MonitorInfo = NULL; + + Ret = FALSE; + } + } + else + Ret = FALSE; + } + + if (!Ret) + infoPtr->SelectedMonitor = -1; + + if (!Ret || dwMonitors == 0) + { + InvalidateRect(infoPtr->hSelf, + NULL, + TRUE); + } + + return Ret; +} + +static DWORD +MonSelGetMonitorInfo(IN PMONITORSELWND infoPtr, + IN DWORD dwMonitors, + IN OUT PMONSL_MONINFO MonitorsInfo) +{ + if (dwMonitors != 0) + { + if (dwMonitors > infoPtr->MonitorsCount) + dwMonitors = infoPtr->MonitorsCount; + + CopyMemory(MonitorsInfo, + infoPtr->MonitorInfo, + dwMonitors * sizeof(MONSL_MONINFO)); + return dwMonitors; + } + else + return infoPtr->MonitorsCount; +} + +static BOOL +MonSelSetCurSelMonitor(IN OUT PMONITORSELWND infoPtr, + IN INT Index) +{ + INT PrevSel; + BOOL Ret = FALSE; + + if (Index == -1 || Index < (INT)infoPtr->MonitorsCount) + { + if (Index != infoPtr->SelectedMonitor) + { + PrevSel = infoPtr->SelectedMonitor; + infoPtr->SelectedMonitor = Index; + + if (PrevSel >= 0) + { + MonSelRepaintMonitor(infoPtr, + PrevSel); + } + + if (infoPtr->SelectedMonitor >= 0) + MonSelRepaintSelected(infoPtr); + } + + Ret = TRUE; + } + + return Ret; +} + +static VOID +MonSelCreate(IN OUT PMONITORSELWND infoPtr) +{ + infoPtr->SelectionFrame.cx = infoPtr->SelectionFrame.cy = 4; + infoPtr->Margin.cx = infoPtr->Margin.cy = 20; + infoPtr->SelectedMonitor = -1; + return; +} + +static VOID +MonSelDestroy(IN OUT PMONITORSELWND infoPtr) +{ + /* Free all monitors */ + MonSelSetMonitorInfo(infoPtr, + 0, + NULL); +} + +static VOID +MonSelPaint(IN PMONITORSELWND infoPtr, + IN HDC hDC, + IN LPRECT prcUpdate) +{ + HBRUSH hbBk, hbOldBk; + HPEN hpFg, hpOldFg; + DWORD Index; + RECT rc; + + hbBk = GetSysColorBrush(COLOR_BACKGROUND); + hpFg = CreatePen(PS_SOLID, + 0, + GetSysColor(COLOR_WINDOW)); + + hbOldBk = SelectObject(hDC, + hbBk); + hpOldFg = SelectObject(hDC, + hpFg); + + for (Index = 0; Index < infoPtr->MonitorsCount; Index++) + { + MonSelRectToScreen(infoPtr, + &infoPtr->Monitors[Index].rc, + &rc); + + if ((INT)Index == infoPtr->SelectedMonitor) + { + FillRect(hDC, + &rc, + (HBRUSH)(COLOR_HIGHLIGHT + 1)); + + if (infoPtr->HasFocus && !(infoPtr->UIState & UISF_HIDEFOCUS)) + { + DrawFocusRect(hDC, + &rc); + } + } + + InflateRect(&rc, + -infoPtr->SelectionFrame.cx, + -infoPtr->SelectionFrame.cy); + + Rectangle(hDC, + rc.left, + rc.top, + rc.right, + rc.bottom); + } + + SelectObject(hDC, + hpOldFg); + SelectObject(hDC, + hbOldBk); +} + +static LRESULT CALLBACK +MonitorSelWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PMONITORSELWND infoPtr; + LRESULT Ret = 0; + + infoPtr = (PMONITORSELWND)GetWindowLongPtrW(hwnd, + 0); + + if (infoPtr == NULL && uMsg != WM_CREATE) + { + goto HandleDefaultMessage; + } + + switch (uMsg) + { + case WM_PAINT: + case WM_PRINTCLIENT: + { + PAINTSTRUCT ps; + HDC hDC; + + if (wParam != 0) + { + if (!GetUpdateRect(hwnd, + &ps.rcPaint, + TRUE)) + { + break; + } + hDC = (HDC)wParam; + } + else + { + hDC = BeginPaint(hwnd, + &ps); + if (hDC == NULL) + { + break; + } + } + + if (infoPtr->CanDisplay) + { + MonSelPaint(infoPtr, + hDC, + &ps.rcPaint); + } + + if (wParam == 0) + { + EndPaint(hwnd, + &ps); + } + break; + } + + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + { + INT Index; + POINT pt; + + pt.x = (LONG)LOWORD(lParam); + pt.y = (LONG)HIWORD(lParam); + + Index = MonSelHitTest(infoPtr, + &pt); + if (Index >= 0) + { + MonSelSetCurSelMonitor(infoPtr, + Index); + } + + /* fall through */ + } + + case WM_MBUTTONDOWN: + { + if (!infoPtr->HasFocus) + SetFocus(hwnd); + break; + } + + case WM_GETDLGCODE: + { + INT virtKey; + + virtKey = (lParam != 0 ? (INT)((LPMSG)lParam)->wParam : 0); + switch (virtKey) + { + case VK_TAB: + { + /* change the UI status */ + SendMessage(GetAncestor(hwnd, + GA_PARENT), + WM_CHANGEUISTATE, + MAKEWPARAM(UIS_INITIALIZE, + 0), + 0); + break; + } + } + + Ret |= DLGC_WANTARROWS; + break; + } + + case WM_SETFOCUS: + { + infoPtr->HasFocus = TRUE; + MonSelRepaintSelected(infoPtr); + break; + } + + case WM_KILLFOCUS: + { + infoPtr->HasFocus = FALSE; + MonSelRepaintSelected(infoPtr); + break; + } + + case WM_UPDATEUISTATE: + { + DWORD OldUIState = infoPtr->UIState; + switch (LOWORD(wParam)) + { + case UIS_SET: + infoPtr->UIState |= HIWORD(wParam); + break; + + case UIS_CLEAR: + infoPtr->UIState &= ~HIWORD(wParam); + break; + } + + if (infoPtr->UIState != OldUIState) + MonSelRepaintSelected(infoPtr); + break; + } + + case WM_SETFONT: + { + Ret = (LRESULT)MonSelChangeFont(infoPtr, + (HFONT)wParam, + (BOOL)LOWORD(lParam)); + break; + } + + case WM_SIZE: + { + infoPtr->ClientSize.cx = LOWORD(lParam); + infoPtr->ClientSize.cy = HIWORD(lParam); + + /* Don't let MonSelUpdateMonitorsInfo repaint the control + because this won't work properly in case the control + was sized down! */ + MonSelUpdateMonitorsInfo(infoPtr, + FALSE); + InvalidateRect(infoPtr->hSelf, + NULL, + TRUE); + break; + } + + case WM_GETFONT: + { + Ret = (LRESULT)infoPtr->hFont; + break; + } + + case WM_ENABLE: + { + infoPtr->Enabled = ((BOOL)wParam != FALSE); + /* FIXME */ + break; + } + + case WM_STYLECHANGED: + { + if (wParam == GWL_STYLE) + { + unsigned int OldEnabled = infoPtr->Enabled; + infoPtr->Enabled = !(((LPSTYLESTRUCT)lParam)->styleNew & WS_DISABLED); + + if (OldEnabled != infoPtr->Enabled) + { + /* FIXME */ + } + } + break; + } + + case MSLM_SETMONITORINFO: + { + Ret = MonSelSetMonitorInfo(infoPtr, + (DWORD)wParam, + (const MONSL_MONINFO *)lParam); + break; + } + + case MSLM_GETMONITORINFO: + { + Ret = MonSelGetMonitorInfo(infoPtr, + (DWORD)wParam, + (PMONSL_MONINFO)lParam); + break; + } + + case MSLM_GETMONITORINFOCOUNT: + { + Ret = infoPtr->MonitorsCount; + break; + } + + case MSLM_HITTEST: + { + Ret = MonSelHitTest(infoPtr, + (const POINT *)wParam); + break; + } + + case WM_CREATE: + { + infoPtr = (PMONITORSELWND) HeapAlloc(GetProcessHeap(), + 0, + sizeof(MONITORSELWND)); + if (infoPtr == NULL) + { + Ret = (LRESULT)-1; + break; + } + + ZeroMemory(infoPtr, + sizeof(MONITORSELWND)); + infoPtr->hSelf = hwnd; + infoPtr->hNotify = ((LPCREATESTRUCTW)lParam)->hwndParent; + infoPtr->Enabled = !(((LPCREATESTRUCTW)lParam)->style & WS_DISABLED); + infoPtr->UIState = SendMessage(hwnd, + WM_QUERYUISTATE, + 0, + 0); + + SetWindowLongPtrW(hwnd, + 0, + (LONG_PTR)infoPtr); + + MonSelCreate(infoPtr); + break; + } + + case WM_DESTROY: + { + MonSelDestroy(infoPtr); + + HeapFree(GetProcessHeap(), + 0, + infoPtr); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)NULL); + break; + } + + default: + { +HandleDefaultMessage: + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} + +BOOL +RegisterMonitorSelectionControl(IN HINSTANCE hInstance) +{ + WNDCLASS wc = {0}; + + wc.style = CS_DBLCLKS; + wc.lpfnWndProc = MonitorSelWndProc; + wc.cbWndExtra = sizeof(PMONITORSELWND); + wc.hInstance = hInstance; + wc.hCursor = LoadCursorW(NULL, + (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); + wc.lpszClassName = szMonitorSelWndClass; + + return RegisterClass(&wc) != 0; +} + +VOID +UnregisterMonitorSelectionControl(IN HINSTANCE hInstance) +{ + UnregisterClassW(szMonitorSelWndClass, + hInstance); +} Propchange: trunk/reactos/dll/cpl/desk/monslctl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/desk/monslctl.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.h?re…
============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.h (added) +++ trunk/reactos/dll/cpl/desk/monslctl.h Sat Sep 29 06:32:14 2007 @@ -1,0 +1,60 @@ +#ifndef __MONSLCTL__H +#define __MONSLCTL__H + +/* MONSL_MONINFO Flags */ +#define MSL_MIF_DISABLED 0x1 + +typedef struct _MONSL_MONINFO +{ + POINT Position; + SIZE Size; + DWORD Flags; /* MSL_MIF_* */ + LPARAM lParam; +} MONSL_MONINFO, *PMONSL_MONINFO; + +/* + * MSLM_SETMONITORINFO + * wParam: DWORD + * Count of MONSL_MONINFO structures provided as lParam. + * lParam: PMONSL_MONINFO + * Array of wParam MONSL_MONINFO structures. + * + * Returns non-zero value if successful. + */ +#define MSLM_SETMONITORINFO (WM_USER + 0x10) + +/* + * MSLM_GETMONITORINFO + * wParam: DWORD + * Length of MONSL_MONINFO array buffer provided in lParam. + * lParam: PMONSL_MONINFO + * Array of wParam MONSL_MONINFO structures + * + * Returns number of structures copied. + */ +#define MSLM_GETMONITORINFO (WM_USER + 0x11) + +/* + * MSLM_GETMONITORINFOCOUNT + * wParam: Ignored. + * lParam: Ignored. + * + * Returns number of monitors. + */ +#define MSLM_GETMONITORINFOCOUNT (WM_USER + 0x12) + +/* + * MSLM_HITTEST + * wParam: PPOINT + * Pointer to a POINT structure specifying the coordinates + * relative to the client area of the control. + * lParam: Ignored. + * + * Returns the index of the monitor at this point, or -1. + */ +#define MSLM_HITTEST (WM_USER + 0x13) + +BOOL RegisterMonitorSelectionControl(IN HINSTANCE hInstance); +VOID UnregisterMonitorSelectionControl(IN HINSTANCE hInstance); + +#endif /* __MONSLCTL__H */ Propchange: trunk/reactos/dll/cpl/desk/monslctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re…
============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Sat Sep 29 06:32:14 2007 @@ -64,6 +64,7 @@ #define IDC_SETTINGS_RESOLUTION 203 #define IDC_SETTINGS_RESOLUTION_TEXT 204 #define IDC_SETTINGS_ADVANCED 205 +#define IDC_SETTINGS_MONSEL 206 #define IDR_PREVIEW_MENU 2100 #define ID_MENU_NORMAL 2101 Modified: trunk/reactos/dll/cpl/desk/settings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re…
============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Sat Sep 29 06:32:14 2007 @@ -9,6 +9,7 @@ */ #include "desk.h" +#include "monslctl.h" typedef struct _GLOBAL_DATA { @@ -503,6 +504,26 @@ } /* we shouldn't go there */ +} + +/* Property sheet page callback */ +UINT CALLBACK +SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) +{ + UINT Ret = 0; + + switch (uMsg) + { + case PSPCB_CREATE: + Ret = RegisterMonitorSelectionControl(hApplet); + break; + + case PSPCB_RELEASE: + UnregisterMonitorSelectionControl(hApplet); + break; + } + + return Ret; } /* Property page dialog callback */
17 years, 2 months
1
0
0
0
[cfinck] 29288: - Fix many warnings - Fix a bug in id_dma.cpp on line 1261: This probably shouldn't be an assignment, but a check, otherwise all ATI chips will be treated as Silicon Image chips
by cfinck@svn.reactos.org
Author: cfinck Date: Sat Sep 29 02:32:34 2007 New Revision: 29288 URL:
http://svn.reactos.org/svn/reactos?rev=29288&view=rev
Log: - Fix many warnings - Fix a bug in id_dma.cpp on line 1261: This probably shouldn't be an assignment, but a check, otherwise all ATI chips will be treated as Silicon Image chips Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Sat Sep 29 02:32:34 2007 @@ -7979,7 +7979,6 @@ PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; BOOLEAN ReEnter = FALSE; WCHAR a; - NTSTATUS status; PCONFIGURATION_INFORMATION GlobalConfig = IoGetConfigurationInformation(); BOOLEAN PrimaryClaimed = FALSE; Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp Sat Sep 29 02:32:34 2007 @@ -1258,7 +1258,7 @@ case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); - if(ChipType = SIIMIO) { + if(ChipType == SIIMIO) { goto l_ATA_SILICON_IMAGE_ID; } //goto ATA_SERVERWORKS_ID; Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp Sat Sep 29 02:32:34 2007 @@ -105,7 +105,7 @@ PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), -/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ), +/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ),*/ /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), @@ -175,7 +175,7 @@ // only by SouthBridge DeviceId DevTypeInfo = (BUSMASTER_CONTROLLER_INFORMATION*)&ViaSouthAdapters[0]; i = AtapiFindListedDev(DevTypeInfo, -1, HwDeviceExtension, SystemIoBusNumber, slotNumber, NULL); - if(i != -1) { + if(i != 0xFFFFFFFF) { KdPrint2((PRINT_PREFIX "VIASOUTH\n")); deviceExtension->HwFlags |= VIASOUTH; } @@ -244,7 +244,7 @@ i = Ata_is_dev_listed(DevTypeInfo, VendorID, DeviceID, RevID, -1); for_ugly_chips: KdPrint2((PRINT_PREFIX "i: %#x\n", i)); - if(i == -1) { + if(i == 0xFFFFFFFF) { return FALSE; } deviceExtension->MaxTransferMode = DevTypeInfo[i].MaxTransferMode; @@ -299,7 +299,6 @@ BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); for(c=0; c<deviceExtension->NumberChannels; c++) { - ULONG unit01 = (c & 1); ULONG unit10 = (c & 2); chan = &deviceExtension->chan[c]; @@ -557,7 +556,7 @@ tmp32 == ATA_SIS5517) { i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION*)&SiSSouthAdapters[0], -1, HwDeviceExtension, SystemIoBusNumber, -1, NULL); - if(i != -1) { + if(i != 0xFFFFFFFF) { deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; //deviceExtension->MaxTransferMode = ATA_UDMA6; deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; @@ -822,7 +821,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { continue; } @@ -863,7 +862,6 @@ IN ULONG slotNumber ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -887,7 +885,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { continue; } @@ -915,7 +913,6 @@ IN ULONG c ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -941,7 +938,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { continue; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp Sat Sep 29 02:32:34 2007 @@ -74,7 +74,7 @@ VOID AtapiDoNothing(VOID) { - ULONG i = 0; + //ULONG i = 0; return; } // end AtapiDoNothing() @@ -250,7 +250,7 @@ if(busDataRead == 2) continue; - if(busDataRead < PCI_COMMON_HDR_LENGTH) + if(busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) continue; VendorID = pciData.VendorID; @@ -289,7 +289,7 @@ //known = UniataChipDetect(HwDeviceExtension, NULL, -1, ConfigInfo, &SimplexOnly); i = Ata_is_dev_listed((PBUSMASTER_CONTROLLER_INFORMATION)&BusMasterAdapters[0], VendorID, DeviceID, 0, NUM_BUSMASTER_ADAPTERS); - known = (i != -1); + known = (i != 0xFFFFFFFF); if(known) { RaidFlags = BusMasterAdapters[i].RaidFlags; if((RaidFlags & UNIATA_RAID_CONTROLLER) && @@ -476,8 +476,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); + sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT)VendorID); + sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT)DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); @@ -591,7 +591,7 @@ ULONG i; // set start/end bus - if(BusNumber == -1) { + if(BusNumber == 0xFFFFFFFF) { busNumber = 0; busNumber2 = maxPciBus; } else { @@ -599,7 +599,7 @@ busNumber2 = BusNumber+1; } // set start/end slot - if(SlotNumber == -1) { + if(SlotNumber == 0xFFFFFFFF) { slotNumber = 0; slotNumber2 = PCI_MAX_DEVICES; } else { @@ -627,11 +627,11 @@ if(busDataRead == 2) continue; - if(busDataRead < PCI_COMMON_HDR_LENGTH) + if(busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) continue; i = Ata_is_dev_listed(BusMasterAdapters, pciData.VendorID, pciData.DeviceID, pciData.RevisionID, lim); - if(i != -1) { + if(i != 0xFFFFFFFF) { if(_slotData) *_slotData = slotData; return i; @@ -679,7 +679,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { continue; } @@ -733,7 +733,7 @@ #ifndef UNIATA_CORE // this buffer must be global for UNIATA_CORE build PCI_COMMON_CONFIG pciData; -#endif UNIATA_CORE +#endif //UNIATA_CORE ULONG slotNumber; ULONG busDataRead; ULONG SystemIoBusNumber; @@ -764,7 +764,7 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; - BOOLEAN skip_find_dev = FALSE; + //BOOLEAN skip_find_dev = FALSE; BOOLEAN AltInit = FALSE; SCSI_PHYSICAL_ADDRESS IoBasePort1; @@ -841,7 +841,7 @@ PCI_COMMON_HDR_LENGTH); #ifndef UNIATA_CORE - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); return SP_RETURN_ERROR; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp Sat Sep 29 02:32:34 2007 @@ -129,7 +129,7 @@ // walk through command queue and find the best // place for insertion of the command - while (AtaReq1 = AtaReq2->prev_req) { + while ((AtaReq1 = AtaReq2->prev_req)) { new_cost1 = UniataGetCost(LunExt, AtaReq1, AtaReq); new_cost2 = UniataGetCost(LunExt, AtaReq, AtaReq2); @@ -181,7 +181,7 @@ AtaReq->prev_req = BestAtaReq1; AtaReq1 = AtaReq; - while(AtaReq1 = AtaReq1->next_req) { + while((AtaReq1 = AtaReq1->next_req)) { //ASSERT(AtaReq1->ttl); AtaReq1->ttl--; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp Sat Sep 29 02:32:34 2007 @@ -7,7 +7,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - ULONG Channel = deviceExtension->Channel + lChannel; + //ULONG Channel = deviceExtension->Channel + lChannel; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; SATA_SSTATUS_REG SStatus; ULONG i; @@ -126,7 +126,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; - ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; SATA_SSTATUS_REG SStatus; SATA_SERROR_REG SError;
17 years, 2 months
1
0
0
0
[cfinck] 29287: uniata patch by encoded: - Make building with QUEUE_STATISTICS possible - Fix the best_c check. As best_c is a ULONG variable, you cannot check for -1
by cfinck@svn.reactos.org
Author: cfinck Date: Sat Sep 29 02:00:52 2007 New Revision: 29287 URL:
http://svn.reactos.org/svn/reactos?rev=29287&view=rev
Log: uniata patch by encoded: - Make building with QUEUE_STATISTICS possible - Fix the best_c check. As best_c is a ULONG variable, you cannot check for -1 Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp Sat Sep 29 02:00:52 2007 @@ -133,9 +133,11 @@ new_cost1 = UniataGetCost(LunExt, AtaReq1, AtaReq); new_cost2 = UniataGetCost(LunExt, AtaReq, AtaReq2); +#ifdef QUEUE_STATISTICS if(new_cost1 == REORDER_COST_INTERSECT || new_cost2 == REORDER_COST_INTERSECT) chan->IntersectCount++; +#endif //QUEUE_STATISTICS if(new_cost2 > REORDER_COST_RESELECT) break; @@ -348,7 +350,7 @@ cost_c = chan->queue_depth * (chan->ChannelSelectWaitCount+1); } } - if(best_c == -1) { + if(best_c == 0xFFFFFFFF) { KdPrint2((PRINT_PREFIX " empty queues\n")); return NULL; }
17 years, 2 months
1
0
0
0
[cfinck] 29286: - Add uniata to the build (it's still not copied to the ISO image) - Give it correct version information
by cfinck@svn.reactos.org
Author: cfinck Date: Sat Sep 29 01:40:45 2007 New Revision: 29286 URL:
http://svn.reactos.org/svn/reactos?rev=29286&view=rev
Log: - Add uniata to the build (it's still not copied to the ISO image) - Give it correct version information Modified: trunk/reactos/drivers/storage/ide/directory.rbuild trunk/reactos/drivers/storage/ide/uniata/idedma.rc Modified: trunk/reactos/drivers/storage/ide/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/direct…
============================================================================== --- trunk/reactos/drivers/storage/ide/directory.rbuild (original) +++ trunk/reactos/drivers/storage/ide/directory.rbuild Sat Sep 29 01:40:45 2007 @@ -10,10 +10,7 @@ <directory name="pciidex"> <xi:include href="pciidex/pciidex.rbuild" /> </directory> - - <!-- Currently excluded from build, someone else please check the driver first <directory name="uniata"> <xi:include href="uniata/uniata.rbuild" /> </directory> - --> </group> Modified: trunk/reactos/drivers/storage/ide/uniata/idedma.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/idedma.rc (original) +++ trunk/reactos/drivers/storage/ide/uniata/idedma.rc Sat Sep 29 01:40:45 2007 @@ -1,22 +1,19 @@ -#undef VERSION -#define VERSION "0." UNIATA_VER_STR -#define VER_FILETYPE VFT_DRV -#define VER_FILESUBTYPE VFT2_DRV_SYSTEM -#undef VER_COMPANYNAME_STR -#define VER_COMPANYNAME_STR "AlterWare" -#define VER_FILEDESCRIPTION_STR "Universal IDE BusMaster (DMA) Miniport Driver" -#define VER_INTERNALNAME_STR "uniata.sys\0" -#define VER_ORIGINALFILENAME_STR "uniata.sys" -#define VER_LEGALCOPYRIGHT_YEARS "1999-2004" -#define VER_LEGALCOPYRIGHT_STR "Copyright \251 AlterWare" VER_LEGALCOPYRIGHT_YEARS -#undef VER_PRODUCTNAME_STR -#define VER_PRODUCTNAME_STR "UniATA" -#undef VER_PRODUCTVERSION -#define VER_PRODUCTVERSION 0,31,2 -#undef VER_PRODUCTVERSION_STR -#define VER_PRODUCTVERSION_STR VERSION -#undef VER_LEGALTRADEMARKS_STR +#include "uniata_ver.h" -#define VER_LANGNEUTRAL +#define VERSION 0,38,2,0 +#define VERSION_STR "0." UNIATA_VER_STR + +#define REACTOS_FILETYPE VFT_DRV +#define REACTOS_FILESUBTYPE VFT2_DRV_SYSTEM +#define REACTOS_FILEVERSION VERSION +#define REACTOS_PRODUCTVERSION VERSION +#define REACTOS_STR_COMPANY_NAME "AlterWare & ReactOS Development Team" +#define REACTOS_STR_FILE_DESCRIPTION "Universal IDE BusMaster (DMA) Miniport Driver" +#define REACTOS_STR_FILE_VERSION VERSION_STR +#define REACTOS_STR_INTERNAL_NAME "uniata.sys" +#define REACTOS_STR_ORIGINAL_FILENAME "uniata.sys" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1999-2004 AlterWare, Copyright 2007 ReactOS Team" +#define REACTOS_STR_PRODUCT_NAME "UniATA Driver for ReactOS" +#define REACTOS_STR_PRODUCT_VERSION VERSION_STR #include <reactos/version.rc>
17 years, 2 months
1
0
0
0
[cfinck] 29285: Fix the uniata linking problems. Hope I did everything right :-D I still disabled building the driver, so someone else can test it first. - The i386.h, libgcc2.c, libgcc2.h, longlong.h and powerpc.h files were taken from the boot/freeldr/freeldr/math directory. They are used for 64-bit division support - Created a directory "ros_glue" for all this stuff, moved the ros_glue.cpp file there - Imported the three functions MOV_DD_SWP (the i486 version), MOV_DW2DD_SWP and MOV_DW_SWP fr
by cfinck@svn.reactos.org
Author: cfinck Date: Fri Sep 28 22:57:05 2007 New Revision: 29285 URL:
http://svn.reactos.org/svn/reactos?rev=29285&view=rev
Log: Fix the uniata linking problems. Hope I did everything right :-D I still disabled building the driver, so someone else can test it first. - The i386.h, libgcc2.c, libgcc2.h, longlong.h and powerpc.h files were taken from the boot/freeldr/freeldr/math directory. They are used for 64-bit division support - Created a directory "ros_glue" for all this stuff, moved the ros_glue.cpp file there - Imported the three functions MOV_DD_SWP (the i486 version), MOV_DW2DD_SWP and MOV_DW_SWP from the misc_i386.cpp file of CrossNt into the ros_glue_asm.s file Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ trunk/reactos/drivers/storage/ide/uniata/ros_glue/i386.h trunk/reactos/drivers/storage/ide/uniata/ros_glue/libgcc2.c trunk/reactos/drivers/storage/ide/uniata/ros_glue/libgcc2.h trunk/reactos/drivers/storage/ide/uniata/ros_glue/longlong.h trunk/reactos/drivers/storage/ide/uniata/ros_glue/powerpc.h trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s Removed: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp Modified: trunk/reactos/drivers/storage/ide/directory.rbuild trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/ide/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/direct…
Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Removed: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/i386.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/libgcc2.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/libgcc2.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/longlong.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/powerpc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue_asm.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
17 years, 2 months
1
0
0
0
[tkreuzer] 29284: - header update - add a resource
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Fri Sep 28 21:26:29 2007 New Revision: 29284 URL:
http://svn.reactos.org/svn/reactos?rev=29284&view=rev
Log: - header update - add a resource Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c trunk/rostests/apitests/w32knapi/resource/ trunk/rostests/apitests/w32knapi/resource.h trunk/rostests/apitests/w32knapi/resource/system.ico (with props) trunk/rostests/apitests/w32knapi/w32knapi.rc Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/apitests/w32knapi/w32knapi.rbuild Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,4 +1,3 @@ -#include "../w32knapi.h" INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,14 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL -APIENTRY -NtGdiDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -) -{ - return (BOOL)Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDrawLocal); -} INT Test_NtGdiDdDeleteDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,23 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL STDCALL -NtGdiDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -) -{ - return (BOOL)Syscall(L"NtGdiDdQueryDirectDrawObject", 11, &hDirectDrawLocal); -} INT Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Fri Sep 28 21:26:29 2007 @@ -1,16 +1,3 @@ - -HPALETTE -APIENTRY -NtGdiEngCreatePalette( - IN ULONG iMode, - IN ULONG cColors, - IN ULONG *pulColors, - IN FLONG flRed, - IN FLONG flGreen, - IN FLONG flBlue) -{ - return (HPALETTE)Syscall(L"NtGdiEngCreatePalette", 6, &iMode); -} INT Test_NtGdiEngCreatePalette(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Fri Sep 28 21:26:29 2007 @@ -25,7 +25,11 @@ /* We should not be able to use DeleteObject() on the handle */ TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); - // FIXME: Close the enum handle + NtGdiEnumFontClose(idEnum); + + // Test no logfont (NULL): should word + // Test empty lfFaceName string: should not work + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Fri Sep 28 21:26:29 2007 @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - INT Test_NtGdiSetBitmapBits(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c Fri Sep 28 21:26:29 2007 @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - /* First the call stub */ DWORD STDCALL NtUserCountClipboardFormats(VOID) Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c Fri Sep 28 21:26:29 2007 @@ -1,0 +1,7 @@ +INT +Test_NtUserFindExistingCursoricon(PTESTINFO pti) +{ + + return APISTATUS_NORMAL; +} + Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c Fri Sep 28 21:26:29 2007 @@ -1,0 +1,30 @@ +INT +Test_NtUserRedrawWindow(PTESTINFO pti) +{ + HWND hWnd; + RECT rect; + + hWnd = CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + ASSERT(hWnd); + + rect.left = 0; + rect.top = 0; + rect.right = 10; + rect.bottom = 10; + + TEST(NtUserRedrawWindow(hWnd, &rect, NULL, RDW_VALIDATE) == TRUE); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Added: trunk/rostests/apitests/w32knapi/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/resourc…
============================================================================== --- trunk/rostests/apitests/w32knapi/resource.h (added) +++ trunk/rostests/apitests/w32knapi/resource.h Fri Sep 28 21:26:29 2007 @@ -1,0 +1,2 @@ + +#define IDI_ICON 1000 Added: trunk/rostests/apitests/w32knapi/resource/system.ico URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/resourc…
============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/w32knapi/resource/system.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/apitests/w32knapi/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis…
============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Fri Sep 28 21:26:29 2007 @@ -20,6 +20,8 @@ #include "ntgdi/NtGdiGetDIBits.c" #include "ntuser/NtUserCountClipboardFormats.c" +#include "ntuser/NtUserFindExistingCursorIcon.c" +#include "ntuser/NtUserRedrawWindow.c" /* The List of tests */ TESTENTRY TestList[] = @@ -44,7 +46,9 @@ { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, /* ntuser */ - { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats } + { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, + { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, + { L"NtUserRedrawWindow", Test_NtUserRedrawWindow } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Fri Sep 28 21:26:29 2007 @@ -1,26 +1,29 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H +/* SDK/NDK Headers */ +#define NTOS_MODE_USER #define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define WINVER 0x501 - #include <windows.h> +#include <winuser.h> +#include <windowsx.h> +#include <winnls32.h> +#include <ndk/ntndk.h> #include <wingdi.h> #include <winddi.h> -#include <ntddk.h> #include <d3dnthal.h> #include <prntfont.h> /* Public Win32K Headers */ +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> #include <win32k/callback.h> -#include <win32k/ntusrtyp.h> #include <win32k/ntgdityp.h> +#include <ntgdi.h> #include <win32k/ntgdihdl.h> -#include <ntgdi.h> - #include "../apitest.h" +#include "resource.h" typedef struct { Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild Fri Sep 28 21:26:29 2007 @@ -2,6 +2,7 @@ <include base="w32knapi">.</include> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x501</define> <library>apitest</library> <library>kernel32</library> <library>user32</library> @@ -10,4 +11,5 @@ <library>w32kdll</library> <file>w32knapi.c</file> <file>testlist.c</file> + <file>w32knapi.rc</file> </module> Added: trunk/rostests/apitests/w32knapi/w32knapi.rc URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rc (added) +++ trunk/rostests/apitests/w32knapi/w32knapi.rc Fri Sep 28 21:26:29 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +IDI_ICON ICON "resource/system.ico" +
17 years, 2 months
1
0
0
0
[dreimer] 29283: Update r29282 to all rc files
by dreimer@svn.reactos.org
Author: dreimer Date: Fri Sep 28 20:41:59 2007 New Revision: 29283 URL:
http://svn.reactos.org/svn/reactos?rev=29283&view=rev
Log: Update r29282 to all rc files Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Fri Sep 28 20:41:59 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Fri Sep 28 20:41:59 2007 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Àäàïòåð" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Fri Sep 28 20:41:59 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Monitor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Fri Sep 28 20:41:59 2007 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ìîí³òîð" FONT 8, "MS Shell Dlg", 0, 0, 0x0
17 years, 2 months
1
0
0
0
[weiden] 29282: Fix the dialog width
by weiden@svn.reactos.org
Author: weiden Date: Fri Sep 28 20:35:34 2007 New Revision: 29282 URL:
http://svn.reactos.org/svn/reactos?rev=29282&view=rev
Log: Fix the dialog width Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Fri Sep 28 20:35:34 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon…
============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Fri Sep 28 20:35:34 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Monitor" FONT 8, "MS Shell Dlg", 0, 0, 0x0
17 years, 2 months
1
0
0
0
[tkreuzer] 29281: update export list
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Fri Sep 28 20:32:57 2007 New Revision: 29281 URL:
http://svn.reactos.org/svn/reactos?rev=29281&view=rev
Log: update export list Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…
============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Fri Sep 28 20:32:57 2007 @@ -187,29 +187,29 @@ NtGdiGetEudcTimeStampEx@12 NtGdiGetFontData@20 NtGdiGetFontResourceInfoInternalW@28 -;NtGdiGetGlyphIndicesW@20 -;NtGdiGetGlyphIndicesWInternal@24 +NtGdiGetGlyphIndicesW@20 +NtGdiGetGlyphIndicesWInternal@24 NtGdiGetGlyphOutline@32 NtGdiGetKerningPairs@12 -;NtGdiGetLinkedUFIs@12 +NtGdiGetLinkedUFIs@12 NtGdiGetMiterLimit@8 -;NtGdiGetMonitorID@12 +NtGdiGetMonitorID@12 NtGdiGetNearestColor@8 NtGdiGetNearestPaletteIndex@8 -;NtGdiGetObjectBitmapHandle@8 +NtGdiGetObjectBitmapHandle@8 NtGdiGetOutlineTextMetricsInternalW@16 NtGdiGetPath@16 NtGdiGetPixel@12 NtGdiGetRandomRgn@12 NtGdiGetRasterizerCaps@8 -;NtGdiGetRealizationInfo@12 +NtGdiGetRealizationInfo@12 NtGdiGetRegionData@12 NtGdiGetRgnBox@8 -;NtGdiGetServerMetaFileBits@28 -;NtGdiGetSpoolMessage@16 -;NtGdiGetStats@20 +NtGdiGetServerMetaFileBits@28 +NtGdiGetSpoolMessage@16 +NtGdiGetStats@20 NtGdiGetStockObject@4 -;NtGdiGetStringBitmapW@20 +NtGdiGetStringBitmapW@20 NtGdiGetSystemPaletteUse@4 NtGdiGetTextCharsetInfo@12 NtGdiGetTextExtent@20 @@ -217,28 +217,28 @@ NtGdiGetTextFaceW@16 NtGdiGetTextMetricsW@12 NtGdiGetTransform@12 -;NtGdiGetUFI@24 -;NtGdiGetEmbUFI@28 -;NtGdiGetUFIPathname@40 -;NtGdiGetEmbedFonts@0 -;NtGdiChangeGhostFont@8 -;NtGdiAddEmbFontToDC@8 -;NtGdiGetFontUnicodeRanges@8 -;NtGdiGetWidthTable@28 +NtGdiGetUFI@24 +NtGdiGetEmbUFI@28 +NtGdiGetUFIPathname@40 +NtGdiGetEmbedFonts@0 +NtGdiChangeGhostFont@8 +NtGdiAddEmbFontToDC@8 +NtGdiGetFontUnicodeRanges@8 +NtGdiGetWidthTable@28 NtGdiGradientFill@24 NtGdiHfontCreate@20 -;NtGdiIcmBrushInfo@32 -;NtGdiInit@0 -;NtGdiInitSpool@0 +NtGdiIcmBrushInfo@32 +NtGdiInit@0 +NtGdiInitSpool@0 NtGdiIntersectClipRect@20 NtGdiInvertRgn@8 NtGdiLineTo@12 -;NtGdiMakeFontDir@20 -;NtGdiMakeInfoDC@8 +NtGdiMakeFontDir@20 +NtGdiMakeInfoDC@8 NtGdiMaskBlt@52 NtGdiModifyWorldTransform@12 -;NtGdiMonoBitmap@4 -;NtGdiMoveTo@16 +NtGdiMonoBitmap@4 +NtGdiMoveTo@16 NtGdiOffsetClipRgn@12 NtGdiOffsetRgn@12 NtGdiOpenDCW@28 @@ -248,16 +248,16 @@ NtGdiPlgBlt@44 NtGdiPolyDraw@16 NtGdiPolyPolyDraw@20 -;NtGdiPolyTextOutW@16 +NtGdiPolyTextOutW@16 NtGdiPtInRegion@12 NtGdiPtVisible@12 -;NtGdiQueryFonts@12 -;NtGdiQueryFontAssocInfo@4 +NtGdiQueryFonts@12 +NtGdiQueryFontAssocInfo@4 NtGdiRectangle@20 NtGdiRectInRegion@8 NtGdiRectVisible@8 -;NtGdiRemoveFontResourceW@24 -;NtGdiRemoveFontMemResourceEx@4 +NtGdiRemoveFontResourceW@24 +NtGdiRemoveFontMemResourceEx@4 NtGdiResetDC@20 NtGdiResizePalette@8 NtGdiRestoreDC@8 @@ -265,61 +265,61 @@ NtGdiSaveDC@4 NtGdiScaleViewportExtEx@24 NtGdiScaleWindowExtEx@24 -;NtGdiSelectBitmap@8 -;NtGdiSelectBrush@8 +NtGdiSelectBitmap@8 +NtGdiSelectBrush@8 NtGdiSelectClipPath@8 -;NtGdiSelectFont@8 -;NtGdiSelectPen@8 -;NtGdiSetBitmapAttributes@8 +NtGdiSelectFont@8 +NtGdiSelectPen@8 +NtGdiSetBitmapAttributes@8 NtGdiSetBitmapBits@12 NtGdiSetBitmapDimension@16 NtGdiSetBoundsRect@12 -;NtGdiSetBrushAttributes@8 +NtGdiSetBrushAttributes@8 NtGdiSetBrushOrg@16 NtGdiSetColorAdjustment@8 NtGdiSetColorSpace@8 NtGdiSetDeviceGammaRamp@8 NtGdiSetDIBitsToDeviceInternal@64 -;NtGdiSetFontEnumeration@4 -;NtGdiSetFontXform@12 +NtGdiSetFontEnumeration@4 +NtGdiSetFontXform@12 NtGdiSetIcmMode@12 -;NtGdiSetLinkedUFIs@12 -;NtGdiSetMagicColors@12 +NtGdiSetLinkedUFIs@12 +NtGdiSetMagicColors@12 NtGdiSetMetaRgn@4 NtGdiSetMiterLimit@12 -;NtGdiGetDeviceWidth@4 -;NtGdiMirrorWindowOrg@4 -;NtGdiSetLayout@12 +NtGdiGetDeviceWidth@4 +NtGdiMirrorWindowOrg@4 +NtGdiSetLayout@12 NtGdiSetPixel@16 NtGdiSetPixelFormat@8 NtGdiSetRectRgn@20 NtGdiSetSystemPaletteUse@8 NtGdiSetTextJustification@12 -;NtGdiSetupPublicCFONT@12 -;NtGdiSetVirtualResolution@20 -;NtGdiSetSizeDevice@12 +NtGdiSetupPublicCFONT@12 +NtGdiSetVirtualResolution@20 +NtGdiSetSizeDevice@12 NtGdiStartDoc@16 NtGdiStartPage@4 NtGdiStretchBlt@48 -;NtGdiStretchDIBitsInternal@64 +NtGdiStretchDIBitsInternal@64 NtGdiStrokeAndFillPath@4 NtGdiStrokePath@4 NtGdiSwapBuffers@4 NtGdiTransformPoints@20 NtGdiTransparentBlt@44 -;NtGdiUnloadPrinterDriver@8 -;NtGdiUnmapMemFont@4 +NtGdiUnloadPrinterDriver@8 +NtGdiUnmapMemFont@4 NtGdiUnrealizeObject@4 NtGdiUpdateColors@4 NtGdiWidenPath@4 NtUserActivateKeyboardLayout@8 NtUserAlterWindowStyle@12 -;NtUserAssociateInputContext@12 +NtUserAssociateInputContext@12 NtUserAttachThreadInput@12 NtUserBeginPaint@8 NtUserBitBltSysBmp@32 NtUserBlockInput@4 -;NtUserBuildHimcList@16 +NtUserBuildHimcList@16 NtUserBuildHwndList@28 NtUserBuildNameList@16 NtUserBuildPropList@16 @@ -335,24 +335,24 @@ NtUserCallTwoParam@12 NtUserChangeClipboardChain@8 NtUserChangeDisplaySettings@20 -;NtUserCheckImeHotKey@8 +NtUserCheckImeHotKey@8 NtUserCheckMenuItem@12 NtUserChildWindowFromPointEx@16 NtUserClipCursor@4 NtUserCloseClipboard@0 NtUserCloseDesktop@4 NtUserCloseWindowStation@4 -;NtUserConsoleControl@12 +NtUserConsoleControl@12 NtUserConvertMemHandle@8 NtUserCopyAcceleratorTable@12 NtUserCountClipboardFormats@0 NtUserCreateAcceleratorTable@8 NtUserCreateCaret@16 NtUserCreateDesktop@20 -;NtUserCreateInputContext@4 +NtUserCreateInputContext@4 NtUserCreateLocalMemHandle@16 -;NtUserCreateWindowEx@60 -;NtUserCreateWindowStation@28 +NtUserCreateWindowEx@60 +NtUserCreateWindowStation@28 NtUserDdeGetQualityOfService@12 NtUserDdeInitialize@20 NtUserDdeSetQualityOfService@12 @@ -360,11 +360,11 @@ NtUserDefSetText@8 NtUserDeleteMenu@12 NtUserDestroyAcceleratorTable@4 -;NtUserDestroyCursor@8 -;NtUserDestroyInputContext@4 +NtUserDestroyCursor@8 +NtUserDestroyInputContext@4 NtUserDestroyMenu@4 NtUserDestroyWindow@4 -;NtUserDisableThreadIme@4 +NtUserDisableThreadIme@4 NtUserDispatchMessage@4 NtUserDragDetect@12 NtUserDragObject@20 @@ -386,13 +386,13 @@ NtUserExcludeUpdateRgn@8 NtUserFillWindow@16 ;NtUserFindExistingCursorIcon@12 -;NtUserFindWindowEx@20 +NtUserFindWindowEx@20 NtUserFlashWindowEx@4 NtUserGetAltTabInfo@24 NtUserGetAncestor@8 ;NtUserGetAppImeLevel@4 NtUserGetAsyncKeyState@4 -;NtUserGetAtomName@8 +NtUserGetAtomName@8 NtUserGetCaretBlinkTime@0 NtUserGetCaretPos@4 ;NtUserGetClassInfo@20 @@ -415,10 +415,10 @@ NtUserGetForegroundWindow@0 NtUserGetGuiResources@8 NtUserGetGUIThreadInfo@8 -;NtUserGetIconInfo@24 -;NtUserGetIconSize@16 +NtUserGetIconInfo@24 +NtUserGetIconSize@16 NtUserGetImeHotKey@16 -;NtUserGetImeInfoEx@8 +NtUserGetImeInfoEx@8 NtUserGetInternalWindowPos@12 NtUserGetKeyboardLayoutList@8 NtUserGetKeyboardLayoutName@4 @@ -435,11 +435,11 @@ NtUserGetOpenClipboardWindow@0 NtUserGetPriorityClipboardFormat@8 NtUserGetProcessWindowStation@0 -;NtUserGetRawInputBuffer@12 -;NtUserGetRawInputData@20 -;NtUserGetRawInputDeviceInfo@16 -;NtUserGetRawInputDeviceList@12 -;NtUserGetRegisteredRawInputDevices@12 +NtUserGetRawInputBuffer@12 +NtUserGetRawInputData@20 +NtUserGetRawInputDeviceInfo@16 +NtUserGetRawInputDeviceList@12 +NtUserGetRegisteredRawInputDevices@12 NtUserGetScrollBarInfo@12 NtUserGetSystemMenu@8 NtUserGetThreadDesktop@8 @@ -450,11 +450,11 @@ NtUserGetWindowDC@4 NtUserGetWindowPlacement@8 NtUserGetWOWClass@8 -;NtUserHardErrorControl@12 +NtUserHardErrorControl@12 NtUserHideCaret@4 NtUserHiliteMenuItem@16 NtUserImpersonateDdeClientWindow@8 -;NtUserInitialize@12 +NtUserInitialize@12 NtUserInitializeClientPfnArrays@16 ;NtUserInitTask@48 NtUserInternalGetWindowText@12 @@ -469,13 +469,13 @@ NtUserMapVirtualKeyEx@16 NtUserMenuItemFromPoint@16 NtUserMessageCall@28 -;NtUserMinMaximize@12 +NtUserMinMaximize@12 NtUserMNDragLeave@0 NtUserMNDragOver@8 NtUserModifyUserStartupInfoFlags@8 NtUserMoveWindow@24 NtUserNotifyIMEStatus@12 -;NtUserNotifyProcessCreate@16 +NtUserNotifyProcessCreate@16 NtUserNotifyWinEvent@16 NtUserOpenClipboard@8 NtUserOpenDesktop@12 @@ -485,34 +485,34 @@ NtUserPeekMessage@20 NtUserPostMessage@16 NtUserPostThreadMessage@16 -;NtUserPrintWindow@12 -;NtUserProcessConnect@12 -;NtUserQueryInformationThread@20 -;NtUserQueryInputContext@8 +NtUserPrintWindow@12 +NtUserProcessConnect@12 +NtUserQueryInformationThread@20 +NtUserQueryInputContext@8 NtUserQuerySendMessage@4 NtUserQueryUserCounters@20 NtUserQueryWindow@8 NtUserRealChildWindowFromPoint@12 -;NtUserRealInternalGetMessage@24 -;NtUserRealWaitMessageEx@8 +NtUserRealInternalGetMessage@24 +NtUserRealWaitMessageEx@8 NtUserRedrawWindow@16 -;NtUserRegisterClassExWOW@28 -;NtUserRegisterUserApiHook@8 +NtUserRegisterClassExWOW@28 +NtUserRegisterUserApiHook@8 NtUserRegisterHotKey@16 -;NtUserRegisterRawInputDevices@12 +NtUserRegisterRawInputDevices@12 NtUserRegisterTasklist@4 NtUserRegisterWindowMessage@4 NtUserRemoveMenu@12 NtUserRemoveProp@8 -;NtUserResolveDesktop@16 +NtUserResolveDesktop@16 NtUserResolveDesktopForWOW@4 NtUserSBGetParms@16 NtUserScrollDC@28 NtUserScrollWindowEx@32 -;NtUserSelectPalette@12 +NtUserSelectPalette@12 NtUserSendInput@12 NtUserSetActiveWindow@4 -;NtUserSetAppImeLevel@8 +NtUserSetAppImeLevel@8 NtUserSetCapture@4 NtUserSetClassLong@16 NtUserSetClassWord@12 @@ -520,15 +520,15 @@ NtUserSetClipboardViewer@4 NtUserSetConsoleReserveKeys@8 NtUserSetCursor@4 -;NtUserSetCursorContents@8 +NtUserSetCursorContents@8 ;NtUserSetCursorIconData@16 NtUserSetDbgTag@8 NtUserSetFocus@4 NtUserSetImeHotKey@20 -;NtUserSetImeInfoEx@4 +NtUserSetImeInfoEx@4 NtUserSetImeOwnerWindow@8 -;NtUserSetInformationProcess@16 -;NtUserSetInformationThread@16 +NtUserSetInformationProcess@16 +NtUserSetInformationThread@16 NtUserSetInternalWindowPos@16 NtUserSetKeyboardState@4 NtUserSetLogonNotifyWindow@4 @@ -548,7 +548,7 @@ NtUserSetSystemMenu@8 NtUserSetSystemTimer@16 NtUserSetThreadDesktop@4 -;NtUserSetThreadLayoutHandles@8 +NtUserSetThreadLayoutHandles@8 NtUserSetThreadState@8 NtUserSetTimer@16 NtUserSetWindowFNID@8 @@ -565,17 +565,17 @@ NtUserShowScrollBar@12 NtUserShowWindow@8 NtUserShowWindowAsync@8 -;NtUserSoundSentry@0 +NtUserSoundSentry@0 NtUserSwitchDesktop@4 NtUserSystemParametersInfo@16 -;NtUserTestForInteractiveUser@4 +NtUserTestForInteractiveUser@4 NtUserThunkedMenuInfo@8 NtUserThunkedMenuItemInfo@24 NtUserToUnicodeEx@28 NtUserTrackMouseEvent@4 NtUserTrackPopupMenuEx@24 -;NtUserCalcMenuBar@20 -;NtUserPaintMenuBar@24 +NtUserCalcMenuBar@20 +NtUserPaintMenuBar@24 NtUserTranslateAccelerator@12 NtUserTranslateMessage@8 NtUserUnhookWindowsHookEx@4 @@ -583,18 +583,18 @@ NtUserUnloadKeyboardLayout@4 NtUserUnlockWindowStation@4 ;NtUserUnregisterClass@12 -;NtUserUnregisterUserApiHook@0 +NtUserUnregisterUserApiHook@0 NtUserUnregisterHotKey@8 NtUserUpdateInputContext@12 NtUserUpdateInstance@12 NtUserUpdateLayeredWindow@36 -;NtUserGetLayeredWindowAttributes@16 +NtUserGetLayeredWindowAttributes@16 NtUserSetLayeredWindowAttributes@16 NtUserUpdatePerUserSystemParameters@8 NtUserUserHandleGrantAccess@12 -;NtUserValidateHandleSecure@8 -;NtUserValidateRect@8 -;NtUserValidateTimerCallback@12 +NtUserValidateHandleSecure@8 +NtUserValidateRect@8 +NtUserValidateTimerCallback@12 NtUserVkKeyScanEx@12 NtUserWaitForInputIdle@12 NtUserWaitForMsgAndEvent@4 @@ -602,78 +602,78 @@ NtUserWin32PoolAllocationStats@24 NtUserWindowFromPoint@8 NtUserYieldTask@0 -;NtUserRemoteConnect@12 -;NtUserRemoteRedrawRectangle@16 -;NtUserRemoteRedrawScreen@0 -;NtUserRemoteStopScreenUpdates@0 -;NtUserCtxDisplayIOCtl@12 -;NtGdiEngAssociateSurface@12 -;NtGdiEngCreateBitmap@24 -;NtGdiEngCreateDeviceSurface@16 -;NtGdiEngCreateDeviceBitmap@16 -;NtGdiEngCreatePalette@24 -;NtGdiEngComputeGlyphSet@12 -;NtGdiEngCopyBits@24 -;NtGdiEngDeletePalette@4 -;NtGdiEngDeleteSurface@4 -;NtGdiEngEraseSurface@12 -;NtGdiEngUnlockSurface@4 +NtUserRemoteConnect@12 +NtUserRemoteRedrawRectangle@16 +NtUserRemoteRedrawScreen@0 +NtUserRemoteStopScreenUpdates@0 +NtUserCtxDisplayIOCtl@12 +NtGdiEngAssociateSurface@12 +NtGdiEngCreateBitmap@24 +NtGdiEngCreateDeviceSurface@16 +NtGdiEngCreateDeviceBitmap@16 +NtGdiEngCreatePalette@24 +NtGdiEngComputeGlyphSet@12 +NtGdiEngCopyBits@24 +NtGdiEngDeletePalette@4 +NtGdiEngDeleteSurface@4 +NtGdiEngEraseSurface@12 +NtGdiEngUnlockSurface@4 NtGdiEngLockSurface@4 NtGdiEngBitBlt@44 NtGdiEngStretchBlt@44 -;NtGdiEngPlgBlt@44 -;NtGdiEngMarkBandingSurface@4 -;NtGdiEngStrokePath@32 -;NtGdiEngFillPath@28 -;NtGdiEngStrokeAndFillPath@40 -;NtGdiEngPaint@20 -;NtGdiEngLineTo@36 +NtGdiEngPlgBlt@44 +NtGdiEngMarkBandingSurface@4 +NtGdiEngStrokePath@32 +NtGdiEngFillPath@28 +NtGdiEngStrokeAndFillPath@40 +NtGdiEngPaint@20 +NtGdiEngLineTo@36 NtGdiEngAlphaBlend@28 -;NtGdiEngGradientFill@40 -;NtGdiEngTransparentBlt@32 -;NtGdiEngTextOut@40 -;NtGdiEngStretchBltROP@52 -;NtGdiXLATEOBJ_cGetPalette@16 -;NtGdiXLATEOBJ_iXlate@8 -;NtGdiXLATEOBJ_hGetColorTransform@4 -;NtGdiCLIPOBJ_bEnum@12 -;NtGdiCLIPOBJ_cEnumStart@20 -;NtGdiCLIPOBJ_ppoGetPath@4 -;NtGdiEngDeletePath@4 -;NtGdiEngCreateClip@0 -;NtGdiEngDeleteClip@4 -;NtGdiBRUSHOBJ_ulGetBrushColor@4 -;NtGdiBRUSHOBJ_pvAllocRbrush@8 -;NtGdiBRUSHOBJ_pvGetRbrush@4 -;NtGdiBRUSHOBJ_hGetColorTransform@4 -;NtGdiXFORMOBJ_bApplyXform@20 -;NtGdiXFORMOBJ_iGetXform@8 -;NtGdiFONTOBJ_vGetInfo@12 -;NtGdiFONTOBJ_pxoGetXform@4 -;NtGdiFONTOBJ_cGetGlyphs@20 -;NtGdiFONTOBJ_pifi@4 -;NtGdiFONTOBJ_pfdg@4 -;NtGdiFONTOBJ_pQueryGlyphAttrs@8 -;NtGdiFONTOBJ_pvTrueTypeFontFile@8 -;NtGdiFONTOBJ_cGetAllGlyphHandles@8 -;NtGdiSTROBJ_bEnum@12 -;NtGdiSTROBJ_bEnumPositionsOnly@12 -;NtGdiSTROBJ_bGetAdvanceWidths@16 -;NtGdiSTROBJ_vEnumStart@4 -;NtGdiSTROBJ_dwGetCodePage@4 -;NtGdiPATHOBJ_vGetBounds@8 -;NtGdiPATHOBJ_bEnum@8 -;NtGdiPATHOBJ_vEnumStart@4 -;NtGdiPATHOBJ_vEnumStartClipLines@16 -;NtGdiPATHOBJ_bEnumClipLines@12 -;NtGdiGetDhpdev@4 -;NtGdiEngCheckAbort@4 -;NtGdiHT_Get8BPPFormatPalette@16 -;NtGdiHT_Get8BPPMaskPalette@24 -;NtGdiUpdateTransform@4 -;NtGdiSetPUMPDOBJ@16 -;NtGdiBRUSHOBJ_DeleteRbrush@8 -;NtGdiUMPDEngFreeUserMem@4 -;NtGdiUnmapMemFont@4 -;NtGdiDrawStream@12 +NtGdiEngGradientFill@40 +NtGdiEngTransparentBlt@32 +NtGdiEngTextOut@40 +NtGdiEngStretchBltROP@52 +NtGdiXLATEOBJ_cGetPalette@16 +NtGdiXLATEOBJ_iXlate@8 +NtGdiXLATEOBJ_hGetColorTransform@4 +NtGdiCLIPOBJ_bEnum@12 +NtGdiCLIPOBJ_cEnumStart@20 +NtGdiCLIPOBJ_ppoGetPath@4 +NtGdiEngDeletePath@4 +NtGdiEngCreateClip@0 +NtGdiEngDeleteClip@4 +NtGdiBRUSHOBJ_ulGetBrushColor@4 +NtGdiBRUSHOBJ_pvAllocRbrush@8 +NtGdiBRUSHOBJ_pvGetRbrush@4 +NtGdiBRUSHOBJ_hGetColorTransform@4 +NtGdiXFORMOBJ_bApplyXform@20 +NtGdiXFORMOBJ_iGetXform@8 +NtGdiFONTOBJ_vGetInfo@12 +NtGdiFONTOBJ_pxoGetXform@4 +NtGdiFONTOBJ_cGetGlyphs@20 +NtGdiFONTOBJ_pifi@4 +NtGdiFONTOBJ_pfdg@4 +NtGdiFONTOBJ_pQueryGlyphAttrs@8 +NtGdiFONTOBJ_pvTrueTypeFontFile@8 +NtGdiFONTOBJ_cGetAllGlyphHandles@8 +NtGdiSTROBJ_bEnum@12 +NtGdiSTROBJ_bEnumPositionsOnly@12 +NtGdiSTROBJ_bGetAdvanceWidths@16 +NtGdiSTROBJ_vEnumStart@4 +NtGdiSTROBJ_dwGetCodePage@4 +NtGdiPATHOBJ_vGetBounds@8 +NtGdiPATHOBJ_bEnum@8 +NtGdiPATHOBJ_vEnumStart@4 +NtGdiPATHOBJ_vEnumStartClipLines@16 +NtGdiPATHOBJ_bEnumClipLines@12 +NtGdiGetDhpdev@4 +NtGdiEngCheckAbort@4 +NtGdiHT_Get8BPPFormatPalette@16 +NtGdiHT_Get8BPPMaskPalette@24 +NtGdiUpdateTransform@4 +NtGdiSetPUMPDOBJ@16 +NtGdiBRUSHOBJ_DeleteRbrush@8 +NtGdiUMPDEngFreeUserMem@4 +NtGdiUnmapMemFont@4 +NtGdiDrawStream@12
17 years, 2 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
...
59
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Results per page:
10
25
50
100
200