Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[cfinck] 32728: Revert r32724 I didn't notice that the "msiserver.h" was not recreated by "msi_msiserver_typelib". Thanks to Usurp for pointing this out. Welcome back, circular dependency ; -)
by cfinck＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: cfinck Date: Thu Mar 20 15:10:28 2008 New Revision: 32728 URL: http://svn.reactos.org/svn/reactos?rev=3D32728&view=3Drev Log: Revert r32724 I didn't notice that the "msiserver.h" was not recreated by "msi_msiserver_= typelib". Thanks to Usurp for pointing this out. Welcome back, circular dependency ;-) Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbu= ild?rev=3D32728&r1=3D32727&r2=3D32728&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/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Thu Mar 20 15:10:28 2008 @@ -50,6 +50,7 @@ <file>update.c</file> <file>upgrade.c</file> <file>where.c</file> + <file>msiserver.idl</file> <file>msi.rc</file> <include base=3D"msi" root=3D"intermediate">.</include> <file>msi.spec</file>

1 0

[mpiulachs] 32727: - Show full filename while copying files. automatically move "copying file" when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes
by mpiulachs＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: mpiulachs Date: Thu Mar 20 13:28:37 2008 New Revision: 32727 URL: http://svn.reactos.org/svn/reactos?rev=3D32727&view=3Drev Log: - Show full filename while copying files. automatically move "copying file"= when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.c?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/interface/consup.c (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c Thu Mar 20 13:28:37 = 2008 @@ -204,44 +204,6 @@ } = VOID -CONSOLE_SetStatusText( - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X =3D 0; - coPos.Y =3D yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); -} - -VOID CONSOLE_InvertTextXY( IN SHORT x, IN SHORT y, @@ -391,6 +353,110 @@ } = VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + coPos.X =3D x; + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + DWORD Length; + va_list ap; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + Length =3D (ULONG)strlen(Buffer); + + if (Length + x <=3D 79) + { + CONSOLE_SetStatusTextX (x , Buffer); + } + else + { + CONSOLE_SetStatusTextX (79 - Length , Buffer); + } +} + +VOID CONSOLE_SetInvertedTextXY( IN SHORT x, IN SHORT y, @@ -537,49 +603,55 @@ = if (Flags & TEXT_TYPE_STATUS) { + coPos.X =3D x; coPos.Y =3D yScreen - 1; - coPos.X =3D 0; } else /* TEXT_TYPE_REGULAR (Default) */ { - coPos.X =3D x; + coPos.X =3D x; coPos.Y =3D y; } = - if (Flags & TEXT_ALIGN_LEFT) - { - coPos.X =3D 0; - = + if (Flags & TEXT_ALIGN_CENTER) + { + coPos.X =3D (xScreen - Length) /2; = + } + else if(Flags & TEXT_ALIGN_RIGHT) + { + coPos.X =3D coPos.X - Length; = + + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X -=3D 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X -=3D 2; = + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X -=3D 3; + } + } + else /* TEXT_ALIGN_LEFT (Default) */ + { if (Flags & TEXT_PADDING_SMALL) { coPos.X +=3D 1; } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X +=3D 2; = + } = else if (Flags & TEXT_PADDING_BIG) { - coPos.X +=3D 2; = + coPos.X +=3D 3; } } - else if (Flags & TEXT_ALIGN_RIGHT) - { - coPos.X =3D coPos.X - Length; = - - if (Flags & TEXT_PADDING_SMALL) - { - coPos.X -=3D 1; - } - else if (Flags & TEXT_PADDING_BIG) - { - coPos.X -=3D 2; = - } - } - else if (Flags & TEXT_ALIGN_CENTER) - { - coPos.X =3D (xScreen - Length) /2; = - } = if (Flags & TEXT_TYPE_STATUS) { - CONSOLE_SetStatusText(Text); + CONSOLE_SetStatusTextX(coPos.X, Text); } else /* TEXT_TYPE_REGULAR (Default) */ { Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/interface/consup.h (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h Thu Mar 20 13:28:37 = 2008 @@ -47,8 +47,9 @@ #define TEXT_ALIGN_CENTER 0x00000100 = /* Text padding */ -#define TEXT_PADDING_SMALL 0x00000200 -#define TEXT_PADDING_BIG 0x00000400 +#define TEXT_PADDING_SMALL 0x00000200 /* One space */ +#define TEXT_PADDING_MEDIUM 0x00000400 /* Two spaces */ +#define TEXT_PADDING_BIG 0x00000800 /* Three spaces */ = extern HANDLE StdInput, StdOutput; extern SHORT xScreen, yScreen; @@ -158,6 +159,16 @@ IN LPCSTR fmt, ...); = VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID CONSOLE_SetTextXY( IN SHORT x, IN SHORT y, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/usetup.c?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Thu Mar 20 13:28:37 = 2008 @@ -3002,13 +3002,13 @@ case SPFILENOTIFY_STARTSUBQUEUE: CopyContext->TotalOperations =3D (ULONG)Param2; ProgressSetStepCount(CopyContext->ProgressBar, - CopyContext->TotalOperations); + CopyContext->TotalOperations); SetupUpdateMemoryInfo(CopyContext, TRUE); break; = case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Par= am1); + CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYIN= G), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; = Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/bg-BG.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "=C2=8D=C2=A5 =C2=A1=C2=A5 =C2=AD=C2=A0=C2=AC=C2=A5=C3=A0=C2=A5=C2=AD = =C3=A0=C2=A0=C2=A7=C2=A4=C2=A5=C2=AB '%S'\n=C2=A2 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=87=C2=A0=C2=AF=C2= =A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB: %S"}, + "\xB3 =C2=87=C2=A0=C2=AF=C2=A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9= =C2=AB: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=92=C2=A5=C3=A7=C2=A5 =C2=A7=C2=A0=C2=AF=C2=A8=C3=A1=C2=A2=C2=A0= =C2=AD=C2=A5 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB=C2=AE=C2=A2=C2=A5=C3=A2= =C2=A5..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/cs-CZ.h (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Nepoda=C3=BDilo se naj=C2=A1t sekci '%S' v souboru\n TXTSETUP.SIF.\n"= }, {STRING_COPYING, - " \xB3 Kop=C2=A1ruj= i soubor: %S"}, + "\xB3 Kop=C2=A1ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, "Instalace kop=C2=A1ruje soubory..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - " \xB3 Kopiere Datei: %S"}, + "\xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/el-GR.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/en-US.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Thu Mar 20 13:28:37 2008 @@ -36,8 +36,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -112,8 +112,8 @@ { 0, 0, - " ENTER =3D Continue R =3D Repair F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue R =3D Repair F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -206,8 +206,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -330,8 +330,8 @@ { 0, 0, - " ENTER =3D Return", - TEXT_TYPE_STATUS + "ENTER =3D Return", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -423,8 +423,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -487,8 +487,8 @@ { 0, 0, - " ESC =3D Main page ENTER =3D Reboot", - TEXT_TYPE_STATUS + "ESC =3D Main page ENTER =3D Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -538,8 +538,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -578,8 +578,8 @@ { 0, 0, - " Flushing cache", - TEXT_TYPE_STATUS + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -624,8 +624,8 @@ { 0, 0, - " Please wait ...", - TEXT_TYPE_STATUS, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -675,8 +675,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -721,8 +721,8 @@ { 0, 0, - " ENTER =3D Reboot computer", - TEXT_TYPE_STATUS + "ENTER =3D Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -767,8 +767,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -826,8 +826,8 @@ { 0, 0, - " Please wait...", - TEXT_TYPE_STATUS + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -860,8 +860,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -912,8 +912,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -950,9 +950,9 @@ TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { - 0, - 0, - " \xB3 P= lease wait... ", + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -998,8 +998,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1050,8 +1050,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1102,8 +1102,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1131,8 +1131,8 @@ { 0, 0, - " Building the file copy list...", - TEXT_TYPE_STATUS + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1178,8 +1178,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1225,8 +1225,8 @@ { 0, 0, - " D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1253,8 +1253,8 @@ { 0, 0, - " Creating registry hives...", - TEXT_TYPE_STATUS + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/es-ES.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Thu Mar 20 13:28:37 2008 @@ -356,34 +356,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " Equipo:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Equipo:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Pantalla:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Pantalla:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, - " Disp. Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Disp. Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Aceptar:", - TEXT_STYLE_NORMAL + "Aceptar:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -932,22 +932,22 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Por favor espere mientras el Instalador de ReactOS copia", - TEXT_STYLE_NORMAL - }, - { - 30, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "archivos en su carpeta de instalaci=C2=A2n de ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 20, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "Esta operaci=C2=A2n puede durar varios minutos.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "El instalador fall=C2=A2 al buscar la secci=C2=A2n\nin TXTSETUP.SIF.\= n"}, {STRING_COPYING, - " \xB3 Copiando archivo: %S"= }, + "\xB3 Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, "El instalador est=C2=A0 copiando archivos..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/fr-FR.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Thu Mar 20 13:28:37 2008 @@ -1611,7 +1611,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + "\xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/it-IT.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copia di: %S"}, + "\xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/lt-LT.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Thu Mar 20 13:28:37 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by=C2=88 w stanie odnale=C2=AB=C2=86 sekji '%S'\nw pli= ku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik=C2=A2w: %S"}, + "\xB3 Kopiowanie plik=C2=A2w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/ru-RU.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AD=C2=A5 =C3=A1=C2=AC=C2=AE= =C2=A3=C2=AB=C2=A0 =C2=AD=C2=A0=C2=A9=C3=A2=C2=A8 =C3=A1=C2=A5=C2=AA=C3=A6= =C2=A8=C3=AE '%S'\n=C2=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C2=A5 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=8A=C2=AE=C2=AF=C2= =A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2=A5: %S"}, + "\xB3 =C2=8A=C2=AE=C2=AF=C2=A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2= =A5: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AA=C2=AE=C2=AF=C2=A8=C3=A0= =C3=A3=C2=A5=C3=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C3=AB..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Thu Mar 20 13:28:37 2008 @@ -1604,7 +1604,7 @@ {STRING_TXTSETUPFAILED, "In=C3=A7tal=C2=A0tor zlyhal pri h=C2=96adan=C2=A1 sekcie '%S'\nv s=C2= =A3bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kop=C2=A1ruje sa s=C2= =A3bor: %S"}, + "\xB3 Kop=C2=A1ruje sa s=C2=A3bor: %S"}, {STRING_SETUPCOPYINGFILES, "In=C3=A7tal=C2=A0tor kop=C2=A1ruje s=C2=A3bory..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sv-SE.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Thu Mar 20 13:28:37 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/uk-UA.h?rev=3D32727&r1=3D32726&r2=3D32727&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/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,

1 0

[tkreuzer] 32726: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserAcquireOrReleaseInputOwnership and NtUserSendMessageCallback - move ros specific types belonging to ros specific ntuser calls into ntuser.h near the respective prototypes - add a commented out GDI_DEBUG define to gdiobj.c
by tkreuzer＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: tkreuzer Date: Thu Mar 20 09:30:42 2008 New Revision: 32726 URL: http://svn.reactos.org/svn/reactos?rev=3D32726&view=3Drev Log: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserAcquireOrReleaseInputOwnership and NtUserSendMessageCallback - move ros specific types belonging to ros specific ntuser calls into ntuse= r.h near the respective prototypes - add a commented out GDI_DEBUG define to gdiobj.c Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/include/reactos/win32k/ntusrtyp.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user= 32.def?rev=3D32726&r1=3D32725&r2=3D32726&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/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Thu Mar 20 09:30:42 2008 @@ -521,7 +521,6 @@ PostThreadMessageA@16 PostThreadMessageW@16 PrintWindow@12 -PrivateCsrssAcquireOrReleaseInputOwnership@4 PrivateCsrssRegisterPrimitive@0 PrivateCsrssManualGuiCheck@4 PrivateCsrssInitialized@0 Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/input.c?rev=3D32726&r1=3D32725&r2=3D32726&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/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Thu Mar 20 09:30:42 2008 @@ -582,16 +582,6 @@ PrivateCsrssRegisterPrimitive(VOID) { NtUserCallNoParam(NOPARAM_ROUTINE_REGISTER_PRIMITIVE); -} - -/* - * Another private call for CSRSS - */ -VOID -STDCALL -PrivateCsrssAcquireOrReleaseInputOwnership(BOOL Release) -{ - NtUserAcquireOrReleaseInputOwnership(Release); } = /* Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/message.c?rev=3D32726&r1=3D32725&r2=3D32726&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/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Thu Mar 20 09:30:42 20= 08 @@ -1829,7 +1829,7 @@ = = /* - * @implemented + * @unimplemented */ BOOL STDCALL @@ -1841,18 +1841,13 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - return NtUserSendMessageCallback( - hWnd, - Msg, - wParam, - lParam, - lpCallBack, - dwData); -} - - -/* - * @implemented + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented */ BOOL STDCALL @@ -1864,13 +1859,8 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - return NtUserSendMessageCallback( - hWnd, - Msg, - wParam, - lParam, - lpCallBack, - dwData); + UNIMPLEMENTED; + return FALSE; } = = Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32726&r1=3D32725&r2=3D32726&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/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Mar 20 09:30:42 2008 @@ -2378,7 +2378,7 @@ = = /* NtUserBad -* ReactOS-specific NtUser calls which shouldn't exist. +* ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = = @@ -2522,6 +2522,34 @@ NTAPI NtUserManualGuiCheck(LONG Check); = + + +/* (other FocusedItem values give the position of the focused item) */ +#define NO_SELECTED_ITEM 0xffff + +typedef struct tagROSMENUINFO +{ + /* ----------- MENUINFO ----------- */ + DWORD cbSize; + DWORD fMask; + DWORD dwStyle; + UINT cyMax; + HBRUSH hbrBack; + DWORD dwContextHelpID; + ULONG_PTR dwMenuData; + /* ----------- Extra ----------- */ + HMENU Self; /* Handle of this menu */ + WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ + UINT FocusedItem; /* Currently focused item */ + UINT MenuItemCount; /* Number of items in the menu */ + HWND Wnd; /* Window containing the menu */ + WORD Width; /* Width of the whole menu */ + WORD Height; /* Height of the whole menu */ + HWND WndOwner; /* window receiving the messages for ownerdraw */ + BOOL TimeToHide; /* Request hiding when receiving a second click in = the top-level menu item */ + SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP = state */ +} ROSMENUINFO, *PROSMENUINFO; + BOOL NTAPI NtUserMenuInfo( @@ -2529,6 +2557,29 @@ PROSMENUINFO lpmi, BOOL fsog ); + + + +typedef struct tagROSMENUITEMINFO +{ + /* ----------- MENUITEMINFOW ----------- */ + UINT cbSize; + UINT fMask; + UINT fType; + UINT fState; + UINT wID; + HMENU hSubMenu; + HBITMAP hbmpChecked; + HBITMAP hbmpUnchecked; + DWORD dwItemData; + LPWSTR dwTypeData; + UINT cch; + HBITMAP hbmpItem; + /* ----------- Extra ----------- */ + RECT Rect; /* Item area (relative to menu window) */ + UINT XTab; /* X position of text after Tab */ + LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */ +} ROSMENUITEMINFO, *PROSMENUITEMINFO; = BOOL NTAPI Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntusrtyp.h?rev=3D32726&r1=3D32725&r2=3D32726&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/include/reactos/win32k/ntusrtyp.h (original) +++ trunk/reactos/include/reactos/win32k/ntusrtyp.h Thu Mar 20 09:30:42 2008 @@ -120,51 +120,4 @@ BYTE Showing; } THRDCARETINFO, *PTHRDCARETINFO; = -typedef struct tagROSMENUINFO -{ - /* ----------- MENUINFO ----------- */ - DWORD cbSize; - DWORD fMask; - DWORD dwStyle; - UINT cyMax; - HBRUSH hbrBack; - DWORD dwContextHelpID; - ULONG_PTR dwMenuData; - /* ----------- Extra ----------- */ - HMENU Self; /* Handle of this menu */ - WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ - UINT FocusedItem; /* Currently focused item */ - UINT MenuItemCount; /* Number of items in the menu */ - HWND Wnd; /* Window containing the menu */ - WORD Width; /* Width of the whole menu */ - WORD Height; /* Height of the whole menu */ - HWND WndOwner; /* window receiving the messages for ownerdraw */ - BOOL TimeToHide; /* Request hiding when receiving a second click in = the top-level menu item */ - SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP = state */ -} ROSMENUINFO, *PROSMENUINFO; - -/* (other FocusedItem values give the position of the focused item) */ -#define NO_SELECTED_ITEM 0xffff - -typedef struct tagROSMENUITEMINFO -{ - /* ----------- MENUITEMINFOW ----------- */ - UINT cbSize; - UINT fMask; - UINT fType; - UINT fState; - UINT wID; - HMENU hSubMenu; - HBITMAP hbmpChecked; - HBITMAP hbmpUnchecked; - DWORD dwItemData; - LPWSTR dwTypeData; - UINT cch; - HBITMAP hbmpItem; - /* ----------- Extra ----------- */ - RECT Rect; /* Item area (relative to menu window) */ - UINT XTab; /* X position of text after Tab */ - LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */ -} ROSMENUITEMINFO, *PROSMENUITEMINFO; - #endif Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/input.c?rev=3D32726&r1=3D32725&r2=3D32726&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/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Mar 20 09:30:4= 2 2008 @@ -832,13 +832,6 @@ } = = -NTSTATUS STDCALL -NtUserAcquireOrReleaseInputOwnership(BOOLEAN Release) -{ - return STATUS_SUCCESS; -} - - NTSTATUS FASTCALL InitInputImpl(VOID) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/message.c?rev=3D32726&r1=3D32725&r2=3D32726&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/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Thu Mar 20 09:30= :42 2008 @@ -1687,19 +1687,6 @@ END_CLEANUP; } = -BOOL STDCALL -NtUserSendMessageCallback(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData) -{ - UNIMPLEMENTED; - - return 0; -} - = BOOL FASTCALL UserSendNotifyMessage(HWND hWnd, Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32726&r1=3D32725&r2=3D32726&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/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Mar 20 09:30= :42 2008 @@ -29,6 +29,8 @@ = /* FIXME include right header for KeRosDumpStackFrames */ VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); + +//#define GDI_DEBUG = #ifdef GDI_DEBUG BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); @@ -730,6 +732,7 @@ * The object is currently locked, so freeing is forbidden! */ DPRINT1("Object->cExclusiveLock =3D %d\n", Object->cExclus= iveLock); + GDIDBG_TRACECALLER(); GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); ASSERT(FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/w32ksvc.db?rev=3D32726&r1=3D32725&r2=3D32726&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/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Mar 20 09:30:42 20= 08 @@ -679,7 +679,6 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 -NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 NtUserDereferenceWndProcHandle 2 @@ -714,7 +713,6 @@ NtUserRegisterClassEx 6 NtUserRegisterClipboardFormat 1 NtUserSendMessage 5 -NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3

1 0

[cfinck] 32725: - The implementation of the "Mouse Reset" command differs much from chip to chip. While most return an ACK or NACK as the first byte to indicate, whether a mouse is plugged in or not, some systems (like ECS K7S5A Pro, SiS735 chipset) always return an ACK and 0xAA. Only the last byte indicates the status of the actual mouse. It is either sent as 0x00 or not. Therefore only get the first two bytes in a loop and issue just one i8042ReadDataWait command for the last byte. This reduce
by cfinck＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: cfinck Date: Thu Mar 20 07:21:34 2008 New Revision: 32725 URL: http://svn.reactos.org/svn/reactos?rev=3D32725&view=3Drev Log: - The implementation of the "Mouse Reset" command differs much from chip to= chip. While most return an ACK or NACK as the first byte to indicate, whether a= mouse is plugged in or not, some systems (like ECS K7S5A Pro, SiS735 chips= et) always return an ACK and 0xAA. Only the last byte indicates the status of the actual mouse. It is either= sent as 0x00 or not. Therefore only get the first two bytes in a loop and issue just one i8042= ReadDataWait command for the last byte. This reduced the "black screen time" in 1st stage setup (after loading th= e drivers and before showing the language selection screen) from 45 seconds= to 3 seconds on my K7S5A Pro system. I also tested this change with three other systems, with and without mous= e, and they are still detected properly. - Wait 50 microseconds, when we got no data after the Mouse Reset and befor= e trying it again. This way, the implementation doesn't depend on the system speed. - Break the loop, when the CTRL_SELF_TEST command completed successfully. - Remove the return values from i8042DetectKeyboard and i8042DetectMouse. We just used them for outputting debug info if no keyboard or mouse was d= etected. But this info is already printed by the procedures themselves. This way, I could also drop one variable in i8042DetectMouse :-) Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32725&r1=3D32724&r2=3D32725&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/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Thu Mar 20 07:21:34 2008 @@ -4,6 +4,7 @@ * FILE: drivers/input/i8042prt/pnp.c * PURPOSE: IRP_MJ_PNP operations * PROGRAMMERS: Copyright 2006-2007 Herv=C3=A9 Poussineau (hpoussin@reacto= s.org) + * Copyright 2008 Colin Finck (mail(a)colinfinck.de) */ = /* INCLUDES **************************************************************= ****/ @@ -100,13 +101,17 @@ return Status; } = - if (Value =3D=3D KBD_RESEND) + if (Value =3D=3D KBD_SELF_TEST_OK) + { + INFO_(I8042PRT, "CTRL_SELF_TEST completed successfully!\n"); + break; + } + else if (Value =3D=3D KBD_RESEND) { TRACE_(I8042PRT, "Resending...\n", Value); KeStallExecutionProcessor(50); - continue; - } - else if (Value !=3D KBD_SELF_TEST_OK) + } + else { WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); return STATUS_IO_DEVICE_ERROR; @@ -134,7 +139,7 @@ return STATUS_SUCCESS; } = -static BOOLEAN +static VOID i8042DetectKeyboard( IN PPORT_DEVICE_EXTENSION DeviceExtension) { @@ -148,7 +153,7 @@ if (!NT_SUCCESS(Status)) { WARN_(I8042PRT, "Can't finish SET_LEDS (0x%08lx)\n", Status); - return FALSE; + return; } } else @@ -158,19 +163,18 @@ = /* Turn on translation and SF (Some machines don't reboot if SF is not se= t, see ReactOS bug #1842) */ if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) - return FALSE; - - return TRUE; -} - -static BOOLEAN + return; + + INFO_(I8042PRT, "Keyboard detected\n"); +} + +static VOID i8042DetectMouse( IN PPORT_DEVICE_EXTENSION DeviceExtension) { - BOOLEAN Ok =3D FALSE; NTSTATUS Status; UCHAR Value; - UCHAR ExpectedReply[] =3D { MOUSE_ACK, 0xAA, 0x00 }; + UCHAR ExpectedReply[] =3D { MOUSE_ACK, 0xAA }; UCHAR ReplyByte; = i8042Flush(DeviceExtension); @@ -179,9 +183,20 @@ ||!i8042Write(DeviceExtension, DeviceExtension->DataPort, MOU_CMD_RESET= )) { WARN_(I8042PRT, "Failed to write reset command to mouse\n"); - goto cleanup; - } - + goto failure; + } + + /* The implementation of the "Mouse Reset" command differs much from chip= to chip. + + By default, the first byte is an ACK, when the mouse is plugged in and= working and NACK when it's not. + On success, the next bytes are 0xAA and 0x00. + + But on some systems (like ECS K7S5A Pro, SiS 735 chipset), we always g= et an ACK and 0xAA. + Only the last byte indicates, whether a mouse is plugged in. + It is either sent or not, so there is no byte, which indicates a failu= re here. + + After the Mouse Reset command was issued, it usually takes some time u= ntil we get a response. + So get the first two bytes in a loop. */ for (ReplyByte =3D 0; ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]); ReplyByte++) @@ -191,39 +206,55 @@ do { Status =3D i8042ReadDataWait(DeviceExtension, &Value); + + if(!NT_SUCCESS(Status)) + { + /* Wait some time before trying again */ + KeStallExecutionProcessor(50); + } } while (Status =3D=3D STATUS_IO_TIMEOUT && Counter--); = if (!NT_SUCCESS(Status)) { WARN_(I8042PRT, "No ACK after mouse reset, status 0x%08lx\n", Status); - goto cleanup; + goto failure; } else if (Value !=3D ExpectedReply[ReplyByte]) { - WARN_(I8042PRT, "Unexpected reply: 0x%02x (expected 0x%02x)\n", - Value, ExpectedReply[ReplyByte]); - goto cleanup; - } - } - - Ok =3D TRUE; - -cleanup: - if (!Ok) - { - /* There is probably no mouse present. On some systems, - the probe locks the entire keyboard controller. Let's - try to get access to the keyboard again by sending a - reset */ - i8042Flush(DeviceExtension); - i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST= ); - i8042ReadDataWait(DeviceExtension, &Value); - i8042Flush(DeviceExtension); - } - - INFO_(I8042PRT, "Mouse %sdetected\n", Ok ? "" : "not "); - - return Ok; + WARN_(I8042PRT, "Unexpected reply: 0x%02x (expected 0x%02x)\n", Value, = ExpectedReply[ReplyByte]); + goto failure; + } + } + + /* Finally get the third byte, but only try it one time (see above). + Otherwise this takes around 45 seconds on a K7S5A Pro, when no mouse i= s plugged in. */ + Status =3D i8042ReadDataWait(DeviceExtension, &Value); + + if(!NT_SUCCESS(Status)) + { + WARN_(I8042PRT, "Last byte was not transmitted after mouse reset, status= 0x%08lx\n", Status); + goto failure; + } + else if(Value !=3D 0x00) + { + WARN_(I8042PRT, "Last byte after mouse reset was not 0x00, but 0x%02x\n"= , Value); + goto failure; + } + + INFO_(I8042PRT, "Mouse detected\n"); + return; + +failure: + /* There is probably no mouse present. On some systems, + the probe locks the entire keyboard controller. Let's + try to get access to the keyboard again by sending a + reset */ + i8042Flush(DeviceExtension); + i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST); + i8042ReadDataWait(DeviceExtension, &Value); + i8042Flush(DeviceExtension); + + INFO_(I8042PRT, "Mouse not detected\n"); } = static NTSTATUS @@ -387,12 +418,10 @@ return STATUS_UNSUCCESSFUL; } TRACE_(I8042PRT, "Detecting keyboard\n"); - if (!i8042DetectKeyboard(DeviceExtension)) - INFO_(I8042PRT, "No keyboard detected!\n"); + i8042DetectKeyboard(DeviceExtension); = TRACE_(I8042PRT, "Detecting mouse\n"); - if (!i8042DetectMouse(DeviceExtension)) - INFO_(I8042PRT, "No mouse detected!\n"); + i8042DetectMouse(DeviceExtension); = INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBO= ARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE= _PRESENT ? "YES" : "NO");

1 0

[cfinck] 32724: Remove the "<file>msiserver.idl</file>" entry from the msi module, so it's not built twice. As msi depends on msi_msiserver_typelib, we can be sure that "msiserver.idl" is built before msi, so it's there when it's needed. Fixes the last circular dependency.
by cfinck＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: cfinck Date: Wed Mar 19 12:42:08 2008 New Revision: 32724 URL: http://svn.reactos.org/svn/reactos?rev=3D32724&view=3Drev Log: Remove the "<file>msiserver.idl</file>" entry from the msi module, so it's = not built twice. As msi depends on msi_msiserver_typelib, we can be sure that "msiserver.idl= " is built before msi, so it's there when it's needed. Fixes the last circular dependency. Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbu= ild?rev=3D32724&r1=3D32723&r2=3D32724&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/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Wed Mar 19 12:42:08 2008 @@ -50,7 +50,6 @@ <file>update.c</file> <file>upgrade.c</file> <file>where.c</file> - <file>msiserver.idl</file> <file>msi.rc</file> <include base=3D"msi" root=3D"intermediate">.</include> <file>msi.spec</file>

1 0

[tkreuzer] 32723: [FORMATTING] Apply consistent indentation of 4 spaces
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Wed Mar 19 09:53:15 2008 New Revision: 32723 URL: http://svn.reactos.org/svn/reactos?rev=3D32723&view=3Drev Log: [FORMATTING] Apply consistent indentation of 4 spaces Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/surface.c?rev=3D32723&r1=3D32722&r2=3D32723&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/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Wed Mar 19 09:53:15= 2008 @@ -38,74 +38,100 @@ = enum Rle_EscapeCodes { - RLE_EOL =3D 0, /* End of line */ - RLE_END =3D 1, /* End of bitmap */ - RLE_DELTA =3D 2 /* Delta */ + RLE_EOL =3D 0, /* End of line */ + RLE_END =3D 1, /* End of bitmap */ + RLE_DELTA =3D 2 /* Delta */ }; = INT FASTCALL BitsPerFormat(ULONG Format) { - switch(Format) - { - case BMF_1BPP: return 1; - case BMF_4BPP: - case BMF_4RLE: return 4; - case BMF_8BPP: - case BMF_8RLE: return 8; - case BMF_16BPP: return 16; - case BMF_24BPP: return 24; - case BMF_32BPP: return 32; - default: return 0; - } + switch (Format) + { + case BMF_1BPP: + return 1; + + case BMF_4BPP: + /* Fall through */ + case BMF_4RLE: + return 4; + + case BMF_8BPP: + /* Fall through */ + case BMF_8RLE: + return 8; + + case BMF_16BPP: + return 16; + + case BMF_24BPP: + return 24; + + case BMF_32BPP: + return 32; + + default: + return 0; + } } = ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression) { - switch(Compression) - { - case BI_RGB: - case BI_BITFIELDS: - switch(Bits) - { - case 1: return BMF_1BPP; - case 4: return BMF_4BPP; - case 8: return BMF_8BPP; - case 16: return BMF_16BPP; - case 24: return BMF_24BPP; - case 32: return BMF_32BPP; - } - return 0; - - case BI_RLE4: return BMF_4RLE; - case BI_RLE8: return BMF_8RLE; - - default: return 0; - } + switch (Compression) + { + case BI_RGB: + /* Fall through */ + case BI_BITFIELDS: + switch (Bits) + { + case 1: + return BMF_1BPP; + case 4: + return BMF_4BPP; + case 8: + return BMF_8BPP; + case 16: + return BMF_16BPP; + case 24: + return BMF_24BPP; + case 32: + return BMF_32BPP; + } + return 0; + + case BI_RLE4: + return BMF_4RLE; + + case BI_RLE8: + return BMF_8RLE; + + default: + return 0; + } } = BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *BitmapObj) { - BitmapObj->BitsLock =3D ExAllocatePoolWithTag(NonPagedPool, - sizeof(FAST_MUTEX), - TAG_BITMAPOBJ); - if (NULL =3D=3D BitmapObj->BitsLock) - { - return FALSE; - } - - ExInitializeFastMutex(BitmapObj->BitsLock); - - return TRUE; + BitmapObj->BitsLock =3D ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_MUTEX), + TAG_BITMAPOBJ); + if (NULL =3D=3D BitmapObj->BitsLock) + { + return FALSE; + } + + ExInitializeFastMutex(BitmapObj->BitsLock); + + return TRUE; } = void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *BitmapObj) { - if (NULL !=3D BitmapObj->BitsLock) - { - ExFreePoolWithTag(BitmapObj->BitsLock, TAG_BITMAPOBJ); - BitmapObj->BitsLock =3D NULL; + if (NULL !=3D BitmapObj->BitsLock) + { + ExFreePoolWithTag(BitmapObj->BitsLock, TAG_BITMAPOBJ); + BitmapObj->BitsLock =3D NULL; } } = @@ -115,252 +141,260 @@ */ HBITMAP STDCALL EngCreateDeviceBitmap(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ - HBITMAP NewBitmap; - SURFOBJ *SurfObj; - - NewBitmap =3D EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, BitsPe= rFormat(Format)), Format, 0, NULL); - if(!NewBitmap) - { - DPRINT1("EngCreateBitmap failed\n"); - return 0; - } - - SurfObj =3D EngLockSurface((HSURF)NewBitmap); - SurfObj->dhsurf =3D dhsurf; - EngUnlockSurface(SurfObj); - - return NewBitmap; + IN SIZEL Size, + IN ULONG Format) +{ + HBITMAP NewBitmap; + SURFOBJ *SurfObj; + + NewBitmap =3D EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, Bits= PerFormat(Format)), Format, 0, NULL); + if (!NewBitmap) + { + DPRINT1("EngCreateBitmap failed\n"); + return 0; + } + + SurfObj =3D EngLockSurface((HSURF)NewBitmap); + SurfObj->dhsurf =3D dhsurf; + EngUnlockSurface(SurfObj); + + return NewBitmap; } = VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBi= ts, LONG Delta) { - int x =3D 0; - int y =3D Size.cy - 1; - int c; - int length; - int width =3D ((Size.cx+1)/2); - int height =3D Size.cy - 1; - BYTE *begin =3D CompressedBits; - BYTE *bits =3D CompressedBits; - BYTE *temp; - while (y >=3D 0) - { - length =3D *bits++ / 2; - if (length) - { - c =3D *bits++; - while (length--) - { - if (x >=3D width) break; - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } else { - length =3D *bits++; - switch (length) - { - case RLE_EOL: - x =3D 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x +=3D (*bits++)/2; - y -=3D (*bits++)/2; - break; - default: - length /=3D 2; - while (length--) - { - c =3D *bits++; - if (x < width) - { - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } - if ((bits - begin) & 1) - bits++; - } - } - } + int x =3D 0; + int y =3D Size.cy - 1; + int c; + int length; + int width =3D ((Size.cx+1)/2); + int height =3D Size.cy - 1; + BYTE *begin =3D CompressedBits; + BYTE *bits =3D CompressedBits; + BYTE *temp; + while (y >=3D 0) + { + length =3D *bits++ / 2; + if (length) + { + c =3D *bits++; + while (length--) + { + if (x >=3D width) break; + temp =3D UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp =3D c; + } + } + else + { + length =3D *bits++; + switch (length) + { + case RLE_EOL: + x =3D 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x +=3D (*bits++)/2; + y -=3D (*bits++)/2; + break; + default: + length /=3D 2; + while (length--) + { + c =3D *bits++; + if (x < width) + { + temp =3D UncompressedBits + (((height - y) * D= elta) + x); + x++; + *temp =3D c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } } = VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBi= ts, LONG Delta) { - int x =3D 0; - int y =3D Size.cy - 1; - int c; - int length; - int width =3D Size.cx; - int height =3D Size.cy - 1; - BYTE *begin =3D CompressedBits; - BYTE *bits =3D CompressedBits; - BYTE *temp; - while (y >=3D 0) - { - length =3D *bits++; - if (length) - { - c =3D *bits++; - while (length--) - { - if (x >=3D width) break; - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } else { - length =3D *bits++; - switch (length) - { - case RLE_EOL: - x =3D 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x +=3D *bits++; - y -=3D *bits++; - break; - default: - while (length--) - { - c =3D *bits++; - if (x < width) - { - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } - if ((bits - begin) & 1) - bits++; - } - } - } + int x =3D 0; + int y =3D Size.cy - 1; + int c; + int length; + int width =3D Size.cx; + int height =3D Size.cy - 1; + BYTE *begin =3D CompressedBits; + BYTE *bits =3D CompressedBits; + BYTE *temp; + while (y >=3D 0) + { + length =3D *bits++; + if (length) + { + c =3D *bits++; + while (length--) + { + if (x >=3D width) break; + temp =3D UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp =3D c; + } + } + else + { + length =3D *bits++; + switch (length) + { + case RLE_EOL: + x =3D 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x +=3D *bits++; + y -=3D *bits++; + break; + default: + while (length--) + { + c =3D *bits++; + if (x < width) + { + temp =3D UncompressedBits + (((height - y) * D= elta) + x); + x++; + *temp =3D c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } } = HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP NewBitmap; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - PVOID UncompressedBits; - ULONG UncompressedFormat; - - if (Format =3D=3D 0) - return 0; - - NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); - if (NewBitmap =3D=3D NULL) - return 0; - - BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap); - if (! BITMAPOBJ_InitBitsLock(BitmapObj)) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewBitmap); - return 0; - } - SurfObj =3D &BitmapObj->SurfObj; - - if (Format =3D=3D BMF_4RLE) - { - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_= 4BPP)); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedFormat =3D BMF_4BPP; - UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj= ->lDelta); - } - else if (Format =3D=3D BMF_8RLE) - { - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_= 8BPP)); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedFormat =3D BMF_8BPP; - UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj= ->lDelta); - } - else - { - SurfObj->lDelta =3D abs(Width); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedBits =3D Bits; - UncompressedFormat =3D Format; - } - - if (UncompressedBits !=3D NULL) - { - SurfObj->pvBits =3D UncompressedBits; - } - else - { - if (SurfObj->cjBits =3D=3D 0) + IN LONG Width, + IN ULONG Format, + IN ULONG Flags, + IN PVOID Bits) +{ + HBITMAP NewBitmap; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + PVOID UncompressedBits; + ULONG UncompressedFormat; + + if (Format =3D=3D 0) + return 0; + + NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); + if (NewBitmap =3D=3D NULL) + return 0; + + BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); + return 0; + } + SurfObj =3D &BitmapObj->SurfObj; + + if (Format =3D=3D BMF_4RLE) + { + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BM= F_4BPP)); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedFormat =3D BMF_4BPP; + UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, = 0); + Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfO= bj->lDelta); + } + else if (Format =3D=3D BMF_8RLE) + { + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BM= F_8BPP)); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedFormat =3D BMF_8BPP; + UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, = 0); + Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfO= bj->lDelta); + } + else + { + SurfObj->lDelta =3D abs(Width); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedBits =3D Bits; + UncompressedFormat =3D Format; + } + + if (UncompressedBits !=3D NULL) + { + SurfObj->pvBits =3D UncompressedBits; + } + else + { + if (SurfObj->cjBits =3D=3D 0) { - SurfObj->pvBits =3D NULL; + SurfObj->pvBits =3D NULL; } - else + else { - if (0 !=3D (Flags & BMF_USERMEM)) - { - SurfObj->pvBits =3D EngAllocUserMem(SurfObj->cjBits, 0); - } - else - { - SurfObj->pvBits =3D EngAllocMem(0 !=3D (Flags & BMF_NOZEROIN= IT) ? 0 : FL_ZERO_MEMORY, - SurfObj->cjBits, 0); - } - if (SurfObj->pvBits =3D=3D NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewBitmap); - return 0; + if (0 !=3D (Flags & BMF_USERMEM)) + { + SurfObj->pvBits =3D EngAllocUserMem(SurfObj->cjBits, 0); + } + else + { + SurfObj->pvBits =3D EngAllocMem(0 !=3D (Flags & BMF_NOZERO= INIT) ? + 0 : FL_ZERO_MEMORY, + SurfObj->cjBits, 0); + } + if (SurfObj->pvBits =3D=3D NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); + return 0; } } - } - - - if (0 =3D=3D (Flags & BMF_TOPDOWN)) - { - SurfObj->pvScan0 =3D (PVOID) ((ULONG_PTR) SurfObj->pvBits + SurfObj-= >cjBits - SurfObj->lDelta); - SurfObj->lDelta =3D - SurfObj->lDelta; - } - else - { - SurfObj->pvScan0 =3D SurfObj->pvBits; - } - - SurfObj->dhsurf =3D 0; /* device managed surface */ - SurfObj->hsurf =3D (HSURF)NewBitmap; - SurfObj->dhpdev =3D NULL; - SurfObj->hdev =3D NULL; - SurfObj->sizlBitmap =3D Size; - SurfObj->iBitmapFormat =3D UncompressedFormat; - SurfObj->iType =3D STYPE_BITMAP; - SurfObj->fjBitmap =3D Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); - SurfObj->iUniq =3D 0; - - BitmapObj->flHooks =3D 0; - BitmapObj->flFlags =3D 0; - BitmapObj->dimension.cx =3D 0; - BitmapObj->dimension.cy =3D 0; - BitmapObj->dib =3D NULL; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return NewBitmap; + } + + if (0 =3D=3D (Flags & BMF_TOPDOWN)) + { + SurfObj->pvScan0 =3D (PVOID) ((ULONG_PTR) SurfObj->pvBits + SurfOb= j->cjBits - SurfObj->lDelta); + SurfObj->lDelta =3D - SurfObj->lDelta; + } + else + { + SurfObj->pvScan0 =3D SurfObj->pvBits; + } + + SurfObj->dhsurf =3D 0; /* device managed surface */ + SurfObj->hsurf =3D (HSURF)NewBitmap; + SurfObj->dhpdev =3D NULL; + SurfObj->hdev =3D NULL; + SurfObj->sizlBitmap =3D Size; + SurfObj->iBitmapFormat =3D UncompressedFormat; + SurfObj->iType =3D STYPE_BITMAP; + SurfObj->fjBitmap =3D Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); + SurfObj->iUniq =3D 0; + + BitmapObj->flHooks =3D 0; + BitmapObj->flFlags =3D 0; + BitmapObj->dimension.cx =3D 0; + BitmapObj->dimension.cy =3D 0; + BitmapObj->dib =3D NULL; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return NewBitmap; } = /* @@ -368,20 +402,20 @@ */ HBITMAP STDCALL EngCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP NewBitmap; - - NewBitmap =3D IntCreateBitmap(Size, Width, Format, Flags, Bits); - if ( !NewBitmap ) - return 0; - - GDIOBJ_SetOwnership(NewBitmap, NULL); - - return NewBitmap; + IN LONG Width, + IN ULONG Format, + IN ULONG Flags, + IN PVOID Bits) +{ + HBITMAP NewBitmap; + + NewBitmap =3D IntCreateBitmap(Size, Width, Format, Flags, Bits); + if ( !NewBitmap ) + return 0; + + GDIOBJ_SetOwnership(NewBitmap, NULL); + + return NewBitmap; } = /* @@ -389,53 +423,55 @@ */ HSURF STDCALL EngCreateDeviceSurface(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ - HSURF NewSurface; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - - NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); - if (NewSurface =3D=3D NULL) - return 0; - - GDIOBJ_SetOwnership(NewSurface, NULL); - - BitmapObj =3D BITMAPOBJ_LockBitmap(NewSurface); - if (! BITMAPOBJ_InitBitsLock(BitmapObj)) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewSurface); - return 0; - } - SurfObj =3D &BitmapObj->SurfObj; - - SurfObj->dhsurf =3D dhsurf; - SurfObj->hsurf =3D NewSurface; - SurfObj->sizlBitmap =3D Size; - SurfObj->iBitmapFormat =3D Format; - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); - SurfObj->iType =3D STYPE_DEVICE; - SurfObj->iUniq =3D 0; - - BitmapObj->flHooks =3D 0; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return NewSurface; + IN SIZEL Size, + IN ULONG Format) +{ + HSURF NewSurface; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + + NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); + if (NewSurface =3D=3D NULL) + return 0; + + GDIOBJ_SetOwnership(NewSurface, NULL); + + BitmapObj =3D BITMAPOBJ_LockBitmap(NewSurface); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewSurface); + return 0; + } + SurfObj =3D &BitmapObj->SurfObj; + + SurfObj->dhsurf =3D dhsurf; + SurfObj->hsurf =3D NewSurface; + SurfObj->sizlBitmap =3D Size; + SurfObj->iBitmapFormat =3D Format; + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format= )); + SurfObj->iType =3D STYPE_DEVICE; + SurfObj->iUniq =3D 0; + + BitmapObj->flHooks =3D 0; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return NewSurface; } = PFN FASTCALL DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc) { - ULONG i; - - for(i=3D0; i<DED->c; i++) - { - if(DED->pdrvfn[i].iFunc =3D=3D DriverFunc) - return DED->pdrvfn[i].pfn; - } - return NULL; + ULONG i; + + for (i=3D0; i<DED->c; i++) + { + if (DED->pdrvfn[i].iFunc =3D=3D DriverFunc) + { + return DED->pdrvfn[i].pfn; + } + } + return NULL; } = /* @@ -443,29 +479,29 @@ */ BOOL STDCALL EngAssociateSurface(IN HSURF Surface, - IN HDEV Dev, - IN ULONG Hooks) -{ - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - GDIDEVICE* Device; - - Device =3D (GDIDEVICE*)Dev; - - BitmapObj =3D BITMAPOBJ_LockBitmap(Surface); - ASSERT(BitmapObj); - SurfObj =3D &BitmapObj->SurfObj; - - /* Associate the hdev */ - SurfObj->hdev =3D Dev; - SurfObj->dhpdev =3D Device->hPDev; - - /* Hook up specified functions */ - BitmapObj->flHooks =3D Hooks; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return TRUE; + IN HDEV Dev, + IN ULONG Hooks) +{ + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + GDIDEVICE* Device; + + Device =3D (GDIDEVICE*)Dev; + + BitmapObj =3D BITMAPOBJ_LockBitmap(Surface); + ASSERT(BitmapObj); + SurfObj =3D &BitmapObj->SurfObj; + + /* Associate the hdev */ + SurfObj->hdev =3D Dev; + SurfObj->dhpdev =3D Device->hPDev; + + /* Hook up specified functions */ + BitmapObj->flHooks =3D Hooks; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return TRUE; } = /* @@ -473,37 +509,37 @@ */ BOOL STDCALL EngModifySurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks, - IN FLONG flSurface, - IN DHSURF dhsurf, - OUT VOID *pvScan0, - IN LONG lDelta, - IN VOID *pvReserved) -{ - SURFOBJ *pso; - - pso =3D EngLockSurface(hsurf); - if (pso =3D=3D NULL) - { - return FALSE; - } - - if (!EngAssociateSurface(hsurf, hdev, flHooks)) - { - EngUnlockSurface(pso); - - return FALSE; - } - - pso->dhsurf =3D dhsurf; - pso->lDelta =3D lDelta; - pso->pvScan0 =3D pvScan0; - - EngUnlockSurface(pso); - - return TRUE; + IN HSURF hsurf, + IN HDEV hdev, + IN FLONG flHooks, + IN FLONG flSurface, + IN DHSURF dhsurf, + OUT VOID *pvScan0, + IN LONG lDelta, + IN VOID *pvReserved) +{ + SURFOBJ *pso; + + pso =3D EngLockSurface(hsurf); + if (pso =3D=3D NULL) + { + return FALSE; + } + + if (!EngAssociateSurface(hsurf, hdev, flHooks)) + { + EngUnlockSurface(pso); + + return FALSE; + } + + pso->dhsurf =3D dhsurf; + pso->lDelta =3D lDelta; + pso->pvScan0 =3D pvScan0; + + EngUnlockSurface(pso); + + return TRUE; } = /* @@ -512,9 +548,9 @@ BOOL STDCALL EngDeleteSurface(IN HSURF Surface) { - GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); - BITMAPOBJ_FreeBitmapByHandle(Surface); - return TRUE; + GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); + BITMAPOBJ_FreeBitmapByHandle(Surface); + return TRUE; } = /* @@ -522,12 +558,12 @@ */ BOOL STDCALL EngEraseSurface(SURFOBJ *Surface, - RECTL *Rect, - ULONG iColor) -{ - ASSERT(Surface); - ASSERT(Rect); - return FillSolid(Surface, Rect, iColor); + RECTL *Rect, + ULONG iColor) +{ + ASSERT(Surface); + ASSERT(Rect); + return FillSolid(Surface, Rect, iColor); } = #define GDIBdyToHdr(body) = \ @@ -550,12 +586,12 @@ SURFOBJ * STDCALL EngLockSurface(IN HSURF Surface) { - BITMAPOBJ *bmp =3D GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP); - - if (bmp !=3D NULL) - return &bmp->SurfObj; - - return NULL; + BITMAPOBJ *bmp =3D GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP= ); + + if (bmp !=3D NULL) + return &bmp->SurfObj; + + return NULL; } = = @@ -574,11 +610,11 @@ VOID STDCALL EngUnlockSurface(IN SURFOBJ *Surface) { - if (Surface !=3D NULL) - { - BITMAPOBJ *bmp =3D CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); - GDIOBJ_ShareUnlockObjByPtr((POBJ)bmp); - } + if (Surface !=3D NULL) + { + BITMAPOBJ *bmp =3D CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); + GDIOBJ_ShareUnlockObjByPtr((POBJ)bmp); + } } = =

1 0

[mpiulachs] 32722: - Allow multiple combination of style flags for usetup translations - Added right & center text align , no more space counting :). All localization can now share X, Y cordinates Note: only the en-US localization currently takes advantage of it , other localizations should be updated
by mpiulachs＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: mpiulachs Date: Tue Mar 18 23:43:40 2008 New Revision: 32722 URL: http://svn.reactos.org/svn/reactos?rev=3D32722&view=3Drev Log: - Allow multiple combination of style flags for usetup translations - Added right & center text align , no more space counting :). All localiza= tion can now share X,Y cordinates Note: only the en-US localization currently takes advantage of it , other l= ocalizations should be updated Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.c?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/bg-BG.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/el-GR.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/en-US.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/es-ES.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/fr-FR.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/it-IT.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/lt-LT.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/ru-RU.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sv-SE.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/uk-UA.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui= .c?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui= .h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff

1 0

[tkreuzer] 32721: - Rename GDIOBJ_AllocObj to GDIOBJ_allocObjWithHandle and make it return a pointer to a locked object.c - Implement GDIOBJ_AllocObjDepricated as a wrapper for those functions that currently still need the old way of allocation. Will be gone soon - Implement GDIOBJ_AllocObj that only allocates a memory object without a handle - Rename GDIOBJ_FreeObject to GDIOBJ_FreeObjByHandle - Implement GDIOBJ_FreeObj that only frees the memory object - Rename all XXX_Alloc and XXX_Free funct
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Tue Mar 18 19:56:40 2008 New Revision: 32721 URL: http://svn.reactos.org/svn/reactos?rev=3D32721&view=3Drev Log: - Rename GDIOBJ_AllocObj to GDIOBJ_allocObjWithHandle and make it return a = pointer to a locked object.c - Implement GDIOBJ_AllocObjDepricated as a wrapper for those functions that= currently still need the old way of allocation. Will be gone soon - Implement GDIOBJ_AllocObj that only allocates a memory object without a h= andle - Rename GDIOBJ_FreeObject to GDIOBJ_FreeObjByHandle - Implement GDIOBJ_FreeObj that only frees the memory object - Rename all XXX_Alloc and XXX_Free functions accordingly - Fix NtGdiCreateClientObject and NtGdiDeleteClientObject - Reformat TextIntCreateFontIndirect - NtGdiHfontCreate: reformat and MmCopyFromCaller -> SEH Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/palette.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/eng/palette.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/palette.c Tue Mar 18 19:56:40= 2008 @@ -82,7 +82,7 @@ { GDIOBJ_SetOwnership(Palette, PsGetCurrentProcess()); = - return PALETTE_FreePalette(Palette); + return PALETTE_FreePaletteByHandle(Palette); } = /* Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/surface.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Tue Mar 18 19:56:40= 2008 @@ -264,7 +264,7 @@ if (Format =3D=3D 0) return 0; = - NewBitmap =3D BITMAPOBJ_AllocBitmap(); + NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); if (NewBitmap =3D=3D NULL) return 0; = @@ -272,7 +272,7 @@ if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewBitmap); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); return 0; } SurfObj =3D &BitmapObj->SurfObj; @@ -325,7 +325,7 @@ if (SurfObj->pvBits =3D=3D NULL) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewBitmap); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); return 0; } } @@ -396,7 +396,7 @@ SURFOBJ *SurfObj; BITMAPOBJ *BitmapObj; = - NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmap(); + NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); if (NewSurface =3D=3D NULL) return 0; = @@ -406,7 +406,7 @@ if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewSurface); + BITMAPOBJ_FreeBitmapByHandle(NewSurface); return 0; } SurfObj =3D &BitmapObj->SurfObj; @@ -513,7 +513,7 @@ EngDeleteSurface(IN HSURF Surface) { GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); - BITMAPOBJ_FreeBitmap(Surface); + BITMAPOBJ_FreeBitmapByHandle(Surface); return TRUE; } = Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/bitmaps.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Tue Mar 18 19:5= 6:40 2008 @@ -26,10 +26,12 @@ = /* Internal interface */ = -#define BITMAPOBJ_AllocBitmap() \ - ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) -#define BITMAPOBJ_FreeBitmap(hBMObj) \ - GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_AllocBitmap() ((PBITMAPOBJ) GDIOBJ_AllocObj(GDIObjTy= pe_SURF_TYPE)) +#define BITMAPOBJ_AllocBitmapWithHandle() ((PBITMAPOBJ) GDIOBJ_AllocOb= jWithHandle(GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_AllocBitmapDepricated() ((HBITMAP) GDIOBJ_AllocObjDe= pricated(GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_FreeBitmap(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObj= Type_SURF_TYPE) +#define BITMAPOBJ_FreeBitmapByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDI= OBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) + /* NOTE: Use shared locks! */ #define BITMAPOBJ_LockBitmap(hBMObj) \ ((PBITMAPOBJ) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BIT= MAP)) Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/brush.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/brush.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h Tue Mar 18 19:56:= 40 2008 @@ -72,8 +72,11 @@ #define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transpare= nt mask (?) */ #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 = -#define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_= BRUSH)) -#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OB= JECT_TYPE_BRUSH) +#define BRUSHOBJ_AllocBrush() ((PGDIBRUSHOBJ) GDIOBJ_AllocObj(GDIObjType_= BRUSH_TYPE)) +#define BRUSHOBJ_AllocBrushWithHandle() ((PGDIBRUSHOBJ) GDIOBJ_AllocObjWi= thHandle (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_AllocBrushDepricated() ((HBRUSH) GDIOBJ_AllocObjDepricat= ed (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjTyp= e_BRUSH_TYPE) +#define BRUSHOBJ_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOB= J)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ= )hBrush, GDI_OBJECT_TYPE_BRUSH)) #define BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr((POBJ)pBrush) = Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/gdiobj.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Mar 18 19:56= :40 2008 @@ -46,6 +46,11 @@ PW32THREAD Tid; } BASEOBJECT, *POBJ; = +enum BASEFLAGS +{ + BASEFLAG_LOOKASIDE =3D 0x80 +}; + BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); VOID INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS = Owner); VOID INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyT= o); @@ -53,8 +58,11 @@ VOID INTERNAL_CALL GDIOBJ_UnlockObjByPtr(POBJ Object); VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType= ); -HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(ULONG ObjectType); -BOOL INTERNAL_CALL GDIOBJ_FreeObj (HGDIOBJ hObj, DWORD ObjectType); +POBJ INTERNAL_CALL GDIOBJ_AllocObj(UCHAR ObjectType); +POBJ INTERNAL_CALL GDIOBJ_AllocObjWithHandle(ULONG ObjectType); +HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDepricated(ULONG ObjectType); +VOID INTERNAL_CALL GDIOBJ_FreeObj (POBJ pObj, UCHAR ObjectType); +BOOL INTERNAL_CALL GDIOBJ_FreeObjByHandle (HGDIOBJ hObj, DWORD ObjectTy= pe); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); = Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/palette.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Tue Mar 18 19:5= 6:40 2008 @@ -64,7 +64,8 @@ ULONG Blue); HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors); -#define PALETTE_FreePalette(hPalette) GDIOBJ_FreeObj((HGDIOBJ)hPalette, = GDI_OBJECT_TYPE_PALETTE) +#define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette, GDI= ObjType_PAL_TYPE) +#define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HG= DIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) #define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)h= Palette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPale= tte) BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/pen.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/pen.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h Tue Mar 18 19:56:40= 2008 @@ -6,11 +6,17 @@ = /* Internal interface */ = -#define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_FreePen(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT= _TYPE_PEN) +#define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) +#define PENOBJ_AllocPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHand= le(GDI_OBJECT_TYPE_PEN)) +#define PENOBJ_AllocPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GDI_O= BJECT_TYPE_PEN)) +#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TY= PE_PEN) +#define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hB= MObj, GDI_OBJECT_TYPE_PEN) #define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBM= Obj, GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_AllocExtPen() ((HPEN)GDIOBJ_AllocObj(GDI_OBJECT_TYPE_EXTPEN= )) -#define PENOBJ_FreeExtPen(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJ= ECT_TYPE_EXTPEN) +#define PENOBJ_AllocExtPen() ((PGDIBRUSHOBJ)GDIOBJ_AllocObj(GDIObjType_BRU= SH_TYPE)) +#define PENOBJ_AllocExtPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithH= andle(GDI_OBJECT_TYPE_EXTPEN)) +#define PENOBJ_AllocExtPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GD= I_OBJECT_TYPE_EXTPEN)) +#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT= _TYPE_EXTPEN) +#define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ)= hBMObj, GDI_OBJECT_TYPE_EXTPEN) #define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) = hBMObj, GDI_OBJECT_TYPE_EXTPEN)) #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) = Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/region.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Tue Mar 18 19:56= :40 2008 @@ -21,7 +21,8 @@ = /* Functions *************************************************************= *****/ = -#define REGION_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_TY= PE_REGION) +#define REGION_FreeRgn(pRgn) GDIOBJ_FreeObj((POBJ)pRgn, GDIObjType_RGN_T= YPE) +#define REGION_FreeRgnByHandle(hRgn) GDIOBJ_FreeObjbyHandle((HGDIOBJ)hRg= n, GDI_OBJECT_TYPE_REGION) #define REGION_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, = GDI_OBJECT_TYPE_REGION)) #define REGION_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr((POBJ)pRgn) = Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/text.h?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Tue Mar 18 19:56:4= 0 2008 @@ -68,9 +68,11 @@ = /* Internal interface */ = -#define TEXTOBJ_AllocText() \ - ((HFONT) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_FONT)) -#define TEXTOBJ_FreeText(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OB= JECT_TYPE_FONT) +#define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_= LFONT_TYPE)) +#define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHand= le(GDI_OBJECT_TYPE_FONT)) +#define TEXTOBJ_AllocTextDepricated() ((HFONT) GDIOBJ_AllocObj(GDI_OBJECT= _TYPE_FONT)) +#define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjT= ype_LO_FONT_TYPE) +#define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj= , GDI_OBJECT_TYPE_FONT) #define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hB= MObj, GDI_OBJECT_TYPE_FONT)) #define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj) = Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/painting.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Tue Mar 18 19:5= 6:40 2008 @@ -272,7 +272,7 @@ if ((HANDLE) 1 !=3D TempRegion && NULL !=3D TempRegion) { /* NOTE: The region can already be deleted! */ - GDIOBJ_FreeObj(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJ= ECT_TYPE_SILENT); + GDIOBJ_FreeObjByHandle(TempRegion, GDI_OBJECT_TYPE_REGION |= GDI_OBJECT_TYPE_SILENT); } } = @@ -801,7 +801,7 @@ if (hRgn !=3D (HANDLE)1 && hRgn !=3D NULL) { /* NOTE: The region can already by deleted! */ - GDIOBJ_FreeObj(hRgn, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SIL= ENT); + GDIOBJ_FreeObjByHandle(hRgn, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_= TYPE_SILENT); } } = Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/brush.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Tue Mar 18 19:56:= 40 2008 @@ -351,16 +351,14 @@ BitmapObject->hDIBPalette =3D BuildDIBPalette(BitmapInfo, &PaletteType); BITMAPOBJ_UnlockBitmap(BitmapObject); = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB; BrushObject->hbmPattern =3D hPattern; @@ -394,16 +392,14 @@ return NULL; } = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_HATCH; BrushObject->hbmPattern =3D hPattern; @@ -431,16 +427,14 @@ return NULL; } = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_BITMAP; BrushObject->hbmPattern =3D hPattern; @@ -460,15 +454,13 @@ HBRUSH hBrush; PGDIBRUSHOBJ BrushObject; = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_SOLID; = @@ -486,15 +478,14 @@ HBRUSH hBrush; PGDIBRUSHOBJ BrushObject; = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush =3D BrushObject->BaseObject.hHmgr; + BrushObject->flAttrs |=3D GDIBRUSH_IS_NULL; BRUSHOBJ_UnlockBrush(BrushObject); = Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/dc.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Mar 18 19:56:40 = 2008 @@ -2270,7 +2270,7 @@ RtlCopyMemory(Buf, Driver->Buffer, Driver->MaximumLength); } = - hDC =3D (HDC) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DC); + hDC =3D (HDC) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_DC); if (hDC =3D=3D NULL) { if(Buf) @@ -2441,7 +2441,7 @@ DC_FreeDcAttr(DCToFree); if(!IsObjectDead( DCToFree )) { - if (!GDIOBJ_FreeObj(DCToFree, GDI_OBJECT_TYPE_DC)) + if (!GDIOBJ_FreeObjByHandle(DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT1("DC_FreeDC failed\n"); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/dibobj.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Tue Mar 18 19:56= :40 2008 @@ -237,7 +237,7 @@ XlateObj =3D IntEngCreateXlate(DDB_Palette_Type, DIB_Palette_Type, DDB_P= alette, DIB_Palette); if (NULL =3D=3D XlateObj) { - PALETTE_FreePalette(DIB_Palette); + PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); BITMAPOBJ_UnlockBitmap(bitmap); @@ -265,7 +265,7 @@ = // Clean up EngDeleteXlate(XlateObj); - PALETTE_FreePalette(DIB_Palette); + PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); = @@ -713,7 +713,7 @@ EngDeleteSurface((HSURF)hDestBitmap); = if (hDestPalette !=3D NULL && bPaletteMatch =3D=3D FALSE) - PALETTE_FreePalette(hDestPalette); + PALETTE_FreePaletteByHandle(hDestPalette); = BITMAPOBJ_UnlockBitmap(BitmapObj); = @@ -1147,7 +1147,7 @@ = if (dib) { ExFreePool(dib); dib =3D NULL; } if (bmp) { bmp =3D NULL; } - if (res) { BITMAPOBJ_FreeBitmap(res); res =3D 0; } + if (res) { BITMAPOBJ_FreeBitmapByHandle(res); res =3D 0; } } = if (lpRGB !=3D bmi->bmiColors) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Mar 18 19:56= :40 2008 @@ -72,7 +72,7 @@ {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC= */ {1, 0, 0, NULL}, /* 02 UN= USED1 */ {1, 0, 0, NULL}, /* 03 UN= USED2 */ - {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN= */ + {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RG= N */ {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SU= RFACE */ {0, sizeof(DC), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CL= IENTOBJ: METADC,... FIXME: don't use DC struct */ {0, 0, TAG_PATH, NULL}, /* 07 PA= TH, unused */ @@ -444,24 +444,51 @@ return FALSE; } = +POBJ INTERNAL_CALL +GDIOBJ_AllocObj(UCHAR BaseType) +{ + POBJ pObject; + + ASSERT((BaseType & ~GDIObjTypeTotal) =3D=3D 0); +// BaseType &=3D GDI_HANDLE_BASETYPE_MASK; + + if (ObjTypeInfo[BaseType].bUseLookaside) + { + PPAGED_LOOKASIDE_LIST LookasideList; + + LookasideList =3D GdiHandleTable->LookasideLists + BaseType; + pObject =3D ExAllocateFromPagedLookasideList(LookasideList); + } + else + { + pObject =3D ExAllocatePoolWithTag(PagedPool, + ObjTypeInfo[BaseType].ulBodySize, + ObjTypeInfo[BaseType].Tag); + } + + if (pObject) + { + RtlZeroMemory(pObject, ObjTypeInfo[BaseType].ulBodySize); + } + + return pObject; +} + + /*! * Allocate memory for GDI object and return handle to it. * * \param ObjectType - type of object \ref GDI object types * - * \return Handle of the allocated object. - * - * \note Use GDIOBJ_Lock() to obtain pointer to the new object. - * \todo return the object pointer and lock it by default. + * \return Pointer to the allocated object, which is locked. */ -HGDIOBJ INTERNAL_CALL -GDIOBJ_AllocObj(ULONG ObjectType) +POBJ INTERNAL_CALL +GDIOBJ_AllocObjWithHandle(ULONG ObjectType) { PW32PROCESS W32Process; POBJ newObject =3D NULL; - PPAGED_LOOKASIDE_LIST LookasideList =3D NULL; HANDLE CurrentProcessId, LockedProcessId; - ULONG TypeIndex; + UCHAR TypeIndex; #ifdef GDI_DEBUG ULONG Attempts =3D 0; #endif @@ -475,106 +502,130 @@ ASSERT(ObjectType !=3D GDI_OBJECT_TYPE_DONTCARE); = TypeIndex =3D GDI_OBJECT_GET_TYPE_INDEX(ObjectType); - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - LookasideList =3D FindLookasideList(TypeIndex); - if (LookasideList !=3D NULL) - { - newObject =3D ExAllocateFromPagedLookasideList(LookasideList); - } + + newObject =3D GDIOBJ_AllocObj(TypeIndex); + if (!newObject) + { + DPRINT1("Not enough memory to allocate gdi object!\n"); + return NULL; + } + + UINT Index; + PGDI_TABLE_ENTRY Entry; + LONG TypeInfo; + + CurrentProcessId =3D PsGetCurrentProcessId(); + LockedProcessId =3D (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); + +// RtlZeroMemory(newObject, GetObjectSize(TypeIndex)); + + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type =3D BRSUH, PEN, EXTPEN, basetype =3D BRUSH) */ + TypeInfo =3D (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> = GDI_ENTRY_UPPER_SHIFT); + + Index =3D InterlockedPopFreeEntry(); + if (Index !=3D 0) + { + HANDLE PrevProcId; + + Entry =3D &GdiHandleTable->Entries[Index]; + +LockHandle: + PrevProcId =3D _InterlockedCompareExchangePointer((PVOID*)&Entry->= ProcessId, LockedProcessId, 0); + if (PrevProcId =3D=3D NULL) + { + PW32THREAD Thread =3D PsGetCurrentThreadWin32Thread(); + HGDIOBJ Handle; + + Entry->KernelData =3D newObject; + + /* copy the reuse-counter */ + TypeInfo |=3D Entry->Type & GDI_ENTRY_REUSE_MASK; + + /* we found a free entry, no need to exchange this field atomi= cally + since we're holding the lock */ + Entry->Type =3D TypeInfo; + + /* Create a handle */ + Handle =3D (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY= _UPPER_SHIFT)); + + /* Initialize BaseObject fields */ + newObject->hHmgr =3D Handle; + newObject->ulShareCount =3D 0; + newObject->cExclusiveLock =3D 1; + newObject->Tid =3D Thread; + + /* unlock the entry */ + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, C= urrentProcessId); + + GDIDBG_CAPTUREALLOCATOR(Index); + + if (W32Process !=3D NULL) + { + _InterlockedIncrement(&W32Process->GDIObjects); + } + + DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObject); + return newObject; + } + else + { +#ifdef GDI_DEBUG + if (++Attempts > 20) + { + DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attempts,= Index); + } +#endif + /* damn, someone is trying to lock the object even though it d= oesn't + even exist anymore, wait a little and try again! + FIXME - we shouldn't loop forever! Give up after some time!= */ + DelayExecution(); + /* try again */ + goto LockHandle; + } + } + + GDIOBJ_FreeObj(newObject, TypeIndex); + + DPRINT1("Failed to insert gdi object into the handle table, no handles= left!\n"); + GDIDBG_DUMPHANDLETABLE(); + + return NULL; +} + +/* Wrapper for compatibility with old calls, will be removed later */ +HGDIOBJ INTERNAL_CALL +GDIOBJ_AllocObjDepricated(ULONG ObjectType) +{ + POBJ pObject; + HGDIOBJ hObject; + + pObject =3D GDIOBJ_AllocObjWithHandle(ObjectType); + hObject =3D pObject->hHmgr; + GDIOBJ_UnlockObjByPtr(pObject); + + return hObject; +} + + +VOID INTERNAL_CALL +GDIOBJ_FreeObj(POBJ pObject, UCHAR BaseType) +{ + /* Object must not have a handle! */ + ASSERT(pObject->hHmgr =3D=3D NULL); + + if (ObjTypeInfo[BaseType].bUseLookaside) + { + PPAGED_LOOKASIDE_LIST LookasideList; + + LookasideList =3D GdiHandleTable->LookasideLists + BaseType; + ExFreeToPagedLookasideList(LookasideList, pObject); } else { - newObject =3D ExAllocatePoolWithTag(PagedPool, - ObjTypeInfo[TypeIndex].ulBodySiz= e, - ObjTypeInfo[TypeIndex].Tag); - } - if (newObject !=3D NULL) - { - UINT Index; - PGDI_TABLE_ENTRY Entry; - LONG TypeInfo; - - CurrentProcessId =3D PsGetCurrentProcessId(); - LockedProcessId =3D (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); - - RtlZeroMemory(newObject, GetObjectSize(TypeIndex)); - - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type =3D BRSUH, PEN, EXTPEN, basetype =3D BRUSH) */ - TypeInfo =3D (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType= >> GDI_ENTRY_UPPER_SHIFT); - - Index =3D InterlockedPopFreeEntry(); - if (Index !=3D 0) - { - HANDLE PrevProcId; - - Entry =3D &GdiHandleTable->Entries[Index]; - -LockHandle: - PrevProcId =3D _InterlockedCompareExchangePointer((PVOID*)&Ent= ry->ProcessId, LockedProcessId, 0); - if (PrevProcId =3D=3D NULL) - { - HGDIOBJ Handle; - - Entry->KernelData =3D newObject; - - /* copy the reuse-counter */ - TypeInfo |=3D Entry->Type & GDI_ENTRY_REUSE_MASK; - - /* we found a free entry, no need to exchange this field a= tomically - since we're holding the lock */ - Entry->Type =3D TypeInfo; - - /* unlock the entry */ - (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessI= d, CurrentProcessId); - - GDIDBG_CAPTUREALLOCATOR(Index); - - if (W32Process !=3D NULL) - { - _InterlockedIncrement(&W32Process->GDIObjects); - } - Handle =3D (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_E= NTRY_UPPER_SHIFT)); - newObject->hHmgr =3D Handle; - - DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObje= ct); - return Handle; - } - else - { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attem= pts, Index); - } -#endif - /* damn, someone is trying to lock the object even though = it doesn't - eve nexist anymore, wait a little and try again! - FIXME - we shouldn't loop forever! Give up after some t= ime! */ - DelayExecution(); - /* try again */ - goto LockHandle; - } - } - - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - ExFreeToPagedLookasideList(LookasideList, newObject); - } - else - { - ExFreePool(newObject); - } - DPRINT1("Failed to insert gdi object into the handle table, no han= dles left!\n"); - GDIDBG_DUMPHANDLETABLE(); - } - else - { - DPRINT1("Not enough memory to allocate gdi object!\n"); - } - return NULL; + ExFreePool(pObject); + } } = /*! @@ -588,10 +639,9 @@ * to the calling process. */ BOOL INTERNAL_CALL -GDIOBJ_FreeObj(HGDIOBJ hObj, DWORD ExpectedType) +GDIOBJ_FreeObjByHandle(HGDIOBJ hObj, DWORD ExpectedType) { PGDI_TABLE_ENTRY Entry; - PPAGED_LOOKASIDE_LIST LookasideList; HANDLE ProcessId, LockedProcessId, PrevProcId; ULONG HandleType, HandleUpper, TypeIndex; BOOL Silent; @@ -658,6 +708,8 @@ /* push this entry to the free list */ InterlockedPushFreeEntry(GDI_ENTRY_TO_INDEX(GdiHandleTable= , Entry)); = + Object->hHmgr =3D NULL; + if (W32Process !=3D NULL) { _InterlockedDecrement(&W32Process->GDIObjects); @@ -668,18 +720,7 @@ Ret =3D RunCleanupCallback(Object, TypeIndex); = /* Now it's time to free the memory */ - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - LookasideList =3D FindLookasideList(TypeIndex); - if (LookasideList !=3D NULL) - { - ExFreeToPagedLookasideList(LookasideList, Object); - } - } - else - { - ExFreePool(Object); - } + GDIOBJ_FreeObj(Object, TypeIndex); = return Ret; } @@ -764,7 +805,7 @@ if (!IsObjectDead(hObject)) { return NULL !=3D hObject - ? GDIOBJ_FreeObj(hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; + ? GDIOBJ_FreeObjByHandle(hObject, GDI_OBJECT_TYPE_DONTCARE)= : FALSE; } else { @@ -818,7 +859,7 @@ simply ignore this fact here. */ ObjectHandle =3D (HGDIOBJ)(Index | (Entry->Type << GDI_ENT= RY_UPPER_SHIFT)); = - if (GDIOBJ_FreeObj(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE)= && + if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_D= ONTCARE) && W32Process->GDIObjects =3D=3D 0) { /* there are no more gdi handles for this process, bai= l */ @@ -1569,21 +1610,30 @@ IN ULONG ulType ) { -// ATM we use DC object for KernelData. I think it should be at a minimum = GDIOBJEMPTYHDR. +// ATM we use DC object for KernelData. This is wrong. +// The real type consists of BASEOBJECT and a pointer. // The UserData is set in user mode, so it is always NULL. +// HANDLE should be HGDIOBJ // - INT Index; - PGDI_TABLE_ENTRY Entry; - HANDLE handle =3D GDIOBJ_AllocObj(GDI_OBJECT_TYPE_CLIOBJ); -// Need to change handle type based on ulType. - Index =3D GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); - Entry =3D &GdiHandleTable->Entries[Index]; -// mask out lower half and set the type by ulType. - Entry->Type &=3D GDI_HANDLE_UPPER_MASK; - Entry->Type |=3D ulType >> GDI_ENTRY_UPPER_SHIFT; -// mask out handle type than set it by ulType. - handle =3D (HANDLE)(((ULONG_PTR)(handle)) & (GDI_HANDLE_REUSE_MASK|GDI= _HANDLE_STOCK_MASK|0x0ffff)); - handle =3D (HANDLE)(((ULONG_PTR)(handle)) | ulType); + POBJ pObject; + HANDLE handle; + + /* Mask out everything that would change the type in a wrong manner */ + ulType &=3D (GDI_HANDLE_TYPE_MASK & ~GDI_HANDLE_BASETYPE_MASK); + + /* Allocate a new object */ + pObject =3D GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_CLIOBJ | ulType); + if (!pObject) + { + return NULL; + } + + /* get the handle */ + handle =3D pObject->hHmgr; + + /* Unlock it */ + GDIOBJ_UnlockObjByPtr(pObject); + return handle; } = @@ -1594,7 +1644,16 @@ IN HANDLE h ) { - return GDIOBJ_FreeObj(h, GDI_OBJECT_TYPE_CLIOBJ); + /* We first need to get the real type from the handle */ + ULONG type =3D GDI_HANDLE_GET_TYPE(h); + + /* Check if it's really a CLIENTOBJ */ + if ((type & GDI_HANDLE_BASETYPE_MASK) !=3D GDILoObjType_LO_CLIENTOBJ_T= YPE) + { + /* FIXME: SetLastError? */ + return FALSE; + } + return GDIOBJ_FreeObjByHandle(h, type); } = INT Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/metafile.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Tue Mar 18 19:= 56:40 2008 @@ -230,7 +230,7 @@ NtClose( Dc->hFile ); } = - hmf =3D GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TYPE_ENHMETAFILE); + hmf =3D GDIOBJ_AllocObjDepricated(GdiHandleTable, GDI_OBJECT_TYPE_ENHMET= AFILE); if (hmf !=3D NULL) { phmf =3D GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAF= ILE); Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/palobj.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/palobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c Tue Mar 18 19:56= :40 2008 @@ -63,7 +63,7 @@ HPALETTE NewPalette; PPALGDI PalGDI; = - NewPalette =3D (HPALETTE) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PALETTE); + NewPalette =3D (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALE= TTE); if (NULL =3D=3D NewPalette) { return NULL; @@ -82,7 +82,7 @@ if (NULL =3D=3D PalGDI->IndexedColors) { PALETTE_UnlockPalette(PalGDI); - PALETTE_FreePalette(NewPalette); + PALETTE_FreePaletteByHandle(NewPalette); return NULL; } RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * = NumColors); @@ -112,7 +112,7 @@ PPALGDI PalGDI; unsigned i; = - NewPalette =3D (HPALETTE) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PALETTE); + NewPalette =3D (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALE= TTE); if (NULL =3D=3D NewPalette) { return NULL; @@ -129,7 +129,7 @@ if (NULL =3D=3D PalGDI->IndexedColors) { PALETTE_UnlockPalette(PalGDI); - PALETTE_FreePalette(NewPalette); + PALETTE_FreePaletteByHandle(NewPalette); return NULL; } for (i =3D 0; i < NumColors; i++) Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/pen.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/pen.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Tue Mar 18 19:56:40= 2008 @@ -51,29 +51,20 @@ = if (bOldStylePen) { - hPen =3D PENOBJ_AllocPen(); + PenObject =3D PENOBJ_AllocPenWithHandle(); } else { - hPen =3D PENOBJ_AllocExtPen(); - } - - if (!hPen) + PenObject =3D PENOBJ_AllocExtPenWithHandle(); + } + + if (!PenObject) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); DPRINT("Can't allocate pen\n"); return 0; } - - if (bOldStylePen) - { - PenObject =3D PENOBJ_LockPen(hPen); - } - else - { - PenObject =3D PENOBJ_LockExtPen(hPen); - } - /* FIXME - Handle PenObject =3D=3D NULL!!! */ + hPen =3D PenObject->BaseObject.hHmgr; = PenObject->ptPenWidth.x =3D dwWidth; PenObject->ptPenWidth.y =3D 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/region.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Tue Mar 18 19:56= :40 2008 @@ -2024,7 +2024,7 @@ HRGN hReg; PROSRGNDATA pReg; = - if ((hReg =3D (HRGN) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_REGION))) + if ((hReg =3D (HRGN) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_REGION)= )) { if (NULL !=3D (pReg =3D REGION_LockRgn(hReg))) { Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/text.c?rev=3D32721&r1=3D32720&r2=3D32721&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/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Mar 18 19:56:4= 0 2008 @@ -487,36 +487,24 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) { PTEXTOBJ TextObj; - NTSTATUS Status =3D STATUS_SUCCESS; - - *NewFont =3D TEXTOBJ_AllocText(); - if (NULL !=3D *NewFont) + + TextObj =3D TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) { - TextObj =3D TEXTOBJ_LockText(*NewFont); - if (NULL !=3D TextObj) - { - memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOG= FONTW)); - if (lf->lfEscapement !=3D lf->lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - } - else - { -/* FIXME */ -/* ASSERT(FALSE);*/ - Status =3D STATUS_INVALID_HANDLE; - } + return STATUS_NO_MEMORY; } - else + + *NewFont =3D TextObj->BaseObject.hHmgr; + memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONT= W)); + if (lf->lfEscapement !=3D lf->lfOrientation) { - Status =3D STATUS_NO_MEMORY; + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; } - - return Status; + TEXTOBJ_UnlockText(TextObj); + + return STATUS_SUCCESS; } = HFONT @@ -528,51 +516,51 @@ IN FLONG fl, IN PVOID pvCliData ) { - ENUMLOGFONTEXDVW SafeLogfont; - HFONT NewFont; - PTEXTOBJ TextObj; - NTSTATUS Status =3D STATUS_SUCCESS; - - if (NULL !=3D pelfw) + ENUMLOGFONTEXDVW SafeLogfont; + HFONT hNewFont; + PTEXTOBJ TextObj; + NTSTATUS Status =3D STATUS_SUCCESS; + + if (!pelfw) { - Status =3D MmCopyFromCaller(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXD= VW)); - if (NT_SUCCESS(Status)) - { - NewFont =3D TEXTOBJ_AllocText(); - if (NULL !=3D NewFont) - { - TextObj =3D TEXTOBJ_LockText(NewFont); - - if (NULL !=3D TextObj) - { - RtlCopyMemory ( &TextObj->logfont, - &SafeLogfont, - sizeof(ENUMLOGFONTEXDVW)); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement !=3D - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation= =3D - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - } - else - { -/* FIXME */ -/* ASSERT(FALSE);*/ - Status =3D STATUS_INVALID_HANDLE; - } - } - } + return NULL; } - else + + _SEH_TRY { - Status =3D STATUS_INVALID_PARAMETER; + ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); + RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); } - - return NT_SUCCESS(Status) ? NewFont : NULL; + _SEH_HANDLE + { + Status =3D _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + TextObj =3D TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) + { + return NULL; + } + hNewFont =3D TextObj->BaseObject.hHmgr; + + RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)= ); + + if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement !=3D + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + TEXTOBJ_UnlockText(TextObj); + + return hNewFont; = } = @@ -1577,7 +1565,7 @@ = Dc_Attr =3D dc->pDc_Attr; if(!Dc_Attr) Dc_Attr =3D &dc->Dc_Attr; - = + /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && UnsafeString =3D=3D NULL)) { @@ -2159,7 +2147,7 @@ SetLastWin32Error(Status); return FALSE; } - = + BufferSize =3D Count * sizeof(ABC); // Same size! SafeBuff =3D ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (!fl) SafeBuffF =3D (LPABCFLOAT) SafeBuff; @@ -2447,7 +2435,7 @@ WCHAR DefChar =3D 0; PWSTR Buffer =3D NULL; ULONG Size; - = + if ((!UnSafepwc) && (!UnSafepgi)) return cwc; = dc =3D DC_LockDc(hdc); @@ -2488,7 +2476,7 @@ goto ErrorRet; } IntGetOutlineTextMetrics(FontGDI, Size, potm); - DefChar =3D potm->otmTextMetrics.tmDefaultChar; // May need this. = + DefChar =3D potm->otmTextMetrics.tmDefaultChar; // May need this. ExFreePool(potm); } = @@ -2508,7 +2496,7 @@ = IntLockFreeType; face =3D FontGDI->face; - = + for (i =3D 0; i < cwc; i++) { Buffer[i] =3D FT_Get_Char_Index(face, UnSafepwc[i]); @@ -3340,7 +3328,7 @@ PDC Dc; PDC_ATTR Dc_Attr; DWORD cscp =3D IntGdiGetCharSet(hDC); - // If here, update everything! = + // If here, update everything! Dc =3D DC_LockDc(hDC); Dc_Attr =3D Dc->pDc_Attr; if (!Dc_Attr) Dc_Attr =3D &Dc->Dc_Attr;

1 0

[tkreuzer] 32720: Add GDILoObjType enum to ntgdityp.h
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Tue Mar 18 19:33:11 2008 New Revision: 32720 URL: http://svn.reactos.org/svn/reactos?rev=3D32720&view=3Drev Log: Add GDILoObjType enum to ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntgdityp.h?rev=3D32720&r1=3D32719&r2=3D32720&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/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Mar 18 19:33:11 2008 @@ -97,42 +97,61 @@ GdiLpToDp, } TRANSFORMTYPE, *PTRANSFORMTYPE; = -typedef enum _GDIOBJTYPE -{ - GDIObjType_DEF_TYPE, - GDIObjType_DC_TYPE, - GDIObjType_UNUSED1_TYPE, - GDIObjType_UNUSED2_TYPE, - GDIObjType_RGN_TYPE, - GDIObjType_SURF_TYPE, - GDIObjType_CLIENTOBJ_TYPE, - GDIObjType_PATH_TYPE, - GDIObjType_PAL_TYPE, - GDIObjType_ICMLCS_TYPE, - GDIObjType_LFONT_TYPE, - GDIObjType_RFONT_TYPE, - GDIObjType_PFE_TYPE, - GDIObjType_PFT_TYPE, - GDIObjType_ICMCXF_TYPE, - GDIObjType_SPRITE_TYPE, - GDIObjType_BRUSH_TYPE, - GDIObjType_UMPD_TYPE, - GDIObjType_UNUSED4_TYPE, - GDIObjType_SPACE_TYPE, - GDIObjType_UNUSED5_TYPE, - GDIObjType_META_TYPE, - GDIObjType_EFSTATE_TYPE, - GDIObjType_BMFD_TYPE, - GDIObjType_VTFD_TYPE, - GDIObjType_TTFD_TYPE, - GDIObjType_RC_TYPE, - GDIObjType_TEMP_TYPE, - GDIObjType_DRVOBJ_TYPE, - GDIObjType_DCIOBJ_TYPE, - GDIObjType_SPOOL_TYPE, +typedef enum GDIObjType +{ + GDIObjType_DEF_TYPE =3D 0x00, + GDIObjType_DC_TYPE =3D 0x01, + GDIObjType_UNUSED1_TYPE =3D 0x02, + GDIObjType_UNUSED2_TYPE =3D 0x03, + GDIObjType_RGN_TYPE =3D 0x04, + GDIObjType_SURF_TYPE =3D 0x05, + GDIObjType_CLIENTOBJ_TYPE =3D 0x06, + GDIObjType_PATH_TYPE =3D 0x07, + GDIObjType_PAL_TYPE =3D 0x08, + GDIObjType_ICMLCS_TYPE =3D 0x09, + GDIObjType_LFONT_TYPE =3D 0x0a, + GDIObjType_RFONT_TYPE =3D 0x0b, + GDIObjType_PFE_TYPE =3D 0x0c, + GDIObjType_PFT_TYPE =3D 0x0d, + GDIObjType_ICMCXF_TYPE =3D 0x0e, + GDIObjType_SPRITE_TYPE =3D 0x0f, + GDIObjType_BRUSH_TYPE =3D 0x10, + GDIObjType_UMPD_TYPE =3D 0x11, + GDIObjType_UNUSED4_TYPE =3D 0x12, + GDIObjType_SPACE_TYPE =3D 0x13, + GDIObjType_UNUSED5_TYPE =3D 0x14, + GDIObjType_META_TYPE =3D 0x15, + GDIObjType_EFSTATE_TYPE =3D 0x16, + GDIObjType_BMFD_TYPE =3D 0x17, + GDIObjType_VTFD_TYPE =3D 0x18, + GDIObjType_TTFD_TYPE =3D 0x19, + GDIObjType_RC_TYPE =3D 0x1a, + GDIObjType_TEMP_TYPE =3D 0x1b, + GDIObjType_DRVOBJ_TYPE =3D 0x1c, + GDIObjType_DCIOBJ_TYPE =3D 0x1d, + GDIObjType_SPOOL_TYPE =3D 0x1e, + GDIObjType_MAX_TYPE =3D 0x1e, + GDIObjTypeTotal =3D 0x1f, } GDIOBJTYPE, *PGDIOBJTYPE; - -#define GDIObjType_MAX_TYPE GDIObjType_SPOOL_TYPE + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE =3D 0x100000, + GDILoObjType_LO_DC_TYPE =3D 0x10000, + GDILoObjType_LO_BITMAP_TYPE =3D 0x50000, + GDILoObjType_LO_PALETTE_TYPE =3D 0x80000, + GDILoObjType_LO_FONT_TYPE =3D 0xa0000, + GDILoObjType_LO_REGION_TYPE =3D 0x40000, + GDILoObjType_LO_ICMLCS_TYPE =3D 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE =3D 0x60000, + GDILoObjType_LO_ALTDC_TYPE =3D 0x210000, + GDILoObjType_LO_PEN_TYPE =3D 0x300000, + GDILoObjType_LO_EXTPEN_TYPE =3D 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE =3D 0x250000, + GDILoObjType_LO_METAFILE16_TYPE =3D 0x260000, + GDILoObjType_LO_METAFILE_TYPE =3D 0x460000, + GDILoObjType_LO_METADC16_TYPE =3D 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; = #define GdiWorldSpaceToPageSpace 0x203 = @@ -182,7 +201,7 @@ LONG lMinWidthD; } CHWIDTHINFO, *PCHWIDTHINFO; = -typedef struct _UNIVERSAL_FONT_ID = +typedef struct _UNIVERSAL_FONT_ID { DWORD dwUfid[2]; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; @@ -394,7 +413,7 @@ ULONG ulForegroundClr; ULONG ulBackgroundClr; int x; - int y; = + int y; UINT Options; RECT Rect; DWORD iCS_CP; @@ -429,7 +448,7 @@ LONG right; LONG bottom; LONG left; - LONG top; = + LONG top; } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; // // Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. @@ -445,36 +464,36 @@ typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *= , ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); = +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); = -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); = +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOB= J*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF= OBJ*, XLATEOBJ*, ULONG); = -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); = -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB= J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); = -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*= , POINTL*, MIX, ULONG); = -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, = XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); = -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI= X); = -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X= LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); = +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF= OBJ*, XLATEOBJ*, ULONG); +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB= J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*= , POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, = XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI= X); +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X= LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLA= TEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*= , RECTL*, POINTL*); = +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*= , RECTL*, POINTL*); typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ= *, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIP= OBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG,= BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG)= ; = -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R= ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); = -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, = PVOID *); = -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U= LONG, PVOID *); = -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); = -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO= NG); = -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G= LYPHDATA*, PVOID, ULONG); = -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X= LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); = -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); = +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R= ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, = PVOID *); +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U= LONG, PVOID *); +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO= NG); +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G= LYPHDATA*, PVOID, ULONG); +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X= LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG= , LONG, LONG, RECTL*, MIX); typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); @@ -535,9 +554,9 @@ PGD_COPYBITS CopyBits; PGD_STRETCHBLT StretchBlt; PVOID Unknown1; - PGD_SETPALETTE SetPalette; = + PGD_SETPALETTE SetPalette; PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; = + PGD_ESCAPE Escape; PGD_DRAWESCAPE DrawEscape; PGD_QUERYFONT QueryFont; PGD_QUERYFONTTREE QueryFontTree; @@ -600,7 +619,7 @@ PVOID Reserved6; PVOID Reserved7; PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; = + PFN_DrvDeriveSurface DeriveSurface; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvNotify Notify; PGD_SYNCHRONIZESURFACE SynchronizeSurface;

1 0

[hpoussin] 32719: Fix indentation
by hpoussin＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: hpoussin Date: Tue Mar 18 07:28:33 2008 New Revision: 32719 URL: http://svn.reactos.org/svn/reactos?rev=3D32719&view=3Drev Log: Fix indentation Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32719&r1=3D32718&r2=3D32719&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/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Mar 18 07:28:33 2008 @@ -338,8 +338,8 @@ static NTSTATUS EnableInterrupts( IN PPORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR FlagsToDisable, - IN UCHAR FlagsToEnable) + IN UCHAR FlagsToDisable, + IN UCHAR FlagsToEnable) { i8042Flush(DeviceExtension); = @@ -367,8 +367,8 @@ IN PPORT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - UCHAR FlagsToDisable =3D 0; - UCHAR FlagsToEnable =3D 0; + UCHAR FlagsToDisable =3D 0; + UCHAR FlagsToEnable =3D 0; = if (DeviceExtension->DataPort =3D=3D 0) { @@ -399,8 +399,6 @@ } = /* Connect interrupts */ - Status =3D STATUS_SUCCESS; - if (DeviceExtension->Flags & KEYBOARD_PRESENT && DeviceExtension->Flags & KEYBOARD_CONNECTED && DeviceExtension->Flags & KEYBOARD_STARTED && @@ -411,8 +409,8 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D KEYBOARD_INITIALIZED; - FlagsToDisable |=3D CCB_KBD_DISAB; - FlagsToEnable |=3D CCB_KBD_INT_ENAB; + FlagsToDisable |=3D CCB_KBD_DISAB; + FlagsToEnable |=3D CCB_KBD_INT_ENAB; } } = @@ -426,13 +424,15 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D MOUSE_INITIALIZED; - FlagsToDisable |=3D CCB_MOUSE_DISAB; - FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; - } - } - - if(FlagsToEnable) - Status =3D EnableInterrupts(DeviceExtension, FlagsToDisable, Flags= ToEnable); + FlagsToDisable |=3D CCB_MOUSE_DISAB; + FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; + } + } + + if (FlagsToEnable) + Status =3D EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnab= le); + else + Status =3D STATUS_SUCCESS; = return Status; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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