Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 50312: [CMAKE] - Add ntdll apitest to build.
by akhaldi＠svn.reactos.org 07 Jan '11

07 Jan '11

Author: akhaldi Date: Fri Jan 7 20:31:56 2011 New Revision: 50312 URL: http://svn.reactos.org/svn/reactos?rev=50312&view=rev Log: [CMAKE] - Add ntdll apitest to build. Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/ntdll/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Jan 7 20:31:56 2011 @@ -3,7 +3,7 @@ add_subdirectory(dciman32) add_subdirectory(gdi32) -#add_subdirectory(ntdll) The asm file needs to be fixed. +add_subdirectory(ntdll) add_subdirectory(user32) if(ARCH MATCHES i386) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Fri Jan 7 20:31:56 2011 @@ -1,5 +1,5 @@ -#add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE RtlInitializeBitMap.c @@ -7,13 +7,11 @@ testlist.c) if(ARCH MATCHES i386) -list(APPEND SOURCE i386/ZwContinue.asm) + list(APPEND SOURCE i386/ZwContinue.S) endif() add_executable(ntdll_apitest ${SOURCE}) -target_link_libraries(ntdll_apitest wine - #${PSEH_LIB} - ) +target_link_libraries(ntdll_apitest wine) set_module_type(ntdll_apitest win32cui) -add_importlibs(ntdll_apitest ntdll) +add_importlibs(ntdll_apitest msvcrt kernel32 ntdll) add_cab_target(ntdll_apitest 7)

1 0

[tkreuzer] 50311: [NTDLL_APITEST] Convert asm to GAS/ML compatible format
by tkreuzer＠svn.reactos.org 07 Jan '11

07 Jan '11

Author: tkreuzer Date: Fri Jan 7 20:11:56 2011 New Revision: 50311 URL: http://svn.reactos.org/svn/reactos?rev=50311&view=rev Log: [NTDLL_APITEST] Convert asm to GAS/ML compatible format Added: trunk/rostests/apitests/ntdll/i386/ZwContinue.S - copied, changed from r50248, trunk/rostests/apitests/ntdll/i386/ZwContinue.asm Removed: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild Copied: trunk/rostests/apitests/ntdll/i386/ZwContinue.S (from r50248, trunk/rostests/apitests/ntdll/i386/ZwContinue.asm) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.S [iso-8859-1] Fri Jan 7 20:11:56 2011 @@ -1,15 +1,20 @@ -; cpu 486 -segment .text use32 + +#include <asm.inc> +#include <ks386.inc> + + +// cpu 486 +.text extern _check -global _continuePoint +PUBLIC _continuePoint _continuePoint: push ss - push dword 0 + push 0 pushfd push cs - push dword _continuePoint + push offset _continuePoint push ebp push eax @@ -24,25 +29,26 @@ push fs push gs - ; TODO: floating point state - sub esp, 70h + // TODO: floating point state + sub esp, 112 - ; Debug registers - sub esp, 18h + // Debug registers + sub esp, 24 - push dword 00010007h + push HEX(00010007) - ; Fill the Esp field - lea eax, [esp+0CCh] - lea ecx, [esp+0C4h] + // Fill the Esp field + lea eax, [esp + HEX(0CC)] + lea ecx, [esp + HEX(0C4)] mov [ecx], eax - ; Call the function that will compare the current context with the expected one + // Call the function that will compare the current context with the expected one cld push esp call _check - ; check() must not return + // check() must not return int 3 -; EOF +// EOF +END Removed: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (removed) @@ -1,48 +1,0 @@ -; cpu 486 -segment .text use32 - -extern _check - -global _continuePoint -_continuePoint: - push ss - push dword 0 - pushfd - push cs - push dword _continuePoint - push ebp - - push eax - push ecx - push edx - push ebx - push esi - push edi - - push ds - push es - push fs - push gs - - ; TODO: floating point state - sub esp, 70h - - ; Debug registers - sub esp, 18h - - push dword 00010007h - - ; Fill the Esp field - lea eax, [esp+0CCh] - lea ecx, [esp+0C4h] - mov [ecx], eax - - ; Call the function that will compare the current context with the expected one - cld - push esp - call _check - - ; check() must not return - int 3 - -; EOF Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Fri Jan 7 20:11:56 2011 @@ -12,7 +12,7 @@ <file>ZwContinue.c</file> <if property="ARCH" value="i386"> <directory name="i386"> - <file>ZwContinue.asm</file> + <file>ZwContinue.S</file> </directory> </if> </module>

1 0

[akhaldi] 50310: [CMAKE] - Silence the quotes warning.
by akhaldi＠svn.reactos.org 07 Jan '11

07 Jan '11

Author: akhaldi Date: Fri Jan 7 20:07:15 2011 New Revision: 50310 URL: http://svn.reactos.org/svn/reactos?rev=50310&view=rev Log: [CMAKE] - Silence the quotes warning. Modified: branches/cmake-bringup/base/applications/findstr/lang/bg-BG.rc branches/cmake-bringup/base/applications/findstr/lang/ca-ES.rc branches/cmake-bringup/base/applications/findstr/lang/cs-CZ.rc branches/cmake-bringup/base/applications/findstr/lang/de-DE.rc branches/cmake-bringup/base/applications/findstr/lang/el-GR.rc branches/cmake-bringup/base/applications/findstr/lang/en-US.rc branches/cmake-bringup/base/applications/findstr/lang/es-ES.rc branches/cmake-bringup/base/applications/findstr/lang/fr-FR.rc branches/cmake-bringup/base/applications/findstr/lang/it-IT.rc branches/cmake-bringup/base/applications/findstr/lang/lt-LT.rc branches/cmake-bringup/base/applications/findstr/lang/no-NO.rc branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc branches/cmake-bringup/base/applications/findstr/lang/pt-BR.rc branches/cmake-bringup/base/applications/findstr/lang/ru-RU.rc branches/cmake-bringup/base/applications/findstr/lang/sk-SK.rc branches/cmake-bringup/base/applications/findstr/lang/sv-SE.rc branches/cmake-bringup/base/applications/findstr/lang/uk-UA.rc Modified: branches/cmake-bringup/base/applications/findstr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/bg-BG.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Èçâåæäà âñè÷êè ðåäîâå âúâ ôàéëà, êîèòî ñúäúðæàò óêàçàíèÿ íèç..\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"íèç\" [ ôàéë... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""íèç"" [ ôàéë... ]\n\ /C Áðîè êîëêî ðåäà ñúäúðæàò íèçà\n\ /I Ïðåíåáðåãâà ÃëÀâÍÎñÒòà\n\ /N Áðîé ïîêàçàíè ðåäîâå, êàòî ñå çàïî÷âà îò 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/ca-ES.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""Cadena de caràcters"" [ file... ]\n\ /C Conta el numero de linies que contenen la cadena de caràcters\n\ /I Ignora majúscules i minúscules\n\ /N Numero de linies mostrades, començant per la primera\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/cs-CZ.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -10,7 +10,7 @@ BEGIN IDS_USAGE, "FIND: Zobrazí vechny øádky souboru obsahující hledaný øetìzec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"øetìzec\" [ soubor... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""øetìzec"" [ soubor... ]\n\ /C Zobrazí poèet øádkù obsahující øetìzec.\n\ /I Ignoruje velikost písmen.\n\ /N Èísluje zobrazené øádky, zaèíná od 1.\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/de-DE.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/el-GR.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Åêôõðþíåé üëåò ôéò ãñáììÝò åíüò áñ÷åßïõ ðïõ ðåñéÝ÷ïõí Ýíá áëöáñéèìçôéêü.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"áëöáñéèìçôéêü\" [ áñ÷åßï... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""áëöáñéèìçôéêü"" [ áñ÷åßï... ]\n\ /C ÌÝôñçóç ãñáììþí ðïõ ðåñéÝ÷ïõí ôï áëöáñéèìçôéêü\n\ /I Áãíüçóç êåöáëáßùí\n\ /N ÅìöÜíéóç áñéèìþí óôéò åìöáíéæüìåíåò ãñáììÝò, îåêéíþíôáò áðü ôï 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/en-US.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FINDSTR: Prints all lines of a file that contain a string.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ /C Count the number of lines that contain string\n\ /I Ignore case\n\ /N Number the displayed lines, starting at 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/es-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/es-ES.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"cadena\" [ fichero... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""cadena"" [ fichero... ]\n\ /C Cuenta el número de líneas que contienen la cadena de caracteres\n\ /I Ignora mayúsculas y minúsculas\n\ /N Numero de líneas a mostrar en pantalla, a partir de la primera\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/fr-FR.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Affiche toutes les lignes d'un fichier qui contiennent un morceau de texte.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"texte\" [ fichier... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""texte"" [ fichier... ]\n\ /C Compte le nombre de lignes qui contiennent le texte\n\ /I Insensible à la casse\n\ /N Numérote les lignes affichées en commençant à 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/it-IT.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""stringa"" [ file... ]\n\ /C Conta il numero di linee che contengono la stringa\n\ /I Ignora maiuscole/minuscole\n\ /N Numera le linee visualizzate a partire da 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/lt-LT.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -13,7 +13,7 @@ BEGIN IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ieðkomas tekstas.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""tekstas"" [ byla... ]\n\ /C Skaièiuoti eilutes, kuriose yra ieðkomas tekstas\n\ /I Ignoruoti raidþiø dydá\n\ /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/no-NO.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FINN: Skriv alle linjene for filen som inneholder en streng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"streng\" [ fil... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""streng"" [ fil... ]\n\ /C Teller nummer av linjer som inneholder strenger\n\ /I Ignorere sak\n\ /N Nummer viste linjer, start med 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -11,7 +11,7 @@ BEGIN IDS_USAGE, "FIND: Wywietla wszystkie linie danego pliku, zawieraj¹ce szukany ci¹g znaków.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ci¹g znaków\" [ plik... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ci¹g znaków"" [ plik... ]\n\ /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ /I Ignoruje wielkoæ liter\n\ /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/pt-BR.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Localiza uma seqüência de texto em um ou mais arquivos.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"seqüência\" [ arquivo... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""seqüência"" [ arquivo... ]\n\ /C Exibe apenas o número de linhas que contêm a seqüência.\n\ /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ /N Exibe o número de cada linha, iniciando no 1.\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/ru-RU.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Ïîèñê òåêñòîâîé ñòðîêè â îäíîì èëè íåñêîëüêèõ ôàéëàõ.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ñòðîêà\" [ ôàéë... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ñòðîêà"" [ ôàéë... ]\n\ /C Âûâîä òîëüêî îáùåãî ÷èñëà ñòðîê, ñîäåðæàùèõ çàäàííóþ ñòðîêó.\n\ /I Ïîèñê áåç ó÷åòà ðåãèñòðà ñèìâîëîâ.\n\ /N Âûâîä íîìåðîâ îòîáðàæàåìûõ ñòðîê (íà÷èíàÿ ñ 1).\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/sk-SK.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -8,7 +8,7 @@ BEGIN IDS_USAGE, "FIND: Zobraz¡ vçetky riadky s£boru obsahuj£ce hadanì reazec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"reazec\" [ s£bor... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""reazec"" [ s£bor... ]\n\ /C Zobraz¡ poet riadkov, ktor obsahuj£ reazec.\n\ /I Ignoruje vekos p¡smen.\n\ /N ¬¡sluje zobrazen riadky, za¡na od 1.\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/sv-SE.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Skriver ut alla rader i en fil som innehåller en sträng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"sträng\" [ fil... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""sträng"" [ fil... ]\n\ /C Räkna nummren av linjer som innehåller en strängen\n\ /I Ignorera skiftläge\n\ /N Antal visade rader, börjar på 1\n\ Modified: branches/cmake-bringup/base/applications/findstr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/lang/uk-UA.rc [iso-8859-1] Fri Jan 7 20:07:15 2011 @@ -12,7 +12,7 @@ BEGIN IDS_USAGE, "FIND: Âèâåäåííÿ âñ³õ ðÿäê³â ôàéëó, ÿê³ ì³ñòÿòü ðÿäîê.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ðÿäîê\" [ ôàéë... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ðÿäîê"" [ ôàéë... ]\n\ /C Ïîðàõóâàòè ê³ëüê³ñòü ðÿäê³â, ÿê³ ì³ñòÿòü ðÿäîê\n\ /I Íå âðàõîâóâàòè ðåã³ñòð ñèìâîë³â\n\ /N Íóìåðóâàòè ðÿäêè, ÿê³ â³äîáðàæàþòüñÿ (ïî÷èíàþ÷è ç 1)\n\

1 0

[fireball] 50309: [HEAP] - Fix a typo (assignment) in the ASSERT, spotted by Johannes Anderwald.
by fireball＠svn.reactos.org 07 Jan '11

07 Jan '11

Author: fireball Date: Fri Jan 7 15:33:46 2011 New Revision: 50309 URL: http://svn.reactos.org/svn/reactos?rev=50309&view=rev Log: [HEAP] - Fix a typo (assignment) in the ASSERT, spotted by Johannes Anderwald. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50309&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Fri Jan 7 15:33:46 2011 @@ -238,7 +238,7 @@ /* Check if PreviousSize of the next entry matches ours */ if (!(FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) { - ASSERT(((PHEAP_ENTRY)FreeEntry + BlockSize)->PreviousSize = BlockSize); + ASSERT(((PHEAP_ENTRY)FreeEntry + BlockSize)->PreviousSize == BlockSize); } /* Insert it either into dedicated or non-dedicated list */ @@ -2344,6 +2344,7 @@ /* Release the heap lock */ if (Locked) RtlLeaveHeapLock(Heap->LockVariable); + DbgBreakPoint(); return FALSE; }

1 0

[akhaldi] 50308: [CMAKE] - Delete an unneeded lib.mak - Don't build bin2c, we don't seem to need it. - A minor cleanup, no functionality change intended.
by akhaldi＠svn.reactos.org 07 Jan '11

07 Jan '11

Author: akhaldi Date: Fri Jan 7 12:11:46 2011 New Revision: 50308 URL: http://svn.reactos.org/svn/reactos?rev=50308&view=rev Log: [CMAKE] - Delete an unneeded lib.mak - Don't build bin2c, we don't seem to need it. - A minor cleanup, no functionality change intended. Removed: branches/cmake-bringup/lib/lib.mak Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt branches/cmake-bringup/lib/atl/CMakeLists.txt branches/cmake-bringup/lib/cmlib/CMakeLists.txt branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt branches/cmake-bringup/lib/inflib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt branches/cmake-bringup/lib/pseh/CMakeLists.txt branches/cmake-bringup/lib/recyclebin/CMakeLists.txt branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/sdk/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/smlib/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -12,4 +12,4 @@ add_subdirectory(libxml2) add_subdirectory(mingw) add_subdirectory(stlport) -add_subdirectory(zlib) +add_subdirectory(zlib) Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -21,4 +21,4 @@ src/types.c) add_library(adns ${SOURCE}) -add_dependencies(adns psdk) +add_dependencies(adns psdk) Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -4,8 +4,8 @@ add_definitions(-D_CRTBLD) if(NOT MSVC) -add_definitions(-Wno-main) -endif(NOT MSVC) + add_definitions(-Wno-main) +endif() list(APPEND MINGW_COMMON_SOURCE _newmode.c @@ -36,16 +36,16 @@ cxa_pure_virtual.c) if(MSVC) -list(APPEND MINGW_COMMON_SOURCE mscmain.c) + list(APPEND MINGW_COMMON_SOURCE mscmain.c) else() -list(APPEND MINGW_COMMON_SOURCE gccmain.c) + list(APPEND MINGW_COMMON_SOURCE gccmain.c) endif() add_library(mingw_common ${MINGW_COMMON_SOURCE}) if(NOT MSVC) target_link_libraries(mingw_common oldnames) -endif(NOT MSVC) +endif() set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) add_dependencies(mingw_common psdk) @@ -62,15 +62,15 @@ add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk) -if (NOT MSVC) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +if(NOT MSVC) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) -add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) + add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) endif() add_library(getopt getopt.c) Modified: branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/zlib… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -19,7 +19,7 @@ zutil.c) if(CMAKE_CROSSCOMPILING) -add_library(zlib ${SOURCE}) + add_library(zlib ${SOURCE}) else() -add_library(zlibhost ${SOURCE}) + add_library(zlibhost ${SOURCE}) endif() Modified: branches/cmake-bringup/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/atl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DROS_Headers) +add_definitions( + -DUNICODE -D_UNICODE + -DROS_Headers) -add_library(atlnew atlbase.cpp atlcore.cpp) +add_library(atlnew atlbase.cpp atlcore.cpp) Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -13,13 +13,13 @@ hivewrt.c) if(CMAKE_CROSSCOMPILING) -add_library(cmlib ${SOURCE}) -add_dependencies(cmlib bugcodes) + add_library(cmlib ${SOURCE}) + add_dependencies(cmlib bugcodes) else() -add_definitions( - -DWINE_UNICODE_API= - -D__NO_CTYPE_INLINES - -DCMLIB_HOST) -add_library(cmlibhost ${SOURCE}) -target_link_libraries(cmlibhost unicode) + add_definitions( + -DWINE_UNICODE_API= + -D__NO_CTYPE_INLINES + -DCMLIB_HOST) + add_library(cmlibhost ${SOURCE}) + target_link_libraries(cmlibhost unicode) endif() Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM… ============================================================================== --- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -6,7 +6,7 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) if(ARCH MATCHES i386) -list(APPEND SOURCE network/i386/checksum.S) + list(APPEND SOURCE network/i386/checksum.S) endif() list(APPEND SOURCE Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,20 +1,15 @@ -SET(GLOBAL_FILES infcore.c infget.c infput.c) +set(GLOBAL_FILES infcore.c infget.c infput.c) if(CMAKE_CROSSCOMPILING) - -file(GLOB_RECURSE SOURCE "infros*.c") -add_library(inflib ${GLOBAL_FILES} ${SOURCE}) -add_dependencies(inflib psdk) - + file(GLOB_RECURSE SOURCE "infros*.c") + add_library(inflib ${GLOBAL_FILES} ${SOURCE}) + add_dependencies(inflib psdk) else() - -file(GLOB_RECURSE SOURCE "infhost*.c") - -add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) -if(NOT MSVC) -add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes) + file(GLOB_RECURSE SOURCE "infhost*.c") + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) + if(NOT MSVC) + add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes) + endif() + add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) endif() -add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) - -endif() Removed: branches/cmake-bringup/lib/lib.mak URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lib.mak?rev=5… ============================================================================== --- branches/cmake-bringup/lib/lib.mak [iso-8859-1] (original) +++ branches/cmake-bringup/lib/lib.mak (removed) @@ -1,7 +1,0 @@ -LIB_BASE = lib -LIB_BASE_ = $(LIB_BASE)$(SEP) - -include lib/inflib/inflib.mak -ifeq ($(ARCH),powerpc) -include lib/ppcmmu/ppcmmu.mak -endif Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,22 +1,16 @@ -SET(GLOBAL_FILES infcore.c infget.c infput.c) +set(GLOBAL_FILES infcore.c infget.c infput.c) if(CMAKE_CROSSCOMPILING) - -file(GLOB_RECURSE SOURCE "infros*.c") -add_library(newinflib ${GLOBAL_FILES} ${SOURCE}) -add_dependencies(newinflib psdk) - + file(GLOB_RECURSE SOURCE "infros*.c") + add_library(newinflib ${GLOBAL_FILES} ${SOURCE}) + add_dependencies(newinflib psdk) else() - -file(GLOB_RECURSE SOURCE "infhost*.c") - -add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS) -if(NOT MSVC) -add_definitions(-Wpointer-arith -Wwrite-strings) + file(GLOB_RECURSE SOURCE "infhost*.c") + add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS) + if(NOT MSVC) + add_definitions(-Wpointer-arith -Wwrite-strings) + endif() + add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE}) + target_link_libraries(newinflibhost unicode) endif() -add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE}) -target_link_libraries(newinflibhost unicode) - -endif() - Modified: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ppcmmu/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -2,8 +2,7 @@ list(APPEND SOURCE dummy.c) if(ARCH MATCHES powerpc) -list(APPEND SOURCE - mmuutil.c) -endif(ARCH MATCHES powerpc) + list(APPEND SOURCE mmuutil.c) +endif() add_library(ppcmmu ${SOURCE}) Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLis… ============================================================================== --- branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,20 +1,19 @@ if(NOT MSVC) -list(APPEND SOURCE framebased.c) + list(APPEND SOURCE framebased.c) + if(ARCH MATCHES i386) + list(APPEND SOURCE + i386/framebased.S + i386/framebased-gcchack.c + i386/framebased-gcchack-asm.S) + elseif(ARCH MATCHES amd64) + list(APPEND SOURCE amd64/framebased.S) + elseif(ARCH MATCHES powerpc) + list(APPEND SOURCE powerpc/framebased.S) + endif() -if(ARCH MATCHES i386) -list(APPEND SOURCE - i386/framebased.S - i386/framebased-gcchack.c - i386/framebased-gcchack-asm.S) -elseif(ARCH MATCHES amd64) -list(APPEND SOURCE amd64/framebased.S) -elseif(ARCH MATCHES powerpc) -list(APPEND SOURCE powerpc/framebased.S) -endif(ARCH MATCHES i386) - -add_library(pseh ${SOURCE}) -add_dependencies(pseh psdk) + add_library(pseh ${SOURCE}) + add_dependencies(pseh psdk) endif() Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CM… ============================================================================== --- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -7,4 +7,4 @@ recyclebin_v5.c recyclebin_v5_enumerator.c) -add_library(recyclebin ${SOURCE}) +add_library(recyclebin ${SOURCE}) Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -19,4 +19,4 @@ pe.c zwfile.c) add_library(rossym ${SOURCE}) -add_dependencies(rossym psdk) +add_dependencies(rossym psdk) Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -66,39 +66,38 @@ workitem.c) if(ARCH MATCHES i386) -list(APPEND SOURCE - i386/debug_asm.S - i386/except_asm.s - i386/except.c - i386/interlck.S - i386/rtlmem.s - i386/res_asm.s - i386/thread.c) + list(APPEND SOURCE + i386/debug_asm.S + i386/except_asm.s + i386/except.c + i386/interlck.S + i386/rtlmem.s + i386/res_asm.s + i386/thread.c) elseif(ARCH MATCHES amd64) -list(APPEND SOURCE - amd64/debug_asm.S - amd64/except_asm.S - amd64/slist.S - amd64/unwind.c - amd64/stubs.c - mem.c - memgen.c) + list(APPEND SOURCE + amd64/debug_asm.S + amd64/except_asm.S + amd64/slist.S + amd64/unwind.c + amd64/stubs.c + mem.c + memgen.c) elseif(ARCH MATCHES arm) -list(APPEND SOURCE - arm/debug_asm.S - mem.c - memgen.c) + list(APPEND SOURCE + arm/debug_asm.S + mem.c + memgen.c) elseif(ARCH MATCHES powerpc) -list(APPEND SOURCE - powerpc/debug.c - powerpc/except.c - powerpc/interlocked.c - powerpc/rtlmem.s - powerpc/rtlswap.s - powerpc/thread.c) -endif(ARCH MATCHES i386) + list(APPEND SOURCE + powerpc/debug.c + powerpc/except.c + powerpc/interlocked.c + powerpc/rtlmem.s + powerpc/rtlswap.s + powerpc/thread.c) +endif() add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE}) add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) add_dependencies(rtl psdk asm) - Modified: branches/cmake-bringup/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/sdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -7,4 +7,4 @@ add_subdirectory(scrnsave) add_subdirectory(strmiids) add_subdirectory(uuid) -add_subdirectory(wdmguid) +add_subdirectory(wdmguid) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -280,139 +280,139 @@ wine/undname.c) if(NOT ARCH MATCHES arm) -list(APPEND CRT_SOURCE - except/${ARCH}/seh.s) + list(APPEND CRT_SOURCE + except/${ARCH}/seh.s) endif() if(ARCH MATCHES i386) -list(APPEND CRT_SOURCE - except/i386/chkstk_asm.s - except/i386/prolog.s - except/i386/unwind.c - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - setjmp/i386/setjmp.s) + list(APPEND CRT_SOURCE + except/i386/chkstk_asm.s + except/i386/prolog.s + except/i386/unwind.c + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c + setjmp/i386/setjmp.s) elseif(ARCH MATCHES amd64) -list(APPEND CRT_SOURCE - except/amd64/chkstk_asm.s - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - setjmp/amd64/setjmp.s) + list(APPEND CRT_SOURCE + except/amd64/chkstk_asm.s + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c + setjmp/amd64/setjmp.s) endif() if(ARCH MATCHES i386) -list(APPEND CRT_SOURCE - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/ceilf.S - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/floorf.S - math/i386/ftol_asm.s - math/i386/log_asm.s - math/i386/log10_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - math/i386/atan2_asm.s - math/i386/ci.c - math/i386/exp_asm.s - math/i386/fmod_asm.s - math/i386/fmodf_asm.s - math/i386/ldexp.c - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - misc/i386/readcr4.S - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) + list(APPEND CRT_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/ceilf.S + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/floorf.S + math/i386/ftol_asm.s + math/i386/log_asm.s + math/i386/log10_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/atan2_asm.s + math/i386/ci.c + math/i386/exp_asm.s + math/i386/fmod_asm.s + math/i386/fmodf_asm.s + math/i386/ldexp.c + mem/i386/memchr_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + misc/i386/readcr4.S + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) else() -list(APPEND CRT_SOURCE - math/stubs.c - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) + list(APPEND CRT_SOURCE + math/stubs.c + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) endif() if(ARCH MATCHES amd64) -list(APPEND CRT_SOURCE - math/cos.c - math/sin.c - math/amd64/alldiv.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/ceilf.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/floorf.S - math/amd64/fmod.S - math/amd64/fmodf.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/sqrtf.S - math/amd64/tan.S) + list(APPEND CRT_SOURCE + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/ceilf.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/floorf.S + math/amd64/fmod.S + math/amd64/fmodf.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/sqrtf.S + math/amd64/tan.S) endif() add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) @@ -471,109 +471,109 @@ wstring/wcsstr.c) if(NOT ARCH MATCHES arm) -list(APPEND LIBCNTPR_SOURCE - except/${ARCH}/chkstk_asm.s - except/${ARCH}/seh.s - setjmp/${ARCH}/setjmp.s) + list(APPEND LIBCNTPR_SOURCE + except/${ARCH}/chkstk_asm.s + except/${ARCH}/seh.s + setjmp/${ARCH}/setjmp.s) endif() if(ARCH MATCHES i386) -list(APPEND LIBCNTPR_SOURCE - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/ftol_asm.s - math/i386/ftol2_asm.s - math/i386/log_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - math/i386/ci.c - misc/i386/readcr4.S) + list(APPEND LIBCNTPR_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/ftol_asm.s + math/i386/ftol2_asm.s + math/i386/log_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/ci.c + misc/i386/readcr4.S) elseif(ARCH MATCHES amd64) -list(APPEND LIBCNTPR_SOURCE - math/cos.c - math/sin.c - math/amd64/alldiv.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/fmod.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/tan.S) + list(APPEND LIBCNTPR_SOURCE + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/fmod.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/tan.S) endif() if(ARCH MATCHES i386) -list(APPEND LIBCNTPR_SOURCE - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) + list(APPEND LIBCNTPR_SOURCE + mem/i386/memchr_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) else() -list(APPEND LIBCNTPR_SOURCE - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) + list(APPEND LIBCNTPR_SOURCE + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) @@ -582,11 +582,11 @@ if(MSVC) # This is a temporary solution until we have proper crt libs -list(APPEND MSVCSUP_SOURCE - misc/fltused.c - except/i386/chkstk_asm.s - math/i386/ftol2_asm.S) - -add_library(msvcsup ${MSVCSUP_SOURCE}) -add_dependencies(msvcsup psdk buildno_header asm) -endif() + list(APPEND MSVCSUP_SOURCE + misc/fltused.c + except/i386/chkstk_asm.s + math/i386/ftol2_asm.S) + + add_library(msvcsup ${MSVCSUP_SOURCE}) + add_dependencies(msvcsup psdk buildno_header asm) +endif() Modified: branches/cmake-bringup/lib/smlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,3 +1,4 @@ + add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) Modified: branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,18 +1,16 @@ -include_directories(include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_executable(csrss csrss.c csrss.rc) set_module_type(csrss nativecui) - target_link_libraries(csrss nt) - add_importlibs(csrss ntdll csrsrv) - add_dependencies(csrss psdk bugcodes) +add_cab_target(csrss 1) add_subdirectory(csrsrv) add_subdirectory(win32csr) -add_cab_target(csrss 1) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -173,7 +173,7 @@ list(APPEND SOURCE dib/dib24bppc.c dib/dib32bppc.c) -endif(ARCH MATCHES i386) +endif() add_library(win32k SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch @@ -192,4 +192,3 @@ add_dependencies(win32k gendib_generated subsystem_napi) add_cab_target(win32k 1) add_importlib_target(win32k.spec win32k.sys) - Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011 @@ -1,6 +1,6 @@ + add_library(xml xml.cpp) -add_executable(bin2c bin2c.c) #add_executable(pefixup pefixup.c) add_subdirectory(buildno) @@ -12,12 +12,8 @@ add_subdirectory(nci) add_subdirectory(spec2def) add_subdirectory(unicode) + if(NOT MSVC) -#add_subdirectory(rsym) add_subdirectory(wpp) -#add_subdirectory(wmc) add_subdirectory(widl) -#add_subdirectory(wrc) -#add_subdirectory(log2lines) endif() -

1 0

[tkreuzer] 50307: [WIN32K] - Use if, instead of switch to handle flags in XFORMOBJ_bXformFixPoints - Define XFORMOBJ to EXFORMOBJ, a stack object that links to the matrix - There is no spoon.
by tkreuzer＠svn.reactos.org 06 Jan '11

06 Jan '11

Author: tkreuzer Date: Thu Jan 6 22:00:26 2011 New Revision: 50307 URL: http://svn.reactos.org/svn/reactos?rev=50307&view=rev Log: [WIN32K] - Use if, instead of switch to handle flags in XFORMOBJ_bXformFixPoints - Define XFORMOBJ to EXFORMOBJ, a stack object that links to the matrix - There is no spoon. Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/subsystems/win32/win32k/include/xformobj.h trunk/reactos/subsystems/win32/win32k/objects/xformobj.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c trunk/reactos/subsystems/win32/win32k/win32k.pspec Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -1,13 +1,80 @@ #pragma once #include <include/dc.h> +#include <include/xformobj.h> -#define IntDPtoLP(dc, pp, c) XFORMOBJ_bApplyXform((XFORMOBJ*)&(dc)->dclevel.mxDeviceToWorld, XF_LTOL, c, pp, pp); -#define IntLPtoDP(dc, pp, c) XFORMOBJ_bApplyXform((XFORMOBJ*)&(dc)->dclevel.mxWorldToDevice, XF_LTOL, c, pp, pp); -#define CoordDPtoLP(dc, pp) XFORMOBJ_bApplyXform((XFORMOBJ*)&(dc)->dclevel.mxDeviceToWorld, XF_LTOL, 1, pp, pp); -#define CoordLPtoDP(dc, pp) XFORMOBJ_bApplyXform((XFORMOBJ*)&(dc)->dclevel.mxWorldToDevice, XF_LTOL, 1, pp, pp); -#define XForm2MatrixS(m, x) XFORMOBJ_iSetXform((XFORMOBJ*)m, (XFORML*)x) -#define MatrixS2XForm(x, m) XFORMOBJ_iGetXform((XFORMOBJ*)m, (XFORML*)x) +#define IntLPtoDP(pdc, ppt, count) DC_vXformWorldToDevice(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define CoordLPtoDP(pdc, ppt) DC_vXformWorldToDevice(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define IntDPtoLP(pdc, ppt, count) DC_vXformDeviceToWorld(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define CoordDPtoLP(pdc, ppt) DC_vXformDeviceToWorld(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); + +#define XForm2MatrixS(m, x) XFormToMatrix(m, (XFORML*)x) +#define MatrixS2XForm(x, m) MatrixToXForm((XFORML*)x, m) + +FORCEINLINE +void +XFormToMatrix( + MATRIX *pmx, + const XFORML *pxform) +{ + XFORMOBJ xo; + XFORMOBJ_vInit(&xo, pmx); + XFORMOBJ_iSetXform(&xo, pxform); +} + +FORCEINLINE +void +MatrixToXForm( + XFORML *pxform, + const MATRIX *pmx) +{ + XFORMOBJ xo; + XFORMOBJ_vInit(&xo, (MATRIX*)pmx); + XFORMOBJ_iGetXform(&xo, pxform); +} + +FORCEINLINE +void +InvertXform( + XFORML *pxformDest, + const XFORML *pxformSource) +{ + XFORMOBJ xo; + MATRIX mx; + + XFORMOBJ_vInit(&xo, &mx); + XFORMOBJ_iSetXform(&xo, pxformSource); + XFORMOBJ_iInverse(&xo, &xo); + XFORMOBJ_iGetXform(&xo, pxformDest); +} + +FORCEINLINE +void +DC_vXformDeviceToWorld( + IN PDC pdc, + IN ULONG cNumPoints, + IN PPOINTL pptlDest, + IN PPOINTL pptlSource) +{ + XFORMOBJ xo; + + XFORMOBJ_vInit(&xo, &pdc->dclevel.mxDeviceToWorld); + XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); +} + +FORCEINLINE +void +DC_vXformWorldToDevice( + IN PDC pdc, + IN ULONG cNumPoints, + IN PPOINTL pptlDest, + IN PPOINTL pptlSource) +{ + XFORMOBJ xo; + + XFORMOBJ_vInit(&xo, &pdc->dclevel.mxWorldToDevice); + XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); +} int APIENTRY IntGdiSetMapMode(PDC, int); @@ -20,4 +87,4 @@ VOID FASTCALL IntMirrorWindowOrg(PDC); void FASTCALL IntFixIsotropicMapping(PDC); LONG FASTCALL IntCalcFillOrigin(PDC); -PPOINTL FASTCALL IntptlBrushOrigin(PDC pdc,LONG,LONG); +PPOINTL FASTCALL IntptlBrushOrigin(PDC pdc,LONG,LONG); Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -4,6 +4,7 @@ #include <reactos/win32k/ntgdihdl.h> #include "dc.h" #include "math.h" +#include "xformobj.h" #include <ft2build.h> #include FT_FREETYPE_H Modified: trunk/reactos/subsystems/win32/win32k/include/xformobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/xformobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/xformobj.h [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -1,28 +1,76 @@ #pragma once + +typedef struct _EXFORMOBJ +{ + MATRIX *pmx; +} EXFORMOBJ; + +#define XFORMOBJ EXFORMOBJ +#define XFORMOBJ_iGetXform EXFORMOBJ_iGetXform +#define XFORMOBJ_iGetFloatObjXform EXFORMOBJ_iGetFloatObjXform +#define XFORMOBJ_bApplyXform EXFORMOBJ_bApplyXform +#define XFORMOBJ_vInit EXFORMOBJ_vInit +#define XFORMOBJ_pmx EXFORMOBJ_pmx +#define XFORMOBJ_iSetXform EXFORMOBJ_iSetXform +#define XFORMOBJ_iCombine EXFORMOBJ_iCombine +#define XFORMOBJ_iCombineXform EXFORMOBJ_iCombineXform +#define XFORMOBJ_iInverse EXFORMOBJ_iInverse + +FORCEINLINE +VOID +XFORMOBJ_vInit( + OUT XFORMOBJ *pxo, + IN MATRIX *pmx) +{ + pxo->pmx = pmx; +} + +FORCEINLINE +MATRIX* +XFORMOBJ_pmx( + IN XFORMOBJ *pxo) +{ + return pxo->pmx; +} ULONG INTERNAL_CALL XFORMOBJ_iSetXform( - OUT XFORMOBJ *pxo, - IN XFORML * pxform); + OUT XFORMOBJ *pxo, + IN const XFORML *pxform); ULONG INTERNAL_CALL XFORMOBJ_iCombine( - IN XFORMOBJ *pxo, - IN XFORMOBJ *pxo1, - IN XFORMOBJ *pxo2); + IN XFORMOBJ *pxo, + IN XFORMOBJ *pxo1, + IN XFORMOBJ *pxo2); ULONG INTERNAL_CALL XFORMOBJ_iCombineXform( - IN XFORMOBJ *pxo, - IN XFORMOBJ *pxo1, - IN XFORML *pxform, - IN BOOL bLeftMultiply); + IN XFORMOBJ *pxo, + IN XFORMOBJ *pxo1, + IN XFORML *pxform, + IN BOOL bLeftMultiply); ULONG INTERNAL_CALL -XFORMOBJ_Inverse( - OUT XFORMOBJ *pxoDst, - IN XFORMOBJ *pxoSrc); +XFORMOBJ_iInverse( + OUT XFORMOBJ *pxoDst, + IN XFORMOBJ *pxoSrc); + +ULONG +APIENTRY +XFORMOBJ_iGetXform( + IN XFORMOBJ *pxo, + OUT XFORML *pxform); + +BOOL +APIENTRY +XFORMOBJ_bApplyXform( + IN XFORMOBJ *pxo, + IN ULONG iMode, + IN ULONG cPoints, + IN PVOID pvIn, + OUT PVOID pvOut); Modified: trunk/reactos/subsystems/win32/win32k/objects/xformobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/xformobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/xformobj.c [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -97,14 +97,14 @@ { switch (flAccel & (MX_NOTRANSLATE | MX_IDENTITYSCALE | MX_SCALE)) { - case (MX_SCALE | MX_IDENTITYSCALE | MX_NOTRANSLATE): - return GX_IDENTITY; - case (MX_SCALE | MX_IDENTITYSCALE): - return GX_OFFSET; - case MX_SCALE: - return GX_SCALE; - default: - return GX_GENERAL; + case (MX_SCALE | MX_IDENTITYSCALE | MX_NOTRANSLATE): + return GX_IDENTITY; + case (MX_SCALE | MX_IDENTITYSCALE): + return GX_OFFSET; + case MX_SCALE: + return GX_SCALE; + default: + return GX_GENERAL; } } @@ -115,7 +115,7 @@ XFORMOBJ_UpdateAccel( IN XFORMOBJ *pxo) { - PMATRIX pmx = (PMATRIX)pxo; + PMATRIX pmx = XFORMOBJ_pmx(pxo); /* Copy Dx and Dy to FIX format */ pmx->fxDx = FLOATOBJ_GetFix(&pmx->efDx); @@ -124,25 +124,25 @@ pmx->flAccel = 0; if (FLOATOBJ_Equal0(&pmx->efDx) && - FLOATOBJ_Equal0(&pmx->efDy)) + FLOATOBJ_Equal0(&pmx->efDy)) { pmx->flAccel |= MX_NOTRANSLATE; } if (FLOATOBJ_Equal0(&pmx->efM12) && - FLOATOBJ_Equal0(&pmx->efM21)) + FLOATOBJ_Equal0(&pmx->efM21)) { pmx->flAccel |= MX_SCALE; } if (FLOATOBJ_Equal1(&pmx->efM11) && - FLOATOBJ_Equal1(&pmx->efM22)) + FLOATOBJ_Equal1(&pmx->efM22)) { pmx->flAccel |= MX_IDENTITYSCALE; } if (FLOATOBJ_IsLong(&pmx->efM11) && FLOATOBJ_IsLong(&pmx->efM12) && - FLOATOBJ_IsLong(&pmx->efM21) && FLOATOBJ_IsLong(&pmx->efM22)) + FLOATOBJ_IsLong(&pmx->efM21) && FLOATOBJ_IsLong(&pmx->efM22)) { pmx->flAccel |= MX_INTEGER; } @@ -155,9 +155,9 @@ INTERNAL_CALL XFORMOBJ_iSetXform( OUT XFORMOBJ *pxo, - IN XFORML * pxform) -{ - PMATRIX pmx = (PMATRIX)pxo; + IN const XFORML *pxform) +{ + PMATRIX pmx = XFORMOBJ_pmx(pxo); /* Check parameters */ if (!pxo || !pxform) @@ -195,9 +195,9 @@ MATRIX mx; PMATRIX pmx, pmx1, pmx2; - pmx = (PMATRIX)pxo; - pmx1 = (PMATRIX)pxo1; - pmx2 = (PMATRIX)pxo2; + pmx = XFORMOBJ_pmx(pxo); + pmx1 =XFORMOBJ_pmx(pxo1); + pmx2 = XFORMOBJ_pmx(pxo2); /* Do a 3 x 3 matrix multiplication with mx as destinantion */ MulAdd(&mx.efM11, &pmx1->efM11, &pmx2->efM11, &pmx1->efM12, &pmx2->efM21); @@ -226,17 +226,18 @@ IN BOOL bLeftMultiply) { MATRIX mx; - XFORMOBJ *pxo2 = (XFORMOBJ*)&mx; - - XFORMOBJ_iSetXform(pxo2, pxform); + XFORMOBJ xo2; + + XFORMOBJ_vInit(&xo2, &mx); + XFORMOBJ_iSetXform(&xo2, pxform); if (bLeftMultiply) { - return XFORMOBJ_iCombine(pxo, pxo2, pxo1); + return XFORMOBJ_iCombine(pxo, &xo2, pxo1); } else { - return XFORMOBJ_iCombine(pxo, pxo1, pxo2); + return XFORMOBJ_iCombine(pxo, pxo1, &xo2); } } @@ -246,15 +247,15 @@ */ ULONG INTERNAL_CALL -XFORMOBJ_Inverse( +XFORMOBJ_iInverse( OUT XFORMOBJ *pxoDst, IN XFORMOBJ *pxoSrc) { PMATRIX pmxDst, pmxSrc; FLOATOBJ foDet; - pmxDst = (PMATRIX)pxoDst; - pmxSrc = (PMATRIX)pxoSrc; + pmxDst = XFORMOBJ_pmx(pxoDst); + pmxSrc = XFORMOBJ_pmx(pxoSrc); /* det = M11 * M22 - M12 * M21 */ MulSub(&foDet, &pmxSrc->efM11, &pmxSrc->efM22, &pmxSrc->efM12, &pmxSrc->efM21); @@ -296,56 +297,57 @@ FLOATOBJ fo1, fo2; FLONG flAccel; - pmx = (PMATRIX)pxo; - flAccel = pmx->flAccel & (MX_INTEGER|MX_SCALE|MX_IDENTITYSCALE); - - switch (flAccel) - { - case (MX_SCALE | MX_IDENTITYSCALE): - case (MX_SCALE | MX_IDENTITYSCALE | MX_INTEGER): + pmx = XFORMOBJ_pmx(pxo); + flAccel = pmx->flAccel; + + if ((flAccel & (MX_SCALE|MX_IDENTITYSCALE)) == (MX_SCALE|MX_IDENTITYSCALE)) + { /* Identity transformation, nothing todo */ - break; - - case (MX_IDENTITYSCALE | MX_INTEGER): - /* 1-scale integer transform */ - i = cPoints - 1; - do - { - LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); - pptOut[i].y = y; - pptOut[i].x = x; - } - while (--i >= 0); - break; - - case (MX_SCALE | MX_INTEGER): - /* Diagonal integer transform */ - i = cPoints - 1; - do - { - pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); - } - while (--i >= 0); - break; - - case (MX_INTEGER): - /* Full integer transform */ - i = cPoints - 1; - do - { - LONG x; - x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); - pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); - pptOut[i].x = x; - } - while (--i >= 0); - break; - - case (MX_IDENTITYSCALE): + } + else if (flAccel & MX_INTEGER) + { + if (flAccel & MX_IDENTITYSCALE) + { + /* 1-scale integer transform */ + i = cPoints - 1; + do + { + LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); + LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + pptOut[i].y = y; + pptOut[i].x = x; + } + while (--i >= 0); + } + else if (flAccel & MX_SCALE) + { + /* Diagonal integer transform */ + i = cPoints - 1; + do + { + pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); + pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); + } + while (--i >= 0); + } + else + { + /* Full integer transform */ + i = cPoints - 1; + do + { + LONG x; + x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); + x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); + pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); + pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + pptOut[i].x = x; + } + while (--i >= 0); + } + } + else if (flAccel & MX_IDENTITYSCALE) + { /* 1-scale transform */ i = cPoints - 1; do @@ -358,9 +360,9 @@ pptOut[i].y = pptIn[i].y + FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; - - case (MX_SCALE): + } + else if (flAccel & MX_SCALE) + { /* Diagonal float transform */ i = cPoints - 1; do @@ -373,9 +375,9 @@ pptOut[i].y = FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; - - default: + } + else + { /* Full float transform */ i = cPoints - 1; do @@ -386,7 +388,6 @@ pptOut[i].y = FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; } if (!(pmx->flAccel & MX_NOTRANSLATE)) @@ -414,7 +415,7 @@ IN XFORMOBJ *pxo, OUT XFORML *pxform) { - PMATRIX pmx = (PMATRIX)pxo; + PMATRIX pmx = XFORMOBJ_pmx(pxo); /* Check parameters */ if (!pxo || !pxform) @@ -442,7 +443,7 @@ IN XFORMOBJ *pxo, OUT FLOATOBJ_XFORM *pxfo) { - PMATRIX pmx = (PMATRIX)pxo; + PMATRIX pmx = XFORMOBJ_pmx(pxo); /* Check parameters */ if (!pxo || !pxfo) @@ -467,13 +468,14 @@ BOOL APIENTRY XFORMOBJ_bApplyXform( - IN XFORMOBJ *pxo, - IN ULONG iMode, - IN ULONG cPoints, - IN PVOID pvIn, - OUT PVOID pvOut) + IN XFORMOBJ *pxo, + IN ULONG iMode, + IN ULONG cPoints, + IN PVOID pvIn, + OUT PVOID pvOut) { MATRIX mx; + XFORMOBJ xoInv; POINTL *pptl; INT i; @@ -486,13 +488,12 @@ /* Use inverse xform? */ if (iMode == XF_INV_FXTOL || iMode == XF_INV_LTOL) { - ULONG ret; - ret = XFORMOBJ_Inverse((XFORMOBJ*)&mx, pxo); - if (ret == DDI_ERROR) + XFORMOBJ_vInit(&xoInv, &mx); + if (XFORMOBJ_iInverse(&xoInv, pxo) == DDI_ERROR) { return FALSE; } - pxo = (XFORMOBJ*)&mx; + pxo = &xoInv; } /* Convert POINTL to POINTFIX? */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -3,6 +3,7 @@ */ #include <win32k.h> +#undef XFORMOBJ #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) Modified: trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -1,4 +1,5 @@ #include <win32k.h> +#undef XFORMOBJ #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) Modified: trunk/reactos/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] Thu Jan 6 22:00:26 2011 @@ -214,9 +214,9 @@ @ stdcall WNDOBJ_bEnum(ptr long ptr) @ stdcall WNDOBJ_cEnumStart(ptr long long long) @ stdcall WNDOBJ_vSetConsumer(ptr ptr) -@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) -@ stdcall XFORMOBJ_iGetFloatObjXform(ptr ptr) -@ stdcall XFORMOBJ_iGetXform(ptr ptr) +@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) EXFORMOBJ_bApplyXform +@ stdcall XFORMOBJ_iGetFloatObjXform(ptr ptr) EXFORMOBJ_iGetFloatObjXform +@ stdcall XFORMOBJ_iGetXform(ptr ptr) EXFORMOBJ_iGetXform @ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) @ stdcall XLATEOBJ_hGetColorTransform(ptr) @ stdcall XLATEOBJ_iXlate(ptr long)

1 0

[jgardou] 50306: [APITESTS:GDI32] Add missing \n
by jgardou＠svn.reactos.org 06 Jan '11

06 Jan '11

Author: jgardou Date: Thu Jan 6 19:03:09 2011 New Revision: 50306 URL: http://svn.reactos.org/svn/reactos?rev=50306&view=rev Log: [APITESTS:GDI32] Add missing \n Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] Thu Jan 6 19:03:09 2011 @@ -29,7 +29,7 @@ SetLastError(_SEH2_GetExceptionCode()); } _SEH2_END - ok(result == -1, "AddFontResourceExW should throw an exception!, result == %d", result); + ok(result == -1, "AddFontResourceExW should throw an exception!, result == %d\n", result); ok(GetLastError() == 0xc0000005, "GetLastError()==%lx\n", GetLastError()); /* Test "" filename */

1 0

[akhaldi] 50305: [CMAKE] - Restructure hal build.
by akhaldi＠svn.reactos.org 06 Jan '11

06 Jan '11

Author: akhaldi Date: Thu Jan 6 18:59:49 2011 New Revision: 50305 URL: http://svn.reactos.org/svn/reactos?rev=50305&view=rev Log: [CMAKE] - Restructure hal build. Added: branches/cmake-bringup/hal/halx86/CMakeLists.txt (with props) Modified: branches/cmake-bringup/hal/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Thu Jan 6 18:59:49 2011 @@ -1,110 +1,8 @@ -spec2def(hal.dll hal.spec) - -if(ARCH MATCHES i386) - -add_definitions( - -D_NTHALDLL_ - -D_NTHAL_) - -include_directories( - halx86/include - ${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -list(APPEND HAL_GENERIC_SOURCE - halx86/generic/beep.c - halx86/generic/cmos.c - halx86/generic/display.c - halx86/generic/dma.c - halx86/generic/drive.c - halx86/generic/memory.c - halx86/generic/misc.c - halx86/generic/profil.c - halx86/generic/reboot.c - halx86/generic/sysinfo.c - halx86/generic/timer.c - halx86/generic/usage.c) - -list(APPEND HAL_GENERIC_SOURCE - halx86/generic/bios.c - halx86/generic/halinit.c - halx86/generic/i386/portio.c - halx86/generic/i386/systimer.S - halx86/generic/i386/trap.S) - -list(APPEND HAL_GENERIC_PCAT_SOURCE - halx86/generic/legacy/bus/bushndlr.c - halx86/generic/legacy/bus/cmosbus.c - halx86/generic/legacy/bus/isabus.c - halx86/generic/legacy/bus/pcibus.c - halx86/generic/legacy/bus/pcidata.c - halx86/generic/legacy/bus/sysbus.c - halx86/generic/legacy/bussupp.c - halx86/generic/legacy/halpcat.c) - -list(APPEND HAL_GENERIC_UP_SOURCE - halx86/generic/spinlock.c - halx86/up/pic.c - halx86/up/processor.c) - -list(APPEND HAL_SOURCE - ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch - ${HAL_GENERIC_SOURCE} - ${HAL_GENERIC_PCAT_SOURCE} - ${HAL_GENERIC_UP_SOURCE} - halx86/up/halinit_up.c - halx86/up/halup.rc - ${CMAKE_CURRENT_BINARY_DIR}/hal.def) - -add_library(hal SHARED ${HAL_SOURCE}) -add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) -add_dependencies(hal psdk bugcodes) - -set_entrypoint(hal HalInitSystem@8) -set_subsystem(hal native) -set_image_base(hal 0x00010000) - -add_importlibs(hal ntoskrnl) - -target_link_libraries(hal libcntpr) - -list(APPEND MINI_HAL_SOURCE - halx86/generic/legacy/bus/bushndlr.c - halx86/generic/legacy/bus/cmosbus.c - halx86/generic/legacy/bus/isabus.c - halx86/generic/legacy/bus/pcibus.c - halx86/generic/legacy/bus/sysbus.c - halx86/generic/legacy/bussupp.c - halx86/generic/beep.c - halx86/generic/bios.c - halx86/generic/cmos.c - halx86/generic/dma.c - halx86/generic/display.c - halx86/generic/drive.c - halx86/generic/misc.c - halx86/generic/profil.c - halx86/generic/reboot.c - halx86/generic/spinlock.c - halx86/generic/sysinfo.c - halx86/generic/timer.c - halx86/generic/usage.c - halx86/up/halinit_up.c - halx86/up/pic.c - halx86/up/processor.c) - -if(ARCH MATCHES i386) -list(APPEND MINI_HAL_SOURCE - halx86/generic/i386/portio.c - halx86/generic/i386/systimer.S) -endif(ARCH MATCHES i386) - -add_library(mini_hal ${MINI_HAL_SOURCE}) -set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") -add_dependencies(mini_hal psdk bugcodes asm) -add_minicd_target(hal reactos hal.dll) -add_livecd_target(hal reactos/system32) -else() -#TBD -endif(ARCH MATCHES i386) - -add_importlib_target(hal.spec) +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) + add_subdirectory(halx86) +elseif(ARCH MATCHES arm) +# add_subdirectory(halarm) +elseif(ARCH MATCHES powerpc) +# add_subdirectory(halppc) +endif() Added: branches/cmake-bringup/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/CMakeL… ============================================================================== --- branches/cmake-bringup/hal/halx86/CMakeLists.txt (added) +++ branches/cmake-bringup/hal/halx86/CMakeLists.txt [iso-8859-1] Thu Jan 6 18:59:49 2011 @@ -1,0 +1,116 @@ + +add_definitions( + -D_NTHALDLL_ + -D_NTHAL_) + +include_directories( + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +list(APPEND HAL_GENERIC_SOURCE + generic/beep.c + generic/cmos.c + generic/display.c + generic/dma.c + generic/drive.c + generic/memory.c + generic/misc.c + generic/profil.c + generic/reboot.c + generic/sysinfo.c + generic/timer.c + generic/usage.c) + +if(ARCH MATCHES i386) + list(APPEND HAL_GENERIC_SOURCE + generic/bios.c + generic/halinit.c + generic/i386/portio.c + generic/i386/systimer.S + generic/i386/trap.S) +endif() + +list(APPEND HAL_GENERIC_PCAT_SOURCE + generic/legacy/bus/bushndlr.c + generic/legacy/bus/cmosbus.c + generic/legacy/bus/isabus.c + generic/legacy/bus/pcibus.c + generic/legacy/bus/pcidata.c + generic/legacy/bus/sysbus.c + generic/legacy/bussupp.c + generic/legacy/halpcat.c) + +list(APPEND HAL_GENERIC_ACPI_SOURCE + generic/acpi/halacpi.c + generic/acpi/halpnpdd.c + generic/acpi/busemul.c + generic/legacy/bus/pcibus.c) + +if(ARCH MATCHES i386) + + list(APPEND HAL_GENERIC_UP_SOURCE + generic/spinlock.c + up/pic.c + up/processor.c) + + list(APPEND MINI_HAL_SOURCE + generic/i386/portio.c + generic/i386/systimer.S + generic/legacy/bus/bushndlr.c + generic/legacy/bus/cmosbus.c + generic/legacy/bus/isabus.c + generic/legacy/bus/pcibus.c + generic/legacy/bus/sysbus.c + generic/legacy/bussupp.c + generic/beep.c + generic/bios.c + generic/cmos.c + generic/dma.c + generic/display.c + generic/drive.c + generic/misc.c + generic/profil.c + generic/reboot.c + generic/spinlock.c + generic/sysinfo.c + generic/timer.c + generic/usage.c + up/halinit_up.c + up/pic.c + up/processor.c) + + spec2def(hal.dll ../hal.spec) + + list(APPEND HAL_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch + ${HAL_GENERIC_SOURCE} + ${HAL_GENERIC_PCAT_SOURCE} + ${HAL_GENERIC_UP_SOURCE} + up/halinit_up.c + up/halup.rc + ${CMAKE_CURRENT_BINARY_DIR}/hal.def) + + # hal + add_library(hal SHARED ${HAL_SOURCE}) + add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h ${HAL_SOURCE}) + add_dependencies(hal psdk bugcodes) + + set_entrypoint(hal HalInitSystem@8) + set_subsystem(hal native) + set_image_base(hal 0x00010000) + add_importlibs(hal ntoskrnl) + target_link_libraries(hal libcntpr) + + add_minicd_target(hal reactos hal.dll) + add_livecd_target(hal reactos/system32) + + # mini_hal + add_library(mini_hal ${MINI_HAL_SOURCE}) + set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") + add_dependencies(mini_hal psdk bugcodes asm) + +elseif(ARCH MATCHES amd64) +#TBD +endif() + +add_importlib_target(../hal.spec) Propchange: branches/cmake-bringup/hal/halx86/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 50304: [usb/usbehci]: - EhciDefferedRoutine: Only free Mdl if one was created when the request was added to the queue. - Dont assume that three transfer descriptors need to be freed, use...
by mjmartin＠svn.reactos.org 06 Jan '11

06 Jan '11

Author: mjmartin Date: Thu Jan 6 18:45:18 2011 New Revision: 50304 URL: http://svn.reactos.org/svn/reactos?rev=50304&view=rev Log: [usb/usbehci]: - EhciDefferedRoutine: Only free Mdl if one was created when the request was added to the queue. - Dont assume that three transfer descriptors need to be freed, use a while moving to each linked and free instead. - Yabba Dabba Doo added to increase size of message. :) Modified: trunk/reactos/drivers/usb/usbehci/fdo.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Thu Jan 6 18:45:18 2011 @@ -46,12 +46,12 @@ DPRINT("Asyn Complete!\n"); ULONG CurrentAddr, OffSet; PQUEUE_HEAD CompletedQH, NextQH; - PQUEUE_TRANSFER_DESCRIPTOR CompletedTD; + PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD; - /* AsyncListAddr Register will have the next QueueHead to execute */ + /* AsyncListAddr Register will have the next QueueHead to execute */ CurrentAddr = GetAsyncListQueueRegister(hcd); - /* Calculate the VA for the next QueueHead */ + /* Calculate the VA for the next QueueHead */ OffSet = CurrentAddr - (ULONG)FdoDeviceExtension->hcd.CommonBufferPA.LowPart; NextQH = (PQUEUE_HEAD)((ULONG)FdoDeviceExtension->hcd.CommonBufferVA + OffSet); @@ -62,16 +62,15 @@ //DumpQueueHead(CompletedQH); - /* Free memory for the Descriptors */ + /* Free memory for the Descriptors */ CompletedTD = CompletedQH->TransferDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); - CompletedTD = CompletedTD->NextDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); - CompletedTD = CompletedTD->NextDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); + NextTD = CompletedTD; + while (NextTD) + { + CompletedTD = NextTD; + NextTD = NextTD->NextDescriptor; + FreeDescriptor(CompletedTD); + } /* If the Event is set then release waiter */ if (CompletedQH->Event) @@ -79,27 +78,25 @@ KeSetEvent(CompletedQH->Event, IO_NO_INCREMENT, FALSE); } - /* Free the Mdl */ - ASSERT(CompletedQH->MdlToFree); - IoFreeMdl(CompletedQH->MdlToFree); + /* Free the Mdl if there was one */ + if(CompletedQH->MdlToFree) + IoFreeMdl(CompletedQH->MdlToFree); /* Is there an IRP that needs to be completed */ if (CompletedQH->IrpToComplete) { - PIRP Irp; - + PIRP Irp; + PIO_STACK_LOCATION Stack; + PURB Urb; + Irp = CompletedQH->IrpToComplete; + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + Urb = (PURB) Stack->Parameters.Others.Argument1; /* Check for error */ if (CStatus & EHCI_ERROR_INT) { - PIO_STACK_LOCATION Stack; - PURB Urb; - - Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(Stack); - Urb = (PURB) Stack->Parameters.Others.Argument1; - ASSERT(FALSE); /* Haled bit should be set */ if (CompletedQH->Token.Bits.Halted) {

1 0

[mjmartin] 50303: [usb/usbehci]: - Implement URB_FUNCTION_SELECT_INTERFACE. - Add missing IoMarkIrpPending before calling SubmitControlRequest. - Now use BuildSetupPacketFromURB for creating the Ct...
by mjmartin＠svn.reactos.org 06 Jan '11

06 Jan '11

Author: mjmartin Date: Thu Jan 6 18:29:52 2011 New Revision: 50303 URL: http://svn.reactos.org/svn/reactos?rev=50303&view=rev Log: [usb/usbehci]: - Implement URB_FUNCTION_SELECT_INTERFACE. - Add missing IoMarkIrpPending before calling SubmitControlRequest. - Now use BuildSetupPacketFromURB for creating the CtrlSetup data structure. - When selecting configuration, make the ConfigurationHandle from the related UsbDevice instead of always the RootHub device. - Fix typo that caused all pipes to be marked as interrupt type. - Change CompletePendingURBRequest to only complete one SCE request Irp. Modified: trunk/reactos/drivers/usb/usbehci/irp.c Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Thu Jan 6 18:29:52 2011 @@ -139,20 +139,21 @@ } } else - DPRINT("Interrupt Transfer not for hub\n"); + DPRINT1("Interrupt Transfer not for hub\n"); break; } case URB_FUNCTION_GET_STATUS_FROM_DEVICE: { DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); - if (Urb->UrbControlGetStatusRequest.Index == 0) + /* If for the hub device */ + if ((Urb->UrbControlGetStatusRequest.Index == 0) && (UsbDevice == PdoDeviceExtension->UsbDevices[0])) { ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); - *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE; + *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT /*| USB_PORT_STATUS_ENABLE*/; } else { - DPRINT1("Uknown identifier\n"); + DPRINT1("UsbDeviceHandle %x, Index %x not implemented yet\n", UsbDevice, Urb->UrbControlGetStatusRequest.Index); Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; Status = STATUS_UNSUCCESSFUL; } @@ -189,15 +190,14 @@ ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer != NULL); - DPRINT("Calling BuildSetUpPacketFromUrb\n"); BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); - DPRINT("SubmitControlTransfer\n"); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, Irp); - break; } case USB_CONFIGURATION_DESCRIPTOR_TYPE: @@ -267,24 +267,15 @@ if (Urb->UrbControlDescriptorRequest.Index == 0) DPRINT1("Requesting LANGID's\n"); - CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; - CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; - CtrlSetup.bmRequestType._BM.Reserved = 0; - CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; - CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; - CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; - CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; - CtrlSetup.wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, Irp); - - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; break; } default: @@ -301,11 +292,11 @@ DPRINT1("Selecting Configuration\n"); DPRINT1("ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); - if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) { - Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&PdoDeviceExtension->UsbDevices[0]->ActiveConfig->ConfigurationDescriptor; - DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + Urb->UrbSelectConfiguration.ConfigurationHandle = &UsbDevice->ActiveConfig->ConfigurationDescriptor; + DPRINT1("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + ASSERT(FALSE); InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; DPRINT1("Length %x\n", InterfaceInfo->Length); @@ -324,7 +315,7 @@ InterfaceInfo->Pipes[pCount].MaximumPacketSize = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.wMaxPacketSize; InterfaceInfo->Pipes[pCount].EndpointAddress = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bEndpointAddress; InterfaceInfo->Pipes[pCount].Interval = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bInterval; - InterfaceInfo->Pipes[pCount].PipeType = UsbdPipeTypeInterrupt; + InterfaceInfo->Pipes[pCount].PipeType = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bmAttributes; InterfaceInfo->Pipes[pCount].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor; if (InterfaceInfo->Pipes[pCount].MaximumTransferSize == 0) InterfaceInfo->Pipes[pCount].MaximumTransferSize = 4096; @@ -337,7 +328,37 @@ else { /* FIXME: Set device to unconfigured state */ - } + DPRINT1("Setting device to unconfigured state not implemented!\n"); + } + break; + } + case URB_FUNCTION_SELECT_INTERFACE: + { + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PUSBD_INTERFACE_INFORMATION InterfaceInfo; + int i; + + DPRINT1("Select Interface!\n"); + DPRINT1("Config Handle %x\n", Urb->UrbSelectInterface.ConfigurationHandle); + + InterfaceInfo = &Urb->UrbSelectInterface.Interface; + DPRINT1("InterfaceNumber %x\n", InterfaceInfo->InterfaceNumber); + DPRINT1("AlternateSetting %x\n", InterfaceInfo->AlternateSetting); + DPRINT1("NumPipes %x\n", InterfaceInfo->NumberOfPipes); + for (i=0;i<InterfaceInfo->NumberOfPipes;i++) + { + InterfaceInfo->Pipes[i].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor; + } + + BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + SubmitControlTransfer(&FdoDeviceExtension->hcd, + &CtrlSetup, + NULL, + 0, + Irp); break; } case URB_FUNCTION_CLASS_DEVICE: @@ -456,7 +477,7 @@ { case USB_REQUEST_GET_STATUS: { - DPRINT1("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); + DPRINT("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); DPRINT("PortStatus %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); @@ -467,23 +488,21 @@ } case USB_REQUEST_CLEAR_FEATURE: { - DPRINT1("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); switch (Urb->UrbControlVendorClassRequest.Value) { case C_PORT_CONNECTION: - DPRINT1("C_PORT_CONNECTION\n"); + DPRINT("C_PORT_CONNECTION\n"); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; break; case C_PORT_RESET: - DPRINT1("C_PORT_RESET\n"); + DPRINT("C_PORT_RESET\n"); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; break; default: - DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); - break; - } - CompletePendingURBRequest(PdoDeviceExtension); + DPRINT("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + break; + } break; } case USB_REQUEST_SET_FEATURE: @@ -495,18 +514,10 @@ { case PORT_RESET: { - //PWORKITEMDATA WorkItemData; - - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; + DPRINT("Port Reset %d\n", Urb->UrbControlVendorClassRequest.Index-1); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange |= USB_PORT_STATUS_RESET; - + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus &= ~USB_PORT_STATUS_ENABLE; ResetPort(&FdoDeviceExtension->hcd, Urb->UrbControlVendorClassRequest.Index-1); - //WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEMDATA)); - //WorkItemData->Context = PdoDeviceExtension; - //ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)WorkerThread, (PVOID) WorkItemData) - //ExQueueWorkItem(&WorkItemData->WorkItem, DelayedWorkQueue); - //IoMarkIrpPending(Irp); - //Status = STATUS_PENDING; break; } case PORT_ENABLE: @@ -525,7 +536,10 @@ break; } } - CompletePendingURBRequest(PdoDeviceExtension); + + if (!(PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) + CompletePendingURBRequest(PdoDeviceExtension); + break; } case USB_REQUEST_SET_ADDRESS: @@ -577,6 +591,23 @@ } break; } + case URB_FUNCTION_CONTROL_TRANSFER: + { + DPRINT1("URB_FUNCTION_CONTROL_TRANSFER\n"); + DPRINT1("PipeHandle %x\n", Urb->UrbControlTransfer.PipeHandle); + DPRINT1("TransferFlags %x\n", Urb->UrbControlTransfer.TransferFlags); + DPRINT1("TransferLength %x\n", Urb->UrbControlTransfer.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlTransfer.TransferBuffer); + DPRINT1("TransferMDL %x\n", Urb->UrbControlTransfer.TransferBufferMDL); + DPRINT1("SetupPacket %x\n", Urb->UrbControlTransfer.SetupPacket); + ASSERT(FALSE); + break; + } + case URB_FUNCTION_CLASS_INTERFACE: + { + DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + break; + } default: { DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); @@ -586,14 +617,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; - - if (Urb->UrbHeader.Status == USBD_STATUS_SUCCESS) - { - /* Fake a successful Control Transfer */ - Urb->UrbHeader.Function = 0x08; - Urb->UrbHeader.UsbdFlags = 0; - } - return Status; } @@ -606,23 +629,25 @@ KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - while (!IsListEmpty(&DeviceExtension->IrpQueue)) + if (IsListEmpty(&DeviceExtension->IrpQueue)) { - NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); - Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); - - if (!Irp) - { - DPRINT1("No IRP\n"); - break; - } - IoSetCancelRoutine(Irp, NULL); + DPRINT1("There should have been one SCE request pending\n"); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - HandleUrbRequest(DeviceExtension, Irp); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + return; } - + NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); + Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); + + if (!Irp) + { + DPRINT1("No Irp\n"); + return; + } + + IoSetCancelRoutine(Irp, NULL); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + + HandleUrbRequest(DeviceExtension, Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs