Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49788: [WORDPAD] Fix rc syntax (multiline strings with \ at the end). This is to compile with MS reasource compiler, we can hope wine will adopt this, because latest versions of gcc's pr...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 20:19:55 2010 New Revision: 49788 URL: http://svn.reactos.org/svn/reactos?rev=49788&view=rev Log: [WORDPAD] Fix rc syntax (multiline strings with \ at the end). This is to compile with MS reasource compiler, we can hope wine will adopt this, because latest versions of gcc's preprocessor also don't support this anymore. Modified: branches/cmake-bringup/base/applications/wordpad/Da.rc branches/cmake-bringup/base/applications/wordpad/De.rc branches/cmake-bringup/base/applications/wordpad/En.rc branches/cmake-bringup/base/applications/wordpad/Fr.rc branches/cmake-bringup/base/applications/wordpad/It.rc branches/cmake-bringup/base/applications/wordpad/Ja.rc branches/cmake-bringup/base/applications/wordpad/Ko.rc branches/cmake-bringup/base/applications/wordpad/Lt.rc branches/cmake-bringup/base/applications/wordpad/Nl.rc branches/cmake-bringup/base/applications/wordpad/No.rc branches/cmake-bringup/base/applications/wordpad/Pl.rc branches/cmake-bringup/base/applications/wordpad/Pt.rc branches/cmake-bringup/base/applications/wordpad/Ru.rc branches/cmake-bringup/base/applications/wordpad/Si.rc branches/cmake-bringup/base/applications/wordpad/Sv.rc branches/cmake-bringup/base/applications/wordpad/Uk.rc branches/cmake-bringup/base/applications/wordpad/Zh.rc Modified: branches/cmake-bringup/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Da.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "Gemme Ã¦ndringer i Â«%sÂ»?" STRING_SEARCH_FINISHED, "FÃ¦rdig med at sÃ¸ge i dokumentet." STRING_LOAD_RICHED_FAILED, "Kunne ikke indlÃ¦se RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som " \ - "vil medfÃ¸re at al formatering gÃ¥r tabt. Er du " \ - "sikker pÃ¥ at du vil fortsÃ¦tte?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som vil medfÃ¸re at al formatering gÃ¥r tabt. Er du sikker pÃ¥ at du vil fortsÃ¦tte?" STRING_INVALID_NUMBER, "Ugyldigt talformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understÃ¸ttet" STRING_WRITE_FAILED, "Kunne ikke gemme filen." Modified: branches/cmake-bringup/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/De.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ãnderungen an '%s' speichern?" STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." - STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ - "Dadurch geht die Formatierung verloren. " \ - "MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" + STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. Dadurch geht die Formatierung verloren. MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" STRING_INVALID_NUMBER, "Diese MaÃeinheit ist nicht zulÃ¤ssig." STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstÃ¼tzt." STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden." Modified: branches/cmake-bringup/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/En.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -251,9 +251,7 @@ STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_SEARCH_FINISHED, "Finished searching the document." STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" + STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, which will cause all formatting to be lost. Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Could not save the file." Modified: branches/cmake-bringup/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Fr.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -263,9 +263,7 @@ STRING_PROMPT_SAVE_CHANGES, "Enregistrer les modifications de Â«Â %sÂ Â»Â ?" STRING_SEARCH_FINISHED, "Recherche terminÃ©e dans le document." STRING_LOAD_RICHED_FAILED, "Impossible de charger la bibliothÃ¨que RichEdit." - STRING_SAVE_LOSEFORMATTING, "Vous avez choisi d'enregistrer en texte simple, " \ - "ce qui causera la perte de tout formattage. " \ - "Voulez-vous vraiment continuerÂ ?" + STRING_SAVE_LOSEFORMATTING, "Vous avez choisi d'enregistrer en texte simple, ce qui causera la perte de tout formattage. Voulez-vous vraiment continuerÂ ?" STRING_INVALID_NUMBER, "Format de nombre invalide" STRING_OLE_STORAGE_NOT_SUPPORTED, "Les documents conteneur OLE ne sont pas supportÃ©s" STRING_WRITE_FAILED, "Impossible d'enregistrer le fichier." Modified: branches/cmake-bringup/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/It.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -255,9 +255,7 @@ STRING_PROMPT_SAVE_CHANGES, "Salva i cambiamenti su '%s'?" STRING_SEARCH_FINISHED, "Finita la ricerca sul documento." STRING_LOAD_RICHED_FAILED, "Impossibile caricare la libreria RichEdit." - STRING_SAVE_LOSEFORMATTING, "Hai scelto di salvare nel formato Testo semplice, " \ - "che causerÃ la perdita di tutta la formattazione. " \ - "Sei sicuro?" + STRING_SAVE_LOSEFORMATTING, "Hai scelto di salvare nel formato Testo semplice, che causerÃ la perdita di tutta la formattazione. Sei sicuro?" STRING_INVALID_NUMBER, "Numero di formato non valido" STRING_OLE_STORAGE_NOT_SUPPORTED, "I documenti di storage OLE non sono supportati" STRING_WRITE_FAILED, "Impossibile salvare il file." Modified: branches/cmake-bringup/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -254,9 +254,7 @@ STRING_PROMPT_SAVE_CHANGES, "'%s'ã¸ã®å¤æ´ãä¿åãã¾ãã?" STRING_SEARCH_FINISHED, "ææ¸ã®æ¤ç´¢ãå®äºã" STRING_LOAD_RICHED_FAILED, "RichEditã©ã¤ãã©ãªã®èªã¿è¾¼ã¿ã«å¤±æã" - STRING_SAVE_LOSEFORMATTING, "ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ä¿åããã¨ã" \ - "ãã¹ã¦ã®æ¸å¼ãå¤±ããã¾ãã" \ - "ããã§ãããã§ããï¼" + STRING_SAVE_LOSEFORMATTING, "ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ä¿åããã¨ããã¹ã¦ã®æ¸å¼ãå¤±ããã¾ããããã§ãããã§ããï¼" STRING_INVALID_NUMBER, "æ°ã®æ¸å¼ãä¸æ£" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLEã¹ãã¬ã¼ã¸ææ¸ã¯ãµãã¼ãããã¦ãã¾ããã" STRING_WRITE_FAILED, "ãã¡ã¤ã«ãä¿åã§ãã¾ããã" Modified: branches/cmake-bringup/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ko.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -253,9 +253,7 @@ STRING_PROMPT_SAVE_CHANGES, "'%s'ÀÇ ¹Ù²ï °ÍÀ» ÀúÀåÇÏ°Ú½À´Ï±î?" STRING_SEARCH_FINISHED, "¹®¼¿¡¼ Ã£±â ³¡." STRING_LOAD_RICHED_FAILED, "¸®Ä¡ÅØ½ºÆ® ¶óÀÌºê·¯¸® ºÒ·¯¿À±â ½ÇÆÐ." - STRING_SAVE_LOSEFORMATTING, "´ç½ÅÀº º¸Åë ÅØ½ºÆ® Çü½ÄÀ¸·Î ÀúÀåÇÏ±â¸¦ ¼±ÅÃÇß½À´Ï´Ù, " \ - "ÀÌ°ÍÀº Æ÷¸ËÆÃÀ» ¾ø¿¤ °ÍÀÔ´Ï´Ù. " \ - "´ç½ÅÀº Á¤¸»·Î ÀúÀåÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + STRING_SAVE_LOSEFORMATTING, "´ç½ÅÀº º¸Åë ÅØ½ºÆ® Çü½ÄÀ¸·Î ÀúÀåÇÏ±â¸¦ ¼±ÅÃÇß½À´Ï´Ù, ÀÌ°ÍÀº Æ÷¸ËÆÃÀ» ¾ø¿¤ °ÍÀÔ´Ï´Ù. ´ç½ÅÀº Á¤¸»·Î ÀúÀåÇÏ±â¸¦ ¿øÇÕ´Ï±î?" STRING_INVALID_NUMBER, "¿Ã¹Ù¸£Áö ¾ÊÀº ¼ýÀÚ Çü½Ä" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE ÀúÀå ¹®¼´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù" STRING_WRITE_FAILED, "ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù." Modified: branches/cmake-bringup/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Lt.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "IÅ¡saugoti â%sâ pakeitimus?" STRING_SEARCH_FINISHED, "PaieÅ¡ka dokumente baigta." STRING_LOAD_RICHED_FAILED, "Nepavyko Ä¯kelti RichEdit bibliotekos." - STRING_SAVE_LOSEFORMATTING, "JÅ«s pasirinkote iÅ¡saugoti paprasto teksto formatu, " \ - "todÄl bus prarastas visas formatavimas. " \ - "Ar tikrai norite tai padaryti?" + STRING_SAVE_LOSEFORMATTING, "JÅ«s pasirinkote iÅ¡saugoti paprasto teksto formatu, todÄl bus prarastas visas formatavimas. Ar tikrai norite tai padaryti?" STRING_INVALID_NUMBER, "Neteisingas skaiÄiaus formatas" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE saugyklos dokumentai yra nepalaikomi" STRING_WRITE_FAILED, "Nepavyko iÅ¡saugoti failo." Modified: branches/cmake-bringup/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Nl.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -254,9 +254,7 @@ STRING_PROMPT_SAVE_CHANGES, "Wijzigingen opslaan naar '%s'?" STRING_SEARCH_FINISHED, "Doorzoeken van document voltooid." STRING_LOAD_RICHED_FAILED, "Laden van de RichEdit library is mislukt." - STRING_SAVE_LOSEFORMATTING, "U koos voor opslaan in gewoon tekst formaat, " \ - "waardoor alle formattering verloren zal gaan. " \ - "Weet u zeker dat u dit wilt?" + STRING_SAVE_LOSEFORMATTING, "U koos voor opslaan in gewoon tekst formaat, waardoor alle formattering verloren zal gaan. Weet u zeker dat u dit wilt?" STRING_INVALID_NUMBER, "Foutief nummerformaat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten worden niet ondersteund" STRING_WRITE_FAILED, "Bestand kon niet worden opgeslagen." Modified: branches/cmake-bringup/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/No.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i Â«%sÂ»?" STRING_SEARCH_FINISHED, "Ferdig med Ã¥ sÃ¸ke i dokumentet." STRING_LOAD_RICHED_FAILED, "Klarte ikke laste RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt Ã¥ lagre i rent tekstformat, noe som " \ - "vil fÃ¸re til at all formatering gÃ¥r tapt. Er du " \ - "sikker pÃ¥ at du vil fortsette?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt Ã¥ lagre i rent tekstformat, noe som vil fÃ¸re til at all formatering gÃ¥r tapt. Er du sikker pÃ¥ at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter stÃ¸ttes ikke" STRING_WRITE_FAILED, "Klarte ikke lagre filen." Modified: branches/cmake-bringup/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Pl.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,9 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Zapisaæ zmiany w pliku '%s'?" STRING_SEARCH_FINISHED, "Zakoñczono przeszukiwanie dokumentu." STRING_LOAD_RICHED_FAILED, "Nie uda³o siê za³adowaæ biblioteki systemowej RichEdit." - STRING_SAVE_LOSEFORMATTING, "Wybrano zapisanie dokumentu jako zwyk³y tekst, " \ - "w wyniku czego formatowanie zostanie utracone. " \ - "Czy na pewno chcesz to zrobiæ?" + STRING_SAVE_LOSEFORMATTING, "Wybrano zapisanie dokumentu jako zwyk³y tekst, w wyniku czego formatowanie zostanie utracone. Czy na pewno chcesz to zrobiæ?" STRING_INVALID_NUMBER, "Z³y format liczby" STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s¹ obs³ugiwane" STRING_WRITE_FAILED, "Nie mo¿na by³o zapisaæ pliku." Modified: branches/cmake-bringup/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Pt.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -375,9 +375,7 @@ STRING_PROMPT_SAVE_CHANGES, "Salvar as alteraÃ§Ãµes de '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falha ao carregar a biblioteca RichEdit." - STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, " \ - "o que vai anular todas as formataÃ§Ãµes. " \ - "Tem a certeza que deseja fazer isto?" + STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, o que vai anular todas as formataÃ§Ãµes. Tem a certeza que deseja fazer isto?" STRING_INVALID_NUMBER, "Formato de nÃºmero invÃ¡lido" STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE nÃ£o sÃ£o suportados" STRING_WRITE_FAILED, "NÃ£o foi possÃvel salvar o arquivo." @@ -396,9 +394,7 @@ STRING_PROMPT_SAVE_CHANGES, "Guardar alteraÃ§Ãµes a '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falhou o carregamento da biblioteca RichEdit." - STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, " \ - "o que vai anular todas as formataÃ§Ãµes. " \ - "Tem a certeza que quer fazer isto?" + STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, o que vai anular todas as formataÃ§Ãµes. Tem a certeza que quer fazer isto?" STRING_INVALID_NUMBER, "Formato de nÃºmero invÃ¡lido" STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE nÃ£o sÃ£o suportados" STRING_WRITE_FAILED, "NÃ£o foi possÃvel guardar o ficheiro." Modified: branches/cmake-bringup/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Ru.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -262,9 +262,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾Ð¸ÑÐº Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð·Ð°Ð²ÐµÑÑÐµÐ½." STRING_LOAD_RICHED_FAILED, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸ RichEdit." - STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ° " \ - "Ð¿ÑÐ¸Ð²ÐµÐ´ÑÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ" \ - "ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" + STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ° Ð¿ÑÐ¸Ð²ÐµÐ´ÑÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ." STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ." STRING_WRITE_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð¹Ð»." Modified: branches/cmake-bringup/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Si.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -261,10 +261,7 @@ STRING_PROMPT_SAVE_CHANGES, "Ali naj shranim spremembe v '%s'?" STRING_SEARCH_FINISHED, "Konec iskanja po dokumentu." STRING_LOAD_RICHED_FAILED, "Napaka pri nalaganju RichEdit knjiÅ¾nice." - STRING_SAVE_LOSEFORMATTING, "Izbrali ste shranjevanje v Äisti besedilni " \ - "obliki, kar bo povzroÄilo izgubo oblikovanja. " \ - "Ali ste prepriÄani, da Å¾elite shraniti " \ - "dokument v tej obliki?" + STRING_SAVE_LOSEFORMATTING, "Izbrali ste shranjevanje v Äisti besedilni obliki, kar bo povzroÄilo izgubo oblikovanja. Ali ste prepriÄani, da Å¾elite shraniti dokument v tej obliki?" STRING_INVALID_NUMBER, "Neveljavna oblika Å¡tevila" STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenti z OLE predmeti niso podprti" STRING_WRITE_FAILED, "Napaka pri shranjevanju datoteke." Modified: branches/cmake-bringup/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Sv.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -265,9 +265,7 @@ STRING_PROMPT_SAVE_CHANGES, "Spara Ã¤ndringar i '%s'?" STRING_SEARCH_FINISHED, "SÃ¶kningen i dokumentet har slutfÃ¶rts." STRING_LOAD_RICHED_FAILED, "Misslyckades att ladda RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, " \ - "vilket kommer leda till att all formatering fÃ¶rloras. " \ - "Ãr du sÃ¤ker att du vill gÃ¶ra detta?" + STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, vilket kommer leda till att all formatering fÃ¶rloras. Ãr du sÃ¤ker att du vill gÃ¶ra detta?" STRING_INVALID_NUMBER, "Ogiltigt talformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Kunde inte spara filen." Modified: branches/cmake-bringup/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Uk.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -258,9 +258,7 @@ STRING_PROMPT_SAVE_CHANGES, "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð·Ð¼ÑÐ½Ð¸ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾ÐºÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾." STRING_LOAD_RICHED_FAILED, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÑ RichEdit." - STRING_SAVE_LOSEFORMATTING, "ÐÐ¸ Ð²Ð¸Ð±ÑÐ°Ð»Ð¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐµÐºÑÑÑ, " \ - "ÑÐ¾ Ð¿ÑÐ¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²ÑÑÐ°ÑÐ¸ ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ. " \ - "ÐÐ¸ ÑÐ¿ÑÐ°Ð²Ð´Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐµÑÐµ?" + STRING_SAVE_LOSEFORMATTING, "ÐÐ¸ Ð²Ð¸Ð±ÑÐ°Ð»Ð¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐµÐºÑÑÑ, ÑÐ¾ Ð¿ÑÐ¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²ÑÑÐ°ÑÐ¸ ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ. ÐÐ¸ ÑÐ¿ÑÐ°Ð²Ð´Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐµÑÐµ?" STRING_INVALID_NUMBER, "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ" STRING_WRITE_FAILED, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐ°Ð¹Ð»." Modified: branches/cmake-bringup/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] Wed Nov 24 20:19:55 2010 @@ -487,9 +487,7 @@ STRING_PROMPT_SAVE_CHANGES, "å²åæ¹åå° '%s'?" STRING_SEARCH_FINISHED, "æªæ¡æ¥æ¾çµæ." STRING_LOAD_RICHED_FAILED, "RichEdit è£è¼å¤±æ." - STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, " \ - "éå¯è½å°è´æ ¼å¼ä¸å¤±. " \ - "ä½ ç¢ºå®è¦ééº¼åå?" + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, éå¯è½å°è´æ ¼å¼ä¸å¤±. ä½ ç¢ºå®è¦ééº¼åå?" STRING_INVALID_NUMBER, "æ¸åæ ¼å¼ç¡æ" STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æ´OLE å²åæªæ¡" STRING_WRITE_FAILED, "ä¸è½å²åæªæ¡."

13 years, 10 months

[tkreuzer] 49787: [NTOS] Add some missing intrinsics for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 20:03:01 2010 New Revision: 49787 URL: http://svn.reactos.org/svn/reactos?rev=49787&view=rev Log: [NTOS] Add some missing intrinsics for MSVC Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Nov 24 20:03:01 2010 @@ -144,6 +144,32 @@ sgdt [eax] } } + +FORCEINLINE +VOID +__fxsave(OUT PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxsave [eax] +} + +FORCEINLINE +VOID +__fxrstor(IN PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxrstor [eax] +} + +FORCEINLINE +VOID +__fnsave(OUT PFLOATING_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fnsave [eax] + __asm wait; +} + #define Ke386GetGlobalDescriptorTable __sgdt FORCEINLINE @@ -267,6 +293,28 @@ __asm mov ax, Value; __asm mov gs, ax; } + +extern ULONG KeI386FxsrPresent; + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PVOID SaveArea) +{ + if (KeI386FxsrPresent) + { + __fxsave(SaveArea); + } + else + { + __fnsave(SaveArea); + } +} + +#define Ke386FnSave __fnsave +#define Ke386FxSave __fxsave +// The name suggest, that the original author didn't understand what frstor means +#define Ke386FxStore __fxrstor + #else #error Unknown compiler for inline assembler

13 years, 10 months

[sir_richard] 49786: [NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an infinite loop in the entrypoint on ARM.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:56:35 2010 New Revision: 49786 URL: http://svn.reactos.org/svn/reactos?rev=49786&view=rev Log: [NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an infinite loop in the entrypoint on ARM. Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] Wed Nov 24 18:56:35 2010 @@ -15,7 +15,10 @@ PROLOG_END KiSystemStartup /* Put us in FIQ mode, set IRQ stack */ - msr cpsr_c, #CPSR_FIQ_MODE + b . + mrs r3, cpsr + orr r3, r1, #CPSR_FIQ_MODE + msr cpsr, r3 ldr sp, [a1, #LpbInterruptStack] /* Repeat for IRQ mode */

13 years, 10 months

[sir_richard] 49785: [NTOS]: STATUS_SUCCESS is not the only succesful return code.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:53:47 2010 New Revision: 49785 URL: http://svn.reactos.org/svn/reactos?rev=49785&view=rev Log: [NTOS]: STATUS_SUCCESS is not the only succesful return code. Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Nov 24 18:53:47 2010 @@ -529,7 +529,7 @@ Address, KiGetPreviousMode(TrapFrame), TrapFrame); - if (Status == STATUS_SUCCESS) return Status; + if (NT_SUCCESS(Status)) return Status; } //

13 years, 10 months

[tkreuzer] 49784: [CMAKE] Add importlib targets for glu32, opengl32, rpcrt4

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 18:53:07 2010 New Revision: 49784 URL: http://svn.reactos.org/svn/reactos?rev=49784&view=rev Log: [CMAKE] Add importlib targets for glu32, opengl32, rpcrt4 Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -120,4 +120,5 @@ kernel32 ntdll) -add_cab_target(glu32 1) +add_cab_target(glu32 1) +add_importlib_target(glu32.spec) Modified: branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/opengl3… ============================================================================== --- branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -30,3 +30,4 @@ add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE}) add_cab_target(opengl32 1) +add_importlib_target(opengl32.spec) Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Wed Nov 24 18:53:07 2010 @@ -45,5 +45,5 @@ add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 winesdk) add_cab_target(rpcrt4 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) +add_importlib_target(rpcrt4.spec)

13 years, 10 months

[tkreuzer] 49783: [SERVICES] Fix a typo (|| instead of |). Found by clang.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 18:30:12 2010 New Revision: 49783 URL: http://svn.reactos.org/svn/reactos?rev=49783&view=rev Log: [SERVICES] Fix a typo (|| instead of |). Found by clang. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Nov 24 18:30:12 2010 @@ -834,8 +834,8 @@ return ERROR_INVALID_HANDLE; } - if (dwSecurityInformation & (DACL_SECURITY_INFORMATION || - GROUP_SECURITY_INFORMATION || + if (dwSecurityInformation & (DACL_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION)) DesiredAccess |= READ_CONTROL;

13 years, 10 months

[sir_richard] 49782: [NTOS]: Fix 16-bit interlocked operations on ARM (GCC doesn't provide built-ins). ARM should build now.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 18:19:42 2010 New Revision: 49782 URL: http://svn.reactos.org/svn/reactos?rev=49782&view=rev Log: [NTOS]: Fix 16-bit interlocked operations on ARM (GCC doesn't provide built-ins). ARM should build now. Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] Wed Nov 24 18:19:42 2010 @@ -67,12 +67,40 @@ __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) { - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - return __sync_fetch_and_add(Addend, Value); + short a, b; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %1, [%2]\n\t" + "cmp %1, %4\n\t" + "bne 1f\n\t" + "swp %0, %3, [%2]\n\t" + "cmp %0, %1\n\t" + "swpne %3, %0, [%2]\n\t" + "bne 0b\n\t" + "1:" + : "=&r" (a), "=&r" (b) + : "r" (Destination), "r" (Exchange), "r" (Comperand) + : "cc", "memory"); + + return a; +} + +__INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + short a, b, c; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %0, [%3]\n\t" + "add %1, %0, %4\n\t" + "swp %2, %1, [%3]\n\t" + "cmp %0, %2\n\t" + "swpne %1, %2, [%3]\n\t" + "bne 0b" + : "=&r" (a), "=&r" (b), "=&r" (c) + : "r" (Value), "r" (Addend) + : "cc", "memory"); + + return a; } __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp)

13 years, 10 months

[sir_richard] 49781: [NTOS]: Some more ARM build and linker fixes, moving some of the new x86 C code into ARM. This should really be shared later. [NTOS]: Totally broke thread context switching on ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 17:49:52 2010 New Revision: 49781 URL: http://svn.reactos.org/svn/reactos?rev=49781&view=rev Log: [NTOS]: Some more ARM build and linker fixes, moving some of the new x86 C code into ARM. This should really be shared later. [NTOS]: Totally broke thread context switching on ARM for now. It's a Good Thing. Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -58,6 +58,15 @@ } VOID +FASTCALL +KeZeroPages(IN PVOID Address, + IN ULONG Size) +{ + /* Not using XMMI in this routine */ + RtlZeroMemory(Address, Size); +} + +VOID NTAPI KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) { Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -13,6 +13,10 @@ TEXTAREA NESTED_ENTRY KiSwapContext PROLOG_END KiSwapContext + + // BUSTEDDDD + b . + // // a1 = Old Thread // a2 = New Thread @@ -104,3 +108,19 @@ b . ENTRY_END KiThreadStartup + + NESTED_ENTRY KiSwitchThreads + PROLOG_END KiSwitchThreads + + // BUSTEDDDD + b . + + ENTRY_END KiSwitchThreads + + NESTED_ENTRY KiSwapContextInternal + PROLOG_END KiSwapContextInternal + + // BUSTEDDDD + b . + + ENTRY_END KiSwapContextInternal Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -14,6 +14,13 @@ /* GLOBALS ********************************************************************/ +typedef struct _KSWITCHFRAME +{ + PVOID ExceptionList; + BOOLEAN ApcBypassDisable; + PVOID RetAddr; +} KSWITCHFRAME, *PKSWITCHFRAME; + typedef struct _KUINIT_FRAME { KEXCEPTION_FRAME CtxSwitchFrame; @@ -32,6 +39,15 @@ NTAPI KiThreadStartup(VOID); +VOID +FASTCALL +KiSwitchThreads( + IN PKTHREAD OldThread, + IN PKTHREAD NewThread +); + + +/* FIXME: THIS IS TOTALLY BUSTED NOW */ VOID NTAPI KiInitializeContextThread(IN PKTHREAD Thread, @@ -131,3 +147,217 @@ // Thread->KernelStack = (PVOID)CtxSwitchFrame; } + +VOID +FASTCALL +KiIdleLoop(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD OldThread, NewThread; + + /* Initialize the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + + /* Now loop forever */ + while (TRUE) + { + /* Check for pending timers, pending DPCs, or pending ready threads */ + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + /* Quiesce the DPC software interrupt */ + HalClearSoftwareInterrupt(DISPATCH_LEVEL); + + /* Handle it */ + KiRetireDpcList(Prcb); + } + + /* Check if a new thread is scheduled for execution */ + if (Prcb->NextThread) + { + /* Enable interupts */ + _enable(); + + /* Capture current thread data */ + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + + /* Set new thread data */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NewThread; + + /* The thread is now running */ + NewThread->State = Running; + + /* Switch away from the idle thread */ + KiSwapContext(APC_LEVEL, OldThread); + + /* We are back in the idle thread -- disable interrupts again */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + } + else + { + /* Continue staying idle. Note the HAL returns with interrupts on */ + Prcb->PowerState.IdleFunction(&Prcb->PowerState); + } + } +} + +BOOLEAN +FASTCALL +KiSwapContextExit(IN PKTHREAD OldThread, + IN PKSWITCHFRAME SwitchFrame) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPROCESS OldProcess, NewProcess; + PKTHREAD NewThread; + ARM_TTB_REGISTER TtbRegister; + + /* We are on the new thread stack now */ + NewThread = Pcr->PrcbData.CurrentThread; + + /* Now we are the new thread. Check if it's in a new process */ + OldProcess = OldThread->ApcState.Process; + NewProcess = NewThread->ApcState.Process; + if (OldProcess != NewProcess) + { + TtbRegister.AsUlong = NewProcess->DirectoryTableBase[0]; + ASSERT(TtbRegister.Reserved == 0); + KeArmTranslationTableRegisterSet(TtbRegister); + } + + /* Increase thread context switches */ + NewThread->ContextSwitches++; + + /* Load data from switch frame */ + Pcr->NtTib.ExceptionList = SwitchFrame->ExceptionList; + + /* DPCs shouldn't be active */ + if (Pcr->PrcbData.DpcRoutineActive) + { + /* Crash the machine */ + KeBugCheckEx(ATTEMPTED_SWITCH_FROM_DPC, + (ULONG_PTR)OldThread, + (ULONG_PTR)NewThread, + (ULONG_PTR)OldThread->InitialStack, + 0); + } + + /* Kernel APCs may be pending */ + if (NewThread->ApcState.KernelApcPending) + { + /* Are APCs enabled? */ + if (!NewThread->SpecialApcDisable) + { + /* Request APC delivery */ + if (SwitchFrame->ApcBypassDisable) HalRequestSoftwareInterrupt(APC_LEVEL); + return TRUE; + } + } + + /* Return */ + return FALSE; +} + +VOID +FASTCALL +KiSwapContextEntry(IN PKSWITCHFRAME SwitchFrame, + IN ULONG_PTR OldThreadAndApcFlag) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKTHREAD OldThread, NewThread; + + /* Save APC bypass disable */ + SwitchFrame->ApcBypassDisable = OldThreadAndApcFlag & 3; + SwitchFrame->ExceptionList = Pcr->NtTib.ExceptionList; + + /* Increase context switch count and check if tracing is enabled */ + Pcr->ContextSwitches++; + if (Pcr->PerfGlobalGroupMask) + { + /* We don't support this yet on x86 either */ + DPRINT1("WMI Tracing not supported\n"); + ASSERT(FALSE); + } + + /* Get thread pointers */ + OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); + NewThread = Pcr->PrcbData.CurrentThread; + + /* Get the old thread and set its kernel stack */ + OldThread->KernelStack = SwitchFrame; + + /* Do the switch */ + KiSwitchThreads(OldThread, NewThread->KernelStack); +} + +VOID +NTAPI +KiDispatchInterrupt(VOID) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPRCB Prcb = &Pcr->PrcbData; + PVOID OldHandler; + PKTHREAD NewThread, OldThread; + + /* Disable interrupts */ + _disable(); + + /* Check for pending timers, pending DPCs, or pending ready threads */ + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + /* Switch to safe execution context */ + OldHandler = Pcr->NtTib.ExceptionList; + Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; + + /* Retire DPCs while under the DPC stack */ + //KiRetireDpcListInDpcStack(Prcb, Prcb->DpcStack); + // FIXME!!! // + KiRetireDpcList(Prcb); + + /* Restore context */ + Pcr->NtTib.ExceptionList = OldHandler; + } + + /* Re-enable interrupts */ + _enable(); + + /* Check for quantum end */ + if (Prcb->QuantumEnd) + { + /* Handle quantum end */ + Prcb->QuantumEnd = FALSE; + KiQuantumEnd(); + } + else if (Prcb->NextThread) + { + /* Capture current thread data */ + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + + /* Set new thread data */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NewThread; + + /* The thread is now running */ + NewThread->State = Running; + OldThread->WaitReason = WrDispatchInt; + + /* Make the old thread ready */ + KxQueueReadyThread(OldThread, Prcb); + + /* Swap to the new thread */ + KiSwapContext(APC_LEVEL, OldThread); + } +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -112,7 +112,7 @@ @ FASTCALL ExInterlockedAddLargeStatistic(ptr long) #endif @ stdcall ExInterlockedAddUlong(ptr long ptr) -#ifndef __x86_64__ +#ifdef __x86__ @ FASTCALL ExInterlockedCompareExchange64(ptr ptr ptr ptr) @ stdcall ExInterlockedDecrementLong(ptr ptr) @ stdcall ExInterlockedExchangeUlong(ptr long ptr)

13 years, 10 months

[sir_richard] 49780: [NDK]: Fix definition of ARM PTE/PDE structure. [NTOS]: Fix up ARM code to match recent ARM3 changes. [NTOS]: Do not use initguid inside every single file to zillionplicate the...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 17:26:30 2010 New Revision: 49780 URL: http://svn.reactos.org/svn/reactos?rev=49780&view=rev Log: [NDK]: Fix definition of ARM PTE/PDE structure. [NTOS]: Fix up ARM code to match recent ARM3 changes. [NTOS]: Do not use initguid inside every single file to zillionplicate the GUIDs! Why doesn't the x86 linker catch this?!!? [ARMDDK]: Define some spinlock functions. Modified: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -200,7 +200,7 @@ PFN_NUMBER Pfn; /* Setup templates */ - TempPte.Accessed = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Accessed = TempPde.Valid = 1; + TempPte.Sbo = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Sbo = TempPde.Valid = 1; /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4978… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -9726,7 +9726,7 @@ OUT PLARGE_INTEGER CurrentTime); #endif /* !_M_AMD64 */ -#if !defined(_X86_) +#if !defined(_X86_) && !defined(_M_ARM) NTKERNELAPI KIRQL NTAPI Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -68,7 +68,7 @@ ULONG NoExecute:1; ULONG Domain:4; ULONG Ecc:1; - ULONG Accessed:1; + ULONG Sbo:1; ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; @@ -85,7 +85,7 @@ ULONG Valid:1; ULONG Buffered:1; ULONG Cached:1; - ULONG Accessed:1; + ULONG Sbo:1; ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; @@ -100,9 +100,9 @@ typedef struct _MMPTE_SOFTWARE { - ULONG Valid:1; + ULONG Valid:2; ULONG PageFileLow:4; - ULONG Protection:5; + ULONG Protection:4; ULONG Prototype:1; ULONG Transition:1; ULONG PageFileHigh:20; @@ -110,12 +110,12 @@ typedef struct _MMPTE_TRANSITION { - ULONG Valid:1; - ULONG Write:1; + ULONG Valid:2; + ULONG Buffered:1; + ULONG Cached:1; ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Protection:5; + ULONG Protection:4; + ULONG ReadOnly:1; ULONG Prototype:1; ULONG Transition:1; ULONG PageFrameNumber:20; @@ -123,19 +123,18 @@ typedef struct _MMPTE_PROTOTYPE { - ULONG Valid:1; + ULONG Valid:2; ULONG ProtoAddressLow:7; ULONG ReadOnly:1; - ULONG WhichPool:1; ULONG Prototype:1; ULONG ProtoAddressHigh:21; } MMPTE_PROTOTYPE; typedef struct _MMPTE_SUBSECTION { - ULONG Valid:1; + ULONG Valid:2; ULONG SubsectionAddressLow:4; - ULONG Protection:5; + ULONG Protection:4; ULONG Prototype:1; ULONG SubsectionAddressHigh:20; ULONG WhichPool:1; @@ -143,47 +142,38 @@ typedef struct _MMPTE_LIST { - ULONG Valid:1; + ULONG Valid:2; ULONG OneEntry:1; ULONG filler0:8; ULONG NextEntry:20; ULONG Prototype:1; - ULONG filler1:1; } MMPTE_LIST; typedef union _MMPTE_HARDWARE { - struct - { - ULONG NoExecute:1; - ULONG Valid:1; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access:1; - ULONG Owner:1; - ULONG CacheAttributes:3; - ULONG ReadOnly:1; - ULONG Shared:1; - ULONG NonGlobal:1; - ULONG PageFrameNumber:20; - }; - ULONG AsUlong; + ULONG NoExecute:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Sbo:1; + ULONG Owner:1; + ULONG CacheAttributes:3; + ULONG ReadOnly:1; + ULONG Prototype:1; + ULONG NonGlobal:1; + ULONG PageFrameNumber:20; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; typedef union _MMPDE_HARDWARE { - struct - { - ULONG Valid:1; - ULONG LargePage:1; - ULONG Buffered:1; - ULONG Cached:1; - ULONG NoExecute:1; - ULONG Domain:4; - ULONG Ecc:1; - ULONG PageFrameNumber:22; - }; - ULONG AsUlong; + ULONG Valid:1; + ULONG LargePage:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG NoExecute:1; + ULONG Domain:4; + ULONG Ecc:1; + ULONG PageFrameNumber:22; } MMPDE_HARDWARE, *PMMPDE_HARDWARE; typedef struct _MMPDE Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -252,6 +252,35 @@ #define KeLowerIrql(NewIrql) KfLowerIrql(NewIrql) #define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KfRaiseIrql(NewIrql) +NTHALAPI +KIRQL +FASTCALL +KfAcquireSpinLock( + IN OUT PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) + +NTHALAPI +VOID +FASTCALL +KfReleaseSpinLock( + IN OUT PKSPIN_LOCK SpinLock, + IN KIRQL NewIrql); +#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +NTKERNELAPI +VOID +FASTCALL +KefAcquireSpinLockAtDpcLevel( + IN OUT PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) + +NTKERNELAPI +VOID +FASTCALL +KefReleaseSpinLockFromDpcLevel( + IN OUT PKSPIN_LOCK SpinLock); +#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) + // // Cache clean and flush // Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#include "initguid.h" +#include <guiddef.h> #include <poclass.h> // Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -24,10 +24,7 @@ PVOID MmNonPagedSystemStart; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; -PVOID MmPagedPoolStart = MI_PAGED_POOL_START; PVOID MmPagedPoolEnd; -ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; PVOID MiSessionSpaceEnd; PVOID MiSessionImageEnd; PVOID MiSessionImageStart; @@ -49,7 +46,7 @@ PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage; ULONG MmBootImageSize; ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; @@ -61,17 +58,17 @@ /* PRIVATE FUNCTIONS **********************************************************/ -BOOLEAN +NTSTATUS NTAPI -MmArmInitSystem(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) +INIT_FUNCTION +MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { // // Always return success for now // DPRINT1("NEVER TELL ME THE ODDS!\n"); while (TRUE); - return TRUE; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -130,12 +130,12 @@ // // Access Flags // -#define PTE_READONLY 0 +#define PTE_READONLY 0 // Doesn't exist on x86 #define PTE_EXECUTE 0 // Not worrying about NX yet #define PTE_EXECUTE_READ 0 // Not worrying about NX yet #define PTE_READWRITE 0x2 #define PTE_WRITECOPY 0x200 -#define PTE_EXECUTE_READWRITE 0x0 +#define PTE_EXECUTE_READWRITE 0x2 // Not worrying about NX yet #define PTE_EXECUTE_WRITECOPY 0x200 #define PTE_PROTOTYPE 0x400 // @@ -145,6 +145,20 @@ #define PTE_DISABLE_CACHE 0x10 #define PTE_WRITECOMBINED_CACHE 0x10 #elif defined(_M_ARM) +#define PTE_READONLY 0x200 +#define PTE_EXECUTE 0 // Not worrying about NX yet +#define PTE_EXECUTE_READ 0 // Not worrying about NX yet +#define PTE_READWRITE 0 // Doesn't exist on ARM +#define PTE_WRITECOPY 0 // Doesn't exist on ARM +#define PTE_EXECUTE_READWRITE 0 // Not worrying about NX yet +#define PTE_EXECUTE_WRITECOPY 0 // Not worrying about NX yet +#define PTE_PROTOTYPE 0x400 // Using the Shared bit +// +// Cache flags +// +#define PTE_ENABLE_CACHE 0 +#define PTE_DISABLE_CACHE 0x10 +#define PTE_WRITECOMBINED_CACHE 0x10 #else #error Define these please! #endif @@ -179,7 +193,7 @@ #ifdef _M_IX86 #define MM_PTE_SOFTWARE_PROTECTION_BITS 5 #elif _M_ARM -#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 +#define MM_PTE_SOFTWARE_PROTECTION_BITS 6 #elif _M_AMD64 #define MM_PTE_SOFTWARE_PROTECTION_BITS 5 #else Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -12,10 +12,111 @@ #define NDEBUG #include <debug.h> +#line 15 "ARMÂ³::ARMPAGE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + /* GLOBALS ********************************************************************/ +const +ULONG +MmProtectToPteMask[32] = +{ + // + // These are the base MM_ protection flags + // + 0, + PTE_READONLY | PTE_ENABLE_CACHE, + PTE_EXECUTE | PTE_ENABLE_CACHE, + PTE_EXECUTE_READ | PTE_ENABLE_CACHE, + PTE_READWRITE | PTE_ENABLE_CACHE, + PTE_WRITECOPY | PTE_ENABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, + // + // These OR in the MM_NOCACHE flag + // + 0, + PTE_READONLY | PTE_DISABLE_CACHE, + PTE_EXECUTE | PTE_DISABLE_CACHE, + PTE_EXECUTE_READ | PTE_DISABLE_CACHE, + PTE_READWRITE | PTE_DISABLE_CACHE, + PTE_WRITECOPY | PTE_DISABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_DISABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_DISABLE_CACHE, + // + // These OR in the MM_DECOMMIT flag, which doesn't seem supported on x86/64/ARM + // + 0, + PTE_READONLY | PTE_ENABLE_CACHE, + PTE_EXECUTE | PTE_ENABLE_CACHE, + PTE_EXECUTE_READ | PTE_ENABLE_CACHE, + PTE_READWRITE | PTE_ENABLE_CACHE, + PTE_WRITECOPY | PTE_ENABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, + // + // These OR in the MM_NOACCESS flag, which seems to enable WriteCombining? + // + 0, + PTE_READONLY | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_READ | PTE_WRITECOMBINED_CACHE, + PTE_READWRITE | PTE_WRITECOMBINED_CACHE, + PTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_READWRITE | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, +}; + +const +ULONG MmProtectToValue[32] = +{ + PAGE_NOACCESS, + PAGE_READONLY, + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_READWRITE, + PAGE_WRITECOPY, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_NOCACHE | PAGE_READONLY, + PAGE_NOCACHE | PAGE_EXECUTE, + PAGE_NOCACHE | PAGE_EXECUTE_READ, + PAGE_NOCACHE | PAGE_READWRITE, + PAGE_NOCACHE | PAGE_WRITECOPY, + PAGE_NOCACHE | PAGE_EXECUTE_READWRITE, + PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_GUARD | PAGE_READONLY, + PAGE_GUARD | PAGE_EXECUTE, + PAGE_GUARD | PAGE_EXECUTE_READ, + PAGE_GUARD | PAGE_READWRITE, + PAGE_GUARD | PAGE_WRITECOPY, + PAGE_GUARD | PAGE_EXECUTE_READWRITE, + PAGE_GUARD | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_WRITECOMBINE | PAGE_READONLY, + PAGE_WRITECOMBINE | PAGE_EXECUTE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READ, + PAGE_WRITECOMBINE | PAGE_READWRITE, + PAGE_WRITECOMBINE | PAGE_WRITECOPY, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY +}; + ULONG MmGlobalKernelPageDirectory[4096]; -MMPDE HyperTemplatePde; + +/* Template PTE and PDE for a kernel page */ +MMPDE ValidKernelPde = {.u.Hard.Valid = 1}; +MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Sbo = 1}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; +MMPTE DemandZeroPte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; + +/* Template PTE for prototype page */ +MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; /* PRIVATE FUNCTIONS **********************************************************/ @@ -47,25 +148,6 @@ { /* Nothing to do */ return; -} - -NTSTATUS -NTAPI -Mmi386ReleaseMmInfo(IN PEPROCESS Process) -{ - UNIMPLEMENTED; - while (TRUE); - return 0; -} - -NTSTATUS -NTAPI -MmInitializeHandBuiltProcess(IN PEPROCESS Process, - IN PULONG DirectoryTableBase) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; } PULONG @@ -246,16 +328,7 @@ { ULONG i; PULONG CurrentPageDirectory = (PULONG)PDE_BASE; - extern MMPTE HyperTemplatePte; - - /* Setup PTE template */ - HyperTemplatePte.u.Long = 0; - HyperTemplatePte.u.Hard.Valid = 1; - HyperTemplatePte.u.Hard.Access = 1; - - /* Setup PDE template */ - HyperTemplatePde.u.Long = 0; - HyperTemplatePde.u.Hard.Valid = 1; + /* Loop the 2GB of address space which belong to the kernel */ for (i = MiGetPdeOffset(MmSystemRangeStart); i < 2048; i++) Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -367,18 +367,6 @@ return TRUE; } -VOID -NTAPI -MmUpdatePageDir(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG Size) -{ - // - // Nothing to do - // - return; -} - NTSTATUS NTAPI Mmi386ReleaseMmInfo(IN PEPROCESS Process) @@ -389,30 +377,6 @@ UNIMPLEMENTED; while (TRUE); return 0; -} - -NTSTATUS -NTAPI -MmInitializeHandBuiltProcess(IN PEPROCESS Process, - IN PULONG DirectoryTableBase) -{ - // - // Share the directory base with the idle process - // - DirectoryTableBase[0] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]; - DirectoryTableBase[1] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[1]; - - // - // Initialize the Addresss Space - // - KeInitializeGuardedMutex(&Process->AddressCreationLock); - Process->VadRoot.BalancedRoot.u1.Parent = NULL; - - // - // The process now has an address space - // - Process->HasAddressSpace = TRUE; - return STATUS_SUCCESS; } PULONG Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ +#include "initguid.h" #include <ntoskrnl.h> #define NDEBUG #include <debug.h>

13 years, 10 months

[pschweitzer] 49779: [NTOSKRNL] That's not because ARM will rule the world on a day that you're obliged to break x86 build. Fixed build. Will it work? Only God knows.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 24 17:24:54 2010 New Revision: 49779 URL: http://svn.reactos.org/svn/reactos?rev=49779&view=rev Log: [NTOSKRNL] That's not because ARM will rule the world on a day that you're obliged to break x86 build. Fixed build. Will it work? Only God knows. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Wed Nov 24 17:24:54 2010 @@ -39,6 +39,7 @@ // Convert a PTE into a corresponding address // #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) +#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 18)) #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) @@ -55,7 +56,7 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) -#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.Large == 1) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else @@ -81,6 +82,18 @@ #define TEB_BASE 0x7FFDE000 +#define MI_HYPERSPACE_PTES (256 - 1) +#define MI_ZERO_PTES (32) +#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE +#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ + MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE

13 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010