Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[cwittich] 32638: change script to work with new subdir structure
by cwittich＠svn.reactos.org 10 Mar '08

10 Mar '08

Author: cwittich Date: Mon Mar 10 03:56:40 2008 New Revision: 32638 URL: http://svn.reactos.org/svn/reactos?rev=3D32638&view=3Drev Log: change script to work with new subdir structure Modified: trunk/tools/buildbot/scripts/Linux/cleaniso Modified: trunk/tools/buildbot/scripts/Linux/cleaniso URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/= cleaniso?rev=3D32638&r1=3D32637&r2=3D32638&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/buildbot/scripts/Linux/cleaniso (original) +++ trunk/tools/buildbot/scripts/Linux/cleaniso Mon Mar 10 03:56:40 2008 @@ -1,7 +1,7 @@ #!/bin/bash for CD in boot live do - ls -l --size -r /home/rosbuild/isostorage/$CD*.7z | awk '{ print $10 }'= | while read fname + ls -l --size -r /home/rosbuild/isostorage/${CD}cd/$CD*.7z | awk '{ prin= t $10 }' | while read fname do FILECOUNT=3D`7za t $fname | grep -e 'Files:' | awk '{ print $2 }'` if [ $FILECOUNT ]; then

1 0

[jimtabor] 32637: - Cleanup GreatLordisms and half implement GdiRealizationInfo.
by jimtabor＠svn.reactos.org 10 Mar '08

10 Mar '08

Author: jimtabor Date: Sun Mar 9 23:02:49 2008 New Revision: 32637 URL: http://svn.reactos.org/svn/reactos?rev=3D32637&view=3Drev Log: - Cleanup GreatLordisms and half implement GdiRealizationInfo. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32= .rbuild?rev=3D32637&r1=3D32636&r2=3D32637&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sun Mar 9 23:02:49 2008 @@ -5,6 +5,7 @@ <define name=3D"UNICODE" /> <define name=3D"WINVER">0x0600</define> <define name=3D"_WIN32_WINNT">0x0501</define> + <define name=3D"LANGPACK" /> <library>ntdll</library> <library>user32</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubs.c?rev=3D32637&r1=3D32636&r2=3D32637&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Mar 9 23:02:49 2008 @@ -1473,9 +1473,8 @@ GdiRealizationInfo(HDC hdc, PREALIZATION_INFO pri) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + // ATM we do not support local font data and Language Pack. + return NtGdiGetRealizationInfo(hdc, pri, (HFONT) NULL); } = /* @@ -1520,7 +1519,7 @@ { case ABORTDOC: = /* Note Winodws check see if the handle have any user data= for ABORTDOC command = - * ReactOS copy this behoir to be compatible with windows = 2003 = + * ReactOS copy this behavior to be compatible with window= s 2003 = */ if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = (pUserData =3D=3D NULL) ) = @@ -1539,7 +1538,7 @@ case SETCOLORTABLE: /* Note 1: DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE is outdat= ed and been replace with other api */ /* Note 2: Winodws check see if the handle have any user d= ata for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = - * ReactOS copy this behoir to be compatible with windows = 2003 = + * ReactOS copy this behavior to be compatible with window= s 2003 = */ if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = (pUserData =3D=3D NULL) ) = @@ -1551,7 +1550,7 @@ = case SETABORTPROC: /* Note : Winodws check see if the handle have any user da= ta for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = - * ReactOS copy this behoir to be compatible with windows = 2003 = + * ReactOS copy this behavior to be compatible with window= s 2003 = */ if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = (pUserData =3D=3D NULL) ) = @@ -1572,7 +1571,7 @@ = case ENDDOC: /* Note : Winodws check see if the handle have any user da= ta for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = - * ReactOS copy this behoir to be compatible with windows = 2003 = + * ReactOS copy this behavior to be compatible with window= s 2003 = */ if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = (pUserData =3D=3D NULL) ) =

1 0

[greatlrd] 32636: partly implement gdi32 Escape implemented command ENDDOC: Escape
by greatlrd＠svn.reactos.org 10 Mar '08

10 Mar '08

Author: greatlrd Date: Sun Mar 9 19:27:25 2008 New Revision: 32636 URL: http://svn.reactos.org/svn/reactos?rev=3D32636&view=3Drev Log: partly implement gdi32 Escape implemented command ENDDOC: Escape = Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubs.c?rev=3D32636&r1=3D32635&r2=3D32636&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Mar 9 19:27:25 2008 @@ -1569,6 +1569,20 @@ retValue =3D -1; = } = break; + + case ENDDOC: + /* Note : Winodws check see if the handle have any user da= ta for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = + * ReactOS copy this behoir to be compatible with windows = 2003 = + */ + if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = + (pUserData =3D=3D NULL) ) = + { + GdiSetLastError(ERROR_INVALID_HANDLE); + retValue =3D FALSE; + } + retValue =3D EndDoc(hdc); + break; + = case GETSCALINGFACTOR: /* Note GETSCALINGFACTOR is outdated have been replace by = GetDeviceCaps */ Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubsa.c?rev=3D32636&r1=3D32635&r2=3D32636&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Sun Mar 9 19:27:25 2008 @@ -43,7 +43,7 @@ STDCALL StartDocA( HDC hdc, - CONST DOCINFOA *a1 + CONST DOCINFOA *lpdi ) { UNIMPLEMENTED;

1 0

[greatlrd] 32635: partly implement gdi32 Escape need it for getting opengl icd driver working, if they are using ms icd ddk implemented command DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE for they are not longer supported in windows XP/2003 implemented command SETABORTPROC it is still stub in gdi32/misc/stubs.c
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 9 18:32:52 2008 New Revision: 32635 URL: http://svn.reactos.org/svn/reactos?rev=3D32635&view=3Drev Log: partly implement gdi32 Escape need it for getting opengl icd driver working= , if they are using ms icd ddk = implemented command DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE for they are not = longer supported in windows XP/2003 implemented command SETABORTPROC it is still stub in gdi32/misc/stubs.c = Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubs.c?rev=3D32635&r1=3D32634&r2=3D32635&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Mar 9 18:32:52 2008 @@ -619,9 +619,8 @@ int STDCALL SetAbortProc( - HDC hdc, - ABORTPROC a1 - ) + HDC hdc, + ABORTPROC lpAbortProc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1519,7 +1518,7 @@ { switch (nEscape) { - case ABORTDOC: = + case ABORTDOC: = /* Note Winodws check see if the handle have any user data= for ABORTDOC command = * ReactOS copy this behoir to be compatible with windows = 2003 = */ @@ -1535,7 +1534,35 @@ } break; = - case GETCOLORTABLE: = + case DRAFTMODE: + case FLUSHOUTPUT: + case SETCOLORTABLE: + /* Note 1: DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE is outdat= ed and been replace with other api */ + /* Note 2: Winodws check see if the handle have any user d= ata for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = + * ReactOS copy this behoir to be compatible with windows = 2003 = + */ + if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = + (pUserData =3D=3D NULL) ) = + { + GdiSetLastError(ERROR_INVALID_HANDLE); + } + retValue =3D FALSE; + break; + + case SETABORTPROC: + /* Note : Winodws check see if the handle have any user da= ta for DRAFTMODE, FLUSHOUTPUT, SETCOLORTABLE command = + * ReactOS copy this behoir to be compatible with windows = 2003 = + */ + if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = + (pUserData =3D=3D NULL) ) = + { + GdiSetLastError(ERROR_INVALID_HANDLE); + retValue =3D FALSE; + } + retValue =3D SetAbortProc(hdc, (ABORTPROC)lpvInData); + break; + + case GETCOLORTABLE: retValue =3D GetSystemPaletteEntries(hdc, (UINT)*lpvInData= , 1, (LPPALETTEENTRY)lpvOutData); if ( !retValue ) { @@ -1543,11 +1570,7 @@ } = break; = - case GETEXTENDEDTEXTMETRICS: - retValue =3D (int) GetETM( hdc, (EXTTEXTMETRIC *) lpvOutDa= ta) !=3D 0; - break; - = - case GETSCALINGFACTOR: = + case GETSCALINGFACTOR: /* Note GETSCALINGFACTOR is outdated have been replace by = GetDeviceCaps */ if ( Type =3D=3D GDI_OBJECT_TYPE_DC ) { = @@ -1560,6 +1583,13 @@ } = retValue =3D FALSE; break; + + case GETEXTENDEDTEXTMETRICS: + retValue =3D (int) GetETM( hdc, (EXTTEXTMETRIC *) lpvOutDa= ta) !=3D 0; + break; + = + = + = default: UNIMPLEMENTED;

1 0

[greatlrd] 32634: partly implement gdi32 Escape implemented command ABORTDOC Escape
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 9 17:58:13 2008 New Revision: 32634 URL: http://svn.reactos.org/svn/reactos?rev=3D32634&view=3Drev Log: partly implement gdi32 Escape implemented command ABORTDOC Escape = Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubs.c?rev=3D32634&r1=3D32633&r2=3D32634&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Mar 9 17:58:13 2008 @@ -1505,6 +1505,7 @@ int retValue =3D -1; = HGDIOBJ hObject =3D hdc; UINT Type =3D 0; + LPVOID pUserData =3D NULL; = Type =3D GDI_HANDLE_GET_TYPE(hObject); = @@ -1518,6 +1519,22 @@ { switch (nEscape) { + case ABORTDOC: = + /* Note Winodws check see if the handle have any user data= for ABORTDOC command = + * ReactOS copy this behoir to be compatible with windows = 2003 = + */ + if ( (!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) = &pUserData)) || = + (pUserData =3D=3D NULL) ) = + { + GdiSetLastError(ERROR_INVALID_HANDLE); + retValue =3D FALSE; + } + else + { + retValue =3D AbortDoc(hdc); + } + break; + case GETCOLORTABLE: = retValue =3D GetSystemPaletteEntries(hdc, (UINT)*lpvInData= , 1, (LPPALETTEENTRY)lpvOutData); if ( !retValue ) @@ -1541,7 +1558,7 @@ ptr->y =3D 0; = } } = - retValue =3D 0; + retValue =3D FALSE; break; = default:

1 0

[hamtitampti] 32633: Revert Change in readme.txt -- HTTP DAV access working
by hamtitampti＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hamtitampti Date: Sun Mar 9 16:56:42 2008 New Revision: 32633 URL: http://svn.reactos.org/svn/reactos?rev=3D32633&view=3Drev Log: Revert Change in readme.txt -- HTTP DAV access working Modified: trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.= txt?rev=3D32633&r1=3D32632&r2=3D32633&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/bootdata/readme.txt (original) +++ trunk/reactos/boot/bootdata/readme.txt Sun Mar 9 16:56:42 2008 @@ -51,4 +51,4 @@ 6. Author --------- = -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[hamtitampti] 32632: SVN TEST
by hamtitampti＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hamtitampti Date: Sun Mar 9 16:48:27 2008 New Revision: 32632 URL: http://svn.reactos.org/svn/reactos?rev=3D32632&view=3Drev Log: SVN TEST Modified: trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.= txt?rev=3D32632&r1=3D32631&r2=3D32632&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/bootdata/readme.txt (original) +++ trunk/reactos/boot/bootdata/readme.txt Sun Mar 9 16:48:27 2008 @@ -51,4 +51,4 @@ 6. Author --------- = -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[greatlrd] 32631: partly implement gdi32 Escape implemented command GETSCALINGFACTOR Escape change from if to switch statment for it is faster and cleaner
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 9 16:36:09 2008 New Revision: 32631 URL: http://svn.reactos.org/svn/reactos?rev=3D32631&view=3Drev Log: partly implement gdi32 Escape implemented command GETSCALINGFACTOR Escape change from if to switch statment for it is faster and cleaner = Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= stubs.c?rev=3D32631&r1=3D32630&r2=3D32631&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Mar 9 16:36:09 2008 @@ -1502,35 +1502,54 @@ STDCALL Escape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpvInData, LPVOID lpvOutD= ata) { - int retValue =3D -1; - - /* FIXME gdi share memory */ - - if (nEscape =3D=3D GETCOLORTABLE) + int retValue =3D -1; = + HGDIOBJ hObject =3D hdc; + UINT Type =3D 0; + + Type =3D GDI_HANDLE_GET_TYPE(hObject); + + if (Type =3D=3D GDI_OBJECT_TYPE_METADC) { - retValue =3D GetSystemPaletteEntries(hdc, (UINT)*lpvInData, 1, (LP= PALETTEENTRY)lpvOutData); - if ( !retValue ) + /* FIXME we do not support metafile */ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + else + { + switch (nEscape) { - retValue =3D -1; = + case GETCOLORTABLE: = + retValue =3D GetSystemPaletteEntries(hdc, (UINT)*lpvInData= , 1, (LPPALETTEENTRY)lpvOutData); + if ( !retValue ) + { + retValue =3D -1; = + } = + break; + + case GETEXTENDEDTEXTMETRICS: + retValue =3D (int) GetETM( hdc, (EXTTEXTMETRIC *) lpvOutDa= ta) !=3D 0; + break; + = + case GETSCALINGFACTOR: = + /* Note GETSCALINGFACTOR is outdated have been replace by = GetDeviceCaps */ + if ( Type =3D=3D GDI_OBJECT_TYPE_DC ) + { = + if ( lpvOutData ) + { + PPOINT ptr =3D (PPOINT) lpvOutData; + ptr->x =3D 0; + ptr->y =3D 0; = + } + } = + retValue =3D 0; + break; + + default: + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); = } - - /* FIXME tempary until Escape are completed */ - return retValue; } - else if (nEscape =3D=3D GETEXTENDEDTEXTMETRICS) - { - retValue =3D (int) GetETM( hdc, (EXTTEXTMETRIC *) lpvOutData) !=3D= 0; - - /* FIXME tempary until Escape are completed */ - return retValue; - } - else if ( nEscape !=3D QUERYESCSUPPORT ) - { = - } - - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return retValue; } =

1 0

[fireball] 32630: - Move MiGetPfnEntry into arch-independent mm.h header, along with a few defines, structures, and function prototypes which are going to be used with the new pool implementation in future. - Add two new fields into PHYSICAL_PAGE structure, they will be used (in the future new pool implementation) to find end/start of a non-paged pool allocation without storing the actual pointers (based on NTs own PFN entry optimization for this) - thanks to Alex for providing this great idea!
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sun Mar 9 16:15:12 2008 New Revision: 32630 URL: http://svn.reactos.org/svn/reactos?rev=3D32630&view=3Drev Log: - Move MiGetPfnEntry into arch-independent mm.h header, along with a few de= fines, structures, and function prototypes which are going to be used with = the new pool implementation in future. - Add two new fields into PHYSICAL_PAGE structure, they will be used (in th= e future new pool implementation) to find end/start of a non-paged pool all= ocation without storing the actual pointers (based on NTs own PFN entry opt= imization for this) - thanks to Alex for providing this great idea! Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/mm.h?rev=3D32630&r1=3D32629&r2=3D32630&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Sun Mar 9 16:15:12 2008 @@ -55,6 +55,12 @@ #define MM_PAGEOP_PAGEOUT (2) #define MM_PAGEOP_PAGESYNCH (3) #define MM_PAGEOP_ACCESSFAULT (4) + +/* Number of list heads to use */ +#define MI_FREE_POOL_LISTS 4 + +/* Signature of free pool blocks */ +#define MM_FREE_POOL_TAG TAG('F', 'r', 'p', 'l') = #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) @@ -275,6 +281,8 @@ ULONG Type: 2; ULONG Consumer: 3; ULONG Zero: 1; + ULONG StartOfAllocation: 1; + ULONG EndOfAllocation: 1; } Flags; ULONG AllFlags; @@ -337,6 +345,28 @@ LIST_ENTRY RegionListEntry; } MM_REGION, *PMM_REGION; = +/* Entry describing free pool memory */ +typedef struct _MMFREE_POOL_ENTRY +{ + LIST_ENTRY List; + PFN_NUMBER Size; + ULONG Signature; + struct _MMFREE_POOL_ENTRY *Owner; +} MMFREE_POOL_ENTRY, *PMMFREE_POOL_ENTRY; + +/* Paged pool information */ +typedef struct _MM_PAGED_POOL_INFO +{ = + PRTL_BITMAP PagedPoolAllocationMap; + PRTL_BITMAP EndOfPagedPoolBitmap; + PMMPTE FirstPteForPagedPool; + PMMPTE LastPteForPagedPool; + PMMPTE NextPdeForPagedPoolExpansion; + ULONG PagedPoolHint; + SIZE_T PagedPoolCommit; + SIZE_T AllocatedPagedPool; +} MM_PAGED_POOL_INFO, *PMM_PAGED_POOL_INFO; + extern MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; = typedef VOID @@ -489,6 +519,25 @@ = PVOID NTAPI +MiAllocatePoolPages( + IN POOL_TYPE PoolType, + IN SIZE_T SizeInBytes +); + +POOL_TYPE +NTAPI +MmDeterminePoolType( + IN PVOID VirtualAddress +); + +ULONG +NTAPI +MiFreePoolPages( + IN PVOID StartingAddress +); + +PVOID +NTAPI MmGetMdlPageAddress( PMDL Mdl, PVOID Offset @@ -935,6 +984,29 @@ MmPageOutPhysicalAddress(PFN_TYPE Page); = /* freelist.c **********************************************************/ + +#define ASSERT_PFN(x) ASSERT((x)->Flags.Type !=3D 0) + +FORCEINLINE +PPHYSICAL_PAGE +MiGetPfnEntry(IN PFN_TYPE Pfn) +{ + PPHYSICAL_PAGE Page; + extern PPHYSICAL_PAGE MmPageArray; + extern ULONG MmPageArraySize; + + /* Make sure the PFN number is valid */ + ASSERT(Pfn <=3D MmPageArraySize); + + /* Get the entry */ + Page =3D &MmPageArray[Pfn]; + + /* Make sure it's valid */ + ASSERT_PFN(Page); + + /* Return it */ + return Page; +}; = PFN_TYPE NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.= c?rev=3D32630&r1=3D32629&r2=3D32630&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Mar 9 16:15:12 2008 @@ -25,12 +25,9 @@ #define MM_PHYSICAL_PAGE_USED (0x2) #define MM_PHYSICAL_PAGE_BIOS (0x3) = - -#define ASSERT_PFN(x) ASSERT((x)->Flags.Type !=3D 0) - /* GLOBALS ***************************************************************= */ = -static PPHYSICAL_PAGE MmPageArray; +PPHYSICAL_PAGE MmPageArray; ULONG MmPageArraySize; = static KSPIN_LOCK PageListLock; @@ -44,25 +41,6 @@ static ULONG UnzeroedPageCount =3D 0; = /* FUNCTIONS *************************************************************/ - -FORCEINLINE -PPHYSICAL_PAGE -MiGetPfnEntry(IN PFN_TYPE Pfn) -{ - PPHYSICAL_PAGE Page; - - /* Make sure the PFN number is valid */ - ASSERT(Pfn <=3D MmPageArraySize); - - /* Get the entry */ - Page =3D &MmPageArray[Pfn]; - - /* Make sure it's valid */ - ASSERT_PFN(Page); - - /* Return it */ - return Page; -} = PFN_TYPE NTAPI

1 0

[fireball] 32629: - Move some PTE/PDE macros from i386/page.c into arch-specific mm.h. Also change some macros operation from integer division to bit shifting. - Remove unused/#if0-ed stuff from mm.h.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sun Mar 9 15:30:28 2008 New Revision: 32629 URL: http://svn.reactos.org/svn/reactos?rev=3D32629&view=3Drev Log: - Move some PTE/PDE macros from i386/page.c into arch-specific mm.h. Also c= hange some macros operation from integer division to bit shifting. - Remove unused/#if0-ed stuff from mm.h. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/i386/mm.h?rev=3D32629&r1=3D32628&r2=3D32629&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h Sun Mar 9 15:30:28 2= 008 @@ -5,29 +5,27 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H #define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H = -#if 0 -/* - * Page access attributes (or these together) - */ -#define PA_READ (1<<0) -#define PA_WRITE ((1<<0)+(1<<1)) -#define PA_EXECUTE PA_READ -#define PA_PCD (1<<4) -#define PA_PWT (1<<3) - -/* - * Page attributes - */ -#define PA_USER (1<<2) -#define PA_SYSTEM (0) -#endif - struct _EPROCESS; PULONG MmGetPageDirectory(VOID); - - = #define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) = +/* Base addresses of PTE and PDE */ +#define PAGETABLE_MAP (0xc0000000) +#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) + +/* Converting address to a corresponding PDE or PTE entry */ +#define MiAddressToPde(x) \ + ((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) +#define MiAddressToPte(x) \ + ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PAGETABLE_MAP)) + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE= _SIZE) + +/* Easy accessing PFN in PTE */ +#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page= .c?rev=3D32629&r1=3D32628&r2=3D32629&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Sun Mar 9 15:30:28 2008 @@ -39,9 +39,6 @@ #define PA_ACCESSED (1 << PA_BIT_ACCESSED) #define PA_GLOBAL (1 << PA_BIT_GLOBAL) = -#define PAGETABLE_MAP (0xc0000000) -#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) - #define HYPERSPACE (0xc0400000) #define IS_HYPERSPACE(v) (((ULONG)(v) >=3D HYPERSPACE && (ULONG)(v) < HYPE= RSPACE + 0x400000)) = @@ -141,17 +138,6 @@ } return(Attributes); } - -#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) - -#define ADDR_TO_PDE(v) (PULONG)(PAGEDIRECTORY_MAP + \ - ((((ULONG)(v)) / (1024 * 1024))&(~0x3))) -#define ADDR_TO_PTE(v) (PULONG)(PAGETABLE_MAP + ((((ULONG)(v) / 1024))&(~0= x3))) - -#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) - -#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE= _SIZE) - = NTSTATUS NTAPI @@ -294,8 +280,9 @@ KeAttachProcess(&Process->Pcb); } = - *(ADDR_TO_PDE(Address)) =3D 0; - MiFlushTlb(ADDR_TO_PDE(Address), ADDR_TO_PTE(Address)); + MiAddressToPde(Address)->u.Long =3D 0; + MiFlushTlb((PULONG)MiAddressToPde(Address), + MiAddressToPte(Address)); = if (Address >=3D MmSystemRangeStart) { @@ -323,7 +310,7 @@ KeAttachProcess(&Process->Pcb); } = - PageTable =3D (PULONG)PAGE_ROUND_DOWN((PVOID)ADDR_TO_PTE(Address)); + PageTable =3D (PULONG)PAGE_ROUND_DOWN((PVOID)MiAddressToPte(Address)= ); for (i =3D 0; i < 1024; i++) { if (PageTable[i] !=3D 0) @@ -333,9 +320,9 @@ KEBUGCHECK(0); } } - Pfn =3D PTE_TO_PFN(*(ADDR_TO_PDE(Address))); - *(ADDR_TO_PDE(Address)) =3D 0; - MiFlushTlb(ADDR_TO_PDE(Address), ADDR_TO_PTE(Address)); + Pfn =3D MiAddressToPde(Address)->u.Hard.PageFrameNumber; + MiAddressToPde(Address)->u.Long =3D 0; + MiFlushTlb((PULONG)MiAddressToPde(Address), MiAddressToPte(Address)); = if (Address >=3D MmSystemRangeStart) { @@ -399,7 +386,7 @@ } return Pt + ADDR_TO_PTE_OFFSET(Address); } - PageDir =3D ADDR_TO_PDE(Address); + PageDir =3D (PULONG)MiAddressToPde(Address); if (0 =3D=3D InterlockedCompareExchangeUL(PageDir, 0, 0)) { if (Address >=3D MmSystemRangeStart) @@ -445,7 +432,7 @@ } } } - return (PULONG)ADDR_TO_PTE(Address); + return (PULONG)MiAddressToPte(Address); } = BOOLEAN MmUnmapPageTable(PULONG Pt) @@ -693,7 +680,7 @@ Mmi386MakeKernelPageTableGlobal(PVOID PAddress) { PULONG Pt, Pde; - Pde =3D ADDR_TO_PDE(PAddress); + Pde =3D (PULONG)MiAddressToPde(PAddress); if (*Pde =3D=3D 0) { Pt =3D MmGetPageTableForProcess(NULL, PAddress, FALSE); @@ -1274,7 +1261,7 @@ ULONG Entry; PULONG Pte; Entry =3D PFN_TO_PTE(Page) | PA_PRESENT | PA_READWRITE; - Pte =3D ADDR_TO_PTE(HYPERSPACE) + Page % 1024; + Pte =3D (PULONG)MiAddressToPte(HYPERSPACE) + Page % 1024; if (Page & 1024) { for (i =3D Page % 1024; i < 1024; i++, Pte++) @@ -1286,7 +1273,7 @@ } if (i >=3D 1024) { - Pte =3D ADDR_TO_PTE(HYPERSPACE); + Pte =3D (PULONG)MiAddressToPte(HYPERSPACE); for (i =3D 0; i < Page % 1024; i++, Pte++) { if (0 =3D=3D InterlockedCompareExchange((PLONG)Pte, (LONG)E= ntry, 0)) @@ -1311,7 +1298,7 @@ } if ((LONG)i < 0) { - Pte =3D ADDR_TO_PTE(HYPERSPACE) + 1023; + Pte =3D (PULONG)MiAddressToPte(HYPERSPACE) + 1023; for (i =3D 1023; i > Page % 1024; i--, Pte--) { if (0 =3D=3D InterlockedCompareExchange((PLONG)Pte, (LONG)E= ntry, 0)) @@ -1339,7 +1326,7 @@ = ASSERT (IS_HYPERSPACE(Address)); = - Entry =3D InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PT= E(NewPage) | PA_PRESENT | PA_READWRITE); + Entry =3D InterlockedExchange((PLONG)MiAddressToPte(Address), PFN_TO= _PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn =3D PTE_TO_PFN(Entry); = __invlpg(Address); @@ -1355,7 +1342,7 @@ = ASSERT (IS_HYPERSPACE(Address)); = - Entry =3D InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); + Entry =3D InterlockedExchange((PLONG)MiAddressToPte(Address), 0); Pfn =3D PTE_TO_PFN(Entry); = __invlpg(Address);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008