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
October 2008
----- 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
25 participants
517 discussions
Start a n
N
ew thread
[janderwald] 37091: - Convert recovery option dialog to unicode - Simply & optimize LoadRecoveryOptions function - CID 786
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Oct 30 05:46:55 2008 New Revision: 37091 URL:
http://svn.reactos.org/svn/reactos?rev=37091&view=rev
Log: - Convert recovery option dialog to unicode - Simply & optimize LoadRecoveryOptions function - CID 786 Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r…
============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Thu Oct 30 05:46:55 2008 @@ -12,9 +12,9 @@ typedef struct _STARTINFO { - TCHAR szFreeldrIni[MAX_PATH + 15]; - TCHAR szDumpFile[MAX_PATH]; - TCHAR szMinidumpDir[MAX_PATH]; + WCHAR szFreeldrIni[MAX_PATH + 15]; + WCHAR szDumpFile[MAX_PATH]; + WCHAR szMinidumpDir[MAX_PATH]; DWORD dwCrashDumpEnabled; INT iFreeLdrIni; } STARTINFO, *PSTARTINFO; @@ -33,8 +33,8 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTEDIT), TRUE); } - SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); - SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } static VOID @@ -50,33 +50,33 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECUPDWN), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECEDIT), TRUE); } - SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); - SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } static DWORD -GetSystemDrive(TCHAR **szSystemDrive) +GetSystemDrive(WCHAR **szSystemDrive) { DWORD dwBufSize; /* get Path to freeldr.ini or boot.ini */ - *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); + *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if (szSystemDrive != NULL) { - dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, MAX_PATH); + dwBufSize = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, MAX_PATH); if (dwBufSize > MAX_PATH) { - TCHAR *szTmp; + WCHAR *szTmp; DWORD dwBufSize2; - szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(TCHAR)); + szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(WCHAR)); if (szTmp == NULL) goto FailGetSysDrive; *szSystemDrive = szTmp; - dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, dwBufSize); + dwBufSize2 = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, dwBufSize); if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) goto FailGetSysDrive; } @@ -95,15 +95,15 @@ } static PBOOTRECORD -ReadFreeldrSection(HINF hInf, TCHAR *szSectionName) +ReadFreeldrSection(HINF hInf, WCHAR *szSectionName) { PBOOTRECORD pRecord; INFCONTEXT InfContext; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; - if (!SetupFindFirstLine(hInf, + if (!SetupFindFirstLineW(hInf, szSectionName, NULL, &InfContext)) @@ -118,31 +118,31 @@ return NULL; } - _tcscpy(pRecord->szSectionName, szSectionName); + wcscpy(pRecord->szSectionName, szSectionName); do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { break; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { break; } - if (!_tcsnicmp(szName, _T("BootType"), 8)) - { - if (!_tcsnicmp(szValue, _T("ReactOS"), 7)) + if (!wcsnicmp(szName, L"BootType", 8)) + { + if (!wcsnicmp(szValue, L"ReactOS", 7)) { //FIXME store as enum pRecord->BootType = 1; @@ -152,14 +152,14 @@ pRecord->BootType = 0; } } - else if (!_tcsnicmp(szName, _T("SystemPath"), 10)) - { - _tcscpy(pRecord->szBootPath, szValue); - } - else if (!_tcsnicmp(szName, _T("Options"), 7)) + else if (!wcsnicmp(szName, L"SystemPath", 10)) + { + wcscpy(pRecord->szBootPath, szValue); + } + else if (!wcsnicmp(szName, L"Options", 7)) { //FIXME store flags as values - _tcscpy(pRecord->szOptions, szValue); + wcscpy(pRecord->szOptions, szValue); } } @@ -174,35 +174,35 @@ { INFCONTEXT InfContext; PBOOTRECORD pRecord; - TCHAR szDefaultOs[MAX_PATH]; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szDefaultOs[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; DWORD TimeOut; LRESULT lResult; - if (!SetupFindFirstLine(hInf, - _T("FREELOADER"), - _T("DefaultOS"), + if (!SetupFindFirstLineW(hInf, + L"FREELOADER", + L"DefaultOS", &InfContext)) { /* failed to find default os */ return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szDefaultOs, - sizeof(szDefaultOs) / sizeof(TCHAR), + sizeof(szDefaultOs) / sizeof(WCHAR), &LineLength)) { /* no key */ return FALSE; } - if (!SetupFindFirstLine(hInf, - _T("FREELOADER"), - _T("TimeOut"), + if (!SetupFindFirstLineW(hInf, + L"FREELOADER", + L"TimeOut", &InfContext)) { /* expected to find timeout value */ @@ -218,8 +218,8 @@ return FALSE; } - if (!SetupFindFirstLine(hInf, - _T("Operating Systems"), + if (!SetupFindFirstLineW(hInf, + L"Operating Systems", NULL, &InfContext)) { @@ -229,20 +229,20 @@ do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { /* the ini file is messed up */ return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { /* the ini file is messed up */ @@ -252,14 +252,14 @@ pRecord = ReadFreeldrSection(hInf, szName); if (pRecord) { - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); - if (!_tcscmp(szDefaultOs, szName)) + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + if (!wcscmp(szDefaultOs, szName)) { /* we store the friendly name as key */ - _tcscpy(szDefaultOs, szValue); + wcscpy(szDefaultOs, szValue); } } else @@ -271,16 +271,16 @@ while (SetupFindNextLine(&InfContext, &InfContext)); /* find default os in list */ - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); if (lResult != CB_ERR) { /* set cur sel */ - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } if(TimeOut) { - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut); @@ -292,17 +292,17 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) { INFCONTEXT InfContext; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; DWORD TimeOut = 0; - TCHAR szDefaultOS[MAX_PATH]; - TCHAR szOptions[MAX_PATH]; + WCHAR szDefaultOS[MAX_PATH]; + WCHAR szOptions[MAX_PATH]; PBOOTRECORD pRecord; LRESULT lResult; - if(!SetupFindFirstLine(hInf, - _T("boot loader"), + if(!SetupFindFirstLineW(hInf, + L"boot loader", NULL, &InfContext)) { @@ -311,39 +311,39 @@ do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!_tcsnicmp(szName, _T("timeout"), 7)) - { - TimeOut = _ttoi(szValue); - } - - if (!_tcsnicmp(szName, _T("default"), 7)) - { - _tcscpy(szDefaultOS, szValue); + if (!wcsnicmp(szName, L"timeout", 7)) + { + TimeOut = _wtoi(szValue); + } + + if (!wcsnicmp(szName, L"default", 7)) + { + wcscpy(szDefaultOS, szValue); } } while (SetupFindNextLine(&InfContext, &InfContext)); - if (!SetupFindFirstLine(hInf, - _T("operating systems"), + if (!SetupFindFirstLineW(hInf, + L"operating systems", NULL, &InfContext)) { @@ -353,48 +353,48 @@ do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { return FALSE; } - SetupGetStringField(&InfContext, + SetupGetStringFieldW(&InfContext, 2, szOptions, - sizeof(szOptions) / sizeof(TCHAR), + sizeof(szOptions) / sizeof(WCHAR), &LineLength); pRecord = (PBOOTRECORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); if (pRecord) { pRecord->BootType = 0; - _tcscpy(pRecord->szBootPath, szName); - _tcscpy(pRecord->szSectionName, szValue); - _tcscpy(pRecord->szOptions, szOptions); - - if (!_tcscmp(szName, szDefaultOS)) + wcscpy(pRecord->szBootPath, szName); + wcscpy(pRecord->szSectionName, szValue); + wcscpy(pRecord->szOptions, szOptions); + + if (!wcscmp(szName, szDefaultOS)) { /* ms boot ini stores the path not the friendly name */ - _tcscpy(szDefaultOS, szValue); + wcscpy(szDefaultOS, szValue); } - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); } else { @@ -406,16 +406,16 @@ while (SetupFindNextLine(&InfContext, &InfContext)); /* find default os in list */ - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); if (lResult != CB_ERR) { /* set cur sel */ - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } if(TimeOut) { - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut); @@ -430,40 +430,40 @@ LONG index; PBOOTRECORD pRecord; - lIndex = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + lIndex = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); if (lIndex == CB_ERR) return; for (index = 0; index <lIndex; index++) { - pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0); + pRecord = (PBOOTRECORD) SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0); if ((INT)pRecord != CB_ERR) { HeapFree(GetProcessHeap(), 0, pRecord); } } - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0); } static LRESULT LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo) { DWORD dwBufSize; - TCHAR *szSystemDrive; + WCHAR *szSystemDrive; HINF hInf; dwBufSize = GetSystemDrive(&szSystemDrive); if (!dwBufSize) return FALSE; - _tcscpy(pStartInfo->szFreeldrIni, szSystemDrive); - _tcscat(pStartInfo->szFreeldrIni, _T("\\freeldr.ini")); - - if (PathFileExists(pStartInfo->szFreeldrIni)) + wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); + wcscat(pStartInfo->szFreeldrIni, L"\\freeldr.ini"); + + if (PathFileExistsW(pStartInfo->szFreeldrIni)) { /* freeldr.ini exists */ - hInf = SetupOpenInfFile(pStartInfo->szFreeldrIni, + hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, INF_STYLE_OLDNT, NULL); @@ -479,13 +479,13 @@ } /* try load boot.ini settings */ - _tcscpy(pStartInfo->szFreeldrIni, szSystemDrive); - _tcscat(pStartInfo->szFreeldrIni, _T("\\boot.ini")); - - if (PathFileExists(pStartInfo->szFreeldrIni)) + wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); + wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini"); + + if (PathFileExistsW(pStartInfo->szFreeldrIni)) { /* load boot.ini settings */ - hInf = SetupOpenInfFile(pStartInfo->szFreeldrIni, + hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, INF_STYLE_OLDNT, NULL); @@ -518,16 +518,16 @@ /* minidump type */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); - SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir); + SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir); } else if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { /* kernel or complete dump */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE); - SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile); - } - SendDlgItemMessage(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)pStartInfo->dwCrashDumpEnabled, (LPARAM)0); + SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile); + } + SendDlgItemMessageW(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)pStartInfo->dwCrashDumpEnabled, (LPARAM)0); } static VOID @@ -536,8 +536,8 @@ HKEY hKey; DWORD lResult; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("System\\CurrentControlSet\\Control\\CrashControl"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) @@ -547,30 +547,30 @@ } lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("LogEvent"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"LogEvent", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("SendAlert"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"SendAlert", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("AutoReboot"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"AutoReboot", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("Overwrite"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"Overwrite", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); - RegSetValueEx(hKey, _T("DumpFile"), 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (_tcslen(pStartInfo->szDumpFile) + 1) * sizeof(TCHAR)); + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); + RegSetValueExW(hKey, L"DumpFile", 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (wcslen(pStartInfo->szDumpFile) + 1) * sizeof(WCHAR)); } else if (pStartInfo->dwCrashDumpEnabled == 3) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); - RegSetValueEx(hKey, _T("MinidumpDir"), 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (_tcslen(pStartInfo->szDumpFile) + 1) * sizeof(TCHAR)); - } - - RegSetValueEx(hKey, _T("CrashDumpEnabled"), 0, REG_DWORD, (LPBYTE)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); + RegSetValueExW(hKey, L"MinidumpDir", 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (wcslen(pStartInfo->szDumpFile) + 1) * sizeof(WCHAR)); + } + + RegSetValueExW(hKey, L"CrashDumpEnabled", 0, REG_DWORD, (LPBYTE)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); RegCloseKey(hKey); } @@ -578,13 +578,11 @@ LoadRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) { HKEY hKey; - DWORD dwValues; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; - DWORD i, dwName, dwValue, dwValueLength, dwType; + WCHAR szName[MAX_PATH]; + DWORD dwValue, dwValueLength, dwType; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("System\\CurrentControlSet\\Control\\CrashControl"), + L"System\\CurrentControlSet\\Control\\CrashControl", 0, KEY_READ, &hKey) != ERROR_SUCCESS) @@ -593,88 +591,57 @@ return; } - if (RegQueryInfoKey(hKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - NULL, - NULL, - NULL, - NULL) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return; - } - - for (i = 0; i < dwValues; i++) - { - dwName = sizeof(szName) / sizeof(TCHAR); - - RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, NULL, NULL); - if (dwType == REG_DWORD) - { - dwValueLength = sizeof(dwValue); - dwName = sizeof(szName) / sizeof(TCHAR); - if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) != ERROR_SUCCESS) - continue; - } - else - { - dwValueLength = sizeof(szValue); - dwName = sizeof(szName) / sizeof(TCHAR); - if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&szValue, &dwValueLength) != ERROR_SUCCESS) - continue; - } - - if (!_tcscmp(szName, _T("LogEvent"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("SendAlert"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("AutoReboot"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("Overwrite"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("DumpFile"))) - { - _tcscpy(pStartInfo->szDumpFile, szValue); - } - else if (!_tcscmp(szName, _T("MinidumpDir"))) - { - _tcscpy(pStartInfo->szMinidumpDir, szValue); - } - else if (!_tcscmp(szName, _T("CrashDumpEnabled"))) - { - pStartInfo->dwCrashDumpEnabled = dwValue; - } - } - - if (LoadString(hApplet, IDS_NO_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); - - if (LoadString(hApplet, IDS_FULL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); - - if (LoadString(hApplet, IDS_KERNEL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); - - if (LoadString(hApplet, IDS_MINI_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"LogEvent", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECWRITEEVENT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"SendAlert", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECSENDALERT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"AutoReboot", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECRESTART, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"Overwrite", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECOVERWRITE, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"CrashDumpEnabled", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + pStartInfo->dwCrashDumpEnabled = dwValue; + + dwValueLength = sizeof(pStartInfo->szDumpFile); + if (RegQueryValueExW(hKey, L"DumpFile", NULL, &dwType, (LPBYTE)pStartInfo->szDumpFile, &dwValueLength) != ERROR_SUCCESS) + pStartInfo->szDumpFile[0] = L'\0'; + + dwValueLength = sizeof(pStartInfo->szMinidumpDir); + if (RegQueryValueExW(hKey, L"MinidumpDir", NULL, &dwType, (LPBYTE)pStartInfo->szMinidumpDir, &dwValueLength) != ERROR_SUCCESS) + pStartInfo->szMinidumpDir[0] = L'\0'; + + if (LoadStringW(hApplet, IDS_NO_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } + + if (LoadString(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } + + if (LoadStringW(hApplet, IDS_KERNEL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } + + if (LoadStringW(hApplet, IDS_MINI_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } SetCrashDlgItems(hwndDlg, pStartInfo); RegCloseKey(hKey); @@ -692,7 +659,7 @@ PBOOTRECORD pRecord; int iTimeout; LRESULT lResult; - TCHAR szTimeout[10]; + WCHAR szTimeout[10]; UNREFERENCED_PARAMETER(lParam); @@ -717,7 +684,7 @@ switch(LOWORD(wParam)) { case IDC_STRRECEDIT: - ShellExecute(0, _T("open"), _T("notepad"), pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL); + ShellExecuteW(0, L"open", L"notepad", pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL); // FIXME use CreateProcess and wait untill finished // DeleteBootRecords(hwndDlg); // LoadOSList(hwndDlg); @@ -729,9 +696,9 @@ iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); else iTimeout = 0; - _stprintf(szTimeout, _T("%i"), iTimeout); - - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + swprintf(szTimeout, L"%i", iTimeout); + + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (lResult == CB_ERR) { /* ? */ @@ -746,13 +713,13 @@ if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style { /* set default timeout */ - WritePrivateProfileString(_T("FREELOADER"), - _T("TimeOut"), + WritePrivateProfileStringW(L"FREELOADER", + L"TimeOut", szTimeout, pStartInfo->szFreeldrIni); /* set default os */ - WritePrivateProfileString(_T("FREELOADER"), - _T("DefaultOS"), + WritePrivateProfileStringW(L"FREELOADER", + L"DefaultOS", pRecord->szSectionName, pStartInfo->szFreeldrIni); @@ -760,13 +727,13 @@ else if (pStartInfo->iFreeLdrIni == 2) // BootIni style { /* set default timeout */ - WritePrivateProfileString(_T("boot loader"), - _T("timeout"), + WritePrivateProfileStringW(L"boot loader", + L"timeout", szTimeout, pStartInfo->szFreeldrIni); /* set default os */ - WritePrivateProfileString(_T("boot loader"), - _T("default"), + WritePrivateProfileStringW(L"boot loader", + L"default", pRecord->szBootPath, pStartInfo->szFreeldrIni); @@ -807,11 +774,11 @@ { if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); + SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); } else if (pStartInfo->dwCrashDumpEnabled == 3) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(TCHAR), (LPARAM)pStartInfo->szMinidumpDir); + SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); } pStartInfo->dwCrashDumpEnabled = lResult;
16 years, 1 month
1
0
0
0
[jimtabor] 37090: - Implemented: GetFontLanguageInfo based on wine. GetLanguageID, it reads the registry for default language type. - Move more function in and out of freetype.c. Minor code fixes too.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Thu Oct 30 05:46:27 2008 New Revision: 37090 URL:
http://svn.reactos.org/svn/reactos?rev=37090&view=rev
Log: - Implemented: GetFontLanguageInfo based on wine. GetLanguageID, it reads the registry for default language type. - Move more function in and out of freetype.c. Minor code fixes too. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -518,6 +518,8 @@ XlateGDI = ObjToGDI(XlateObj, XLATE); + if (!XlateGDI) return; + if ((XlateObj->flXlate & XO_TABLE) && XlateObj->pulXlate != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -31,6 +31,9 @@ #define W32PF_CREATEDWINORDC (0x04000000) +extern SHORT gusLanguageID; + +SHORT FASTCALL IntGdiGetLanguageID(); ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); VOID FASTCALL IntUserManualGuiCheck(LONG Check); Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -84,6 +84,14 @@ INT FASTCALL FontGetObject(PTEXTOBJ TextObj, INT Count, PVOID Buffer); VOID FASTCALL IntLoadSystemFonts(VOID); INT FASTCALL IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics); +ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); +INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); +BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); +BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); +DWORD FASTCALL IntGdiGetCharSet(HDC); +BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); +DWORD FASTCALL ftGetFontLanguageInfo(PDC); +INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -41,6 +41,8 @@ PSERVERINFO gpsi = NULL; // Global User Server Information. HSEMAPHORE hsemDriverMgmt = NULL; + +SHORT gusLanguageID; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -420,6 +422,13 @@ if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); + GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); + if (GdiHandleTable == NULL) + { + DPRINT1("Failed to initialize the GDI handle table.\n"); + return STATUS_UNSUCCESSFUL; + } + Status = InitUserImpl(); if (!NT_SUCCESS(Status)) { @@ -510,13 +519,6 @@ DPRINT1("Failed to initialize GUI check implementation.\n"); return(Status); } - - GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); - if (GdiHandleTable == NULL) - { - DPRINT1("Failed to initialize the GDI handle table.\n"); - return STATUS_UNSUCCESSFUL; - } Status = InitDcImpl(); if (!NT_SUCCESS(Status)) @@ -537,6 +539,8 @@ CreateStockObjects(); CreateSysColorObjects(); + gusLanguageID = IntGdiGetLanguageID(); + return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -13,6 +13,52 @@ #define NDEBUG #include <debug.h> + +SHORT +FASTCALL +IntGdiGetLanguageID() +{ + HANDLE KeyHandle; + ULONG Size = sizeof(WCHAR) * (MAX_PATH + 12); + OBJECT_ATTRIBUTES ObAttr; +//
http://support.microsoft.com/kb/324097
+ ULONG Ret = 0x409; // English + PVOID KeyInfo; + UNICODE_STRING Language; + + RtlInitUnicodeString( &Language, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); + + InitializeObjectAttributes( &ObAttr, + &Language, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + if ( NT_SUCCESS(ZwOpenKey(&KeyHandle, KEY_READ, &ObAttr))) + { + KeyInfo = ExAllocatePoolWithTag(PagedPool, Size, TAG_STRING); + if ( KeyInfo ) + { + RtlInitUnicodeString(&Language, L"Default"); + + if ( NT_SUCCESS(ZwQueryValueKey( KeyHandle, + &Language, + KeyValuePartialInformation, + KeyInfo, + Size, + &Size)) ) + { + RtlInitUnicodeString(&Language, (PVOID)((char *)KeyInfo + 12)); + RtlUnicodeStringToInteger(&Language, 16, &Ret); + } + ExFreePoolWithTag(KeyInfo, TAG_STRING); + } + ZwClose(KeyHandle); + } + DPRINT1("Language ID = %x\n",Ret); + return (SHORT) Ret; +} /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -16,12 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Message queues - * FILE: subsys/win32k/ntuser/msgqueue.c + * FILE: subsystems/win32/win32k/ntuser/msgqueue.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -2411,6 +2411,7 @@ case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: + SafeResult = ftGetFontLanguageInfo(dc); break; case GdiGetIsMemDc: SafeResult = dc->DC_Type; Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -13,32 +13,54 @@ #define NDEBUG #include <debug.h> -// -// FIXME PLEASE!!!! -// Why are these here? Well there is a problem with drivers/directx. -// 1st: It does not belong there. -// 2nd: Due to being placed outside Win32k build environment, it creates -// compiling issues. -// Until svn mv drivers/directx subsystem/win32/win32k/drivers/directx, -// it will not get fixed. -// -ULONG -FASTCALL -ftGdiGetGlyphOutline( - IN PDC pdc, - IN WCHAR wch, - IN UINT iFormat, - OUT LPGLYPHMETRICS pgm, - IN ULONG cjBuf, - OUT OPTIONAL PVOID UnsafeBuf, - IN LPMAT2 pmat2, - IN BOOL bIgnoreRotation); +/** Functions ******************************************************************/ INT -FASTCALL -IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, OUTLINETEXTMETRICW *Otm); - -/** Functions ******************************************************************/ +APIENTRY +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + UNICODE_STRING SafeFileName; + PWSTR src; + NTSTATUS Status; + int Ret; + + /* FIXME - Protect with SEH? */ + RtlInitUnicodeString(&SafeFileName, pwszFiles); + + /* Reserve for prepending '\??\' */ + SafeFileName.Length += 4 * sizeof(WCHAR); + SafeFileName.MaximumLength += 4 * sizeof(WCHAR); + + src = SafeFileName.Buffer; + SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING); + if(!SafeFileName.Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + + /* Prepend '\??\' */ + RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR)); + + Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); + if(!NT_SUCCESS(Status)) + { + ExFreePool(SafeFileName.Buffer); + SetLastNtError(Status); + return 0; + } + + Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); + + ExFreePool(SafeFileName.Buffer); + return Ret; +} ULONG APIENTRY @@ -148,4 +170,61 @@ return Size; } +HFONT +STDCALL +NtGdiHfontCreate( + IN PENUMLOGFONTEXDVW pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData ) +{ + ENUMLOGFONTEXDVW SafeLogfont; + HFONT hNewFont; + PTEXTOBJ TextObj; + NTSTATUS Status = STATUS_SUCCESS; + + if (!pelfw) + { + return NULL; + } + + _SEH_TRY + { + ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); + RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + TextObj = TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) + { + return NULL; + } + hNewFont = TextObj->BaseObject.hHmgr; + + RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + + if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + TEXTOBJ_UnlockText(TextObj); + + return hNewFont; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -22,7 +22,6 @@ #define NDEBUG #include <debug.h> - FT_Library library; typedef struct _FONT_ENTRY { @@ -43,8 +42,6 @@ #define MAX_FONT_CACHE 256 UINT Hits; UINT Misses; - -SHORT ftLanguageID = 0; typedef struct _FONT_CACHE_ENTRY { LIST_ENTRY ListEntry; @@ -244,6 +241,7 @@ } } + /* * IntGdiAddFontResource * @@ -446,52 +444,6 @@ return FT_RENDER_MODE_NORMAL; } -INT -APIENTRY -NtGdiAddFontResourceW( - IN WCHAR *pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN FLONG fl, - IN DWORD dwPidTid, - IN OPTIONAL DESIGNVECTOR *pdv) -{ - UNICODE_STRING SafeFileName; - PWSTR src; - NTSTATUS Status; - int Ret; - - /* FIXME - Protect with SEH? */ - RtlInitUnicodeString(&SafeFileName, pwszFiles); - - /* Reserve for prepending '\??\' */ - SafeFileName.Length += 4 * sizeof(WCHAR); - SafeFileName.MaximumLength += 4 * sizeof(WCHAR); - - src = SafeFileName.Buffer; - SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING); - if(!SafeFileName.Buffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - /* Prepend '\??\' */ - RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR)); - - Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); - if(!NT_SUCCESS(Status)) - { - ExFreePool(SafeFileName.Buffer); - SetLastNtError(Status); - return 0; - } - - Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); - - ExFreePool(SafeFileName.Buffer); - return Ret; -} NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) @@ -515,63 +467,6 @@ TEXTOBJ_UnlockText(TextObj); return STATUS_SUCCESS; -} - -HFONT -STDCALL -NtGdiHfontCreate( - IN PENUMLOGFONTEXDVW pelfw, - IN ULONG cjElfw, - IN LFTYPE lft, - IN FLONG fl, - IN PVOID pvCliData ) -{ - ENUMLOGFONTEXDVW SafeLogfont; - HFONT hNewFont; - PTEXTOBJ TextObj; - NTSTATUS Status = STATUS_SUCCESS; - - if (!pelfw) - { - return NULL; - } - - _SEH_TRY - { - ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); - RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) - { - return NULL; - } - hNewFont = TextObj->BaseObject.hHmgr; - - RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - - return hNewFont; - } /************************************************************************* @@ -1329,7 +1224,7 @@ { lprs->nSize = sizeof(RASTERIZER_STATUS); lprs->wFlags = TT_AVAILABLE | TT_ENABLED; - lprs->nLanguageID = ftLanguageID; + lprs->nLanguageID = gusLanguageID; return TRUE; } SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1413,7 +1308,7 @@ } FT_Glyph STDCALL -NtGdiGlyphCacheGet( +ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, INT Height) @@ -1462,7 +1357,7 @@ } FT_Glyph STDCALL -NtGdiGlyphCacheSet( +ftGdiGlyphCacheSet( FT_Face Face, INT GlyphIndex, INT Height, @@ -1842,7 +1737,7 @@ else glyph_index = FT_Get_Char_Index(face, *TempText); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -1852,7 +1747,7 @@ } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, + realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); if (!realglyph) { @@ -1903,7 +1798,7 @@ else glyph_index = FT_Get_Char_Index(face, *String); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -1914,7 +1809,7 @@ goto fail; } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, + realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, @@ -2591,14 +2486,14 @@ ULONG FASTCALL ftGdiGetGlyphOutline( - IN PDC dc, - IN WCHAR wch, - IN UINT iFormat, - OUT LPGLYPHMETRICS pgm, - IN ULONG cjBuf, - OUT OPTIONAL PVOID UnsafeBuf, - IN LPMAT2 pmat2, - IN BOOL bIgnoreRotation) + PDC dc, + WCHAR wch, + UINT iFormat, + LPGLYPHMETRICS pgm, + ULONG cjBuf, + OPTIONAL PVOID UnsafeBuf, + LPMAT2 pmat2, + BOOL bIgnoreRotation) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; PDC_ATTR Dc_Attr; @@ -3313,7 +3208,7 @@ for (i = 0; i < Count; i++) { glyph_index = FT_Get_Char_Index(face, *String); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -3324,7 +3219,7 @@ } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, + realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); if (!realglyph) { @@ -3363,7 +3258,6 @@ return TRUE; } - DWORD FASTCALL @@ -3393,38 +3287,13 @@ return (MAKELONG(cp, charset)); } - -DWORD -APIENTRY -NtGdiGetCharSet(HDC hDC) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - DWORD cscp = IntGdiGetCharSet(hDC); - // If here, update everything! - Dc = DC_LockDc(hDC); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Dc_Attr = Dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - Dc_Attr->iCS_CP = cscp; - Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; - DC_UnlockDc( Dc ); - return cscp; -} - - INT -APIENTRY -NtGdiGetTextCharsetInfo( - IN HDC hdc, - OUT OPTIONAL LPFONTSIGNATURE lpSig, - IN DWORD dwFlags) -{ - PDC Dc; +FASTCALL +ftGdiGetTextCharsetInfo( + PDC Dc, + LPFONTSIGNATURE lpSig, + DWORD dwFlags) +{ PDC_ATTR Dc_Attr; UINT Ret = DEFAULT_CHARSET, i = 0, fs_fsCsb0 = 0; HFONT hFont; @@ -3433,19 +3302,12 @@ FONTSIGNATURE fs; TT_OS2 *pOS2; FT_Face Face; - NTSTATUS Status; - - Dc = DC_LockDc(hdc); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } + Dc_Attr = Dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc( Dc ); + if ( TextObj == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -3479,14 +3341,9 @@ } DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]); if (lpSig) - { - Status = MmCopyToCaller(lpSig, &fs, sizeof(FONTSIGNATURE)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return Ret; - } - } + { + RtlCopyMemory(lpSig, &fs, sizeof(FONTSIGNATURE)); + } if (0 == fs_fsCsb0) { /* let's see if we can find any interesting cmaps */ for (i = 0; i < Face->num_charmaps; i++) @@ -3514,33 +3371,80 @@ return Ret; } -W32KAPI +DWORD +FASTCALL +ftGetFontLanguageInfo(PDC Dc) +{ + PDC_ATTR Dc_Attr; + FONTSIGNATURE fontsig; + static const DWORD GCP_DBCS_MASK=0x003F0000, + GCP_DIACRITIC_MASK=0x00000000, + FLI_GLYPHS_MASK=0x00000000, + GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_KASHIDA_MASK=0x00000000, + GCP_LIGATE_MASK=0x00000000, + GCP_USEKERNING_MASK=0x00000000, + GCP_REORDER_MASK=0x00000060; + + DWORD result=0; + + ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); + + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) + result|=GCP_DBCS; + + if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) + result|=GCP_DIACRITIC; + + if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) + result|=FLI_GLYPHS; + + if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) + result|=GCP_GLYPHSHAPE; + + if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) + result|=GCP_KASHIDA; + + if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) + result|=GCP_LIGATE; + + if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + result|=GCP_USEKERNING; + + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ( Dc_Attr->lTextAlign & TA_RTLREADING ) + if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) + result|=GCP_REORDER; + + return result; +} + + BOOL -APIENTRY -NtGdiGetTextMetricsW( - IN HDC hDC, - OUT TMW_INTERNAL * pUnsafeTmwi, - IN ULONG cj -) +FASTCALL +ftGdiGetTextMetricsW( + HDC hDC, + PTMW_INTERNAL ptmwi) { PDC dc; PDC_ATTR Dc_Attr; PTEXTOBJ TextObj; PFONTGDI FontGDI; - NTSTATUS Status = STATUS_SUCCESS; - TMW_INTERNAL tmwi; FT_Face Face; TT_OS2 *pOS2; TT_HoriHeader *pHori; ULONG Error; - - if (NULL == pUnsafeTmwi) + NTSTATUS Status = STATUS_SUCCESS; + + if (!ptmwi) { SetLastWin32Error(STATUS_INVALID_PARAMETER); return FALSE; } - - /* FIXME: check cj ? */ if(!(dc = DC_LockDc(hDC))) { @@ -3570,9 +3474,9 @@ } else { - memcpy(&tmwi.TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); + memcpy(&ptmwi->TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); /* FIXME: Fill Diff member */ - RtlZeroMemory(&tmwi.Diff, sizeof(tmwi.Diff)); + RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff)); Status = STATUS_SUCCESS; IntLockFreeType; @@ -3594,38 +3498,22 @@ if (NT_SUCCESS(Status)) { - FillTM(&tmwi.TextMetric, FontGDI->face, pOS2, pHori); - - if (cj > sizeof(TMW_INTERNAL)) - cj = sizeof(TMW_INTERNAL); - - Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(pUnsafeTmwi, cj, 1); - RtlCopyMemory(pUnsafeTmwi,&tmwi,cj); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END + FillTM(&ptmwi->TextMetric, FontGDI->face, pOS2, pHori); } } TEXTOBJ_UnlockText(TextObj); } else - { - Status = STATUS_INVALID_HANDLE; - } + { + Status = STATUS_INVALID_HANDLE; + } DC_UnlockDc(dc); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Thu Oct 30 05:46:27 2008 @@ -13,23 +13,29 @@ #define NDEBUG #include <debug.h> -BOOL -FASTCALL -ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs); - -BOOL -FASTCALL -TextIntGetTextExtentPoint(PDC dc, - PTEXTOBJ TextObj, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size); - - /** Functions ******************************************************************/ + +DWORD +APIENTRY +NtGdiGetCharSet(HDC hDC) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + DWORD cscp = IntGdiGetCharSet(hDC); + // If here, update everything! + Dc = DC_LockDc(hDC); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + Dc_Attr->iCS_CP = cscp; + Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; + DC_UnlockDc( Dc ); + return cscp; +} BOOL APIENTRY @@ -66,6 +72,55 @@ } } return FALSE; +} + +INT +APIENTRY +NtGdiGetTextCharsetInfo( + IN HDC hdc, + OUT OPTIONAL LPFONTSIGNATURE lpSig, + IN DWORD dwFlags) +{ + PDC Dc; + INT Ret; + FONTSIGNATURE fsSafe; + PFONTSIGNATURE pfsSafe = &fsSafe; + NTSTATUS Status = STATUS_SUCCESS; + + Dc = DC_LockDc(hdc); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return DEFAULT_CHARSET; + } + + if (!lpSig) pfsSafe = NULL; + + Ret = ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags); + + if (lpSig) + { + _SEH_TRY + { + ProbeForWrite( lpSig, + sizeof(FONTSIGNATURE), + 1); + RtlCopyMemory(lpSig, pfsSafe, sizeof(FONTSIGNATURE)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DEFAULT_CHARSET; + } + } + DC_UnlockDc(Dc); + return Ret; } W32KAPI @@ -298,4 +353,42 @@ return Count; } +W32KAPI +BOOL +APIENTRY +NtGdiGetTextMetricsW( + IN HDC hDC, + OUT TMW_INTERNAL * pUnsafeTmwi, + IN ULONG cj +) +{ + TMW_INTERNAL Tmwi; + NTSTATUS Status = STATUS_SUCCESS; + + if ( cj <= sizeof(TMW_INTERNAL) ) + { + if (ftGdiGetTextMetricsW(hDC,&Tmwi)) + { + _SEH_TRY + { + ProbeForWrite(pUnsafeTmwi, cj, 1); + RtlCopyMemory(pUnsafeTmwi,&Tmwi,cj); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; + } + } + return FALSE; +} + /* EOF */
16 years, 1 month
1
0
0
0
[tkreuzer] 37089: remove ntoskrnl.spec
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Oct 30 05:01:33 2008 New Revision: 37089 URL:
http://svn.reactos.org/svn/reactos?rev=37089&view=rev
Log: remove ntoskrnl.spec Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec (removed) @@ -1,1660 +1,0 @@ -#include "include/reactos/msvctarget.h" - -@ stdcall CcCanIWrite(ptr long long long) -@ stdcall CcCopyRead(ptr ptr long long ptr ptr) -@ stdcall CcCopyWrite(ptr ptr long long ptr) -@ stdcall CcDeferWrite(ptr ptr ptr ptr long long) -@ stdcall CcFastCopyRead(ptr long long long ptr ptr) -@ stdcall CcFastCopyWrite(ptr long long ptr) -@ extern CcFastMdlReadWait -@ extern CcFastReadNotPossible -@ extern CcFastReadWait -@ stdcall CcFlushCache(ptr ptr long ptr) -@ stdcall CcGetDirtyPages(ptr ptr ptr ptr) -@ stdcall CcGetFileObjectFromBcb(ptr) -@ stdcall CcGetFileObjectFromSectionPtrs(ptr) -@ stdcall CcGetFlushedValidData(ptr long) -@ stdcall CcGetLsnForFileObject(ptr ptr) -@ stdcall CcInitializeCacheMap(ptr ptr long ptr ptr) -@ stdcall CcIsThereDirtyData(ptr) -@ stdcall CcMapData(ptr ptr long long ptr ptr) -@ stdcall CcMdlRead(ptr ptr long ptr ptr) -@ stdcall CcMdlReadComplete(ptr ptr) -@ stdcall CcMdlWriteAbort(ptr ptr) -@ stdcall CcMdlWriteComplete(ptr ptr ptr) -@ stdcall CcPinMappedData(ptr ptr long long ptr) -@ stdcall CcPinRead(ptr ptr long long ptr ptr) -@ stdcall CcPrepareMdlWrite(ptr ptr long ptr ptr) -@ stdcall CcPreparePinWrite(ptr ptr long long long ptr ptr) -@ stdcall CcPurgeCacheSection(ptr ptr long long) -@ stdcall CcRemapBcb(ptr) -@ stdcall CcRepinBcb(ptr) -@ stdcall CcScheduleReadAhead(ptr ptr long) -@ stdcall CcSetAdditionalCacheAttributes(ptr long long) -@ stdcall CcSetBcbOwnerPointer(ptr ptr) -@ stdcall CcSetDirtyPageThreshold(ptr long) -@ stdcall CcSetDirtyPinnedData(ptr ptr) -@ stdcall CcSetFileSizes(ptr ptr) -@ stdcall CcSetLogHandleForFile(ptr ptr ptr) -@ stdcall CcSetReadAheadGranularity(ptr long) -@ stdcall CcUninitializeCacheMap(ptr ptr ptr) -@ stdcall CcUnpinData(ptr) -@ stdcall CcUnpinDataForThread(ptr ptr) -@ stdcall CcUnpinRepinnedBcb(ptr long ptr) -@ stdcall CcWaitForCurrentLazyWriterActivity() -@ stdcall CcZeroData(ptr ptr ptr long) -@ stdcall CmRegisterCallback(ptr ptr ptr) -@ stdcall CmUnRegisterCallback(long long) -@ stdcall DbgBreakPoint() -@ stdcall DbgBreakPointWithStatus(long) -;DbgCommandString -@ stdcall DbgLoadImageSymbols(ptr ptr long) -@ cdecl DbgPrint(str) -@ cdecl DbgPrintEx(long long str) -@ cdecl DbgPrintReturnControlC(str) -@ stdcall DbgPrompt(str ptr long) -@ stdcall DbgQueryDebugFilterState(long long) -@ stdcall DbgSetDebugFilterState(long long long) -#ifdef __x86_64__ -@ fastcall ExAcquireFastMutex(ptr) -#endif -@ fastcall ExAcquireFastMutexUnsafe(ptr) -@ stdcall ExAcquireResourceExclusiveLite(ptr long) -@ stdcall ExAcquireResourceSharedLite(ptr long) -@ fastcall ExAcquireRundownProtection(ptr) ExfAcquireRundownProtection -@ fastcall ExAcquireRundownProtectionCacheAware(ptr) ExfAcquireRundownProtectionCacheAware -@ fastcall ExAcquireRundownProtectionCacheAwareEx(ptr long) ExfAcquireRundownProtectionCacheAwareEx -@ fastcall ExAcquireRundownProtectionEx(ptr long) ExfAcquireRundownProtectionEx -@ stdcall ExAcquireSharedStarveExclusive(ptr long) -@ stdcall ExAcquireSharedWaitForExclusive(ptr long) -@ stdcall ExAllocateCacheAwareRundownProtection(long long) -@ stdcall ExAllocateFromPagedLookasideList(ptr) ExiAllocateFromPagedLookasideList -@ stdcall ExAllocatePool(long long) -@ stdcall ExAllocatePoolWithQuota(long long) -@ stdcall ExAllocatePoolWithQuotaTag(long long long) -@ stdcall ExAllocatePoolWithTag(long long long) -@ stdcall ExAllocatePoolWithTagPriority(long long long long) -@ stdcall ExConvertExclusiveToSharedLite(ptr) -@ stdcall ExCreateCallback(ptr ptr long long) -@ stdcall ExDeleteNPagedLookasideList(ptr) -@ stdcall ExDeletePagedLookasideList(ptr) -@ stdcall ExDeleteResourceLite(ptr) -@ extern ExDesktopObjectType -@ stdcall ExDisableResourceBoostLite(ptr) -@ fastcall ExEnterCriticalRegionAndAcquireFastMutexUnsafe(ptr) -@ stdcall ExEnterCriticalRegionAndAcquireResourceExclusive(ptr) -;ExEnterCriticalRegionAndAcquireResourceShared -;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive -@ stdcall ExEnumHandleTable(ptr ptr ptr ptr) -@ extern ExEventObjectType _ExEventObjectType -@ stdcall ExExtendZone(ptr ptr long) -@ stdcall ExFreeCacheAwareRundownProtection(ptr) -@ stdcall ExFreePool(ptr) -@ stdcall ExFreePoolWithTag(ptr long) -@ stdcall ExFreeToPagedLookasideList(ptr ptr) ExiFreeToPagedLookasideList -@ stdcall ExGetCurrentProcessorCounts(ptr ptr ptr) -@ stdcall ExGetCurrentProcessorCpuUsage(ptr) -@ stdcall ExGetExclusiveWaiterCount(ptr) -@ stdcall ExGetPreviousMode() -@ stdcall ExGetSharedWaiterCount(ptr) -@ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) -@ stdcall ExInitializePagedLookasideList(ptr ptr ptr long long long long) -@ stdcall ExInitializeResourceLite(ptr) -@ fastcall ExInitializeRundownProtection(ptr) ExfInitializeRundownProtection -@ stdcall ExInitializeRundownProtectionCacheAware(ptr long) -@ stdcall ExInitializeZone(ptr long ptr long) -@ stdcall ExInterlockedAddLargeInteger(ptr long long ptr) -@ fastcall ExInterlockedAddLargeStatistic(ptr long) -@ stdcall ExInterlockedAddUlong(ptr long ptr) -#ifndef __x86_64__ -@ fastcall ExInterlockedCompareExchange64(ptr ptr ptr ptr) -@ stdcall ExInterlockedDecrementLong(ptr ptr) -@ stdcall ExInterlockedExchangeUlong(ptr long ptr) -#endif -@ stdcall ExInterlockedExtendZone(ptr ptr long ptr) -#ifndef __x86_64__ -@ fastcall ExInterlockedFlushSList(ptr) -@ stdcall ExInterlockedIncrementLong(ptr ptr) -#endif -@ stdcall ExInterlockedInsertHeadList(ptr ptr ptr) -@ stdcall ExInterlockedInsertTailList(ptr ptr ptr) -@ stdcall ExInterlockedPopEntryList(ptr ptr) -#ifndef __x86_64__ -@ fastcall ExInterlockedPopEntrySList(ptr ptr) -#endif -@ stdcall ExInterlockedPushEntryList(ptr ptr ptr) -#ifndef __x86_64__ -@ fastcall ExInterlockedPushEntrySList(ptr ptr ptr) -#endif -@ stdcall ExInterlockedRemoveHeadList(ptr ptr) -@ stdcall ExIsProcessorFeaturePresent(long) -@ stdcall ExIsResourceAcquiredExclusiveLite(ptr) -@ stdcall ExIsResourceAcquiredSharedLite(ptr) -@ stdcall ExLocalTimeToSystemTime(ptr ptr) -@ stdcall ExNotifyCallback(ptr ptr ptr) -@ stdcall ExQueryPoolBlockSize(ptr ptr) -@ stdcall ExQueueWorkItem(ptr long) -@ stdcall ExRaiseAccessViolation() -@ stdcall ExRaiseDatatypeMisalignment() -@ stdcall ExRaiseException(ptr) RtlRaiseException -@ stdcall ExRaiseHardError(long long long ptr long ptr) -@ stdcall ExRaiseStatus(long) RtlRaiseStatus -@ fastcall ExReInitializeRundownProtection(ptr) ExfReInitializeRundownProtection -@ fastcall ExReInitializeRundownProtectionCacheAware(ptr) ExfReInitializeRundownProtectionCacheAware -@ stdcall ExRegisterCallback(ptr ptr ptr) -@ stdcall ExReinitializeResourceLite(ptr) -#ifdef __x86_64__ -@ fastcall ExReleaseFastMutex(ptr) -#endif -@ fastcall ExReleaseFastMutexUnsafe(ptr) -@ fastcall ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(ptr) -@ fastcall ExReleaseResourceAndLeaveCriticalRegion(ptr) -@ stdcall ExReleaseResourceForThreadLite(ptr long) -@ fastcall ExReleaseResourceLite(ptr) -@ fastcall ExReleaseRundownProtection(ptr) ExfReleaseRundownProtection -@ fastcall ExReleaseRundownProtectionCacheAware(ptr) ExfReleaseRundownProtectionCacheAware -@ fastcall ExReleaseRundownProtectionCacheAwareEx(ptr long) ExfReleaseRundownProtectionCacheAwareEx -@ fastcall ExReleaseRundownProtectionEx(ptr long) ExfReleaseRundownProtectionEx -@ fastcall ExRundownCompleted(ptr) ExfRundownCompleted -@ fastcall ExRundownCompletedCacheAware(ptr) ExfRundownCompletedCacheAware -@ extern ExSemaphoreObjectType _ExSemaphoreObjectType -@ stdcall ExSetResourceOwnerPointer(ptr ptr) -@ stdcall ExSetTimerResolution(long long) -@ stdcall ExSizeOfRundownProtectionCacheAware() -@ stdcall ExSystemExceptionFilter() -@ stdcall ExSystemTimeToLocalTime(ptr ptr) -#ifdef __x86_64__ -@ fastcall ExTryToAcquireFastMutex(ptr) -#endif -@ stdcall ExUnregisterCallback(ptr) -@ stdcall ExUuidCreate(ptr) -@ stdcall ExVerifySuite(long) -@ fastcall ExWaitForRundownProtectionRelease(ptr) ExfWaitForRundownProtectionRelease -@ fastcall ExWaitForRundownProtectionReleaseCacheAware(ptr) ExfWaitForRundownProtectionReleaseCacheAware -@ extern ExWindowStationObjectType -@ fastcall ExfAcquirePushLockExclusive(ptr) -@ fastcall ExfAcquirePushLockShared(ptr) -#ifndef __x86_64__ -@ fastcall ExfInterlockedAddUlong(ptr long ptr) -@ fastcall ExfInterlockedCompareExchange64(ptr ptr ptr) -@ fastcall ExfInterlockedInsertHeadList(ptr ptr ptr) -@ fastcall ExfInterlockedInsertTailList(ptr ptr ptr) -@ fastcall ExfInterlockedPopEntryList(ptr ptr) -@ fastcall ExfInterlockedPushEntryList(ptr ptr ptr) -@ fastcall ExfInterlockedRemoveHeadList(ptr ptr) -#endif -@ fastcall ExfReleasePushLock(ptr) -@ fastcall ExfReleasePushLockExclusive(ptr) -@ fastcall ExfReleasePushLockShared(ptr) -@ fastcall ExfTryToWakePushLock(ptr) -@ fastcall ExfUnblockPushLock(ptr ptr) -#ifdef __x86_64__ -@ stdcall ExpInterlockedFlushSList(ptr) -@ stdcall ExpInterlockedPopEntrySList(ptr ptr) -@ stdcall ExpInterlockedPushEntrySList(ptr ptr) -#endif -#ifdef _M_IX86 -@ fastcall Exfi386InterlockedDecrementLong(ptr) -@ fastcall Exfi386InterlockedExchangeUlong(ptr long) -@ fastcall Exfi386InterlockedIncrementLong(ptr) -@ stdcall Exi386InterlockedDecrementLong(ptr) -@ stdcall Exi386InterlockedExchangeUlong(ptr long long) -@ stdcall Exi386InterlockedIncrementLong(ptr) -#endif -#ifdef _M_IX86 -@ fastcall ExiAcquireFastMutex(ptr) ExAcquireFastMutex -@ fastcall ExiReleaseFastMutex(ptr) ExReleaseFastMutex -@ fastcall ExiTryToAcquireFastMutex(ptr) ExTryToAcquireFastMutex -#endif -@ stdcall FsRtlAcquireFileExclusive(ptr) -;FsRtlAddBaseMcbEntry -@ stdcall FsRtlAddLargeMcbEntry(ptr long long long long long long) -@ stdcall FsRtlAddMcbEntry(ptr long long long) -@ stdcall FsRtlAddToTunnelCache(ptr long long ptr ptr long long ptr) -@ stdcall FsRtlAllocateFileLock(ptr ptr) -@ stdcall FsRtlAllocatePool(long long) -@ stdcall FsRtlAllocatePoolWithQuota(long long) -@ stdcall FsRtlAllocatePoolWithQuotaTag(long long long) -@ stdcall FsRtlAllocatePoolWithTag(long long long) -@ stdcall FsRtlAllocateResource() -@ stdcall FsRtlAreNamesEqual(ptr ptr long wstr) -@ stdcall FsRtlBalanceReads(ptr) -@ stdcall FsRtlCheckLockForReadAccess(ptr ptr) -@ stdcall FsRtlCheckLockForWriteAccess(ptr ptr) -@ stdcall FsRtlCheckOplock(ptr ptr ptr ptr ptr) -@ stdcall FsRtlCopyRead(ptr ptr long long long ptr ptr ptr) -@ stdcall FsRtlCopyWrite(ptr ptr long long long ptr ptr ptr) -@ stdcall FsRtlCreateSectionForDataScan(ptr ptr ptr ptr long ptr ptr long long long) -@ stdcall FsRtlCurrentBatchOplock(ptr) -@ stdcall FsRtlDeleteKeyFromTunnelCache(ptr long long) -@ stdcall FsRtlDeleteTunnelCache(ptr) -@ stdcall FsRtlDeregisterUncProvider(ptr) -@ stdcall FsRtlDissectDbcs(long ptr ptr ptr) -@ stdcall FsRtlDissectName(long ptr ptr ptr) -@ stdcall FsRtlDoesDbcsContainWildCards(ptr) -@ stdcall FsRtlDoesNameContainWildCards(ptr) -@ stdcall FsRtlFastCheckLockForRead(ptr ptr ptr long ptr ptr) -@ stdcall FsRtlFastCheckLockForWrite(ptr ptr ptr long ptr ptr) -@ stdcall FsRtlFastUnlockAll(ptr ptr ptr ptr) -@ stdcall FsRtlFastUnlockAllByKey(ptr ptr ptr long ptr) -@ stdcall FsRtlFastUnlockSingle(ptr ptr ptr ptr ptr long ptr long) -@ stdcall FsRtlFindInTunnelCache(ptr long long ptr ptr ptr ptr ptr) -@ stdcall FsRtlFreeFileLock(ptr) -@ stdcall FsRtlGetFileSize(ptr ptr) -;FsRtlGetNextBaseMcbEntry -@ stdcall FsRtlGetNextFileLock(ptr long) -@ stdcall FsRtlGetNextLargeMcbEntry(ptr long ptr ptr ptr) -@ stdcall FsRtlGetNextMcbEntry(ptr long ptr ptr ptr) -@ stdcall FsRtlIncrementCcFastReadNoWait() -@ stdcall FsRtlIncrementCcFastReadNotPossible() -@ stdcall FsRtlIncrementCcFastReadResourceMiss() -@ stdcall FsRtlIncrementCcFastReadWait() -;FsRtlInitializeBaseMcb -@ stdcall FsRtlInitializeFileLock(ptr ptr ptr) -@ stdcall FsRtlInitializeLargeMcb(ptr long) -@ stdcall FsRtlInitializeMcb(ptr long) -@ stdcall FsRtlInitializeOplock(ptr) -@ stdcall FsRtlInitializeTunnelCache(ptr) -@ stdcall FsRtlInsertPerFileObjectContext(ptr ptr) -@ stdcall FsRtlInsertPerStreamContext(ptr ptr) -@ stdcall FsRtlIsDbcsInExpression(ptr ptr) -@ stdcall FsRtlIsFatDbcsLegal(long ptr long long long) -@ stdcall FsRtlIsHpfsDbcsLegal(long ptr long long long) -@ stdcall FsRtlIsNameInExpression(ptr ptr long wstr) -@ stdcall FsRtlIsNtstatusExpected(long) -@ stdcall FsRtlIsPagingFile(ptr) -@ stdcall FsRtlIsTotalDeviceFailure(ptr) -@ extern FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray -;FsRtlLookupBaseMcbEntry -@ stdcall FsRtlLookupLargeMcbEntry(ptr long long ptr ptr ptr ptr ptr) -;FsRtlLookupLastBaseMcbEntry -;FsRtlLookupLastBaseMcbEntryAndIndex -@ stdcall FsRtlLookupLastLargeMcbEntry(ptr ptr ptr) -@ stdcall FsRtlLookupLastLargeMcbEntryAndIndex(ptr ptr ptr ptr) -@ stdcall FsRtlLookupLastMcbEntry(ptr ptr ptr) -@ stdcall FsRtlLookupMcbEntry(ptr long ptr ptr ptr) -@ stdcall FsRtlLookupPerFileObjectContext(ptr ptr ptr) -@ stdcall FsRtlLookupPerStreamContextInternal(ptr ptr ptr) -@ stdcall FsRtlMdlRead(ptr ptr long long ptr ptr) -@ stdcall FsRtlMdlReadComplete(ptr ptr) -@ stdcall FsRtlMdlReadCompleteDev(ptr ptr ptr) -@ stdcall FsRtlMdlReadDev(ptr ptr long long ptr ptr ptr) -@ stdcall FsRtlMdlWriteComplete(ptr ptr ptr) -@ stdcall FsRtlMdlWriteCompleteDev(ptr ptr ptr ptr) -@ stdcall FsRtlNormalizeNtstatus(long long) -@ stdcall FsRtlNotifyChangeDirectory(ptr ptr ptr ptr long long ptr) -@ stdcall FsRtlNotifyCleanup(ptr ptr ptr) -@ stdcall FsRtlNotifyFilterChangeDirectory(ptr ptr ptr ptr long long long ptr ptr ptr ptr) -@ stdcall FsRtlNotifyFilterReportChange(ptr ptr ptr long ptr ptr long long ptr ptr) -@ stdcall FsRtlNotifyFullChangeDirectory(ptr ptr ptr ptr long long long ptr ptr ptr) -@ stdcall FsRtlNotifyFullReportChange(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall FsRtlNotifyInitializeSync(ptr) -@ stdcall FsRtlNotifyReportChange(ptr ptr ptr ptr long) -@ stdcall FsRtlNotifyUninitializeSync(ptr) -@ stdcall FsRtlNotifyVolumeEvent(ptr long) -;FsRtlNumberOfRunsInBaseMcb -@ stdcall FsRtlNumberOfRunsInLargeMcb(ptr) -@ stdcall FsRtlNumberOfRunsInMcb(ptr) -@ stdcall FsRtlOplockFsctrl(ptr ptr long) -@ stdcall FsRtlOplockIsFastIoPossible(ptr) -@ stdcall FsRtlPostPagingFileStackOverflow(ptr ptr ptr) -@ stdcall FsRtlPostStackOverflow(ptr ptr ptr) -@ stdcall FsRtlPrepareMdlWrite(ptr ptr long long ptr ptr) -@ stdcall FsRtlPrepareMdlWriteDev(ptr ptr long long ptr ptr ptr) -@ stdcall FsRtlPrivateLock(ptr ptr ptr ptr ptr long long long ptr ptr ptr long) -@ stdcall FsRtlProcessFileLock(ptr ptr ptr) -@ stdcall FsRtlRegisterFileSystemFilterCallbacks(ptr ptr) -@ stdcall FsRtlRegisterUncProvider(ptr ptr long) -@ stdcall FsRtlReleaseFile(ptr) -;FsRtlRemoveBaseMcbEntry -@ stdcall FsRtlRemoveLargeMcbEntry(ptr long long long long) -@ stdcall FsRtlRemoveMcbEntry(ptr long long) -@ stdcall FsRtlRemovePerFileObjectContext(ptr ptr ptr) -@ stdcall FsRtlRemovePerStreamContext(ptr ptr ptr) -;FsRtlResetBaseMcb -@ stdcall FsRtlResetLargeMcb(ptr long) -;FsRtlSplitBaseMcb -@ stdcall FsRtlSplitLargeMcb(ptr long long long long) -@ stdcall FsRtlSyncVolumes(long long long) -@ stdcall FsRtlTeardownPerStreamContexts(ptr) -;FsRtlTruncateBaseMcb -@ stdcall FsRtlTruncateLargeMcb(ptr long long) -@ stdcall FsRtlTruncateMcb(ptr long) -;FsRtlUninitializeBaseMcb -@ stdcall FsRtlUninitializeFileLock(ptr) -@ stdcall FsRtlUninitializeLargeMcb(ptr) -@ stdcall FsRtlUninitializeMcb(ptr) -@ stdcall FsRtlUninitializeOplock(ptr) -@ extern HalDispatchTable _HalDispatchTable -@ fastcall HalExamineMBR(ptr long long ptr) -@ extern HalPrivateDispatchTable -;HeadlessDispatch -@ stdcall InbvAcquireDisplayOwnership() -@ stdcall InbvCheckDisplayOwnership() -@ stdcall InbvDisplayString(str) -@ stdcall InbvEnableBootDriver(long) -@ stdcall InbvEnableDisplayString(long) -@ stdcall InbvInstallDisplayStringFilter(ptr) -@ stdcall InbvIsBootDriverInstalled() -@ stdcall InbvNotifyDisplayOwnershipLost(ptr) -@ stdcall InbvResetDisplay() -@ stdcall InbvSetScrollRegion(long long long long) -@ stdcall InbvSetTextColor(long) -@ stdcall InbvSolidColorFill(long long long long long) -@ extern InitSafeBootMode -@ fastcall InterlockedCompareExchange(ptr long long) -@ fastcall InterlockedDecrement(ptr) -@ fastcall InterlockedExchange(ptr long) -@ fastcall InterlockedExchangeAdd(ptr long) -@ fastcall InterlockedIncrement(ptr) -#ifndef __x86_64__ -@ fastcall InterlockedPopEntrySList(ptr) -@ fastcall InterlockedPushEntrySList(ptr ptr) -#endif -@ stdcall IoAcquireCancelSpinLock(ptr) -@ stdcall IoAcquireRemoveLockEx(ptr ptr str long long) -@ stdcall IoAcquireVpbSpinLock(ptr) -@ extern IoAdapterObjectType -@ stdcall IoAllocateAdapterChannel(ptr ptr long ptr ptr) -@ stdcall IoAllocateController(ptr ptr ptr ptr) -@ stdcall IoAllocateDriverObjectExtension(ptr ptr long ptr) -@ stdcall IoAllocateErrorLogEntry(ptr long) -@ stdcall IoAllocateIrp(long long) -@ stdcall IoAllocateMdl(ptr long long long ptr) -@ stdcall IoAllocateWorkItem(ptr) -@ fastcall IoAssignDriveLetters(ptr ptr ptr ptr) -@ stdcall IoAssignResources(ptr ptr ptr ptr ptr ptr) -@ stdcall IoAttachDevice(ptr ptr ptr) -@ stdcall IoAttachDeviceByPointer(ptr ptr) -@ stdcall IoAttachDeviceToDeviceStack(ptr ptr) -@ stdcall IoAttachDeviceToDeviceStackSafe(ptr ptr ptr) -@ stdcall IoBuildAsynchronousFsdRequest(long ptr ptr long ptr ptr) -@ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) -@ stdcall IoBuildPartialMdl(ptr ptr ptr long) -@ stdcall IoBuildSynchronousFsdRequest(long ptr ptr long ptr ptr ptr) -@ stdcall IoCallDriver(ptr ptr) -@ stdcall IoCancelFileOpen(ptr ptr) -@ stdcall IoCancelIrp(ptr) -@ stdcall IoCheckDesiredAccess(ptr long) -@ stdcall IoCheckEaBufferValidity(ptr long ptr) -@ stdcall IoCheckFunctionAccess(long long long long ptr ptr) -@ stdcall IoCheckQuerySetFileInformation(long long long) -@ stdcall IoCheckQuerySetVolumeInformation(long long long) -@ stdcall IoCheckQuotaBufferValidity(ptr long ptr) -@ stdcall IoCheckShareAccess(long long ptr ptr long) -@ stdcall IoCompleteRequest(ptr long) -@ stdcall IoConnectInterrupt(ptr ptr ptr ptr long long long long long long long) -@ stdcall IoCreateController(long) -@ stdcall IoCreateDevice(ptr long ptr long long long ptr) -@ stdcall IoCreateDisk(ptr ptr) -@ stdcall IoCreateDriver(ptr ptr) -@ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) -@ stdcall IoCreateFileSpecifyDeviceObjectHint(ptr long ptr ptr ptr long long long long ptr long long ptr long ptr) -@ stdcall IoCreateNotificationEvent(ptr ptr) -@ stdcall IoCreateStreamFileObject(ptr ptr) -@ stdcall IoCreateStreamFileObjectEx(ptr ptr ptr) -@ stdcall IoCreateStreamFileObjectLite(ptr ptr) -@ stdcall IoCreateSymbolicLink(ptr ptr) -@ stdcall IoCreateSynchronizationEvent(ptr ptr) -@ stdcall IoCreateUnprotectedSymbolicLink(ptr ptr) -@ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall IoCsqInitializeEx(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall IoCsqInsertIrp(ptr ptr ptr) -@ stdcall IoCsqInsertIrpEx(ptr ptr ptr ptr) -@ stdcall IoCsqRemoveIrp(ptr ptr) -@ stdcall IoCsqRemoveNextIrp(ptr ptr) -@ stdcall IoDeleteController(ptr) -@ stdcall IoDeleteDevice(ptr) -@ stdcall IoDeleteDriver(ptr) -@ stdcall IoDeleteSymbolicLink(ptr) -@ stdcall IoDetachDevice(ptr) -@ extern IoDeviceHandlerObjectSize -@ extern IoDeviceHandlerObjectType -@ extern IoDeviceObjectType -@ stdcall IoDisconnectInterrupt(ptr) -@ extern IoDriverObjectType -@ stdcall IoEnqueueIrp(ptr) -@ stdcall IoEnumerateDeviceObjectList(ptr ptr long ptr) -@ stdcall IoEnumerateRegisteredFiltersList(ptr long ptr) -@ stdcall IoFastQueryNetworkAttributes(ptr long long ptr ptr) -@ extern IoFileObjectType _IoFileObjectType -@ stdcall IoForwardAndCatchIrp(ptr ptr) IoForwardIrpSynchronously -@ stdcall IoForwardIrpSynchronously(ptr ptr) -@ stdcall IoFreeController(ptr) -@ stdcall IoFreeErrorLogEntry(ptr) -@ stdcall IoFreeIrp(ptr) -@ stdcall IoFreeMdl(ptr) -@ stdcall IoFreeWorkItem(ptr) -@ stdcall IoGetAttachedDevice(ptr) -@ stdcall IoGetAttachedDeviceReference(ptr) -@ stdcall IoGetBaseFileSystemDeviceObject(ptr) -@ stdcall IoGetBootDiskInformation(ptr long) -@ stdcall IoGetConfigurationInformation() -@ stdcall IoGetCurrentProcess() -@ stdcall IoGetDeviceAttachmentBaseRef(ptr) -@ stdcall IoGetDeviceInterfaceAlias(ptr ptr ptr) -@ stdcall IoGetDeviceInterfaces(ptr ptr long ptr) -@ stdcall IoGetDeviceObjectPointer(ptr long ptr ptr) -@ stdcall IoGetDeviceProperty(ptr long long ptr ptr) -@ stdcall IoGetDeviceToVerify(ptr) -@ stdcall IoGetDiskDeviceObject(ptr ptr) -@ stdcall IoGetDmaAdapter(ptr ptr ptr) -@ stdcall IoGetDriverObjectExtension(ptr ptr) -@ stdcall IoGetFileObjectGenericMapping() -@ stdcall IoGetInitialStack() -@ stdcall IoGetLowerDeviceObject(ptr) -@ fastcall IoGetPagingIoPriority(ptr) -@ stdcall IoGetRelatedDeviceObject(ptr) -@ stdcall IoGetRequestorProcess(ptr) -@ stdcall IoGetRequestorProcessId(ptr) -@ stdcall IoGetRequestorSessionId(ptr ptr) -@ stdcall IoGetStackLimits(ptr ptr) -@ stdcall IoGetTopLevelIrp() -@ stdcall IoInitializeIrp(ptr long long) -@ stdcall IoInitializeRemoveLockEx(ptr long long long long) -@ stdcall IoInitializeTimer(ptr ptr ptr) -@ stdcall IoInvalidateDeviceRelations(ptr long) -@ stdcall IoInvalidateDeviceState(ptr) -@ stdcall IoIsFileOriginRemote(ptr) -@ stdcall IoIsOperationSynchronous(ptr) -@ stdcall IoIsSystemThread(ptr) -@ stdcall IoIsValidNameGraftingBuffer(ptr ptr) -@ stdcall IoIsWdmVersionAvailable(long long) -@ stdcall IoMakeAssociatedIrp(ptr long) -@ stdcall IoOpenDeviceInterfaceRegistryKey(ptr long ptr) -@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) -@ stdcall IoPageRead(ptr ptr ptr ptr ptr) -@ stdcall IoPnPDeliverServicePowerNotification(long long long long) -@ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall IoQueryFileDosDeviceName(ptr ptr) -@ stdcall IoQueryFileInformation(ptr long long ptr ptr) -@ stdcall IoQueryVolumeInformation(ptr long long ptr ptr) -@ stdcall IoQueueThreadIrp(ptr) -@ stdcall IoQueueWorkItem(ptr ptr long ptr) -@ stdcall IoRaiseHardError(ptr ptr ptr) -@ stdcall IoRaiseInformationalHardError(long ptr ptr) -@ stdcall IoReadDiskSignature(ptr long ptr) -@ extern IoReadOperationCount -@ fastcall IoReadPartitionTable(ptr long long ptr) -@ stdcall IoReadPartitionTableEx(ptr ptr) -@ extern IoReadTransferCount -@ stdcall IoRegisterBootDriverReinitialization(ptr ptr ptr) -@ stdcall IoRegisterDeviceInterface(ptr ptr ptr ptr) -@ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) -@ stdcall IoRegisterFileSystem(ptr) -@ stdcall IoRegisterFsRegistrationChange(ptr ptr) -@ stdcall IoRegisterLastChanceShutdownNotification(ptr) -@ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) -@ stdcall IoRegisterShutdownNotification(ptr) -@ stdcall IoReleaseCancelSpinLock(long) -@ stdcall IoReleaseRemoveLockAndWaitEx(ptr ptr long) -@ stdcall IoReleaseRemoveLockEx(ptr ptr long) -@ stdcall IoReleaseVpbSpinLock(long) -@ stdcall IoRemoveShareAccess(ptr ptr) -@ stdcall IoReportDetectedDevice(ptr long long long ptr ptr long ptr) -@ stdcall IoReportHalResourceUsage(ptr ptr ptr long) -@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) -@ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) -@ stdcall IoReportTargetDeviceChange(ptr ptr) -@ stdcall IoReportTargetDeviceChangeAsynchronous(ptr ptr ptr ptr) -@ stdcall IoRequestDeviceEject(ptr) -@ stdcall IoReuseIrp(ptr long) -@ stdcall IoSetCompletionRoutineEx(ptr ptr ptr ptr long long long) -@ stdcall IoSetDeviceInterfaceState(ptr long) -@ stdcall IoSetDeviceToVerify(ptr ptr) -@ stdcall IoSetFileOrigin(ptr long) -@ stdcall IoSetHardErrorOrVerifyDevice(ptr ptr) -@ stdcall IoSetInformation(ptr ptr long ptr) -@ stdcall IoSetIoCompletion(ptr ptr ptr long ptr long) -@ fastcall IoSetPartitionInformation(ptr long long long) -@ stdcall IoSetPartitionInformationEx(ptr long ptr) -@ stdcall IoSetShareAccess(long long ptr ptr) -@ stdcall IoSetStartIoAttributes(ptr long long) -@ stdcall IoSetSystemPartition(ptr) -@ stdcall IoSetThreadHardErrorMode(long) -@ stdcall IoSetTopLevelIrp(ptr) -@ stdcall IoStartNextPacket(ptr long) -@ stdcall IoStartNextPacketByKey(ptr long long) -@ stdcall IoStartPacket(ptr ptr ptr ptr) -@ stdcall IoStartTimer(ptr) -@ extern IoStatisticsLock -@ stdcall IoStopTimer(ptr) -@ stdcall IoSynchronousInvalidateDeviceRelations(ptr long) -@ stdcall IoSynchronousPageWrite(ptr ptr ptr ptr ptr) -@ stdcall IoThreadToProcess(ptr) -;IoTranslateBusAddress -@ stdcall IoUnregisterFileSystem(ptr) -@ stdcall IoUnregisterFsRegistrationChange(ptr ptr) -@ stdcall IoUnregisterPlugPlayNotification(ptr) -@ stdcall IoUnregisterShutdownNotification(ptr) -@ stdcall IoUpdateShareAccess(ptr ptr) -@ stdcall IoValidateDeviceIoControlAccess(ptr long) -@ stdcall IoVerifyPartitionTable(ptr long) -@ stdcall IoVerifyVolume(ptr long) -@ stdcall IoVolumeDeviceToDosName(ptr ptr) -@ stdcall IoWMIAllocateInstanceIds(ptr long ptr) -@ stdcall IoWMIDeviceObjectToInstanceName(ptr ptr ptr) -@ stdcall IoWMIExecuteMethod(ptr ptr long long ptr ptr) -@ stdcall IoWMIHandleToInstanceName(ptr ptr ptr) -@ stdcall IoWMIOpenBlock(ptr long ptr) -@ stdcall IoWMIQueryAllData(ptr ptr ptr) -@ stdcall IoWMIQueryAllDataMultiple(ptr long ptr ptr) -@ stdcall IoWMIQuerySingleInstance(ptr ptr ptr ptr) -@ stdcall IoWMIQuerySingleInstanceMultiple(ptr ptr long ptr ptr) -@ stdcall IoWMIRegistrationControl(ptr long) -@ stdcall IoWMISetNotificationCallback(ptr ptr ptr) -@ stdcall IoWMISetSingleInstance(ptr ptr long long ptr) -@ stdcall IoWMISetSingleItem(ptr ptr long long long ptr) -@ stdcall IoWMISuggestInstanceName(ptr ptr long ptr) -@ stdcall IoWMIWriteEvent(ptr) -@ stdcall IoWriteErrorLogEntry(ptr) -@ extern IoWriteOperationCount -@ fastcall IoWritePartitionTable(ptr long long long ptr) -@ stdcall IoWritePartitionTableEx(ptr ptr) -@ extern IoWriteTransferCount -@ fastcall IofCallDriver(ptr ptr) -@ fastcall IofCompleteRequest(ptr long) -@ stdcall KdChangeOption(long long ptr long ptr ptr) -@ extern KdDebuggerEnabled _KdDebuggerEnabled -@ extern KdDebuggerNotPresent _KdDebuggerNotPresent -@ stdcall KdDisableDebugger() -@ stdcall KdEnableDebugger() -@ extern KdEnteredDebugger -@ stdcall KdPollBreakIn() -@ stdcall KdPowerTransition(long) -@ stdcall KdRefreshDebuggerNotPresent() -@ stdcall KdSystemDebugControl(long ptr long ptr long ptr long) -#ifdef _M_IX86 -@ stdcall Ke386CallBios(long ptr) -;Ke386IoSetAccessProcess -;Ke386QueryIoAccessMap -;Ke386SetIoAccessMap -#endif -@ fastcall KeAcquireGuardedMutex(ptr) -@ fastcall KeAcquireGuardedMutexUnsafe(ptr) -@ fastcall KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) -@ fastcall KeAcquireInStackQueuedSpinLockForDpc(ptr ptr) -@ stdcall KeAcquireInterruptSpinLock(ptr) -@ stdcall KeAcquireSpinLockAtDpcLevel(ptr) -@ fastcall KeAcquireSpinLockForDpc(ptr) -#ifdef __x86_64__ -@ stdcall KeAcquireSpinLockRaiseToDpc(ptr) -#endif -@ stdcall KeAddSystemServiceTable(ptr ptr long ptr long) -@ stdcall KeAreAllApcsDisabled() -@ stdcall KeAreApcsDisabled() -@ stdcall KeAttachProcess(ptr) -@ stdcall KeBugCheck(long) -@ stdcall KeBugCheckEx(long ptr ptr ptr ptr) -@ stdcall KeCancelTimer(ptr) -@ stdcall KeCapturePersistentThreadState(ptr long long long long long ptr) -@ stdcall KeClearEvent(ptr) -@ stdcall KeConnectInterrupt(ptr) -@ stdcall KeDelayExecutionThread(long long ptr) -@ stdcall KeDeregisterBugCheckCallback(ptr) -@ stdcall KeDeregisterBugCheckReasonCallback(ptr) -@ stdcall KeDeregisterNmiCallback(ptr) -@ stdcall KeDetachProcess() -@ stdcall KeDisconnectInterrupt(ptr) -@ stdcall KeEnterCriticalRegion() _KeEnterCriticalRegion -@ stdcall KeEnterGuardedRegion() _KeEnterGuardedRegion -@ stdcall KeEnterKernelDebugger() -@ stdcall KeFindConfigurationEntry(ptr long long ptr) -@ stdcall KeFindConfigurationNextEntry(ptr long long ptr ptr) -@ stdcall KeFlushEntireTb(long long) -@ stdcall KeFlushQueuedDpcs() -;KeGenericCallDpc -@ stdcall KeGetCurrentThread() -@ stdcall KeGetPreviousMode() -@ stdcall KeGetRecommendedSharedDataAlignment() -#ifdef _M_IX86 -;KeI386AbiosCall -@ stdcall KeI386AllocateGdtSelectors(ptr long) -;KeI386Call16BitCStyleFunction -;KeI386Call16BitFunction -@ stdcall KeI386FlatToGdtSelector(long long long) -;KeI386GetLid -@ extern KeI386MachineType -@ stdcall KeI386ReleaseGdtSelectors(ptr long) -;KeI386ReleaseLid -;KeI386SetGdtSelector -#endif -@ stdcall KeInitializeApc(ptr ptr long ptr ptr ptr long ptr) -@ stdcall KeInitializeCrashDumpHeader(long long ptr long ptr) -@ stdcall KeInitializeDeviceQueue(ptr) -@ stdcall KeInitializeDpc(ptr ptr ptr) -@ stdcall KeInitializeEvent(ptr long long) -@ fastcall KeInitializeGuardedMutex(ptr) -@ stdcall KeInitializeInterrupt(ptr ptr ptr ptr long long long long long long long) -@ stdcall KeInitializeMutant(ptr long) -@ stdcall KeInitializeMutex(ptr long) -@ stdcall KeInitializeQueue(ptr long) -@ stdcall KeInitializeSemaphore(ptr long long) -#ifndef __x86_64__ -@ stdcall KeInitializeSpinLock(ptr) -#endif -@ stdcall KeInitializeThreadedDpc(ptr ptr ptr) -@ stdcall KeInitializeTimer(ptr) -@ stdcall KeInitializeTimerEx(ptr long) -@ stdcall KeInsertByKeyDeviceQueue(ptr ptr long) -@ stdcall KeInsertDeviceQueue(ptr ptr) -@ stdcall KeInsertHeadQueue(ptr ptr) -@ stdcall KeInsertQueue(ptr ptr) -@ stdcall KeInsertQueueApc(ptr ptr ptr long) -@ stdcall KeInsertQueueDpc(ptr ptr ptr) -@ stdcall KeInvalidateAllCaches() -@ stdcall KeIpiGenericCall(ptr ptr) -@ stdcall KeIsAttachedProcess() -@ stdcall KeIsExecutingDpc() -;KeIsWaitListEmpty -@ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion -@ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion -@ extern KeLoaderBlock -@ extern KeNumberProcessors -@ stdcall KeProfileInterrupt(ptr) -@ stdcall KeProfileInterruptWithSource(ptr long) -@ stdcall KePulseEvent(ptr long long) -@ stdcall KeQueryActiveProcessors() -#ifndef __x86_64__ -@ stdcall KeQueryInterruptTime() -#endif -@ stdcall KeQueryPriorityThread(ptr) -@ stdcall KeQueryRuntimeThread(ptr ptr) -#ifndef __x86_64__ -@ stdcall KeQuerySystemTime(ptr) -#endif -@ stdcall KeQueryTickCount(ptr) -@ stdcall KeQueryTimeIncrement() -@ stdcall KeRaiseUserException(long) -@ stdcall KeReadStateEvent(ptr) -@ stdcall KeReadStateMutant(ptr) -@ stdcall KeReadStateMutex(ptr) KeReadStateMutant -@ stdcall KeReadStateQueue(ptr) -@ stdcall KeReadStateSemaphore(ptr) -@ stdcall KeReadStateTimer(ptr) -@ stdcall KeRegisterBugCheckCallback(ptr ptr ptr long ptr) -@ stdcall KeRegisterBugCheckReasonCallback(ptr ptr ptr ptr) -@ stdcall KeRegisterNmiCallback(ptr ptr) -@ fastcall KeReleaseGuardedMutex(ptr) -@ fastcall KeReleaseGuardedMutexUnsafe(ptr) -@ fastcall KeReleaseInStackQueuedSpinLockForDpc(ptr) -@ fastcall KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) -@ stdcall KeReleaseInterruptSpinLock(ptr long) -@ stdcall KeReleaseMutant(ptr long long long) -@ stdcall KeReleaseMutex(ptr long) -@ stdcall KeReleaseSemaphore(ptr long long long) -#ifdef __x86_64__ -@ stdcall KeReleaseSpinLock(ptr long) -#endif -@ fastcall KeReleaseSpinLockForDpc(ptr long) -@ stdcall KeReleaseSpinLockFromDpcLevel(ptr) -@ stdcall KeRemoveByKeyDeviceQueue(ptr long) -@ stdcall KeRemoveByKeyDeviceQueueIfBusy(ptr long) -@ stdcall KeRemoveDeviceQueue(ptr) -@ stdcall KeRemoveEntryDeviceQueue(ptr ptr) -@ stdcall KeRemoveQueue(ptr long ptr) -@ stdcall KeRemoveQueueDpc(ptr) -@ stdcall KeRemoveSystemServiceTable(long) -@ stdcall KeResetEvent(ptr) -@ stdcall KeRestoreFloatingPointState(ptr) -@ stdcall KeRevertToUserAffinityThread() -@ stdcall KeRundownQueue(ptr) -@ stdcall KeSaveFloatingPointState(ptr) -@ cdecl KeSaveStateForHibernate(ptr) -@ extern KeServiceDescriptorTable -@ stdcall KeSetAffinityThread(ptr long) -@ stdcall KeSetBasePriorityThread(ptr long) -@ stdcall KeSetDmaIoCoherency(long) -@ stdcall KeSetEvent(ptr long long) -@ stdcall KeSetEventBoostPriority(ptr ptr) -@ stdcall KeSetIdealProcessorThread(ptr long) -@ stdcall KeSetImportanceDpc(ptr long) -@ stdcall KeSetKernelStackSwapEnable(long) -@ stdcall KeSetPriorityThread(ptr long) -@ stdcall KeSetProfileIrql(long) -@ stdcall KeSetSystemAffinityThread(long) -@ stdcall KeSetTargetProcessorDpc(ptr long) -@ stdcall KeSetTimeIncrement(long long) -@ stdcall KeSetTimer(ptr long long ptr) -@ stdcall KeSetTimerEx(ptr long long long ptr) -;KeSignalCallDpcDone -;KeSignalCallDpcSynchronize -@ stdcall KeStackAttachProcess(ptr ptr) -@ stdcall KeSynchronizeExecution(ptr ptr ptr) -@ stdcall KeTerminateThread(long) -@ fastcall KeTestSpinLock(ptr) -@ extern KeTickCount -@ fastcall KeTryToAcquireGuardedMutex(ptr) -@ fastcall KeTryToAcquireSpinLockAtDpcLevel(ptr) -@ stdcall KeUnstackDetachProcess(ptr) -@ stdcall KeUpdateRunTime(ptr long) -#ifdef _M_IX86 -@ stdcall KeUpdateSystemTime() -#else -@ stdcall KeUpdateSystemTime(ptr long long) -#endif -@ stdcall KeUserModeCallback(long ptr long ptr ptr) -@ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) -@ stdcall KeWaitForMutexObject(ptr long long long ptr) KeWaitForSingleObject -@ stdcall KeWaitForSingleObject(ptr long long long ptr) -@ fastcall KefAcquireSpinLockAtDpcLevel(ptr) -@ fastcall KefReleaseSpinLockFromDpcLevel(ptr) -#ifdef _M_IX86 -@ stdcall Kei386EoiHelper() -#endif -@ fastcall KiAcquireSpinLock(ptr) -@ extern KiBugCheckData -@ stdcall KiCheckForKernelApcDelivery() -#ifdef _M_IX86 -@ stdcall KiCoprocessorError() -#endif -@ stdcall KiDeliverApc(long ptr ptr) -#ifdef _M_IX86 -@ stdcall KiDispatchInterrupt() -#endif -@ extern KiEnableTimerWatchdog -@ stdcall KiIpiServiceRoutine(ptr ptr) -@ fastcall KiReleaseSpinLock(ptr) -@ cdecl KiUnexpectedInterrupt() -#ifdef _M_IX86 -;Kii386SpinOnSpinLock -#endif -@ stdcall LdrAccessResource(ptr ptr ptr ptr) -@ stdcall LdrEnumResources(ptr ptr long ptr ptr) -@ stdcall LdrFindResourceDirectory_U(ptr ptr long ptr) -@ stdcall LdrFindResource_U(ptr ptr long ptr) -@ extern LpcPortObjectType -@ stdcall LpcRequestPort(ptr ptr) -@ stdcall LpcRequestWaitReplyPort(ptr ptr ptr) -@ stdcall LsaCallAuthenticationPackage(long long long long long long long) -@ stdcall LsaDeregisterLogonProcess(long long) -@ stdcall LsaFreeReturnBuffer(ptr) -@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall LsaLookupAuthenticationPackage(long long long) -@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) -@ extern Mm64BitPhysicalAddress -@ stdcall MmAddPhysicalMemory(ptr ptr) -@ stdcall MmAddVerifierThunks(ptr long) -@ stdcall MmAdjustWorkingSetSize(long long long long) -@ stdcall MmAdvanceMdl(ptr long) -@ stdcall MmAllocateContiguousMemory(long long long) -@ stdcall MmAllocateContiguousMemorySpecifyCache(long long long long long long long long) -@ stdcall MmAllocateMappingAddress(long long) -@ stdcall MmAllocateNonCachedMemory(long) -@ stdcall MmAllocatePagesForMdl(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall MmAllocatePagesForMdlEx(long long long long long long long long long) -@ stdcall MmBuildMdlForNonPagedPool(ptr) -@ stdcall MmCanFileBeTruncated(ptr ptr) -;MmCommitSessionMappedView -@ stdcall MmCreateMdl(ptr ptr long) -;MmCreateMirror -@ stdcall MmCreateSection(ptr long ptr ptr long long ptr ptr) -@ stdcall MmDisableModifiedWriteOfSection(long) -@ stdcall MmFlushImageSection(ptr long) -@ stdcall MmForceSectionClosed(ptr long) -@ stdcall MmFreeContiguousMemory(ptr) -@ stdcall MmFreeContiguousMemorySpecifyCache(ptr long long) -@ stdcall MmFreeMappingAddress(ptr long) -@ stdcall MmFreeNonCachedMemory(ptr long) -@ stdcall MmFreePagesFromMdl(ptr) -@ stdcall MmGetPhysicalAddress(ptr) -@ stdcall MmGetPhysicalMemoryRanges() -@ stdcall MmGetSystemRoutineAddress(ptr) -@ stdcall MmGetVirtualForPhysical(long long) -@ stdcall MmGrowKernelStack(ptr) -@ extern MmHighestUserAddress -@ stdcall MmIsAddressValid(ptr) -@ stdcall MmIsDriverVerifying(ptr) -;MmIsIoSpaceActive -@ stdcall MmIsNonPagedSystemAddressValid(ptr) -@ stdcall MmIsRecursiveIoFault() -@ stdcall MmIsThisAnNtAsSystem() -@ stdcall MmIsVerifierEnabled(ptr) -@ stdcall MmLockPagableDataSection(ptr) -@ stdcall MmLockPagableImageSection(ptr) MmLockPagableDataSection -@ stdcall MmLockPagableSectionByHandle(ptr) -@ stdcall MmMapIoSpace(long long long long) -@ stdcall MmMapLockedPages(ptr long) -@ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) -@ stdcall MmMapLockedPagesWithReservedMapping(ptr long ptr long) -@ stdcall MmMapMemoryDumpMdl(ptr) -@ stdcall MmMapUserAddressesToPage(ptr long ptr) -@ stdcall MmMapVideoDisplay(long long long long) -@ stdcall MmMapViewInSessionSpace(ptr ptr ptr) -@ stdcall MmMapViewInSystemSpace(ptr ptr ptr) -@ stdcall MmMapViewOfSection(ptr ptr ptr long long ptr ptr long long long) -@ stdcall MmMarkPhysicalMemoryAsBad(ptr ptr) -@ stdcall MmMarkPhysicalMemoryAsGood(ptr ptr) -@ stdcall MmPageEntireDriver(ptr) -@ stdcall MmPrefetchPages(long ptr) -@ stdcall MmProbeAndLockPages(ptr long long) -@ stdcall MmProbeAndLockProcessPages(ptr ptr long long) -@ stdcall MmProbeAndLockSelectedPages(ptr ptr long long) -@ stdcall MmProtectMdlSystemAddress(ptr long) -@ stdcall MmQuerySystemSize() -@ stdcall MmRemovePhysicalMemory(ptr ptr) -@ stdcall MmResetDriverPaging(ptr) -@ extern MmSectionObjectType -@ stdcall MmSecureVirtualMemory(ptr long long) -@ stdcall MmSetAddressRangeModified(ptr long) -@ stdcall MmSetBankedSection(long long long long long long) -@ stdcall MmSizeOfMdl(ptr long) -@ extern MmSystemRangeStart -@ stdcall MmTrimAllSystemPagableMemory(long) -@ stdcall MmUnlockPagableImageSection(ptr) -@ stdcall MmUnlockPages(ptr) -@ stdcall MmUnmapIoSpace(ptr long) -@ stdcall MmUnmapLockedPages(ptr ptr) -@ stdcall MmUnmapReservedMapping(ptr long ptr) -@ stdcall MmUnmapVideoDisplay(ptr long) -@ stdcall MmUnmapViewInSessionSpace(ptr) -@ stdcall MmUnmapViewInSystemSpace(ptr) -@ stdcall MmUnmapViewOfSection(ptr ptr) -@ stdcall MmUnsecureVirtualMemory(ptr) -@ extern MmUserProbeAddress -@ extern NlsAnsiCodePage -@ extern NlsLeadByteInfo -@ extern NlsMbCodePageTag -@ extern NlsMbOemCodePageTag -@ extern NlsOemCodePage -@ extern NlsOemLeadByteInfo _NlsOemLeadByteInfo -@ stdcall NtAddAtom(wstr long ptr) -@ stdcall NtAdjustPrivilegesToken(ptr long ptr long ptr ptr) -@ stdcall NtAlertThread(ptr) -@ stdcall NtAllocateLocallyUniqueId(ptr) -@ stdcall NtAllocateUuids(ptr ptr ptr ptr) -@ stdcall NtAllocateVirtualMemory(ptr ptr long ptr long long) -@ extern NtBuildNumber -@ stdcall NtClose(ptr) -@ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall NtCreateEvent(ptr long ptr long long) -@ stdcall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) -@ stdcall NtCreateSection(ptr long ptr ptr long long ptr) -@ stdcall NtCreateTimer(ptr long ptr long) -@ stdcall NtDeleteAtom(ptr) -@ stdcall NtDeleteFile(ptr) -@ stdcall NtDeviceIoControlFile(ptr ptr ptr ptr ptr long ptr long ptr long) -@ stdcall NtDuplicateObject(ptr ptr ptr ptr long long long) -@ stdcall NtDuplicateToken(ptr long ptr long long ptr) -@ stdcall NtFindAtom(wstr long ptr) -@ stdcall NtFreeVirtualMemory(ptr ptr ptr long) -@ stdcall NtFsControlFile(ptr ptr ptr ptr ptr long ptr long ptr long) -@ extern NtGlobalFlag -@ stdcall NtLockFile(ptr ptr ptr ptr ptr ptr ptr long long long) -@ stdcall NtMakePermanentObject(ptr) -@ stdcall NtMapViewOfSection(ptr ptr ptr long long ptr ptr long long long) -@ stdcall NtNotifyChangeDirectoryFile(ptr ptr ptr ptr ptr ptr long long long) -@ stdcall NtOpenEvent(ptr long ptr) -@ stdcall NtOpenFile(ptr long ptr ptr long long) -@ stdcall NtOpenProcess(ptr long ptr ptr) -@ stdcall NtOpenProcessToken(ptr long ptr) -@ stdcall NtOpenProcessTokenEx(ptr long long ptr) -@ stdcall NtOpenThread(ptr long ptr ptr) -@ stdcall NtOpenThreadToken(ptr long long ptr) -@ stdcall NtOpenThreadTokenEx(ptr long long long ptr) -@ stdcall NtQueryDirectoryFile(ptr ptr ptr ptr ptr ptr long long long ptr long) -@ stdcall NtQueryEaFile(ptr ptr ptr long long ptr long ptr long) -@ stdcall NtQueryInformationAtom(ptr long ptr long ptr) -@ stdcall NtQueryInformationFile(ptr ptr ptr long long) -@ stdcall NtQueryInformationProcess(ptr ptr ptr long ptr) -@ stdcall NtQueryInformationThread(ptr long ptr long ptr) -@ stdcall NtQueryInformationToken(ptr long ptr long ptr) -@ stdcall NtQueryQuotaInformationFile(ptr ptr ptr long long ptr long ptr long) -@ stdcall NtQuerySecurityObject(ptr long ptr long ptr) -@ stdcall NtQuerySystemInformation(long ptr long ptr) -@ stdcall NtQueryVolumeInformationFile(ptr ptr ptr long long) -@ stdcall NtReadFile(ptr ptr ptr ptr ptr ptr long ptr ptr) -@ stdcall NtRequestPort(ptr ptr) -@ stdcall NtRequestWaitReplyPort(ptr ptr ptr) -@ stdcall NtSetEaFile(ptr ptr ptr long) -@ stdcall NtSetEvent(ptr ptr) -@ stdcall NtSetInformationFile(ptr ptr ptr long long) -@ stdcall NtSetInformationProcess(ptr ptr ptr long) -@ stdcall NtSetInformationThread(ptr long ptr long) -@ stdcall NtSetQuotaInformationFile(ptr ptr ptr long) -@ stdcall NtSetSecurityObject(ptr long ptr) -@ stdcall NtSetVolumeInformationFile(ptr ptr ptr long long) -@ stdcall NtShutdownSystem(long) -@ stdcall NtTraceEvent(long long long ptr) -@ stdcall NtUnlockFile(ptr ptr ptr ptr long) -@ stdcall NtVdmControl(long ptr) -@ stdcall NtWaitForSingleObject(ptr long ptr) -@ stdcall NtWriteFile(ptr ptr ptr ptr ptr ptr long ptr ptr) -@ stdcall ObAssignSecurity(ptr ptr ptr ptr) -@ stdcall ObCheckCreateObjectAccess(ptr long ptr ptr long long ptr) -@ stdcall ObCheckObjectAccess(ptr ptr long long ptr) -@ stdcall ObCloseHandle(ptr long) -@ stdcall ObCreateObject(long ptr ptr long ptr long long long ptr) -@ stdcall ObCreateObjectType(ptr ptr ptr ptr) -;ObDeleteCapturedInsertInfo -@ stdcall ObDereferenceObject(ptr) -@ stdcall ObDereferenceObjectDeferDelete(ptr) -@ stdcall ObDereferenceSecurityDescriptor(ptr long) -@ stdcall ObFindHandleForObject(ptr ptr ptr ptr ptr) -@ stdcall ObGetObjectSecurity(ptr ptr ptr) -@ stdcall ObInsertObject(ptr ptr long long ptr ptr) -@ stdcall ObIsKernelHandle(ptr) -@ stdcall ObLogSecurityDescriptor(ptr ptr long) -@ stdcall ObMakeTemporaryObject(ptr) -@ stdcall ObOpenObjectByName(ptr ptr long ptr long ptr ptr) -@ stdcall ObOpenObjectByPointer(ptr long ptr long ptr long ptr) -@ stdcall ObQueryNameString(ptr ptr long ptr) -@ stdcall ObQueryObjectAuditingByHandle(ptr ptr) -@ stdcall ObReferenceObjectByHandle(ptr long ptr long ptr ptr) -@ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) -@ stdcall ObReferenceObjectByPointer(ptr long ptr long) -@ stdcall ObReferenceSecurityDescriptor(ptr long) -@ stdcall ObReleaseObjectSecurity(ptr long) -;ObSetHandleAttributes@12 -@ stdcall ObSetSecurityDescriptorInfo(ptr ptr ptr ptr long ptr) -@ stdcall ObSetSecurityObjectByPointer(ptr long ptr) -@ fastcall ObfDereferenceObject(ptr) -@ fastcall ObfReferenceObject(ptr) -;PfxFindPrefix -;PfxInitialize -;PfxInsertPrefix -;PfxRemovePrefix -@ stdcall PoCallDriver(ptr ptr) -;PoCancelDeviceNotify -@ stdcall PoQueueShutdownWorkItem(ptr) -@ stdcall PoRegisterDeviceForIdleDetection(ptr long long long) -;PoRegisterDeviceNotify -@ stdcall PoRegisterSystemState(ptr long) -@ stdcall PoRequestPowerIrp(ptr long long ptr ptr ptr) -;PoRequestShutdownEvent -;PoSetHiberRange -@ stdcall PoSetPowerState(ptr long long) -@ stdcall PoSetSystemState(long) -;PoShutdownBugCheck -@ stdcall PoStartNextPowerIrp(ptr) -@ stdcall PoUnregisterSystemState(ptr) -@ stdcall ProbeForRead(ptr long long) -@ stdcall ProbeForWrite(ptr long long) -@ stdcall PsAssignImpersonationToken(ptr ptr) -@ stdcall PsChargePoolQuota(ptr long long) -@ stdcall PsChargeProcessNonPagedPoolQuota(ptr long) -@ stdcall PsChargeProcessPagedPoolQuota(ptr long) -@ stdcall PsChargeProcessPoolQuota(ptr long long) -@ stdcall PsCreateSystemProcess(ptr long ptr) -@ stdcall PsCreateSystemThread(ptr long ptr ptr ptr ptr ptr) -@ stdcall PsDereferenceImpersonationToken(ptr) PsDereferencePrimaryToken -@ stdcall PsDereferencePrimaryToken(ptr) -@ stdcall PsDisableImpersonation(ptr ptr) -@ stdcall PsEstablishWin32Callouts(ptr) -@ stdcall PsGetContextThread(ptr ptr long) -@ stdcall PsGetCurrentProcess() IoGetCurrentProcess -@ stdcall PsGetCurrentProcessId() -@ stdcall PsGetCurrentProcessSessionId() -@ stdcall PsGetCurrentProcessWin32Process() -@ stdcall PsGetCurrentThread() KeGetCurrentThread -@ stdcall PsGetCurrentThreadId() -@ stdcall PsGetCurrentThreadPreviousMode() -;PsGetCurrentThreadProcess -;PsGetCurrentThreadProcessId -@ stdcall PsGetCurrentThreadStackBase() -@ stdcall PsGetCurrentThreadStackLimit() -;PsGetCurrentThreadTeb -@ stdcall PsGetCurrentThreadWin32Thread() -;PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion -@ stdcall PsGetJobLock(ptr) -@ stdcall PsGetJobSessionId(ptr) -@ stdcall PsGetJobUIRestrictionsClass(ptr) -@ stdcall PsGetProcessCreateTimeQuadPart(ptr) -@ stdcall PsGetProcessDebugPort(ptr) -@ stdcall PsGetProcessExitProcessCalled(ptr) -@ stdcall PsGetProcessExitStatus(ptr) -@ stdcall PsGetProcessExitTime() -@ stdcall PsGetProcessId(ptr) -@ stdcall PsGetProcessImageFileName(ptr) -@ stdcall PsGetProcessInheritedFromUniqueProcessId(ptr) -@ stdcall PsGetProcessJob(ptr) -@ stdcall PsGetProcessPeb(ptr) -@ stdcall PsGetProcessPriorityClass(ptr) -@ stdcall PsGetProcessSectionBaseAddress(ptr) -@ stdcall PsGetProcessSecurityPort(ptr) -@ stdcall PsGetProcessSessionId(ptr) -;PsGetProcessSessionIdEx -@ stdcall PsGetProcessWin32Process(ptr) -@ stdcall PsGetProcessWin32WindowStation(ptr) -@ stdcall PsGetThreadFreezeCount(ptr) -@ stdcall PsGetThreadHardErrorsAreDisabled(ptr) -@ stdcall PsGetThreadId(ptr) -@ stdcall PsGetThreadProcess(ptr) -@ stdcall PsGetThreadProcessId(ptr) -@ stdcall PsGetThreadSessionId(ptr) -@ stdcall PsGetThreadTeb(ptr) -@ stdcall PsGetThreadWin32Thread(ptr) -@ stdcall PsGetVersion(ptr ptr ptr ptr) -@ stdcall PsImpersonateClient(ptr ptr long long long) -@ extern PsInitialSystemProcess -@ stdcall PsIsProcessBeingDebugged(ptr) -@ stdcall PsIsSystemProcess(ptr) -@ stdcall PsIsSystemThread(ptr) -@ stdcall PsIsThreadImpersonating(ptr) -@ stdcall PsIsThreadTerminating(ptr) -@ extern PsJobType -@ stdcall PsLookupProcessByProcessId(ptr ptr) -@ stdcall PsLookupProcessThreadByCid(ptr ptr ptr) -@ stdcall PsLookupThreadByThreadId(ptr ptr) -@ extern PsProcessType _PsProcessType -@ stdcall PsReferenceImpersonationToken(ptr ptr ptr ptr) -@ stdcall PsReferencePrimaryToken(ptr) -@ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) -@ stdcall PsRemoveLoadImageNotifyRoutine(ptr) -@ stdcall PsRestoreImpersonation(ptr ptr) -@ stdcall PsReturnPoolQuota(ptr long long) -@ stdcall PsReturnProcessNonPagedPoolQuota(ptr long) -@ stdcall PsReturnProcessPagedPoolQuota(ptr long) -@ stdcall PsRevertThreadToSelf(ptr) -@ stdcall PsRevertToSelf() -@ stdcall PsSetContextThread(ptr ptr long) -@ stdcall PsSetCreateProcessNotifyRoutine(ptr long) -@ stdcall PsSetCreateThreadNotifyRoutine(ptr) -@ stdcall PsSetJobUIRestrictionsClass(ptr long) -@ stdcall PsSetLegoNotifyRoutine(ptr) -@ stdcall PsSetLoadImageNotifyRoutine(ptr) -@ stdcall PsSetProcessPriorityByClass(ptr ptr) -@ stdcall PsSetProcessPriorityClass(ptr long) -@ stdcall PsSetProcessSecurityPort(ptr ptr) -@ stdcall PsSetProcessWin32Process(ptr ptr) -@ stdcall PsSetProcessWindowStation(ptr ptr) -@ stdcall PsSetThreadHardErrorsAreDisabled(ptr long) -@ stdcall PsSetThreadWin32Thread(ptr ptr) -@ stdcall PsTerminateSystemThread(long) -@ extern PsThreadType _PsThreadType -;PsWrapApcWow64Thread -#ifndef __x86_64__ -@ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) -@ stdcall READ_REGISTER_BUFFER_ULONG(ptr ptr long) -@ stdcall READ_REGISTER_BUFFER_USHORT(ptr ptr long) -@ stdcall READ_REGISTER_UCHAR(ptr) -@ stdcall READ_REGISTER_ULONG(ptr) -@ stdcall READ_REGISTER_USHORT(ptr) -#endif -@ stdcall KeRosDumpStackFrames(ptr long) -@ stdcall RtlAbsoluteToSelfRelativeSD(ptr ptr ptr) -@ stdcall RtlAddAccessAllowedAce(ptr long long ptr) -@ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) -@ stdcall RtlAddAce(ptr long long ptr long) -@ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) -@ stdcall RtlAddRange(ptr long long long long long long ptr ptr) -@ stdcall RtlAllocateAndInitializeSid(ptr long long long long long long long long long ptr) -@ stdcall RtlAllocateHeap(ptr long long) -@ stdcall RtlAnsiCharToUnicodeChar(ptr) -@ stdcall RtlAnsiStringToUnicodeSize(ptr) RtlxAnsiStringToUnicodeSize -@ stdcall RtlAnsiStringToUnicodeString(ptr ptr long) -@ stdcall RtlAppendAsciizToString(ptr str) -@ stdcall RtlAppendStringToString(ptr ptr) -@ stdcall RtlAppendUnicodeStringToString(ptr ptr) -@ stdcall RtlAppendUnicodeToString(ptr wstr) -@ stdcall RtlAreAllAccessesGranted(long long) -@ stdcall RtlAreAnyAccessesGranted(long long) -@ stdcall RtlAreBitsClear(ptr long long) -@ stdcall RtlAreBitsSet(ptr long long) -@ stdcall RtlAssert(str str long str) -@ stdcall RtlCaptureContext(ptr) -@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) -@ stdcall RtlCharToInteger(str long ptr) -@ stdcall RtlCheckRegistryKey(long wstr) -@ stdcall RtlClearAllBits(ptr) -@ stdcall RtlClearBit(ptr long) -@ stdcall RtlClearBits(ptr long long) -@ stdcall RtlCompareMemory(ptr ptr long) -@ stdcall RtlCompareMemoryUlong(ptr long long) -@ stdcall RtlCompareString(ptr ptr long) -@ stdcall RtlCompareUnicodeString(ptr ptr long) -@ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) -@ stdcall RtlCompressChunks(ptr long ptr long ptr long ptr) -@ stdcall RtlConvertLongToLargeInteger(long) -@ stdcall RtlConvertSidToUnicodeString(ptr ptr long) -@ stdcall RtlConvertUlongToLargeInteger(long) -@ stdcall RtlCopyLuid(ptr ptr) -@ stdcall RtlCopyRangeList(ptr ptr) -@ stdcall RtlCopySid(long ptr ptr) -@ stdcall RtlCopyString(ptr ptr) -@ stdcall RtlCopyUnicodeString(ptr ptr) -@ stdcall RtlCreateAcl(ptr long long) -@ stdcall RtlCreateAtomTable(long ptr) -@ stdcall RtlCreateHeap(long ptr long long ptr ptr) -@ stdcall RtlCreateRegistryKey(long wstr) -@ stdcall RtlCreateSecurityDescriptor(ptr long) -@ stdcall RtlCreateSystemVolumeInformationFolder(ptr) -@ stdcall RtlCreateUnicodeString(ptr wstr) -@ stdcall RtlCustomCPToUnicodeN(ptr wstr long ptr ptr long) -@ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) -@ stdcall RtlDecompressChunks(ptr long ptr long ptr long ptr) -@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) -@ stdcall RtlDelete(ptr) -@ stdcall RtlDeleteAce(ptr long) -@ stdcall RtlDeleteAtomFromAtomTable(ptr ptr) -@ stdcall RtlDeleteElementGenericTable(ptr ptr) -@ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) -@ stdcall RtlDeleteNoSplay(ptr ptr) -@ stdcall RtlDeleteOwnersRanges(ptr ptr) -@ stdcall RtlDeleteRange(ptr long long long long ptr) -@ stdcall RtlDeleteRegistryValue(long wstr wstr) -@ stdcall RtlDescribeChunk(long ptr ptr ptr ptr) -@ stdcall RtlDestroyAtomTable(ptr) -@ stdcall RtlDestroyHeap(ptr) -@ stdcall RtlDowncaseUnicodeString(ptr ptr long) -@ stdcall RtlEmptyAtomTable(ptr long) -@ stdcall RtlEnlargedIntegerMultiply(long long) -@ stdcall RtlEnlargedUnsignedDivide(long long long ptr) -@ stdcall RtlEnlargedUnsignedMultiply(long long) -@ stdcall RtlEnumerateGenericTable(ptr long) -@ stdcall RtlEnumerateGenericTableAvl(ptr long) -@ stdcall RtlEnumerateGenericTableLikeADirectory(ptr ptr ptr long ptr ptr ptr) -@ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) -@ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) -@ stdcall RtlEqualLuid(ptr ptr) -@ stdcall RtlEqualSid(ptr ptr) -@ stdcall RtlEqualString(ptr ptr long) -@ stdcall RtlEqualUnicodeString(ptr ptr long) -@ stdcall RtlExtendedIntegerMultiply(long long long) -@ stdcall RtlExtendedLargeIntegerDivide(long long long ptr) -@ stdcall RtlExtendedMagicDivide(long long long long long) -@ stdcall RtlFillMemory(ptr long long) -@ stdcall RtlFillMemoryUlong(ptr long long) -@ stdcall RtlFindClearBits(ptr long long) -@ stdcall RtlFindClearBitsAndSet(ptr long long) -@ stdcall RtlFindClearRuns(ptr ptr long long) -@ stdcall RtlFindFirstRunClear(ptr ptr) -@ stdcall RtlFindLastBackwardRunClear(ptr long ptr) -@ stdcall RtlFindLeastSignificantBit(long long) -@ stdcall RtlFindLongestRunClear(ptr ptr) -@ stdcall RtlFindMessage(ptr long long long ptr) -@ stdcall RtlFindMostSignificantBit(long long) -@ stdcall RtlFindNextForwardRunClear(ptr long ptr) -@ stdcall RtlFindRange(ptr long long long long long long long long ptr ptr ptr) -@ stdcall RtlFindSetBits(ptr long long) -@ stdcall RtlFindSetBitsAndClear(ptr long long) -@ stdcall RtlFindUnicodePrefix(ptr ptr long) -@ stdcall RtlFormatCurrentUserKeyPath(ptr) -@ stdcall RtlFreeAnsiString(ptr) -@ stdcall RtlFreeHeap(ptr long ptr) -@ stdcall RtlFreeOemString(ptr) -@ stdcall RtlFreeRangeList(ptr) -@ stdcall RtlFreeUnicodeString(ptr) -@ stdcall RtlGUIDFromString(ptr ptr) -@ stdcall RtlGenerate8dot3Name(ptr ptr long ptr) -@ stdcall RtlGetAce(ptr long ptr) -@ stdcall RtlGetCallersAddress(ptr ptr) -@ stdcall RtlGetCompressionWorkSpaceSize(long ptr ptr) -@ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) -@ stdcall RtlGetDefaultCodePage(ptr ptr) -@ stdcall RtlGetElementGenericTable(ptr long) -@ stdcall RtlGetElementGenericTableAvl(ptr long) -@ stdcall RtlGetFirstRange(ptr ptr ptr) -@ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) -@ stdcall RtlGetNextRange(ptr ptr long) -@ stdcall RtlGetNtGlobalFlags() -@ stdcall RtlGetOwnerSecurityDescriptor(ptr ptr ptr) -@ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) -@ stdcall RtlGetSetBootStatusData(ptr long long ptr long long) -@ stdcall RtlGetVersion(ptr) -@ stdcall RtlHashUnicodeString(ptr long long ptr) -@ stdcall RtlImageDirectoryEntryToData(ptr long long ptr) -@ stdcall RtlImageNtHeader(ptr) -@ stdcall RtlInitAnsiString(ptr str) -@ stdcall RtlInitAnsiStringEx(ptr str) -@ stdcall RtlInitCodePageTable(ptr ptr) -@ stdcall RtlInitString(ptr str) -@ stdcall RtlInitUnicodeString(ptr wstr) -@ stdcall RtlInitUnicodeStringEx(ptr wstr) -@ stdcall RtlInitializeBitMap(ptr ptr long) -@ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) -@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) -@ stdcall RtlInitializeRangeList(ptr) -@ stdcall RtlInitializeSid(ptr ptr long) -@ stdcall RtlInitializeUnicodePrefix(ptr) -@ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) -@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) -@ stdcall RtlInsertElementGenericTableFull(ptr ptr long ptr ptr long) -@ stdcall RtlInsertElementGenericTableFullAvl(ptr ptr long ptr ptr ptr) -@ stdcall RtlInsertUnicodePrefix(ptr ptr ptr) -@ stdcall RtlInt64ToUnicodeString(long long long ptr) -@ stdcall RtlIntegerToChar(long long long ptr) -@ stdcall RtlIntegerToUnicode(long long long ptr) -@ stdcall RtlIntegerToUnicodeString(long long ptr) -@ stdcall RtlInvertRangeList(ptr ptr) -@ stdcall RtlIpv4AddressToStringA(ptr ptr) -@ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) -@ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) -@ stdcall RtlIpv4AddressToStringW(ptr ptr) -@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) -@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) -@ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) -@ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) -@ stdcall RtlIpv6AddressToStringA(ptr ptr) -@ stdcall RtlIpv6AddressToStringExA(ptr long long ptr ptr) -@ stdcall RtlIpv6AddressToStringExW(ptr long long ptr ptr) -@ stdcall RtlIpv6AddressToStringW(ptr ptr) -@ stdcall RtlIpv6StringToAddressA(str ptr ptr) -@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) -@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) -@ stdcall RtlIsGenericTableEmpty(ptr) -@ stdcall RtlIsGenericTableEmptyAvl(ptr) -@ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) -@ stdcall RtlIsRangeAvailable(ptr long long long long long long ptr ptr ptr) -@ stdcall RtlIsValidOemCharacter(ptr) -@ stdcall RtlLargeIntegerAdd(long long long long) -@ stdcall RtlLargeIntegerArithmeticShift(long long long) -@ stdcall RtlLargeIntegerDivide(long long long long ptr) -@ stdcall RtlLargeIntegerNegate(long long) -@ stdcall RtlLargeIntegerShiftLeft(long long long) -@ stdcall RtlLargeIntegerShiftRight(long long long) -@ stdcall RtlLargeIntegerSubtract(long long long long) -@ stdcall RtlLengthRequiredSid(long) -@ stdcall RtlLengthSecurityDescriptor(ptr) -@ stdcall RtlLengthSid(ptr) -@ stdcall RtlLockBootStatusData(ptr) -@ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) -@ stdcall RtlLookupElementGenericTable(ptr ptr) -@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) -@ stdcall RtlLookupElementGenericTableFull(ptr ptr ptr ptr) -@ stdcall RtlLookupElementGenericTableFullAvl(ptr ptr ptr ptr) -@ stdcall RtlMapGenericMask(ptr ptr) -@ stdcall RtlMapSecurityErrorToNtStatus(long) -@ stdcall RtlMergeRangeLists(ptr ptr ptr long) -@ stdcall RtlMoveMemory(ptr ptr long) -@ stdcall RtlMultiByteToUnicodeN(ptr long ptr str long) -@ stdcall RtlMultiByteToUnicodeSize(ptr str long) -@ stdcall RtlNextUnicodePrefix(ptr long) -@ stdcall RtlNtStatusToDosError(long) -@ stdcall RtlNtStatusToDosErrorNoTeb(long) -@ stdcall RtlNumberGenericTableElements(ptr) -@ stdcall RtlNumberGenericTableElementsAvl(ptr) -@ stdcall RtlNumberOfClearBits(ptr) -@ stdcall RtlNumberOfSetBits(ptr) -@ stdcall RtlOemStringToCountedUnicodeString(ptr ptr long) -@ stdcall RtlOemStringToUnicodeSize(ptr) RtlxOemStringToUnicodeSize -@ stdcall RtlOemStringToUnicodeString(ptr ptr long) -@ stdcall RtlOemToUnicodeN(wstr long ptr ptr long) -@ stdcall RtlPinAtomInAtomTable(ptr ptr) -@ fastcall RtlPrefetchMemoryNonTemporal(ptr long) -@ stdcall RtlPrefixString(ptr ptr long) -@ stdcall RtlPrefixUnicodeString(ptr ptr long) -@ stdcall RtlQueryAtomInAtomTable(ptr ptr ptr ptr ptr ptr) -@ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) -@ stdcall RtlQueryTimeZoneInformation(ptr) -@ stdcall RtlRaiseException(ptr) -@ stdcall RtlRandom(ptr) -@ stdcall RtlRandomEx(ptr) -@ stdcall RtlRealPredecessor(ptr) -@ stdcall RtlRealSuccessor(ptr) -@ stdcall RtlRemoveUnicodePrefix(ptr ptr) -@ stdcall RtlReserveChunk(long ptr ptr ptr long) -@ stdcall RtlSecondsSince1970ToTime(long ptr) -@ stdcall RtlSecondsSince1980ToTime(long ptr) -@ stdcall RtlSelfRelativeToAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall RtlSelfRelativeToAbsoluteSD2(ptr long) -@ stdcall RtlSetAllBits(ptr) -@ stdcall RtlSetBit(ptr long) -@ stdcall RtlSetBits(ptr long long) -@ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) -@ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) -@ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) -@ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) -@ stdcall RtlSetTimeZoneInformation(ptr) -@ stdcall RtlSizeHeap(ptr long ptr) -@ stdcall RtlSplay(ptr) -@ stdcall RtlStringFromGUID(ptr ptr) -@ stdcall RtlSubAuthorityCountSid(ptr) -@ stdcall RtlSubAuthoritySid(ptr long) -@ stdcall RtlSubtreePredecessor(ptr) -@ stdcall RtlSubtreeSuccessor(ptr) -@ stdcall RtlTestBit(ptr long) -@ stdcall RtlTimeFieldsToTime(ptr ptr) -@ stdcall RtlTimeToElapsedTimeFields(ptr ptr) -@ stdcall RtlTimeToSecondsSince1970(ptr ptr) -@ stdcall RtlTimeToSecondsSince1980(ptr ptr) -@ stdcall RtlTimeToTimeFields(ptr ptr) -;RtlTraceDatabaseAdd -;RtlTraceDatabaseCreate -;RtlTraceDatabaseDestroy -;RtlTraceDatabaseEnumerate -;RtlTraceDatabaseFind -;RtlTraceDatabaseLock -;RtlTraceDatabaseUnlock -;RtlTraceDatabaseValidate -#ifndef __x86_64__ -@ fastcall RtlUlongByteSwap(long) -@ fastcall RtlUlonglongByteSwap(long long) -#endif -@ stdcall RtlUnicodeStringToAnsiSize(ptr) RtlxUnicodeStringToAnsiSize -@ stdcall RtlUnicodeStringToAnsiString(ptr ptr long) -@ stdcall RtlUnicodeStringToCountedOemString(ptr ptr long) -@ stdcall RtlUnicodeStringToInteger(ptr long ptr) -@ stdcall RtlUnicodeStringToOemSize(ptr) RtlxUnicodeStringToOemSize -@ stdcall RtlUnicodeStringToOemString(ptr ptr long) -@ stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) -@ stdcall RtlUnicodeToMultiByteN(ptr long ptr wstr long) -@ stdcall RtlUnicodeToMultiByteSize(ptr wstr long) -@ stdcall RtlUnicodeToOemN(ptr long ptr wstr long) -@ stdcall RtlUnlockBootStatusData(ptr) -@ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall RtlUpcaseUnicodeChar(long) -@ stdcall RtlUpcaseUnicodeString(ptr ptr long) -@ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) -@ stdcall RtlUpcaseUnicodeStringToCountedOemString(ptr ptr long) -@ stdcall RtlUpcaseUnicodeStringToOemString(ptr ptr long) -@ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) -@ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr wstr long) -@ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr wstr long) -@ stdcall RtlUpperChar(long) -@ stdcall RtlUpperString(ptr ptr) -#ifndef __x86_64__ -@ fastcall RtlUshortByteSwap(long) -#endif -@ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) -@ stdcall RtlValidSecurityDescriptor(ptr) -@ stdcall RtlValidSid(ptr) -@ stdcall RtlVerifyVersionInfo(ptr long long long) -@ stdcall RtlVolumeDeviceToDosName(ptr ptr) -@ stdcall RtlWalkFrameChain(ptr long long) -@ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) -@ stdcall RtlZeroHeap(ptr long) -@ stdcall RtlZeroMemory(ptr long) -@ stdcall RtlxAnsiStringToUnicodeSize(ptr) -@ stdcall RtlxOemStringToUnicodeSize(ptr) -@ stdcall RtlxUnicodeStringToAnsiSize(ptr) -@ stdcall RtlxUnicodeStringToOemSize(ptr) -@ stdcall SeAccessCheck(ptr ptr ptr long long ptr ptr long ptr ptr) -@ stdcall SeAppendPrivileges(ptr ptr) -@ stdcall SeAssignSecurity(ptr ptr ptr long ptr ptr ptr) -@ stdcall SeAssignSecurityEx(ptr ptr ptr ptr long long ptr ptr ptr) -@ stdcall SeAuditHardLinkCreation(ptr ptr long) -@ stdcall SeAuditingFileEvents(long ptr) -@ stdcall SeAuditingFileEventsWithContext(long ptr ptr) -@ stdcall SeAuditingFileOrGlobalEvents(long ptr ptr) -@ stdcall SeAuditingHardLinkEvents(long ptr) -@ stdcall SeAuditingHardLinkEventsWithContext(long ptr ptr) -@ stdcall SeCaptureSecurityDescriptor(ptr long long long ptr) -@ stdcall SeCaptureSubjectContext(ptr) -@ stdcall SeCloseObjectAuditAlarm(ptr ptr long) -@ stdcall SeCreateAccessState(ptr ptr long ptr) -@ stdcall SeCreateClientSecurity(ptr ptr long ptr) -@ stdcall SeCreateClientSecurityFromSubjectContext(ptr ptr long ptr) -@ stdcall SeDeassignSecurity(ptr) -@ stdcall SeDeleteAccessState(ptr) -@ stdcall SeDeleteObjectAuditAlarm(ptr ptr) -@ extern SeExports -@ stdcall SeFilterToken(ptr long ptr ptr ptr ptr) -@ stdcall SeFreePrivileges(ptr) -@ stdcall SeImpersonateClient(ptr ptr) -@ stdcall SeImpersonateClientEx(ptr ptr) -@ stdcall SeLockSubjectContext(ptr) -@ stdcall SeMarkLogonSessionForTerminationNotification(ptr) -@ stdcall SeOpenObjectAuditAlarm(ptr ptr ptr ptr ptr long long long ptr) -@ stdcall SeOpenObjectForDeleteAuditAlarm(ptr ptr ptr ptr ptr long long long ptr) -@ stdcall SePrivilegeCheck(ptr ptr long) -@ stdcall SePrivilegeObjectAuditAlarm(ptr ptr long ptr long long) -@ extern SePublicDefaultDacl -@ stdcall SeQueryAuthenticationIdToken(ptr ptr) -@ stdcall SeQueryInformationToken(ptr long ptr) -@ stdcall SeQuerySecurityDescriptorInfo(ptr ptr ptr ptr) -@ stdcall SeQuerySessionIdToken(ptr ptr) -@ stdcall SeRegisterLogonSessionTerminatedRoutine(ptr) -@ stdcall SeReleaseSecurityDescriptor(ptr long long) -@ stdcall SeReleaseSubjectContext(ptr) -@ stdcall SeSetAccessStateGenericMapping(ptr ptr) -;SeSetAuditParameter -@ stdcall SeSetSecurityDescriptorInfo(ptr ptr ptr ptr long ptr) -@ stdcall SeSetSecurityDescriptorInfoEx(ptr ptr ptr ptr long long ptr) -@ stdcall SeSinglePrivilegeCheck(long long long) -@ extern SeSystemDefaultDacl -@ stdcall SeTokenImpersonationLevel(ptr) -@ stdcall SeTokenIsAdmin(ptr) -@ stdcall SeTokenIsRestricted(ptr) -@ stdcall SeTokenIsWriteRestricted(ptr) -@ stdcall SeTokenType(ptr) -@ stdcall SeUnlockSubjectContext(ptr) -@ stdcall SeUnregisterLogonSessionTerminatedRoutine(ptr) -@ stdcall SeValidSecurityDescriptor(long ptr) -@ stdcall VerSetConditionMask(long long long long) -;VfFailDeviceNode -;VfFailDriver -;VfFailSystemBIOS -;VfIsVerificationEnabled -#ifndef __x86_64__ -@ stdcall WRITE_REGISTER_BUFFER_UCHAR(ptr ptr long) -@ stdcall WRITE_REGISTER_BUFFER_ULONG(ptr ptr long) -@ stdcall WRITE_REGISTER_BUFFER_USHORT(ptr ptr long) -@ stdcall WRITE_REGISTER_UCHAR(ptr long) -@ stdcall WRITE_REGISTER_ULONG(ptr long) -@ stdcall WRITE_REGISTER_USHORT(ptr long) -#endif -;WmiFlushTrace -;WmiGetClock -;WmiQueryTrace -@ stdcall WmiQueryTraceInformation(long ptr long ptr ptr) -;WmiStartTrace -;WmiStopTrace -;WmiTraceFastEvent -@ cdecl WmiTraceMessage() -@ stdcall WmiTraceMessageVa(ptr long ptr long long) -;WmiUpdateTrace -;XIPDispatch -@ stdcall ZwAccessCheckAndAuditAlarm(ptr ptr ptr ptr ptr long ptr long ptr ptr ptr) -@ stdcall ZwAddBootEntry(ptr long) -@ stdcall ZwAddDriverEntry(ptr long) -@ stdcall ZwAdjustPrivilegesToken(ptr long ptr long ptr ptr) -@ stdcall ZwAlertThread(ptr) -@ stdcall ZwAllocateVirtualMemory(ptr ptr long ptr long long) -@ stdcall ZwAssignProcessToJobObject(ptr ptr) -@ stdcall ZwCancelIoFile(ptr ptr) -@ stdcall ZwCancelTimer(ptr ptr) -@ stdcall ZwClearEvent(ptr) -@ stdcall ZwClose(ptr) -@ stdcall ZwCloseObjectAuditAlarm(ptr ptr long) -@ stdcall ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall ZwCreateDirectoryObject(ptr long ptr) -@ stdcall ZwCreateEvent(ptr long ptr long long) -@ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) -@ stdcall ZwCreateJobObject(ptr long ptr) -@ stdcall ZwCreateKey(ptr long ptr long ptr long ptr) -@ stdcall ZwCreateSection(ptr long ptr ptr long long ptr) -@ stdcall ZwCreateSymbolicLinkObject(ptr long ptr ptr) -@ stdcall ZwCreateTimer(ptr long ptr long) -@ stdcall ZwDeleteBootEntry(long) -@ stdcall ZwDeleteDriverEntry(long) -@ stdcall ZwDeleteFile(ptr) -@ stdcall ZwDeleteKey(ptr) -@ stdcall ZwDeleteValueKey(ptr ptr) -@ stdcall ZwDeviceIoControlFile(ptr ptr ptr ptr ptr long ptr long ptr long) -@ stdcall ZwDisplayString(ptr) -@ stdcall ZwDuplicateObject(ptr ptr ptr ptr long long long) -@ stdcall ZwDuplicateToken(ptr long ptr long long ptr) -@ stdcall ZwEnumerateBootEntries(ptr ptr) -@ stdcall ZwEnumerateDriverEntries(ptr ptr) -@ stdcall ZwEnumerateKey(ptr long long ptr long ptr) -@ stdcall ZwEnumerateValueKey(ptr long long ptr long ptr) -@ stdcall ZwFlushInstructionCache(ptr ptr long) -@ stdcall ZwFlushKey(ptr) -@ stdcall ZwFlushVirtualMemory(ptr ptr ptr ptr) -@ stdcall ZwFreeVirtualMemory(ptr ptr ptr long) -@ stdcall ZwFsControlFile(ptr ptr ptr ptr ptr long ptr long ptr long) -@ stdcall ZwInitiatePowerAction(long long long long) -@ stdcall ZwIsProcessInJob(ptr ptr) -@ stdcall ZwLoadDriver(ptr) -@ stdcall ZwLoadKey(ptr ptr) -@ stdcall ZwMakeTemporaryObject(ptr) -@ stdcall ZwMapViewOfSection(ptr ptr ptr long long ptr ptr long long long) -@ stdcall ZwModifyBootEntry(ptr) -@ stdcall ZwModifyDriverEntry(ptr) -@ stdcall ZwNotifyChangeKey(ptr ptr ptr ptr ptr long long ptr long long) -@ stdcall ZwOpenDirectoryObject(ptr long ptr) -@ stdcall ZwOpenEvent(ptr long ptr) -@ stdcall ZwOpenFile(ptr long ptr ptr long long) -@ stdcall ZwOpenJobObject(ptr long ptr) -@ stdcall ZwOpenKey(ptr long ptr) -@ stdcall ZwOpenProcess(ptr long ptr ptr) -@ stdcall ZwOpenProcessToken(ptr long ptr) -@ stdcall ZwOpenProcessTokenEx(ptr long long ptr) -@ stdcall ZwOpenSection(ptr long ptr) -@ stdcall ZwOpenSymbolicLinkObject(ptr long ptr) -@ stdcall ZwOpenThread(ptr long ptr ptr) -@ stdcall ZwOpenThreadToken(ptr long long ptr) -@ stdcall ZwOpenThreadTokenEx(ptr long long long ptr) -@ stdcall ZwOpenTimer(ptr long ptr) -@ stdcall ZwPowerInformation(long ptr long ptr long) -@ stdcall ZwPulseEvent(ptr ptr) -@ stdcall ZwQueryBootEntryOrder(ptr ptr) -@ stdcall ZwQueryBootOptions(ptr ptr) -@ stdcall ZwQueryDefaultLocale(long ptr) -@ stdcall ZwQueryDefaultUILanguage(ptr) -@ stdcall ZwQueryDirectoryFile(ptr ptr ptr ptr ptr ptr long long long ptr long) -@ stdcall ZwQueryDirectoryObject(ptr ptr long long long ptr ptr) -@ stdcall ZwQueryDriverEntryOrder(ptr ptr) -@ stdcall ZwQueryEaFile(ptr ptr ptr long long ptr long ptr long) -@ stdcall ZwQueryFullAttributesFile(ptr ptr) -@ stdcall ZwQueryInformationAtom(ptr long ptr long ptr) -@ stdcall ZwQueryInformationFile(ptr ptr ptr long long) -@ stdcall ZwQueryInformationJobObject(ptr long ptr long ptr) -@ stdcall ZwQueryInformationProcess(ptr long ptr long ptr) -@ stdcall ZwQueryInformationThread(ptr long ptr long ptr) -@ stdcall ZwQueryInformationToken(ptr long long long ptr) -@ stdcall ZwQueryInstallUILanguage(ptr) -@ stdcall ZwQueryKey(ptr long ptr long ptr) -@ stdcall ZwQueryObject(ptr long ptr long ptr) -@ stdcall ZwQuerySection(ptr long ptr long ptr) -@ stdcall ZwQuerySecurityObject(ptr long ptr long ptr) -@ stdcall ZwQuerySymbolicLinkObject(ptr ptr ptr) -@ stdcall ZwQuerySystemInformation(long ptr long ptr) -@ stdcall ZwQueryValueKey(ptr ptr long ptr long ptr) -@ stdcall ZwQueryVolumeInformationFile(ptr ptr ptr long long) -@ stdcall ZwReadFile(ptr ptr ptr ptr ptr ptr long ptr ptr) -@ stdcall ZwReplaceKey(ptr ptr ptr) -@ stdcall ZwRequestWaitReplyPort(ptr ptr ptr) -@ stdcall ZwResetEvent(ptr ptr) -@ stdcall ZwRestoreKey(ptr ptr long) -@ stdcall ZwSaveKey(ptr ptr) -@ stdcall ZwSaveKeyEx(ptr ptr long) -@ stdcall ZwSecureConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall ZwSetBootEntryOrder(ptr ptr) -@ stdcall ZwSetBootOptions(ptr long) -@ stdcall ZwSetDefaultLocale(long long) -@ stdcall ZwSetDefaultUILanguage(long) -@ stdcall ZwSetDriverEntryOrder(ptr ptr) -@ stdcall ZwSetEaFile(ptr ptr ptr long) -@ stdcall ZwSetEvent(ptr ptr) -@ stdcall ZwSetInformationFile(ptr ptr ptr long long) -@ stdcall ZwSetInformationJobObject(ptr long ptr long) -@ stdcall ZwSetInformationObject(ptr long ptr long) -@ stdcall ZwSetInformationProcess(ptr long ptr long) -@ stdcall ZwSetInformationThread(ptr long ptr long) -@ stdcall ZwSetSecurityObject(ptr long ptr) -@ stdcall ZwSetSystemInformation(long ptr long) -@ stdcall ZwSetSystemTime(ptr ptr) -@ stdcall ZwSetTimer(ptr ptr ptr ptr long long ptr) -@ stdcall ZwSetValueKey(ptr ptr long long ptr long) -@ stdcall ZwSetVolumeInformationFile(ptr ptr ptr long long) -@ stdcall ZwTerminateJobObject(ptr long) -@ stdcall ZwTerminateProcess(ptr long) -@ stdcall ZwTranslateFilePath(ptr long ptr long) -@ stdcall ZwUnloadDriver(ptr) -@ stdcall ZwUnloadKey(ptr) -@ stdcall ZwUnmapViewOfSection(ptr ptr) -@ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) -@ stdcall ZwWaitForSingleObject(ptr long ptr) -@ stdcall ZwWriteFile(ptr ptr ptr ptr ptr ptr long ptr ptr) -@ stdcall ZwYieldExecution() -;_CIcos -;_CIsin -;_CIsqrt -#ifndef __x86_64 -@ cdecl _abnormal_termination() -#endif -#ifdef _M_IX86 -@ cdecl _alldiv() -@ cdecl _alldvrm() -@ cdecl _allmul() -@ cdecl _alloca_probe() -@ cdecl _allrem() -@ cdecl _allshl() -@ cdecl _allshr() -@ cdecl _aulldiv() -@ cdecl _aulldvrm() -@ cdecl _aullrem() -@ cdecl _aullshr() -#endif -#ifndef __x86_64 -@ cdecl _except_handler2() -@ cdecl _except_handler3() -@ cdecl _global_unwind2() -#endif -@ cdecl _itoa() -@ cdecl _itow() -#ifndef __x86_64 -@ cdecl _local_unwind2() -#endif -@ cdecl _purecall() -@ cdecl _snprintf() -@ cdecl _snwprintf() -@ cdecl _stricmp() -@ cdecl _strlwr() -@ cdecl _strnicmp() -@ cdecl _strnset() -@ cdecl _strrev() -@ cdecl _strset() -@ cdecl _strupr() -@ cdecl _vsnprintf() -@ cdecl _vsnwprintf() -@ cdecl _wcsicmp() -@ cdecl _wcslwr() -@ cdecl _wcsnicmp() -@ cdecl _wcsnset() -@ cdecl _wcsrev() -@ cdecl _wcsupr() -@ cdecl atoi() -@ cdecl atol() -@ cdecl isdigit() -@ cdecl islower() -@ cdecl isprint() -@ cdecl isspace() -@ cdecl isupper() -@ cdecl isxdigit() -@ cdecl mbstowcs() -@ cdecl mbtowc() -@ cdecl memchr() -@ cdecl memcpy() -@ cdecl memmove() -@ cdecl memset() -@ cdecl qsort() -@ cdecl rand() -@ cdecl sprintf() -@ cdecl srand() -@ cdecl strcat() -@ cdecl strchr() -@ cdecl strcmp() -@ cdecl strcpy() -@ cdecl strlen() -@ cdecl strncat() -@ cdecl strncmp() -@ cdecl strncpy() -@ cdecl strrchr() -@ cdecl strspn() -@ cdecl strstr() -@ cdecl swprintf() -@ cdecl tolower() -@ cdecl toupper() -@ cdecl towlower() -@ cdecl towupper() -@ stdcall vDbgPrintEx(long long str ptr) -@ stdcall vDbgPrintExWithPrefix(str long long str ptr) -@ cdecl vsprintf() -@ cdecl wcscat() -@ cdecl wcschr() -@ cdecl wcscmp() -@ cdecl wcscpy() -@ cdecl wcscspn() -@ cdecl wcslen() -@ cdecl wcsncat() -@ cdecl wcsncmp() -@ cdecl wcsncpy() -@ cdecl wcsrchr() -@ cdecl wcsspn() -@ cdecl wcsstr() -@ cdecl wcstombs() -@ cdecl wctomb()
16 years, 1 month
1
0
0
0
[tkreuzer] 37088: sync to trunk head (37079)
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Oct 30 04:59:28 2008 New Revision: 37088 URL:
http://svn.reactos.org/svn/reactos?rev=37088&view=rev
Log: sync to trunk head (37079) Added: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/platform/acmsc.h - copied unchanged from r37084, trunk/reactos/drivers/bus/acpi/include/platform/acmsc.h branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec - copied unchanged from r37084, trunk/reactos/hal/hal/hal.pspec branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec - copied, changed from r37084, trunk/reactos/ntoskrnl/ntoskrnl.pspec branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c - copied unchanged from r37084, trunk/reactos/subsystems/win32/win32k/objects/freetype.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec - copied unchanged from r37084, trunk/reactos/subsystems/win32/win32k/win32k.pspec Removed: branches/ros-amd64-bringup/reactos/hal/hal/hal.spec branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.spec Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/srvpage.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c branches/ros-amd64-bringup/reactos/base/applications/network/finger/finger.c branches/ros-amd64-bringup/reactos/base/applications/network/ipconfig/ipconfig.c branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c branches/ros-amd64-bringup/reactos/base/shell/explorer-new/traywnd.c branches/ros-amd64-bringup/reactos/base/system/smss/smss.h branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_main.c branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo.h branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/netcfg_iface.c branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/netcfgx.rbuild branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/precomp.h branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/tcpipconf_notify.c branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/bg-BG.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/cs-CZ.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/da-DK.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/de-DE.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/el-GR.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/en-US.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/es-ES.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/hu-HU.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/id-ID.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/it-IT.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/nl-NL.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/no-NO.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/pl-PL.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/ru-RU.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/sk-SK.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/sv-SE.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/uk-UA.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/zh-CN.rc branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c branches/ros-amd64-bringup/reactos/dll/win32/ole32/moniker.c branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/enumidlist.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_recyclebin.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shlview.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shv_def_cmenu.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/platform/acwin.h branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntgdityp.h branches/ros-amd64-bringup/reactos/lib/rtl/debug.c branches/ros-amd64-bringup/reactos/lib/rtl/res.c branches/ros-amd64-bringup/reactos/lib/rtl/rtl.h branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ci.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/timerobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dc.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/text.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/ros-amd64-bringup/reactos/tools/rbuild/compilationunit.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/srvpage.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/applications/network/finger/finger.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ipconfig/ipconfig.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer-new/traywnd.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/base/system/smss/smss.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/netcfg_iface.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/netcfgx.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/precomp.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/da-DK.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/el-GR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/hu-HU.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/ja-JP.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/nl-NL.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/no-NO.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/moniker.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/enumidlist.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_recyclebin.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shlview.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shv_def_cmenu.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/platform/acwin.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Removed: branches/ros-amd64-bringup/reactos/hal/hal/hal.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Modified: branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntgdityp.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/debug.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r…
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/res.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r…
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r…
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/i386/ci.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/timerobj.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Copied: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec (from r37084, trunk/reactos/ntoskrnl/ntoskrnl.pspec) URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dc.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/text.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
Removed: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/compilationunit.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
16 years, 1 month
1
0
0
0
[janderwald] 37087: - Convert LoadSoundFiles to explictely to unicode - Fix 2 possible buffer overflows (CID 553)
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Oct 30 04:58:12 2008 New Revision: 37087 URL:
http://svn.reactos.org/svn/reactos?rev=37087&view=rev
Log: - Convert LoadSoundFiles to explictely to unicode - Fix 2 possible buffer overflows (CID 553) Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev…
============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Thu Oct 30 04:58:12 2008 @@ -648,35 +648,35 @@ BOOL LoadSoundFiles(HWND hwndDlg) { - TCHAR szPath[MAX_PATH]; - TCHAR szNone[MAX_PATH]; - TCHAR * ptr; - WIN32_FIND_DATA FileData; + WCHAR szPath[MAX_PATH]; + WCHAR * ptr; + WIN32_FIND_DATAW FileData; HANDLE hFile; LRESULT lResult; UINT length; - length = GetWindowsDirectory(szPath, sizeof(szPath) / sizeof(TCHAR)); - if (length == 0 || length > (sizeof(szPath) / sizeof(TCHAR))) - { - return FALSE; - } - if (szPath[length-1] != _T('\\')) - { - szPath[length] = _T('\\'); + length = GetWindowsDirectoryW(szPath, MAX_PATH); + if (length == 0 || length >= MAX_PATH - 9) + { + return FALSE; + } + if (szPath[length-1] != L'\\') + { + szPath[length] = L'\\'; length++; } - _tcscpy(&szPath[length], _T("media\\*")); + wcscpy(&szPath[length], L"media\\*"); length += 7; - hFile = FindFirstFile(szPath, &FileData); + hFile = FindFirstFileW(szPath, &FileData); if (hFile == INVALID_HANDLE_VALUE) { return FALSE; } - if (LoadString(hApplet, IDS_NO_SOUND, szNone, MAX_PATH)) - { - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNone); + if (LoadString(hApplet, IDS_NO_SOUND, szPath, MAX_PATH)) + { + szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szPath); } do @@ -684,7 +684,7 @@ if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; - ptr = _tcsrchr(FileData.cFileName, _T('\\')); + ptr = wcsrchr(FileData.cFileName, L'\\'); if (ptr) { ptr++; @@ -693,13 +693,13 @@ { ptr = FileData.cFileName; } - lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); if (lResult != CB_ERR) { - _tcscpy(&szPath[length-1], FileData.cFileName); - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_tcsdup(szPath)); - } - }while(FindNextFile(hFile, &FileData) != 0); + wcscpy(&szPath[length-1], FileData.cFileName); + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)wcsdup(szPath)); + } + }while(FindNextFileW(hFile, &FileData) != 0); FindClose(hFile); return TRUE;
16 years, 1 month
1
0
0
0
[cwittich] 37086: fix 'Cast from pointer to integer of different size' in PickIconProc() patch by hto See issue #3828 for more details.
by cwittich@svn.reactos.org
Author: cwittich Date: Thu Oct 30 04:44:36 2008 New Revision: 37086 URL:
http://svn.reactos.org/svn/reactos?rev=37086&view=rev
Log: fix 'Cast from pointer to integer of different size' in PickIconProc() patch by hto See issue #3828 for more details. Modified: trunk/reactos/dll/win32/shell32/dialogs.c Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.…
============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Thu Oct 30 04:44:36 2008 @@ -117,7 +117,7 @@ pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); else @@ -174,7 +174,7 @@ FreeLibrary(pIconContext->hLibrary); pIconContext->hLibrary = hLibrary; wcscpy(pIconContext->szName, szText); - EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); else
16 years, 1 month
1
0
0
0
[dchapyshev] 37085: - Add getting system font and icon size settings - Other small changes
by dchapyshev@svn.reactos.org
Author: dchapyshev Date: Thu Oct 30 04:41:37 2008 New Revision: 37085 URL:
http://svn.reactos.org/svn/reactos?rev=37085&view=rev
Log: - Add getting system font and icon size settings - Other small changes Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Oct 30 04:41:37 2008 @@ -24,6 +24,8 @@ HANDLE hProcessHeap; HMODULE hDllLib; ULONG ulCurrentLayoutNum = 1; +UINT cxSmIcon, cySmIcon; + static HICON CreateTrayIcon(LPTSTR szLCID) @@ -49,18 +51,18 @@ hdcsrc = GetDC(NULL); hdc = CreateCompatibleDC(hdcsrc); - hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); + hBitmap = CreateCompatibleBitmap(hdcsrc, cxSmIcon, cySmIcon); ReleaseDC(NULL, hdcsrc); if (hdc && hBitmap) { - hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); + hBmpNew = CreateBitmap(cxSmIcon, cySmIcon, 1, 1, NULL); if (hBmpNew) { hBmpOld = SelectObject(hdc, hBitmap); - rect.right = 16; + rect.right = cxSmIcon; rect.left = 0; - rect.bottom = 16; + rect.bottom = cySmIcon; rect.top = 0; bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); @@ -68,14 +70,14 @@ ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); - hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); + hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); + if (!hFont) + goto End; hFontOld = SelectObject(hdc, hFont); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); - PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); + PatBlt(hdc, 0, 0, cxSmIcon, cySmIcon, BLACKNESS); SelectObject(hdc, hBmpOld); SelectObject(hdc, hFontOld); @@ -84,15 +86,15 @@ IconInfo.fIcon = TRUE; hIcon = CreateIconIndirect(&IconInfo); - - DeleteObject(hBmpNew); - DeleteObject(hBmpOld); - DeleteObject(hFont); - } - } - - DeleteDC(hdc); - DeleteObject(hBitmap); +End: + if (hBmpNew) DeleteObject(hBmpNew); + if (hBmpOld) DeleteObject(hBmpOld); + if (hFont) DeleteObject(hFont); + } + } + + if (hdc) DeleteDC(hdc); + if (hBitmap) DeleteObject(hBitmap); return hIcon; } @@ -384,6 +386,23 @@ return -1; } +static VOID +SettingsChanging(HWND hwnd) +{ + UINT cxSmIconCur = 0, cySmIconCur = 0; + + cxSmIconCur = GetSystemMetrics(SM_CXSMICON); + cySmIconCur = GetSystemMetrics(SM_CYSMICON); + + if ((cxSmIcon != cxSmIconCur) || (cySmIcon != cySmIconCur)) + { + cxSmIcon = cxSmIconCur; + cySmIcon = cySmIconCur; + } + + ActivateLayout(hwnd, ulCurrentLayoutNum); +} + LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -394,6 +413,9 @@ { case WM_CREATE: { + cxSmIcon = GetSystemMetrics(SM_CXSMICON); + cySmIcon = GetSystemMetrics(SM_CYSMICON); + SetHooks(); AddTrayIcon(hwnd); hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); @@ -489,6 +511,8 @@ case WM_SETTINGCHANGE: { + SettingsChanging(hwnd); + if (wParam == SPI_SETDEFAULTINPUTLANG) { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI
16 years, 1 month
1
0
0
0
[janderwald] 37084: - Fix a memory leak (CID 625)
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Oct 30 03:35:15 2008 New Revision: 37084 URL:
http://svn.reactos.org/svn/reactos?rev=37084&view=rev
Log: - Fix a memory leak (CID 625) Modified: trunk/reactos/base/applications/network/finger/finger.c Modified: trunk/reactos/base/applications/network/finger/finger.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
============================================================================== --- trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] Thu Oct 30 03:35:15 2008 @@ -122,7 +122,7 @@ static void userlist(int argc, char **argv) { - int *used; + int *used = NULL; char **ap, **nargv, **np, **p; WORD wVersionRequested; WSADATA wsaData; @@ -166,6 +166,8 @@ /* Bring down winsock */ WSACleanup(); + free(nargv); + free(used); exit(0); }
16 years, 1 month
1
0
0
0
[janderwald] 37083: - Fix memory leak (CID 621)
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Oct 30 03:28:50 2008 New Revision: 37083 URL:
http://svn.reactos.org/svn/reactos?rev=37083&view=rev
Log: - Fix memory leak (CID 621) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Thu Oct 30 03:28:50 2008 @@ -296,6 +296,10 @@ // Allocate space for parameters szArguments = (LPTSTR*)malloc(sizeof(LPVOID)* pevlr->NumStrings); + if (!szArguments) + { + return FALSE; + } for (i = 0; i < pevlr->NumStrings ; i++) { @@ -371,6 +375,8 @@ LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); wsprintf (EventText, szStringIDNotFound , (DWORD)(pevlr->EventID & 0xFFFF) , SourceName ); } + + free(szArguments); // No more dlls to try , return result return bDone;
16 years, 1 month
1
0
0
0
[janderwald] 37082: - Clean up resources on failure
by janderwald@svn.reactos.org
Author: janderwald Date: Thu Oct 30 03:23:53 2008 New Revision: 37082 URL:
http://svn.reactos.org/svn/reactos?rev=37082&view=rev
Log: - Clean up resources on failure Modified: trunk/reactos/base/applications/msconfig/srvpage.c Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] Thu Oct 30 03:23:53 2008 @@ -145,7 +145,7 @@ if (hService != INVALID_HANDLE_VALUE) { /* check if service is required by the system*/ - if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, 0, &BytesNeeded)) + if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)NULL, 0, &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -156,11 +156,17 @@ if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, BytesNeeded, &BytesNeeded)) { HeapFree(GetProcessHeap(), 0, pServiceFailureActions); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } else /* exit on failure */ { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } @@ -183,22 +189,32 @@ /* get vendor of service binary */ BytesNeeded = 0; - if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) + if (!QueryServiceConfig(hService, NULL, 0, &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceConfig == NULL) - return; - + { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); + return; + } if (!QueryServiceConfig(hService, pServiceConfig, BytesNeeded, &BytesNeeded)) { HeapFree(GetProcessHeap(), 0, pServiceConfig); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } else /* exit on failure */ { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } @@ -221,11 +237,18 @@ { lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); if (lpData == NULL) - return; - + { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); + return; + } if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { HeapFree(GetProcessHeap(), 0, lpData); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; }
16 years, 1 month
1
0
0
0
← Newer
1
2
3
4
5
6
7
...
52
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
Results per page:
10
25
50
100
200