Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 22528: replace DECL_WINELIB_TYPE_AW macros with typedefs thnx to Greatlord for reviewing patch
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:39:04 2006 New Revision: 22528 URL: http://svn.reactos.org/svn/reactos?rev=22528&view=rev Log: replace DECL_WINELIB_TYPE_AW macros with typedefs thnx to Greatlord for reviewing patch Modified: trunk/reactos/include/objsel.h trunk/reactos/include/reactos/wine/msacm.h Modified: trunk/reactos/include/objsel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/objsel.h?rev=22528… ============================================================================== --- trunk/reactos/include/objsel.h (original) +++ trunk/reactos/include/objsel.h Fri Jun 23 21:39:04 2006 @@ -20,6 +20,9 @@ #ifdef __cplusplus extern "C" { #endif + +#include <objidl.h> +#include <oaidl.h> /* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...}, * but that's not a good idea when EXTERN_C is extern... */ @@ -164,7 +167,7 @@ STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDsObjectPicker methods ***/ STDMETHOD_(HRESULT,Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE; - STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject** ppdoSelections) PURE; + STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject ** ppdoSelections) PURE; }; #undef INTERFACE Modified: trunk/reactos/include/reactos/wine/msacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/msacm… ============================================================================== --- trunk/reactos/include/reactos/wine/msacm.h (original) +++ trunk/reactos/include/reactos/wine/msacm.h Fri Jun 23 21:39:04 2006 @@ -318,9 +318,15 @@ WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS) -DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS) -DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS; +typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS; +typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS; +#else +typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS; +typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS; +typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS; +#endif typedef struct _ACMFILTERCHOOSEA { @@ -374,9 +380,15 @@ ACMFILTERCHOOSEHOOKPROCW pfnHook; } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE) -DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE) -DECL_WINELIB_TYPE_AW(LPACMFILTERCHOOSE) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE; +typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE; +typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE; +#else +typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE; +typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE; +typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE; +#endif typedef struct _ACMFILTERDETAILSA { @@ -400,9 +412,15 @@ WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS) -DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFILTERDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS; +typedef PACMFILTERDETAILSW PACMFILTERDETAILS; +typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS; +#else +typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS; +typedef PACMFILTERDETAILSA PACMFILTERDETAILS; +typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS; +#endif typedef struct _ACMFILTERTAGDETAILSA { @@ -426,9 +444,15 @@ WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS) -DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFILTERTAGDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS; +typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS; +typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS; +#else +typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS; +typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS; +typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS; +#endif typedef struct _ACMFORMATCHOOSEA { @@ -482,9 +506,15 @@ ACMFORMATCHOOSEHOOKPROCW pfnHook; } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE) -DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE) -DECL_WINELIB_TYPE_AW(LPACMFORMATCHOOSE) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE; +typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE; +typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE; +#else +typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE; +typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE; +typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE; +#endif typedef struct _ACMFORMATDETAILSA { @@ -508,9 +538,15 @@ WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS) -DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFORMATDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS; +typedef PACMFORMATDETAILSW PACMFORMATDETAILS; +typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS; +#else +typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS; +typedef PACMFORMATDETAILSA PACMFORMATDETAILS; +typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS; +#endif typedef struct _ACMFORMATTAGDETAILSA { @@ -534,9 +570,15 @@ WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) -DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS; +typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS; +typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS; +#else +typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS; +typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS; +typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS; +#endif typedef struct _ACMSTREAMHEADER {

1 0

[janderwald] 22527: fix TCHAR/WCHAR mixtures spotted by Christoph_vW
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:14:29 2006 New Revision: 22527 URL: http://svn.reactos.org/svn/reactos?rev=22527&view=rev Log: fix TCHAR/WCHAR mixtures spotted by Christoph_vW Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Fri Jun 23 21:14:29 2006 @@ -137,7 +137,7 @@ // to PowerActionNone and sets the Flags & EventCode - swprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags); + _stprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags); MessageBoxW(NULL, szBuffer, NULL, MB_OK); */ Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Fri Jun 23 21:14:29 2006 @@ -14,6 +14,7 @@ #include <commctrl.h> #include <cpl.h> #include <stdio.h> +#include <tchar.h> #include "resource.h" #include "powercfg.h" @@ -69,19 +70,19 @@ if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); + _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE1),szBatteryLevel); } - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETTICFREQ, (WPARAM)TRUE, (LPARAM)20); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); @@ -100,14 +101,14 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH) && LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s, %s",szSound,szText); + _stprintf(szMessage,_T("%s, %s"),szSound,szText); } } else { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s",szText); + _stprintf(szMessage,_T("%s"),szText); } } } @@ -117,7 +118,7 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s",szSound); + _stprintf(szMessage,_T("%s"),szSound); } } } @@ -131,28 +132,28 @@ } if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable) { - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARM2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARM2), BM_SETCHECK, (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED), (LPARAM)0); if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); + _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE2),szBatteryLevel); } - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH)) { - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), WM_SETTEXT, (WPARAM)0, (LPARAM)szAction); @@ -167,14 +168,14 @@ { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH) && LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s, %s",szSound,szText); + _stprintf(szMessage,_T("%s, %s"),szSound,szText); } } else { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s",szText); + _stprintf(szMessage,_T("%s"),szText); } } } @@ -184,7 +185,7 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s",szSound); + _stprintf(szMessage,_T("%s"),szSound); } } } Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c Fri Jun 23 21:14:29 2006 @@ -15,6 +15,7 @@ #include <commctrl.h> #include <cpl.h> #include <stdio.h> +#include <tchar.h> #include "resource.h" #include "powercfg.h" @@ -65,22 +66,22 @@ { SYSTEM_POWER_CAPABILITIES PowerCaps; MEMORYSTATUSEX msex; - WCHAR szSize[MAX_PATH]; - WCHAR szTemp[MAX_PATH]; + TCHAR szSize[MAX_PATH]; + TCHAR szTemp[MAX_PATH]; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; if (GetPwrCapabilities(&PowerCaps)) { if (PowerCaps.HiberFilePresent) { - SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } else { - SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); @@ -106,7 +107,7 @@ { if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); + _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); } } @@ -114,7 +115,7 @@ { if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); + _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); } } @@ -123,7 +124,7 @@ { if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); + _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); } } @@ -131,7 +132,7 @@ { if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,msex.ullTotalPhys); + _stprintf(szSize,szTemp,msex.ullTotalPhys); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); } } @@ -152,7 +153,7 @@ { BOOLEAN bHibernate; - bHibernate = (BOOLEAN)SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + bHibernate = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_GETCHECK, (WPARAM)0, (LPARAM)0); Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Fri Jun 23 21:14:29 2006 @@ -27,7 +27,7 @@ HINSTANCE hApplet = 0; GLOBAL_POWER_POLICY gGPP; -WCHAR langSel[255]; +TCHAR langSel[255]; /* Applets */ APPLET Applets[NUM_APPLETS] = Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Fri Jun 23 21:14:29 2006 @@ -220,7 +220,7 @@ return TRUE; } -BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName, DWORD dwDesc, +BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc, LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) { int index; @@ -237,21 +237,21 @@ memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY)); guiIndex++; - index = SendMessageW(hList, + index = SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)sName); if (index == CB_ERR) return FALSE; - SendMessageW(hList, + SendMessage(hList, CB_SETITEMDATA, index, (LPARAM)uiIndex); if (aps == uiIndex) { - SendMessageW(hList, + SendMessage(hList, CB_SELECTSTRING, TRUE, (LPARAM)sName); @@ -307,7 +307,7 @@ { int ifrom=0,i=0,imin=0; HWND hwnd = NULL; - WCHAR szName[MAX_PATH]; + TCHAR szName[MAX_PATH]; LRESULT index; for(i=1;i<9;i++) @@ -353,7 +353,7 @@ { if (LoadString(hApplet, ifrom, szName, MAX_PATH)) { - index = SendMessageW(hwnd, + index = SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)szName); @@ -361,7 +361,7 @@ if (index == CB_ERR) return; - SendMessageW(hwnd, + SendMessage(hwnd, CB_SETITEMDATA, index, (LPARAM)Sec[ifrom-IDS_TIMEOUT16]); @@ -369,14 +369,14 @@ } if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH)) { - index = SendMessageW(hwnd, + index = SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)szName); if (index == CB_ERR) return; - SendMessageW(hwnd, + SendMessage(hwnd, CB_SETITEMDATA, index, (LPARAM)Sec[0]); @@ -388,12 +388,12 @@ { INT i=0, iCurSel=0; UINT uiIndex; - WCHAR szProfile[MAX_PATH]; - WCHAR szTemp[MAX_PATH]; - WCHAR szConfig[MAX_PATH]; + TCHAR szProfile[MAX_PATH]; + TCHAR szTemp[MAX_PATH]; + TCHAR szConfig[MAX_PATH]; POWER_POLICY pp; - iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); @@ -408,7 +408,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) { - swprintf(szConfig,szTemp,szProfile); + _stprintf(szConfig,szTemp,szProfile); SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); } } @@ -479,7 +479,7 @@ { INT iCurSel=0,tmp=0; - iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0);

1 0

[janderwald] 22526: msvc fix (remove obsolete semicolon)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 20:30:22 2006 New Revision: 22526 URL: http://svn.reactos.ru/svn/reactos?rev=22526&view=rev Log: msvc fix (remove obsolete semicolon) Modified: trunk/reactos/include/authz.h Modified: trunk/reactos/include/authz.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/authz.h?rev=22526&r… ============================================================================== --- trunk/reactos/include/authz.h (original) +++ trunk/reactos/include/authz.h Fri Jun 23 20:30:22 2006 @@ -83,7 +83,7 @@ DWORD ResultListLength; PACCESS_MASK GrantedAccessMask; PDWORD SaclEvaluationResults; - PDWORD Error;; + PDWORD Error; } AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; typedef struct _AUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET

1 0

[tretiakov] 22525: Fix buffer overflow vulnerability (bug 1528)
by tretiakov＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: tretiakov Date: Fri Jun 23 18:55:52 2006 New Revision: 22525 URL: http://svn.reactos.ru/svn/reactos?rev=22525&view=rev Log: Fix buffer overflow vulnerability (bug 1528) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/umpnpmgr/umpn… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Fri Jun 23 18:55:52 2006 @@ -832,7 +832,9 @@ lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class"); lstrcatW(szKeyName, L"\\"); - lstrcatW(szKeyName, ClassGuid); + if(lstrlenW(ClassGuid) < sizeof(szKeyName)-lstrlenW(szKeyName)) + lstrcatW(szKeyName, ClassGuid); + else return CR_INVALID_DATA; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName,

1 0

[greatlrd] 22524: bugfix : patch from w3seek bug 1620 : RTL: Fix a locking bug in the vectored exception handling
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 18:42:14 2006 New Revision: 22524 URL: http://svn.reactos.ru/svn/reactos?rev=22524&view=rev Log: bugfix : patch from w3seek bug 1620 : RTL: Fix a locking bug in the vectored exception handling Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=2252… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c (original) +++ trunk/reactos/lib/rtl/vectoreh.c Fri Jun 23 18:42:14 2006 @@ -51,11 +51,14 @@ RTL_VECTORED_EXCEPTION_HANDLER, ListEntry); VectoredHandler = RtlDecodePointer(veh->VectoredHandler); + RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); + if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); return ExceptionContinueSearch; } + + RtlEnterCriticalSection(&RtlpVectoredExceptionLock); } RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); }

1 0

[jimtabor] 22523: GetGlyphOutline, large wine port. Still testing.
by jimtabor＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: jimtabor Date: Fri Jun 23 16:29:38 2006 New Revision: 22523 URL: http://svn.reactos.ru/svn/reactos?rev=22523&view=rev Log: GetGlyphOutline, large wine port. Still testing. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jun 23 16:29:38 2006 @@ -29,6 +29,10 @@ #include <ft2build.h> #include FT_FREETYPE_H #include <freetype/tttables.h> +#include <freetype/fttrigon.h> +#include <freetype/ftglyph.h> +#include <freetype/ftoutln.h> +#include <freetype/ftwinfnt.h> #define NDEBUG #include <debug.h> @@ -2227,6 +2231,44 @@ return 0; } +static +void +FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) +{ + pt->x.value = vec->x >> 6; + pt->x.fract = (vec->x & 0x3f) << 10; + pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); + pt->y.value = vec->y >> 6; + pt->y.fract = (vec->y & 0x3f) << 10; + pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); + return; +} + +/* + This function builds an FT_Fixed from a float. It puts the integer part + in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. + It fails if the integer part of the float number is greater than SHORT_MAX. +*/ +static inline FT_Fixed FT_FixedFromFloat(float f) +{ + short value = f; + unsigned short fract = (f - value) * 0xFFFF; + return (FT_Fixed)((long)value << 16 | (unsigned long)fract); +} + +/* + This function builds an FT_Fixed from a FIXED. It simply put f.value + in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. +*/ +static inline FT_Fixed FT_FixedFromFIXED(FIXED f) +{ + return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); +} + +/* + * Based on WineEngGetGlyphOutline + * + */ ULONG APIENTRY NtGdiGetGlyphOutline( @@ -2235,12 +2277,631 @@ IN UINT iFormat, OUT LPGLYPHMETRICS pgm, IN ULONG cjBuf, - OUT OPTIONAL PVOID pvBuf, + OUT OPTIONAL PVOID UnsafeBuf, IN LPMAT2 pmat2, IN BOOL bIgnoreRotation) { - UNIMPLEMENTED; - return 0; + static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; + PDC dc; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + NTSTATUS Status; + GLYPHMETRICS gm; + ULONG Size; + FT_Face ft_face; + FT_UInt glyph_index; + DWORD width, height, pitch, needed = 0; + FT_Bitmap ft_bitmap; + FT_Error error; + INT left, right, top = 0, bottom = 0; + FT_Angle angle = 0; + FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FLOAT eM11, widthRatio = 1.0; + FT_Matrix transMat = identityMat; + BOOL needsTransform = FALSE; + INT orientation; + LONG aveWidth; + INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ + OUTLINETEXTMETRICW *potm; + PVOID pvBuf = NULL; + + DPRINT("%p, %d, %08x, %p, %08lx, %p, %p\n", hdc, wch, iFormat, pgm, + cjBuf, UnsafeBuf, pmat2); + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + eM11 = dc->w.xformWorld2Vport.eM11; + hFont = dc->w.hFont; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + FontGDI = ObjToGDI(TextObj->Font, FONT); + ft_face = FontGDI->face; + + aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfWidth: 0; + orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfOrientation: 0; + + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + TEXTOBJ_UnlockText(TextObj); + return GDI_ERROR; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + + IntLockFreeType; + + /* During testing, I never saw this used. In here just incase.*/ + if (ft_face->charmap == NULL) + { + DPRINT("WARNING: No charmap selected!\n"); + DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); + int n; + FT_CharMap found = 0, charmap; + + for (n = 0; n < ft_face->num_charmaps; n++) + { + charmap = ft_face->charmaps[n]; + DPRINT("found charmap encoding: %u\n", charmap->encoding); + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + } + error = FT_Set_Charmap(ft_face, found); + if (error) + { + DPRINT1("WARNING: Could not set the charmap!\n"); + } + } + +// FT_Set_Pixel_Sizes(ft_face, +// TextObj->logfont.lfWidth, + /* FIXME should set character height if neg */ +// (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : +// TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + + TEXTOBJ_UnlockText(TextObj); + + if (iFormat & GGO_GLYPH_INDEX) + { + glyph_index = wch; + iFormat &= ~GGO_GLYPH_INDEX; + } + else glyph_index = FT_Get_Char_Index(ft_face, wch); + + if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) + load_flags |= FT_LOAD_NO_BITMAP; + + error = FT_Load_Glyph(ft_face, glyph_index, load_flags); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + if (potm) ExFreePool(potm); + return GDI_ERROR; + } + IntUnLockFreeType; + + if (aveWidth && potm) + { + widthRatio = (FLOAT)aveWidth * eM11 / + (FLOAT) potm->otmTextMetrics.tmAveCharWidth; + } + + left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + + ft_face->glyph->metrics.width) * widthRatio + 63) & -64; + + adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6; + lsb = left >> 6; + bbx = (right - left) >> 6; + + DPRINT("Advance = %d, lsb = %d, bbx = %d\n",adv, lsb, bbx); + + IntLockFreeType; + + /* Scaling transform */ + if (aveWidth) + { + FT_Matrix scaleMat; + DPRINT("Scaling Trans!\n"); + scaleMat.xx = FT_FixedFromFloat(widthRatio); + scaleMat.xy = 0; + scaleMat.yx = 0; + scaleMat.yy = (1 << 16); + FT_Matrix_Multiply(&scaleMat, &transMat); + needsTransform = TRUE; + } + + /* Slant transform */ + if (potm->otmTextMetrics.tmItalic) + { + FT_Matrix slantMat; + DPRINT("Slant Trans!\n"); + slantMat.xx = (1 << 16); + slantMat.xy = ((1 << 16) >> 2); + slantMat.yx = 0; + slantMat.yy = (1 << 16); + FT_Matrix_Multiply(&slantMat, &transMat); + needsTransform = TRUE; + } + + /* Rotation transform */ + if (orientation) + { + FT_Matrix rotationMat; + FT_Vector vecAngle; + DPRINT("Rotation Trans!\n"); + angle = FT_FixedFromFloat((float)orientation / 10.0); + FT_Vector_Unit(&vecAngle, angle); + rotationMat.xx = vecAngle.x; + rotationMat.xy = -vecAngle.y; + rotationMat.yx = -rotationMat.xy; + rotationMat.yy = rotationMat.xx; + FT_Matrix_Multiply(&rotationMat, &transMat); + needsTransform = TRUE; + } + + /* Extra transformation specified by caller */ + if (pmat2) + { + FT_Matrix extraMat; + DPRINT("MAT2 Matrix Trans!\n"); + extraMat.xx = FT_FixedFromFIXED(pmat2->eM11); + extraMat.xy = FT_FixedFromFIXED(pmat2->eM21); + extraMat.yx = FT_FixedFromFIXED(pmat2->eM12); + extraMat.yy = FT_FixedFromFIXED(pmat2->eM22); + FT_Matrix_Multiply(&extraMat, &transMat); + needsTransform = TRUE; + } + + if (potm) ExFreePool(potm); /* It looks like we are finished with potm ATM.*/ + + if (!needsTransform) + { + DPRINT("No Need to be Transformed!\n"); + top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; + bottom = (ft_face->glyph->metrics.horiBearingY - + ft_face->glyph->metrics.height) & -64; + gm.gmCellIncX = adv; + gm.gmCellIncY = 0; + } + else + { + INT xc, yc; + FT_Vector vec; + for(xc = 0; xc < 2; xc++) + { + for(yc = 0; yc < 2; yc++) + { + vec.x = (ft_face->glyph->metrics.horiBearingX + + xc * ft_face->glyph->metrics.width); + vec.y = ft_face->glyph->metrics.horiBearingY - + yc * ft_face->glyph->metrics.height; + DPRINT("Vec %ld,%ld\n", vec.x, vec.y); + FT_Vector_Transform(&vec, &transMat); + if(xc == 0 && yc == 0) + { + left = right = vec.x; + top = bottom = vec.y; + } + else + { + if(vec.x < left) left = vec.x; + else if(vec.x > right) right = vec.x; + if(vec.y < bottom) bottom = vec.y; + else if(vec.y > top) top = vec.y; + } + } + } + left = left & -64; + right = (right + 63) & -64; + bottom = bottom & -64; + top = (top + 63) & -64; + + DPRINT("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); + vec.x = ft_face->glyph->metrics.horiAdvance; + vec.y = 0; + FT_Vector_Transform(&vec, &transMat); + gm.gmCellIncX = (vec.x+63) >> 6; + gm.gmCellIncY = -((vec.y+63) >> 6); + } + gm.gmBlackBoxX = (right - left) >> 6; + gm.gmBlackBoxY = (top - bottom) >> 6; + gm.gmptGlyphOrigin.x = left >> 6; + gm.gmptGlyphOrigin.y = top >> 6; + + DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n", + gm.gmCellIncX, gm.gmCellIncY, + gm.gmBlackBoxX, gm.gmBlackBoxY, + gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); + + IntUnLockFreeType; + + if (pgm) + { + Status = MmCopyToCaller(pgm, &gm, sizeof(GLYPHMETRICS)); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + DPRINT("Copied GLYPHMETRICS to User!\n"); + } + + if (iFormat == GGO_METRICS) + { + DPRINT("GGO_METRICS Exit!\n"); + return 1; /* FIXME */ + } + + if (ft_face->glyph->format != ft_glyph_format_outline && iFormat != GGO_BITMAP) + { + DPRINT1("loaded a bitmap\n"); + return GDI_ERROR; + } + + if (UnsafeBuf && cjBuf) + { + pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); + if (pvBuf == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return GDI_ERROR; + } + RtlZeroMemory(pvBuf, cjBuf); + } + + + switch(iFormat) + { + case GGO_BITMAP: + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; + pitch = ((width + 31) >> 5) << 2; + needed = pitch * height; + + if(!pvBuf || !cjBuf) break; + + switch(ft_face->glyph->format) + { + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; + INT w = (ft_face->glyph->bitmap.width + 7) >> 3; + INT h = ft_face->glyph->bitmap.rows; + while(h--) + { + RtlCopyMemory(dst, src, w); + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + break; + } + + case ft_glyph_format_outline: + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_mono; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if(needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + /* Note: FreeType will only set 'black' bits for us. */ + RtlZeroMemory(pvBuf, needed); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + break; + + default: + DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); + if(pvBuf) ExFreePool(pvBuf); + return GDI_ERROR; + } + break; + + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + { + unsigned int mult, row, col; + BYTE *start, *ptr; + + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; + pitch = (width + 3) / 4 * 4; + needed = pitch * height; + + if(!pvBuf || !cjBuf) break; + + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_grays; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if(needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + RtlZeroMemory(ft_bitmap.buffer, cjBuf); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + + if(iFormat == GGO_GRAY2_BITMAP) + mult = 4; + else if(iFormat == GGO_GRAY4_BITMAP) + mult = 16; + else if(iFormat == GGO_GRAY8_BITMAP) + mult = 64; + else + { + ASSERT(0); + break; + } + + start = pvBuf; + for(row = 0; row < height; row++) + { + ptr = start; + for(col = 0; col < width; col++, ptr++) + { + *ptr = (((int)*ptr) * mult + 128) / 256; + } + start += pitch; + } + break; + } + + case GGO_NATIVE: + { + int contour, point = 0, first_pt; + FT_Outline *outline = &ft_face->glyph->outline; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + + if(cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ + + IntLockFreeType; + if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); + + for(contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); + first_pt = point; + if(pvBuf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while(point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); + type = (outline->tags[point] & FT_Curve_Tag_On) ? + TT_PRIM_LINE : TT_PRIM_QSPLINE; + cpfx = 0; + do + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } while(point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + + /* At the end of a contour Windows adds the start point, but + only for Beziers */ + if(point > outline->contours[contour] && + !(outline->tags[point-1] & FT_Curve_Tag_On)) + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); + cpfx++; + } + else if(point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* add closing pt for bezier */ + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + if(pvBuf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if(pvBuf) pph->cb = needed - pph_start; + } + IntUnLockFreeType; + break; + } + case GGO_BEZIER: + { + /* Convert the quadratic Beziers to cubic Beziers. + The parametric eqn for a cubic Bezier is, from PLRM: + r(t) = at^3 + bt^2 + ct + r0 + with the control points: + r1 = r0 + c/3 + r2 = r1 + (c + b)/3 + r3 = r0 + c + b + a + + A quadratic Beizer has the form: + p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 + + So equating powers of t leads to: + r1 = 2/3 p1 + 1/3 p0 + r2 = 2/3 p1 + 1/3 p2 + and of course r0 = p0, r3 = p2 + */ + + int contour, point = 0, first_pt; + FT_Outline *outline = &ft_face->glyph->outline; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + FT_Vector cubic_control[4]; + if(cjBuf == 0) pvBuf = NULL; + + if (needsTransform && pvBuf) + { + IntLockFreeType; + FT_Outline_Transform(outline, &transMat); + IntUnLockFreeType; + } + + for(contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); + first_pt = point; + if(pvBuf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while(point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); + type = (outline->tags[point] & FT_Curve_Tag_On) ? + TT_PRIM_LINE : TT_PRIM_CSPLINE; + cpfx = 0; + do + { + if(type == TT_PRIM_LINE) + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + else + { + /* Unlike QSPLINEs, CSPLINEs always have their endpoint + so cpfx = 3n */ + + /* FIXME: Possible optimization in endpoint calculation + if there are two consecutive curves */ + cubic_control[0] = outline->points[point-1]; + if(!(outline->tags[point-1] & FT_Curve_Tag_On)) + { + cubic_control[0].x += outline->points[point].x + 1; + cubic_control[0].y += outline->points[point].y + 1; + cubic_control[0].x >>= 1; + cubic_control[0].y >>= 1; + } + if(point+1 > outline->contours[contour]) + cubic_control[3] = outline->points[first_pt]; + else + { + cubic_control[3] = outline->points[point+1]; + if(!(outline->tags[point+1] & FT_Curve_Tag_On)) + { + cubic_control[3].x += outline->points[point].x + 1; + cubic_control[3].y += outline->points[point].y + 1; + cubic_control[3].x >>= 1; + cubic_control[3].y >>= 1; + } + } + /* r1 = 1/3 p0 + 2/3 p1 + r2 = 1/3 p2 + 2/3 p1 */ + cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; + cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; + cubic_control[2] = cubic_control[1]; + cubic_control[1].x += (cubic_control[0].x + 1) / 3; + cubic_control[1].y += (cubic_control[0].y + 1) / 3; + cubic_control[2].x += (cubic_control[3].x + 1) / 3; + cubic_control[2].y += (cubic_control[3].y + 1) / 3; + if(pvBuf) + { + FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); + FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); + FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); + } + cpfx += 3; + point++; + } + } + while(point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, + but only for Beziers and we've already done that. + */ + if(point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* This is the closing pt of a bezier, but we've already + added it, so just inc point and carry on */ + point++; + } + if(pvBuf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if(pvBuf) pph->cb = needed - pph_start; + } + break; + } + + default: + DPRINT1("Unsupported format %d\n", iFormat); + if(pvBuf) ExFreePool(pvBuf); + return GDI_ERROR; + } + + if (pvBuf) + { + Status = MmCopyToCaller(UnsafeBuf, pvBuf, cjBuf); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ExFreePool(pvBuf); + return GDI_ERROR; + } + DPRINT("NtGdiGetGlyphOutline K -> U worked!\n"); + ExFreePool(pvBuf); + } + + DPRINT("NtGdiGetGlyphOutline END and needed %d\n", needed); + return needed; } DWORD

1 0

[hpoussin] 22522: Fix retrieving of NTP server from registry Set svn:eol-style and svn:keywords properties
by hpoussin＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: hpoussin Date: Fri Jun 23 12:13:50 2006 New Revision: 22522 URL: http://svn.reactos.ru/svn/reactos?rev=22522&view=rev Log: Fix retrieving of NTP server from registry Set svn:eol-style and svn:keywords properties Modified: trunk/reactos/dll/cpl/timedate/Cz.rc (props changed) trunk/reactos/dll/cpl/timedate/Dk.rc (props changed) trunk/reactos/dll/cpl/timedate/Es.rc (props changed) trunk/reactos/dll/cpl/timedate/Fr.rc (props changed) trunk/reactos/dll/cpl/timedate/Gr.rc (props changed) trunk/reactos/dll/cpl/timedate/Hu.rc (contents, props changed) trunk/reactos/dll/cpl/timedate/It.rc (contents, props changed) trunk/reactos/dll/cpl/timedate/Ja.rc (props changed) trunk/reactos/dll/cpl/timedate/Nl.rc (props changed) trunk/reactos/dll/cpl/timedate/Pl.rc (props changed) trunk/reactos/dll/cpl/timedate/Ru.rc (props changed) trunk/reactos/dll/cpl/timedate/Sv.rc (props changed) trunk/reactos/dll/cpl/timedate/clock.c (contents, props changed) trunk/reactos/dll/cpl/timedate/dateandtime.c (contents, props changed) trunk/reactos/dll/cpl/timedate/internettime.c (contents, props changed) trunk/reactos/dll/cpl/timedate/monthcal.c (contents, props changed) trunk/reactos/dll/cpl/timedate/ntpclient.c (contents, props changed) trunk/reactos/dll/cpl/timedate/timezone.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/It.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/It.rc?rev=… Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?re… Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandtim… Modified: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/internetti… Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.c… Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient.… Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.c…

1 0

[ion] 22521: - Cache system static information, such as PAGE_SIZE at kernel32 startup, so we can reference it in our code without always quertying the system for it.
by ion＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: ion Date: Fri Jun 23 03:44:17 2006 New Revision: 22521 URL: http://svn.reactos.ru/svn/reactos?rev=22521&view=rev Log: - Cache system static information, such as PAGE_SIZE at kernel32 startup, so we can reference it in our code without always quertying the system for it. Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dll… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c Fri Jun 23 03:44:17 2006 @@ -55,6 +55,8 @@ #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" + +SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; /* FUNCTIONS *****************************************************************/ @@ -382,6 +384,17 @@ return FALSE; } + /* Cache static system information */ + Status = ZwQuerySystemInformation(SystemBasicInformation, + &BaseCachedSysInfo, + sizeof(BaseCachedSysInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to get system information\n"); + return FALSE; + } + /* Insert more dll attach stuff here! */ DllInitialized = TRUE; DPRINT("Initialization complete\n");

1 0

[ion] 22520: [AUDIT] - Unlock Thomas's low resource notification code, since it's clean. - Entirely rewrite Kernel32 Probe functions to um, actually probe (ported Thomas's code in the kernel and adjusted for user-mode and then checked with WINE's code). I can't begin to fathom what the previous routines were supposed to be doing.
by ion＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: ion Date: Fri Jun 23 03:40:50 2006 New Revision: 22520 URL: http://svn.reactos.ru/svn/reactos?rev=22520&view=rev Log: [AUDIT] - Unlock Thomas's low resource notification code, since it's clean. - Entirely rewrite Kernel32 Probe functions to um, actually probe (ported Thomas's code in the kernel and adjusted for user-mode and then checked with WINE's code). I can't begin to fathom what the previous routines were supposed to be doing. Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c trunk/reactos/dll/win32/kernel32/mem/procmem.c (props changed) trunk/reactos/dll/win32/kernel32/mem/resnotify.c (props changed) trunk/reactos/dll/win32/kernel32/mem/section.c (props changed) trunk/reactos/dll/win32/kernel32/mem/virtual.c (props changed) trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isba… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c Fri Jun 23 03:40:50 2006 @@ -1,259 +1,246 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/kernel32/mem/isbad.c - * PURPOSE: - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * Ge van Geldorp - * Filip Navara - * UPDATE HISTORY: - * Created 03/10/99 - */ + * PURPOSE: Handles probing of memory addresses + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - -/* FIXME: Stubs. What is it for? */ -/* - * @implemented - */ -UINT -wcsnlen ( - LPCWSTR lpsz, - UINT ucchMax - ) -{ - UINT i = 0; - while( i < ucchMax && lpsz[i] ) i++; - return i; -} - - -/* FIXME: Stubs. What is it for? */ -/* - * @implemented - */ -UINT -strnlen ( - LPCSTR lpsz, - UINT uiMax - ) -{ - UINT i = 0; - while( i < uiMax && lpsz[i] ) i++; - return i; -} - -/* --- --- --- */ +#include "debug.h" + +extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; + +/* FUNCTIONS *****************************************************************/ /* * @implemented */ BOOL STDCALL -IsBadReadPtr ( - CONST VOID * lp, - UINT ucb - ) -{ - MEMORY_BASIC_INFORMATION MemoryInformation; - - if ( ucb == 0 ) - { - return TRUE; - } - - VirtualQuery ( - lp, - & MemoryInformation, - sizeof (MEMORY_BASIC_INFORMATION) - ); - - if ( MemoryInformation.State != MEM_COMMIT ) - { - return TRUE; - } - - if ( MemoryInformation.RegionSize < ucb ) - { - return TRUE; - } - - if ( MemoryInformation.Protect == PAGE_EXECUTE ) - { - return TRUE; - } - - if ( MemoryInformation.Protect == PAGE_NOACCESS ) - { - return TRUE; - } - - return FALSE; - -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadHugeReadPtr ( - CONST VOID * lp, - UINT ucb - ) -{ - return IsBadReadPtr (lp, ucb); -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadCodePtr ( - FARPROC lpfn - ) -{ - MEMORY_BASIC_INFORMATION MemoryInformation; - - - VirtualQuery ( - lpfn, - & MemoryInformation, - sizeof (MEMORY_BASIC_INFORMATION) - ); - - if ( MemoryInformation.State != MEM_COMMIT ) - { - return TRUE; - } - - if ( (MemoryInformation.Protect == PAGE_EXECUTE) - || (MemoryInformation.Protect == PAGE_EXECUTE_READ) - ) - { - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadWritePtr ( - LPVOID lp, - UINT ucb - ) -{ - MEMORY_BASIC_INFORMATION MemoryInformation; - - if ( ucb == 0 ) - { - return TRUE; - } - - VirtualQuery ( - lp, - & MemoryInformation, - sizeof (MEMORY_BASIC_INFORMATION) - ); - - if ( MemoryInformation.State != MEM_COMMIT ) - { - return TRUE; - } - - if ( MemoryInformation.RegionSize < ucb ) - { - return TRUE; - } - - - if ( MemoryInformation.Protect == PAGE_READONLY) - { - return TRUE; - } - - if ( (MemoryInformation.Protect == PAGE_EXECUTE) - || (MemoryInformation.Protect == PAGE_EXECUTE_READ) - ) - { - return TRUE; - } - - if ( MemoryInformation.Protect == PAGE_NOACCESS ) - { - return TRUE; - } - - return FALSE; -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadHugeWritePtr ( - LPVOID lp, - UINT ucb - ) -{ - return IsBadWritePtr (lp, ucb); -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadStringPtrW ( - LPCWSTR lpsz, - UINT ucchMax - ) -{ - UINT Len = wcsnlen ( - lpsz + 1, - ucchMax >> 1 - ); - return IsBadReadPtr ( - lpsz, - Len << 1 - ); -} - - -/* - * @implemented - */ -BOOL -STDCALL -IsBadStringPtrA ( - LPCSTR lpsz, - UINT ucchMax - ) -{ - UINT Len = strnlen ( - lpsz + 1, - ucchMax - ); - return IsBadReadPtr ( - lpsz, - Len - ); -} - +IsBadReadPtr(IN LPCVOID lp, + IN UINT_PTR ucb) +{ + ULONG PageSize; + BOOLEAN Result = FALSE; + volatile CHAR *Current; + PCHAR Last; + + /* Quick cases */ + if (!ucb) return FALSE; + if (!lp) return TRUE; + + /* Get the page size */ + PageSize = BaseCachedSysInfo.PageSize; + + /* Calculate the last page */ + Last = (PCHAR)((ULONG_PTR)lp + ucb - 1); + + /* Another quick failure case */ + if ((ULONG_PTR)Last < (ULONG_PTR)lp) return TRUE; + + /* Enter SEH */ + _SEH_TRY + { + /* Probe the entire range */ + Current = (volatile CHAR*)lp; + Last = (PCHAR)(PAGE_ROUND_DOWN(Last)); + do + { + *Current; + Current = (volatile CHAR*)(PAGE_ROUND_DOWN(Current) + PAGE_SIZE); + } while (Current <= Last); + } + _SEH_HANDLE + { + /* We hit an exception, so return true */ + Result = TRUE; + } + _SEH_END + + /* Return exception status */ + return Result; +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadHugeReadPtr(LPCVOID lp, + UINT_PTR ucb) +{ + /* Implementation is the same on 32-bit */ + return IsBadReadPtr(lp, ucb); +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadCodePtr(FARPROC lpfn) +{ + /* Executing has the same privileges as reading */ + return IsBadReadPtr((LPVOID)lpfn, 1); +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadWritePtr(LPVOID lp, + UINT_PTR ucb) +{ + ULONG PageSize; + BOOLEAN Result = FALSE; + volatile CHAR *Current; + PCHAR Last; + + /* Quick cases */ + if (!ucb) return FALSE; + if (!lp) return TRUE; + + /* Get the page size */ + PageSize = BaseCachedSysInfo.PageSize; + + /* Calculate the last page */ + Last = (PCHAR)((ULONG_PTR)lp + ucb - 1); + + /* Another quick failure case */ + if ((ULONG_PTR)Last < (ULONG_PTR)lp) return TRUE; + + /* Enter SEH */ + _SEH_TRY + { + /* Probe the entire range */ + Current = (volatile CHAR*)lp; + Last = (PCHAR)(PAGE_ROUND_DOWN(Last)); + do + { + *Current = *Current; + Current = (volatile CHAR*)(PAGE_ROUND_DOWN(Current) + PAGE_SIZE); + } while (Current <= Last); + } + _SEH_HANDLE + { + /* We hit an exception, so return true */ + Result = TRUE; + } + _SEH_END + + /* Return exception status */ + return Result; +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadHugeWritePtr(LPVOID lp, + UINT_PTR ucb) +{ + /* Implementation is the same on 32-bit */ + return IsBadWritePtr(lp, ucb); +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadStringPtrW(IN LPCWSTR lpsz, + UINT_PTR ucchMax) +{ + BOOLEAN Result = FALSE; + volatile WCHAR *Current; + PWCHAR Last; + WCHAR Char; + + /* Quick cases */ + if (!ucchMax) return FALSE; + if (!lpsz) return TRUE; + + /* Calculate the last page */ + Last = (PWCHAR)((ULONG_PTR)lpsz + (ucchMax * 2) - 2); + + /* Another quick failure case */ + if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; + + /* Enter SEH */ + _SEH_TRY + { + /* Probe the entire range */ + Current = (volatile WCHAR*)lpsz; + Last = (PWCHAR)(PAGE_ROUND_DOWN(Last)); + do + { + Char = *Current; + Current++; + } while (Char && (Current <= Last)); + } + _SEH_HANDLE + { + /* We hit an exception, so return true */ + Result = TRUE; + } + _SEH_END + + /* Return exception status */ + return Result; +} + +/* + * @implemented + */ +BOOL +NTAPI +IsBadStringPtrA(IN LPCSTR lpsz, + UINT_PTR ucchMax) +{ + BOOLEAN Result = FALSE; + volatile CHAR *Current; + PCHAR Last; + CHAR Char; + + /* Quick cases */ + if (!ucchMax) return FALSE; + if (!lpsz) return TRUE; + + /* Calculate the last page */ + Last = (PCHAR)((ULONG_PTR)lpsz + ucchMax - 1); + + /* Another quick failure case */ + if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; + + /* Enter SEH */ + _SEH_TRY + { + /* Probe the entire range */ + Current = (volatile CHAR*)lpsz; + Last = (PCHAR)(PAGE_ROUND_DOWN(Last)); + do + { + Char = *Current; + Current++; + } while (Char && (Current <= Last)); + } + _SEH_HANDLE + { + /* We hit an exception, so return true */ + Result = TRUE; + } + _SEH_END + + /* Return exception status */ + return Result; +} /* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/mem/procmem.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/mem/resnotify.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/mem/section.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/mem/virtual.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h (original) +++ trunk/reactos/include/ndk/mmfuncs.h Fri Jun 23 03:40:50 2006 @@ -232,8 +232,8 @@ IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN PVOID Buffer, - IN ULONG NumberOfBytesToWrite, - OUT PULONG NumberOfBytesWritten + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten ); NTSYSAPI

1 0

[ion] 22519: [AUDIT] These files are clean and simple stubs around NT apis and/or WINE code. - Reformat the files. - Fix A->W calling. - Simpliy WriteProcessMemory to use NtProtectVirtualMemory to query the current state. - Call some APIs with the right DesiredAccess instead of allways sending _ALL_ACCESS. (for example, only use SECTION_MAP_READ | QUERY unless the caller wants r/w. - Flush ITLB when writing to process memory.
by ion＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: ion Date: Fri Jun 23 03:06:14 2006 New Revision: 22519 URL: http://svn.reactos.ru/svn/reactos?rev=22519&view=rev Log: [AUDIT] These files are clean and simple stubs around NT apis and/or WINE code. - Reformat the files. - Fix A->W calling. - Simpliy WriteProcessMemory to use NtProtectVirtualMemory to query the current state. - Call some APIs with the right DesiredAccess instead of allways sending _ALL_ACCESS. (for example, only use SECTION_MAP_READ | QUERY unless the caller wants r/w. - Flush ITLB when writing to process memory. Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/mem/virtual.c Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/proc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/procmem.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/procmem.c Fri Jun 23 03:06:14 2006 @@ -1,10 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/kernel32/mem/procmem.c - * PURPOSE: - * PROGRAMMER: Boudewijn Dekker +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/mem/procmem.c + * PURPOSE: Handles virtual memory APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include "debug.h" /* FUNCTIONS *****************************************************************/ @@ -20,138 +19,138 @@ * @implemented */ BOOL -STDCALL -ReadProcessMemory ( - HANDLE hProcess, - LPCVOID lpBaseAddress, - LPVOID lpBuffer, - DWORD nSize, - LPDWORD lpNumberOfBytesRead - ) +NTAPI +ReadProcessMemory(IN HANDLE hProcess, + IN LPCVOID lpBaseAddress, + IN LPVOID lpBuffer, + IN DWORD nSize, + OUT LPDWORD lpNumberOfBytesRead) { + NTSTATUS Status; - NTSTATUS Status; + /* Do the read */ + Status = NtReadVirtualMemory(hProcess, + (PVOID)lpBaseAddress, + lpBuffer, + nSize, + lpNumberOfBytesRead); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus (Status); + return FALSE; + } - Status = NtReadVirtualMemory( hProcess, (PVOID)lpBaseAddress,lpBuffer, nSize, - (PULONG)lpNumberOfBytesRead - ); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - return TRUE; + /* Return success */ + return TRUE; } - /* * @implemented */ BOOL -STDCALL -WriteProcessMemory ( - HANDLE hProcess, - LPVOID lpBaseAddress, - LPCVOID lpBuffer, - SIZE_T nSize, - SIZE_T *lpNumberOfBytesWritten - ) +NTAPI +WriteProcessMemory(IN HANDLE hProcess, + IN LPVOID lpBaseAddress, + IN LPCVOID lpBuffer, + IN SIZE_T nSize, + OUT SIZE_T *lpNumberOfBytesWritten) { - NTSTATUS Status, ProtectStatus = STATUS_SUCCESS; - MEMORY_BASIC_INFORMATION MemInfo; - ULONG Length; - BOOLEAN UnProtect; + NTSTATUS Status; + ULONG OldValue; + SIZE_T RegionSize; + PVOID Base; + BOOLEAN UnProtect; - if (lpNumberOfBytesWritten) + /* Set parameters for protect call */ + RegionSize = nSize; + Base = lpBaseAddress; + + /* Check the current status */ + Status = NtProtectVirtualMemory(hProcess, + &Base, + &RegionSize, + PAGE_EXECUTE_READWRITE, + &OldValue); + if (NT_SUCCESS(Status)) + { + /* Check if we are unprotecting */ + UnProtect = OldValue & (PAGE_READWRITE | + PAGE_WRITECOPY | + PAGE_EXECUTE_READWRITE | + PAGE_EXECUTE_WRITECOPY) ? FALSE : TRUE; + if (UnProtect) { - *lpNumberOfBytesWritten = 0; - } + /* Set the new protection */ + Status = NtProtectVirtualMemory(hProcess, + &Base, + &RegionSize, + OldValue, + &OldValue); - while (nSize) - { - Status = NtQueryVirtualMemory(hProcess, + /* Write the memory */ + Status = NtWriteVirtualMemory(hProcess, lpBaseAddress, - MemoryBasicInformation, - &MemInfo, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - + (LPVOID)lpBuffer, + nSize, + lpNumberOfBytesWritten); if (!NT_SUCCESS(Status)) { + /* We failed */ SetLastErrorByStatus(Status); return FALSE; } - Length = MemInfo.RegionSize - ((ULONG_PTR)lpBaseAddress - (ULONG_PTR)MemInfo.BaseAddress); - if (Length > nSize) + + /* Flush the ITLB */ + NtFlushInstructionCache(hProcess, lpBaseAddress, nSize); + return TRUE; + } + else + { + /* Check if we were read only */ + if ((OldValue & PAGE_NOACCESS) || (OldValue & PAGE_READONLY)) { - Length = nSize; - } - UnProtect = MemInfo.Protect & (PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY) ? FALSE : TRUE; - if (UnProtect) - { - MemInfo.BaseAddress = lpBaseAddress; - MemInfo.RegionSize = Length; - if (MemInfo.Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ)) - { - MemInfo.Protect &= ~(PAGE_EXECUTE|PAGE_EXECUTE_READ); - MemInfo.Protect |= PAGE_EXECUTE_READWRITE; - } - else - { - MemInfo.Protect &= ~(PAGE_READONLY|PAGE_NOACCESS); - MemInfo.Protect |= PAGE_READWRITE; - } - - ProtectStatus = NtProtectVirtualMemory(hProcess, - &MemInfo.BaseAddress, - &MemInfo.RegionSize, - MemInfo.Protect, - &MemInfo.Protect); - if (!NT_SUCCESS(ProtectStatus)) - { - SetLastErrorByStatus(ProtectStatus); - return FALSE; - } - Length = MemInfo.RegionSize - ((ULONG_PTR)lpBaseAddress - (ULONG_PTR)MemInfo.BaseAddress); - if (Length > nSize) - { - Length = nSize; - } + /* Restore protection and fail */ + NtProtectVirtualMemory(hProcess, + &Base, + &RegionSize, + OldValue, + &OldValue); + SetLastErrorByStatus(STATUS_ACCESS_VIOLATION); + return FALSE; } + /* Otherwise, do the write */ Status = NtWriteVirtualMemory(hProcess, lpBaseAddress, (LPVOID)lpBuffer, - Length, - &Length); - if (UnProtect) + nSize, + lpNumberOfBytesWritten); + + /* And restore the protection */ + NtProtectVirtualMemory(hProcess, + &Base, + &RegionSize, + OldValue, + &OldValue); + if (!NT_SUCCESS(Status)) { - ProtectStatus = NtProtectVirtualMemory(hProcess, - &MemInfo.BaseAddress, - &MemInfo.RegionSize, - MemInfo.Protect, - &MemInfo.Protect); - } - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - if (UnProtect && !NT_SUCCESS(ProtectStatus)) - { - SetLastErrorByStatus (ProtectStatus); + /* We failed */ + SetLastErrorByStatus(STATUS_ACCESS_VIOLATION); return FALSE; } - lpBaseAddress = (LPVOID)((ULONG_PTR)lpBaseAddress + Length); - lpBuffer = (LPCVOID)((ULONG_PTR)lpBuffer + Length); - nSize -= Length; - if (lpNumberOfBytesWritten) - { - *lpNumberOfBytesWritten += Length; - } + + /* Flush the ITLB */ + NtFlushInstructionCache(hProcess, lpBaseAddress, nSize); + return TRUE; } - return TRUE; + } + else + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sect… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c Fri Jun 23 03:06:14 2006 @@ -1,10 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/kernel32/mem/section.c - * PURPOSE: Implementing file mapping - * PROGRAMMER: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/mem/section.c + * PURPOSE: Handles virtual memory APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,371 +11,367 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include "debug.h" /* FUNCTIONS *****************************************************************/ -#define MASK_PAGE_FLAGS (PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY) -#define MASK_SEC_FLAGS (SEC_COMMIT | SEC_IMAGE | SEC_NOCACHE | SEC_RESERVE) - -/* - * @implemented - */ -HANDLE STDCALL -CreateFileMappingA(HANDLE hFile, - LPSECURITY_ATTRIBUTES lpFileMappingAttributes, - DWORD flProtect, - DWORD dwMaximumSizeHigh, - DWORD dwMaximumSizeLow, - LPCSTR lpName) -{ - NTSTATUS Status; - HANDLE SectionHandle; - LARGE_INTEGER MaximumSize; - PLARGE_INTEGER MaximumSizePointer; - OBJECT_ATTRIBUTES ObjectAttributes; - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - PSECURITY_DESCRIPTOR SecurityDescriptor; - - if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect) - { - DPRINT1("Invalid flProtect 0x%08x\n", flProtect); +/* + * @implemented + */ +HANDLE +NTAPI +CreateFileMappingA(IN HANDLE hFile, + IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes, + IN DWORD flProtect, + IN DWORD dwMaximumSizeHigh, + IN DWORD dwMaximumSizeLow, + IN LPCSTR lpName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + LPCWSTR UnicodeName = NULL; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, save the buffer */ + UnicodeName = (LPCWSTR)UnicodeCache->Buffer; + } + + /* Call the Unicode version */ + return CreateFileMappingW(hFile, + lpFileMappingAttributes, + flProtect, + dwMaximumSizeHigh, + dwMaximumSizeLow, + UnicodeName); +} + +/* + * @implemented + */ +HANDLE +NTAPI +CreateFileMappingW(HANDLE hFile, + LPSECURITY_ATTRIBUTES lpFileMappingAttributes, + DWORD flProtect, + DWORD dwMaximumSizeHigh, + DWORD dwMaximumSizeLow, + LPCWSTR lpName) +{ + NTSTATUS Status; + HANDLE SectionHandle; + OBJECT_ATTRIBUTES LocalAttributes; + POBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SectionName; + ACCESS_MASK DesiredAccess; + LARGE_INTEGER LocalSize; + PLARGE_INTEGER SectionSize = NULL; + ULONG Attributes; + + /* Set default access */ + DesiredAccess = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; + + /* Get the attributes for the actual allocation and cleanup flProtect */ + Attributes = flProtect & (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_NOCACHE | SEC_COMMIT); + flProtect ^= Attributes; + + /* If the caller didn't say anything, assume SEC_COMMIT */ + if (!Attributes) Attributes = SEC_COMMIT; + + /* Now check if the caller wanted write access */ + if (flProtect == PAGE_READWRITE) + { + /* Give it */ + DesiredAccess |= (SECTION_MAP_WRITE | SECTION_MAP_READ); + } + + /* Now check if we got a name */ + if (lpName) RtlInitUnicodeString(&SectionName, lpName); + + /* Now convert the object attributes */ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, + lpFileMappingAttributes, + lpName ? &SectionName : NULL); + + /* Check if we got a size */ + if (dwMaximumSizeLow || dwMaximumSizeHigh) + { + /* Use a LARGE_INTEGER and convert */ + SectionSize = &LocalSize; + SectionSize->LowPart = dwMaximumSizeLow; + SectionSize->HighPart = dwMaximumSizeHigh; + } + + /* Make sure the handle is valid */ + if (hFile == INVALID_HANDLE_VALUE) + { + /* It's not, we'll only go on if we have a size */ + hFile = NULL; + if (!SectionSize) + { + /* No size, so this isn't a valid non-mapped section */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + } + + /* Now create the actual section */ + Status = NtCreateSection(&SectionHandle, + DesiredAccess, + ObjectAttributes, + SectionSize, + flProtect, + Attributes, + hFile); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the section */ + return SectionHandle; +} + +/* + * @implemented + */ +LPVOID +NTAPI +MapViewOfFileEx(HANDLE hFileMappingObject, + DWORD dwDesiredAccess, + DWORD dwFileOffsetHigh, + DWORD dwFileOffsetLow, + DWORD dwNumberOfBytesToMap, + LPVOID lpBaseAddress) +{ + NTSTATUS Status; + LARGE_INTEGER SectionOffset; + ULONG ViewSize; + ULONG Protect; + LPVOID ViewBase; + + /* Convert the offset */ + SectionOffset.LowPart = dwFileOffsetLow; + SectionOffset.HighPart = dwFileOffsetHigh; + + /* Save the size and base */ + ViewBase = lpBaseAddress; + ViewSize = dwNumberOfBytesToMap; + + /* Convert flags to NT Protection Attributes */ + if (dwDesiredAccess & FILE_MAP_WRITE) + { + Protect = PAGE_READWRITE; + } + else if (dwDesiredAccess & FILE_MAP_READ) + { + Protect = PAGE_READONLY; + } + else if (dwDesiredAccess & FILE_MAP_COPY) + { + Protect = PAGE_WRITECOPY; + } + else + { + Protect = PAGE_NOACCESS; + } + + /* Map the section */ + Status = ZwMapViewOfSection(hFileMappingObject, + NtCurrentProcess(), + &ViewBase, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + Protect); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the base */ + return ViewBase; +} + +/* + * @implemented + */ +LPVOID +NTAPI +MapViewOfFile(HANDLE hFileMappingObject, + DWORD dwDesiredAccess, + DWORD dwFileOffsetHigh, + DWORD dwFileOffsetLow, + DWORD dwNumberOfBytesToMap) +{ + /* Call the extended API */ + return MapViewOfFileEx(hFileMappingObject, + dwDesiredAccess, + dwFileOffsetHigh, + dwFileOffsetLow, + dwNumberOfBytesToMap, + NULL); +} + +/* + * @implemented + */ +BOOL +NTAPI +UnmapViewOfFile(LPVOID lpBaseAddress) +{ + NTSTATUS Status; + + /* Unmap the section */ + Status = NtUnmapViewOfSection(NtCurrentProcess(), lpBaseAddress); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Otherwise, return sucess */ + return TRUE; +} + +/* + * @implemented + */ +HANDLE +NTAPI +OpenFileMappingA(DWORD dwDesiredAccess, + BOOL bInheritHandle, + LPCSTR lpName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + } + else + { + /* We need a name */ SetLastError(ERROR_INVALID_PARAMETER); return NULL; - } - if (lpFileMappingAttributes) - { - SecurityDescriptor = lpFileMappingAttributes->lpSecurityDescriptor; - } - else - { - SecurityDescriptor = NULL; - } - - if (dwMaximumSizeLow == 0 && dwMaximumSizeHigh == 0) - { - MaximumSizePointer = NULL; - } - else - { - MaximumSize.u.LowPart = dwMaximumSizeLow; - MaximumSize.u.HighPart = dwMaximumSizeHigh; - MaximumSizePointer = &MaximumSize; - } - - if (lpName != NULL) - { - RtlInitAnsiString(&AnsiName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&UnicodeName, - &AnsiName, - TRUE); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpName ? &UnicodeName : NULL), - 0, - (lpName ? hBaseDir : NULL), - SecurityDescriptor); - - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes, - MaximumSizePointer, - flProtect & MASK_PAGE_FLAGS, - flProtect & MASK_SEC_FLAGS, - ((hFile != INVALID_HANDLE_VALUE) ? hFile : NULL)); - if (lpName != NULL) - { - RtlFreeUnicodeString(&UnicodeName); - } - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - return SectionHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -CreateFileMappingW(HANDLE hFile, - LPSECURITY_ATTRIBUTES lpFileMappingAttributes, - DWORD flProtect, - DWORD dwMaximumSizeHigh, - DWORD dwMaximumSizeLow, - LPCWSTR lpName) -{ - NTSTATUS Status; - HANDLE SectionHandle; - LARGE_INTEGER MaximumSize; - PLARGE_INTEGER MaximumSizePointer; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeName; - PSECURITY_DESCRIPTOR SecurityDescriptor; - - if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect) - { - DPRINT1("Invalid flProtect 0x%08x\n", flProtect); + } + + /* Call the Unicode version */ + return OpenFileMappingW(dwDesiredAccess, + bInheritHandle, + (LPCWSTR)UnicodeCache->Buffer); +} + +/* + * @implemented + */ +HANDLE +NTAPI +OpenFileMappingW(DWORD dwDesiredAccess, + BOOL bInheritHandle, + LPCWSTR lpName) +{ + NTSTATUS Status; + HANDLE SectionHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING UnicodeName; + + /* We need a name */ + if (!lpName) + { + /* Otherwise, fail */ SetLastError(ERROR_INVALID_PARAMETER); return NULL; - } - if (lpFileMappingAttributes) - { - SecurityDescriptor = lpFileMappingAttributes->lpSecurityDescriptor; - } - else - { - SecurityDescriptor = NULL; - } - - if (dwMaximumSizeLow == 0 && dwMaximumSizeHigh == 0) - { - MaximumSizePointer = NULL; - } - else - { - MaximumSize.u.LowPart = dwMaximumSizeLow; - MaximumSize.u.HighPart = dwMaximumSizeHigh; - MaximumSizePointer = &MaximumSize; - } - - if (lpName != NULL) - { - RtlInitUnicodeString(&UnicodeName, - lpName); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpName ? &UnicodeName : NULL), - 0, - (lpName ? hBaseDir : NULL), - SecurityDescriptor); - - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes, - MaximumSizePointer, - flProtect & MASK_PAGE_FLAGS, - flProtect & MASK_SEC_FLAGS, - ((hFile != INVALID_HANDLE_VALUE) ? hFile : NULL)); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - return SectionHandle; -} - - -/* - * @implemented - */ -LPVOID STDCALL -MapViewOfFileEx(HANDLE hFileMappingObject, - DWORD dwDesiredAccess, - DWORD dwFileOffsetHigh, - DWORD dwFileOffsetLow, - DWORD dwNumberOfBytesToMap, - LPVOID lpBaseAddress) -{ - NTSTATUS Status; - LARGE_INTEGER SectionOffset; - ULONG ViewSize; - ULONG Protect; - LPVOID BaseAddress; - - SectionOffset.u.LowPart = dwFileOffsetLow; - SectionOffset.u.HighPart = dwFileOffsetHigh; - - if ( ( dwDesiredAccess & FILE_MAP_WRITE) == FILE_MAP_WRITE) - Protect = PAGE_READWRITE; - else if ((dwDesiredAccess & FILE_MAP_READ) == FILE_MAP_READ) - Protect = PAGE_READONLY; - else if ((dwDesiredAccess & FILE_MAP_ALL_ACCESS) == FILE_MAP_ALL_ACCESS) - Protect = PAGE_READWRITE; - else if ((dwDesiredAccess & FILE_MAP_COPY) == FILE_MAP_COPY) - Protect = PAGE_WRITECOPY; - else - Protect = PAGE_READWRITE; - - if (lpBaseAddress == NULL) - { - BaseAddress = NULL; - } - else - { - BaseAddress = lpBaseAddress; - } - - ViewSize = (ULONG) dwNumberOfBytesToMap; - - Status = ZwMapViewOfSection(hFileMappingObject, - NtCurrentProcess(), - &BaseAddress, - 0, - dwNumberOfBytesToMap, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - Protect); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - return BaseAddress; -} - - -/* - * @implemented - */ -LPVOID STDCALL -MapViewOfFile(HANDLE hFileMappingObject, - DWORD dwDesiredAccess, - DWORD dwFileOffsetHigh, - DWORD dwFileOffsetLow, - DWORD dwNumberOfBytesToMap) -{ - return MapViewOfFileEx(hFileMappingObject, - dwDesiredAccess, - dwFileOffsetHigh, - dwFileOffsetLow, - dwNumberOfBytesToMap, - NULL); -} - - -/* - * @implemented - */ -BOOL STDCALL -UnmapViewOfFile(LPVOID lpBaseAddress) -{ - NTSTATUS Status; - - Status = NtUnmapViewOfSection(NtCurrentProcess(), - lpBaseAddress); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenFileMappingA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpName) -{ - NTSTATUS Status; - HANDLE SectionHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - - if (lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitAnsiString(&AnsiName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&UnicodeName, - &AnsiName, - TRUE); - - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeName, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - Status = NtOpenSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - RtlFreeUnicodeString (&UnicodeName); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return NULL; - } - - return SectionHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenFileMappingW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpName) -{ - NTSTATUS Status; - HANDLE SectionHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeName; - - if (lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&UnicodeName, - lpName); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeName, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - Status = ZwOpenSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return SectionHandle; -} - - -/* - * @implemented - */ -BOOL STDCALL + } + + /* Convert attributes */ + RtlInitUnicodeString(&UnicodeName, lpName); + InitializeObjectAttributes(&ObjectAttributes, + &UnicodeName, + (bInheritHandle ? OBJ_INHERIT : 0), + hBaseDir, + NULL); + + /* Convert COPY to READ */ + if (dwDesiredAccess == FILE_MAP_COPY) dwDesiredAccess = FILE_MAP_READ; + + /* Open the section */ + Status = ZwOpenSection(&SectionHandle, + dwDesiredAccess, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, return the handle */ + return SectionHandle; +} + +/* + * @implemented + */ +BOOL +NTAPI FlushViewOfFile(LPCVOID lpBaseAddress, - DWORD dwNumberOfBytesToFlush) -{ - NTSTATUS Status; - ULONG NumberOfBytesFlushed; - - Status = NtFlushVirtualMemory(NtCurrentProcess(), - (LPVOID)lpBaseAddress, - dwNumberOfBytesToFlush, - &NumberOfBytesFlushed); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; + DWORD dwNumberOfBytesToFlush) +{ + NTSTATUS Status; + ULONG NumberOfBytesFlushed; + + /* Flush the view */ + Status = NtFlushVirtualMemory(NtCurrentProcess(), + (LPVOID)lpBaseAddress, + dwNumberOfBytesToFlush, + &NumberOfBytesFlushed); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/virt… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c Fri Jun 23 03:06:14 2006 @@ -1,10 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/kernel32/mem/virtual.c - * PURPOSE: Passing the Virtualxxx functions onto the kernel - * PROGRAMMER: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/mem/virtual.c + * PURPOSE: Handles virtual memory APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,221 +11,250 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include "debug.h" /* FUNCTIONS *****************************************************************/ /* * @implemented */ -LPVOID STDCALL -VirtualAllocEx(HANDLE hProcess, - LPVOID lpAddress, - SIZE_T dwSize, - DWORD flAllocationType, - DWORD flProtect) -{ - NTSTATUS Status; - - Status = NtAllocateVirtualMemory(hProcess, - (PVOID *)&lpAddress, - 0, - &dwSize, - flAllocationType, - flProtect); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(NULL); - } - return(lpAddress); -} - - -/* - * @implemented - */ -LPVOID STDCALL -VirtualAlloc(LPVOID lpAddress, - SIZE_T dwSize, - DWORD flAllocationType, - DWORD flProtect) -{ - return(VirtualAllocEx(GetCurrentProcess(), - lpAddress, - dwSize, - flAllocationType, - flProtect)); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualFreeEx(HANDLE hProcess, - LPVOID lpAddress, - SIZE_T dwSize, - DWORD dwFreeType) -{ - NTSTATUS Status; - - Status = NtFreeVirtualMemory(hProcess, - (PVOID *)&lpAddress, - (PULONG)&dwSize, - dwFreeType); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualFree(LPVOID lpAddress, - SIZE_T dwSize, - DWORD dwFreeType) -{ - return(VirtualFreeEx(GetCurrentProcess(), - lpAddress, - dwSize, - dwFreeType)); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualProtect(LPVOID lpAddress, - SIZE_T dwSize, - DWORD flNewProtect, - PDWORD lpflOldProtect) -{ - return(VirtualProtectEx(GetCurrentProcess(), - lpAddress, - dwSize, - flNewProtect, - lpflOldProtect)); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualProtectEx(HANDLE hProcess, - LPVOID lpAddress, - SIZE_T dwSize, - DWORD flNewProtect, - PDWORD lpflOldProtect) -{ - NTSTATUS Status; - - Status = NtProtectVirtualMemory(hProcess, - &lpAddress, - &dwSize, - flNewProtect, - (PULONG)lpflOldProtect); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - return(TRUE); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualLock(LPVOID lpAddress, - SIZE_T dwSize) -{ - ULONG BytesLocked; - NTSTATUS Status; - - Status = NtLockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - return(TRUE); -} - - -/* - * @implemented - */ -DWORD STDCALL -VirtualQuery(LPCVOID lpAddress, - PMEMORY_BASIC_INFORMATION lpBuffer, - SIZE_T dwLength) -{ - return(VirtualQueryEx(NtCurrentProcess(), - lpAddress, - lpBuffer, - dwLength)); -} - - -/* - * @implemented - */ -DWORD STDCALL -VirtualQueryEx(HANDLE hProcess, - LPCVOID lpAddress, - PMEMORY_BASIC_INFORMATION lpBuffer, - SIZE_T dwLength) -{ - NTSTATUS Status; - ULONG ResultLength; - - Status = NtQueryVirtualMemory(hProcess, - (LPVOID)lpAddress, - MemoryBasicInformation, - lpBuffer, - sizeof(MEMORY_BASIC_INFORMATION), - &ResultLength ); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - return(ResultLength); -} - - -/* - * @implemented - */ -BOOL STDCALL -VirtualUnlock(LPVOID lpAddress, - SIZE_T dwSize) -{ - ULONG BytesLocked; - NTSTATUS Status; - - Status = NtUnlockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - return(TRUE); +LPVOID +NTAPI +VirtualAllocEx(IN HANDLE hProcess, + IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD flAllocationType, + IN DWORD flProtect) +{ + NTSTATUS Status; + + /* Allocate the memory */ + Status = NtAllocateVirtualMemory(hProcess, + (PVOID *)&lpAddress, + 0, + &dwSize, + flAllocationType, + flProtect); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the allocated address */ + return lpAddress; +} + +/* + * @implemented + */ +LPVOID +NTAPI +VirtualAlloc(IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD flAllocationType, + IN DWORD flProtect) +{ + /* Call the extended API */ + return VirtualAllocEx(GetCurrentProcess(), + lpAddress, + dwSize, + flAllocationType, + flProtect); +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualFreeEx(IN HANDLE hProcess, + IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD dwFreeType) +{ + NTSTATUS Status; + + /* Free the memory */ + Status = NtFreeVirtualMemory(hProcess, + (PVOID *)&lpAddress, + (PULONG)&dwSize, + dwFreeType); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualFree(IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD dwFreeType) +{ + /* Call the extended API */ + return VirtualFreeEx(GetCurrentProcess(), + lpAddress, + dwSize, + dwFreeType); +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualProtect(IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD flNewProtect, + OUT PDWORD lpflOldProtect) +{ + /* Call the extended API */ + return VirtualProtectEx(GetCurrentProcess(), + lpAddress, + dwSize, + flNewProtect, + lpflOldProtect); +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualProtectEx(IN HANDLE hProcess, + IN LPVOID lpAddress, + IN SIZE_T dwSize, + IN DWORD flNewProtect, + OUT PDWORD lpflOldProtect) +{ + NTSTATUS Status; + + /* Change the protection */ + Status = NtProtectVirtualMemory(hProcess, + &lpAddress, + &dwSize, + flNewProtect, + (PULONG)lpflOldProtect); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualLock(IN LPVOID lpAddress, + IN SIZE_T dwSize) +{ + ULONG BytesLocked; + NTSTATUS Status; + + /* Lock the memory */ + Status = NtLockVirtualMemory(NtCurrentProcess(), + lpAddress, + dwSize, + &BytesLocked); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +DWORD +NTAPI +VirtualQuery(IN LPCVOID lpAddress, + OUT PMEMORY_BASIC_INFORMATION lpBuffer, + IN SIZE_T dwLength) +{ + /* Call the extended API */ + return VirtualQueryEx(NtCurrentProcess(), + lpAddress, + lpBuffer, + dwLength); +} + +/* + * @implemented + */ +DWORD +NTAPI +VirtualQueryEx(IN HANDLE hProcess, + IN LPCVOID lpAddress, + OUT PMEMORY_BASIC_INFORMATION lpBuffer, + IN SIZE_T dwLength) +{ + NTSTATUS Status; + ULONG ResultLength; + + /* Query basic information */ + Status = NtQueryVirtualMemory(hProcess, + (LPVOID)lpAddress, + MemoryBasicInformation, + lpBuffer, + sizeof(MEMORY_BASIC_INFORMATION), + &ResultLength); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return 0; + } + + /* Return the length returned */ + return ResultLength; +} + +/* + * @implemented + */ +BOOL +NTAPI +VirtualUnlock(IN LPVOID lpAddress, + IN SIZE_T dwSize) +{ + ULONG BytesLocked; + NTSTATUS Status; + + /* Unlock the memory */ + Status = NtUnlockVirtualMemory(NtCurrentProcess(), + lpAddress, + dwSize, + &BytesLocked); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs