Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 72502: [INCLUDE/WINE] Update test.h with a debug function for longlong. Disabled by default because it introduces a new dependency on ntdll (_aullshr)
by mjansen＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: mjansen Date: Mon Aug 29 15:16:50 2016 New Revision: 72502 URL: http://svn.reactos.org/svn/reactos?rev=72502&view=rev Log: [INCLUDE/WINE] Update test.h with a debug function for longlong. Disabled by default because it introduces a new dependency on ntdll (_aullshr) Modified: trunk/reactos/sdk/include/reactos/wine/test.h Modified: trunk/reactos/sdk/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/t… ============================================================================== --- trunk/reactos/sdk/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/wine/test.h [iso-8859-1] Mon Aug 29 15:16:50 2016 @@ -73,6 +73,9 @@ extern const char *wine_dbgstr_point( const POINT *guid ); extern const char *wine_dbgstr_size( const SIZE *guid ); extern const char *wine_dbgstr_rect( const RECT *rect ); +#ifdef WINETEST_USE_DBGSTR_LONGLONG +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); +#endif static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -622,6 +625,21 @@ return res; } +#ifdef WINETEST_USE_DBGSTR_LONGLONG +const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + char *res; + + res = get_temp_buffer( 20 ); + if (/*sizeof(ll) > sizeof(unsigned long) &&*/ ll >> 32) /* ULONGLONG is always > long in ReactOS */ + sprintf( res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else + sprintf( res, "%lx", (unsigned long)ll ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} +#endif + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

[hbelusca] 72501: [SHELL32]: We are not Windows! (and not completely Wine either).
by hbelusca＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: hbelusca Date: Mon Aug 29 14:30:51 2016 New Revision: 72501 URL: http://svn.reactos.org/svn/reactos?rev=72501&view=rev Log: [SHELL32]: We are not Windows! (and not completely Wine either). Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -407,7 +407,7 @@ GROUPBOX "ÐÐ°Ð´Ð°ÑÐ¸", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 AUTORADIOBUTTON "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±ÑÐ¸ÑÐµ Ð·Ð°Ð´Ð°ÑÐ¸ Ð² Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ", IDC_FOLDER_OPTIONS_COMMONTASKS, 20, 25, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸ÑÐµ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð° Windows", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10 + AUTORADIOBUTTON "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸ÑÐµ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð° ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10 GROUPBOX "ÐÐ±Ð·Ð¾Ñ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 AUTORADIOBUTTON "ÐÑÐ²Ð°ÑÑÐ½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð² &ÐµÐ´Ð¸Ð½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ", IDC_FOLDER_OPTIONS_SAMEWINDOW, 20, 70, 210, 10, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -816,7 +816,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,9 +706,9 @@ /* message box strings */ IDS_RESTART_TITLE "KÃ¤ynnistÃ¤ uudestaan" - IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" + IDS_RESTART_PROMPT "Haluatko simuloida ReactOS:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" IDS_SHUTDOWN_TITLE "Sammuta" - IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa ReactOS:n istunnon?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Taille d'allocation par dÃ©faut" IDS_COPY_OF "Copie de" - IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configurÃ© pour ouvrir ce type de fichier." + IDS_SHLEXEC_NOASSOC "Aucun programme ReactOS n'est configurÃ© pour ouvrir ce type de fichier." IDS_FILE_DETAILS "DÃ©tails concernant l'extension '%s'" IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramÃ¨tres qui concernent tous les fichiers '%s', cliquez sur AvancÃ©." Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "ããã©ã«ã ã¢ãã±ã¼ã·ã§ã³ ãµã¤ãº" IDS_COPY_OF "ã³ãã¼ ï½" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "æ¡å¼µå '%s' ã®è©³ç´°" IDS_FILE_DETAILSADV "æ¡å¼µå '%s' ã®ãã¡ã¤ã«ã®ç¨®é¡ã¯'%s'ã§ãã '%s' ã®ãã¡ã¤ã«ãã¹ã¦ã«å¯¾ããè¨å®ãå¤æ´ããã«ã¯ è©³ç´°è¨å®ãã¯ãªãã¯ãã¦ãã ããã" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 182, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen." + IDS_SHLEXEC_NOASSOC "Er is geen ReactOS-programma geconfigureerd om dit soort bestanden te openen." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Standard tildelingsstÃ¸rrelse" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til Ã¥ Ã¥pne denne filtypen." + IDS_SHLEXEC_NOASSOC "Intet ReactOS-program er satt opp til Ã¥ Ã¥pne denne filtypen." IDS_FILE_DETAILS "Detailjer for '%s' utvidelser" IDS_FILE_DETAILSADV "Filer med utvidelser '%s' er av typen '%s'. For Ã¥ endre innstillingene som er av filen '%s', trykk pÃ¥ avansert." Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,7 +706,7 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do Windows?" + IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do ReactOS?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "VocÃª quer finalizar a sessÃ£o?" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,7 +706,7 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do Windows?" + IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do ReactOS?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessÃ£o do ReactOS?" @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Tamanho da unidade de atribuiÃ§Ã£o" IDS_COPY_OF "CÃ³pia de" - IDS_SHLEXEC_NOASSOC "NÃ£o existe um programa Windows configurado para abrir este tipo de ficheiro." + IDS_SHLEXEC_NOASSOC "NÃ£o existe um programa ReactOS configurado para abrir este tipo de ficheiro." IDS_FILE_DETAILS "Detalhes para '%s' extensÃ£o" IDS_FILE_DETAILSADV "Ficheiros com extensÃ£o '%s' sÃ£o do tipo '%s'. Para mudar definiÃ§Ãµes que afectam todos '%s' ficheiros, click AvanÃ§ado." Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo odprl.", 12289, 36, 11, 182, 18 + LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -814,7 +814,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Masa parazgjedhur shpÃ«rndarjes" IDS_COPY_OF "Kopjo" - IDS_SHLEXEC_NOASSOC "Nuk ka asnjÃ« program tÃ« Windows tÃ« konfiguruar pÃ«r tÃ« hapur kÃ«tÃ« lloj file." + IDS_SHLEXEC_NOASSOC "Nuk ka asnjÃ« program tÃ« ReactOS tÃ« konfiguruar pÃ«r tÃ« hapur kÃ«tÃ« lloj file." IDS_FILE_DETAILS "Detaje pÃ«r '%s' prapashtesÃ«" IDS_FILE_DETAILSADV "Dokumente me prapashtesÃ« '%s' janÃ« tÃ« tipit '%s'. PÃ«r tÃ« ndryshuar cilÃ«simet qÃ« ndikojnÃ« tÃ« gjithÃ« '%s' dokumentet, kliko Avancuar." Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och wine kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och ReactOS kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãppna:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ° Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼" IDS_COPY_OF "ÐÐ¾Ð¿ÑÑ" - IDS_SHLEXEC_NOASSOC "ÐÐµÐ¼Ð°Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Windows, ÑÐºÐ¾Ð½ÑÑÐ³ÑÑÐ¾Ð²Ð°Ð½Ð¾Ñ Ð´Ð»Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»ÑÐ²." + IDS_SHLEXEC_NOASSOC "ÐÐµÐ¼Ð°Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ ReactOS, ÑÐºÐ¾Ð½ÑÑÐ³ÑÑÐ¾Ð²Ð°Ð½Ð¾Ñ Ð´Ð»Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»ÑÐ²." IDS_FILE_DETAILS "ÐÐ¾Ð´ÑÐ¾Ð±Ð¸ÑÑ Ð´Ð»Ñ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ '%s'" IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ð¸ Ð· ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½ÑÐ¼ '%s' Ð¼Ð°ÑÑÑ ÑÐ¸Ð¿ '%s'. Ð©Ð¾Ð± Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸, ÑÐºÑ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑÐ¸Ð¼ÑÑÑ Ð½Ð° Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¸ '%s', Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ 'ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾'." Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -818,7 +818,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."

1 0

[mjansen] 72500: Fix the build for msvc users.
by mjansen＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: mjansen Date: Mon Aug 29 13:15:44 2016 New Revision: 72500 URL: http://svn.reactos.org/svn/reactos?rev=72500&view=rev Log: Fix the build for msvc users. Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/message.c trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -79,6 +79,7 @@ set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) +add_dependencies(user32 asm) if(MSVC) # for __ftol2_sse, float to int cast helper Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -17,8 +17,8 @@ #ifdef __i386__ /* For bad applications which provide bad (non stdcall) WndProc */ extern +LRESULT __cdecl -LRESULT CALL_EXTERN_WNDPROC( WNDPROC WndProc, HWND hWnd, Modified: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -15,8 +15,8 @@ .code /* + * LRESULT * __cdecl - * LRESULT * CALL_EXTERN_WNDPROC( * WNDPROC WndProc, * HWND hWnd, @@ -54,3 +54,5 @@ ret ENDFUNC + +END

1 0

[mjansen] 72499: [ATL][SHELL32] Add basic support for _ATL_NO_EXCEPTIONS in CString, use it in shell32 so that we can link without exception support. CORE-11841 #comment Please retest!
by mjansen＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: mjansen Date: Mon Aug 29 12:29:45 2016 New Revision: 72499 URL: http://svn.reactos.org/svn/reactos?rev=72499&view=rev Log: [ATL][SHELL32] Add basic support for _ATL_NO_EXCEPTIONS in CString, use it in shell32 so that we can link without exception support. CORE-11841 #comment Please retest! Added: trunk/reactos/sdk/lib/atl/atlexcept.h (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/sdk/lib/atl/atlsimpstr.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -4,7 +4,7 @@ add_subdirectory(shellmenu) add_subdirectory(shellrecyclebin) -set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) +set_cpp(WITH_RUNTIME) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) if(NOT MSVC) @@ -17,7 +17,8 @@ add_definitions( -D_SHELL32_ - -D_WINE) + -D_WINE + -D_ATL_NO_EXCEPTIONS) include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/atl Added: trunk/reactos/sdk/lib/atl/atlexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlexcept.h?re… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlexcept.h (added) +++ trunk/reactos/sdk/lib/atl/atlexcept.h [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -0,0 +1,38 @@ + +#ifndef __ATLEXCEPT_H__ +#define __ATLEXCEPT_H__ + + +//FIXME: Enable when RaiseException is marked as NORETURN +//DECLSPEC_NORETURN +inline void AtlThrowImp(HRESULT hr) +{ +#ifdef ATLTRACE + ATLTRACE(hr); +#endif + +#ifdef _ATL_NO_EXCEPTIONS + + ATLASSERT(false); + + RaiseException( + hr == E_OUTOFMEMORY ? STATUS_NO_MEMORY : EXCEPTION_ILLEGAL_INSTRUCTION, + EXCEPTION_NONCONTINUABLE, 0, NULL + ); + +#else + + // FIXME: This is horribly wrong, we should implement CException! + throw; + +#endif + +} + + + +#ifndef AtlThrow +#define AtlThrow(x) AtlThrowImp(x) +#endif + +#endif Propchange: trunk/reactos/sdk/lib/atl/atlexcept.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlsimpstr.h?r… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -4,7 +4,7 @@ #pragma once #include <atlcore.h> - +#include <atlexcept.h> namespace ATL { @@ -485,7 +485,7 @@ CStringData* pNewData = pOldData->pStringMgr->Clone()->Allocate(nLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } int nCharsToCopy = ((nOldLength < nLength) ? nOldLength : nLength) + 1; CopyChars(PXSTR(pNewData->data()), nCharsToCopy, @@ -550,7 +550,7 @@ CStringData* pNewData = pStringMgr->Reallocate(pOldData, nLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } Attach(pNewData); @@ -562,7 +562,9 @@ ATLASSERT(nLength <= GetData()->nAllocLength); if (nLength < 0 || nLength > GetData()->nAllocLength) - throw; + { + AtlThrow(E_INVALIDARG); + } GetData()->nDataLength = nLength; m_pszData[nLength] = 0; @@ -583,7 +585,7 @@ pNewData = pNewStringMgr->Allocate(pData->nDataLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } pNewData->nDataLength = pData->nDataLength; @@ -594,6 +596,12 @@ return pNewData; } + + static void ThrowMemoryException() + { + AtlThrow(E_OUTOFMEMORY); + } + }; }

1 0

[aandrejevic] 72498: [NTVDM:SVGA] Don't forget to adapt the console attaching code to the new transposed video memory, and certainly don't forget to make sure the ScanlineSizeLatch and StartAddress...
by aandrejevic＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: aandrejevic Date: Mon Aug 29 04:31:02 2016 New Revision: 72498 URL: http://svn.reactos.org/svn/reactos?rev=72498&view=rev Log: [NTVDM:SVGA] Don't forget to adapt the console attaching code to the new transposed video memory, and certainly don't forget to make sure the ScanlineSizeLatch and StartAddressLatch have the correct values before calling VgaVerticalRetrace. Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] Mon Aug 29 04:31:02 2016 @@ -395,10 +395,10 @@ CurrentAddr = LOWORD((Address + j) * AddressSize); /* Store the character in plane 0 */ - VgaMemory[CurrentAddr] = CharBuff[i * TextResolution.X + j].Char.AsciiChar; + VgaMemory[CurrentAddr * VGA_NUM_BANKS] = CharBuff[i * TextResolution.X + j].Char.AsciiChar; /* Store the attribute in plane 1 */ - VgaMemory[CurrentAddr + VGA_BANK_SIZE] = (BYTE)CharBuff[i * TextResolution.X + j].Attributes; + VgaMemory[CurrentAddr * VGA_NUM_BANKS + 1] = (BYTE)CharBuff[i * TextResolution.X + j].Attributes; } /* Move to the next scanline */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 29 04:31:02 2016 @@ -1765,6 +1765,19 @@ VOID VgaRefreshDisplay(VOID) { + /* Save the scanline size */ + ScanlineSizeLatch = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] + + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; + + /* Save the starting address */ + StartAddressLatch = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT16) << 16) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BITS1718) << 15) + + ((VgaCrtcRegisters[SVGA_CRTC_OVERLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT19) << 12) + + (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F) * ScanlineSizeLatch + + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); + VgaVerticalRetrace(); } @@ -1960,7 +1973,7 @@ UINT i, j; ASSERT(Height <= VGA_MAX_FONT_HEIGHT); - for (i = 0 ; i < VGA_FONT_CHARACTERS; i++) + for (i = 0; i < VGA_FONT_CHARACTERS; i++) { /* Write the character */ for (j = 0; j < Height; j++)

1 0

[jgardou] 72497: [NTOS/MM] - Shuffle parameter chacks in NtMapViewOfSection to make kmtest pass more of them - Restore previously lost check on ZeroBits against 21. Use the architecture specific de...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 21:07:51 2016 New Revision: 72497 URL: http://svn.reactos.org/svn/reactos?rev=72497&view=rev Log: [NTOS/MM] - Shuffle parameter chacks in NtMapViewOfSection to make kmtest pass more of them - Restore previously lost check on ZeroBits against 21. Use the architecture specific define - Better check for ZeroBits and ViewSize Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Aug 28 21:07:51 2016 @@ -3550,14 +3550,40 @@ } _SEH2_END; + /* Check for kernel-mode address */ + if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS) + { + DPRINT1("Kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for range entering kernel-mode */ + if (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)SafeBaseAddress) < SafeViewSize) + { + DPRINT1("Overflowing into kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + /* Check for invalid zero bits */ - if (ZeroBits && SafeBaseAddress) - { - if ((((ULONG_PTR)SafeBaseAddress << ZeroBits) >> ZeroBits) != (ULONG_PTR)SafeBaseAddress) + if (ZeroBits) + { + if (ZeroBits > MI_MAX_ZERO_BITS) { DPRINT1("Invalid zero bits\n"); return STATUS_INVALID_PARAMETER_4; } + + if ((((ULONG_PTR)SafeBaseAddress << ZeroBits) >> ZeroBits) != (ULONG_PTR)SafeBaseAddress) + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } + + if (((((ULONG_PTR)SafeBaseAddress + SafeViewSize) << ZeroBits) >> ZeroBits) != ((ULONG_PTR)SafeBaseAddress + SafeViewSize)) + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } } if (!(AllocationType & MEM_DOS_LIM)) @@ -3575,27 +3601,6 @@ DPRINT("SectionOffset is not at 64-kilobyte address boundary."); return STATUS_MAPPED_ALIGNMENT; } - } - - /* Check for kernel-mode address */ - if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS) - { - DPRINT1("Kernel base not allowed\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check for range entering kernel-mode */ - if (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)SafeBaseAddress) < SafeViewSize) - { - DPRINT1("Overflowing into kernel base not allowed\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check for invalid zero bits */ - if (((ULONG_PTR)SafeBaseAddress + SafeViewSize) > (0xFFFFFFFF >> ZeroBits)) // arch? - { - DPRINT1("Invalid zero bits\n"); - return STATUS_INVALID_PARAMETER_4; } /* Reference the process */

1 0

[aandrejevic] 72496: [NTVDM:BIOS] Implement mode 0x5F, otherwise known as VESA mode 0x101 (640x480 256 colors).
by aandrejevic＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: aandrejevic Date: Sun Aug 28 20:15:03 2016 New Revision: 72496 URL: http://svn.reactos.org/svn/reactos?rev=72496&view=rev Log: [NTVDM:BIOS] Implement mode 0x5F, otherwise known as VESA mode 0x101 (640x480 256 colors). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sun Aug 28 20:15:03 2016 @@ -23,6 +23,87 @@ #include "io.h" /* PRIVATE VARIABLES **********************************************************/ + +static const VBE_MODE_INFO VbeMode_640x480x256_Info = +{ + /* Attributes */ + VBE_MODE_SUPPORTED + | VBE_MODE_OPTIONAL_INFO + // | VBE_MODE_BIOS_SUPPORT + | VBE_MODE_COLOR + | VBE_MODE_GRAPHICS, + + /* Window A attributes */ + VBE_WINDOW_EXISTS | VBE_WINDOW_READABLE | VBE_WINDOW_WRITABLE, + /* Window B attributes */ + 0, + + 16, /* Window granularity, in KB */ + 64, /* Window size, in KB */ + 0xA000, /* Window A segment, or zero if not supported */ + 0x0000, /* Window B segment, or zero if not supported */ + 0x00000000, /* Window position function pointer */ + 800, /* Bytes per scanline */ + 640, /* Width */ + 480, /* Height */ + 8, /* Character cell width */ + 16, /* Character cell height */ + 1, /* Number of memory planes */ + 8, /* Bits per pixel */ + 1, /* Number of banks */ + VBE_MODEL_PACKED, /* Memory model */ + 0, /* Bank size */ + 11, /* Number of image pages */ + 0, /* Reserved field */ + 0, /* Red mask size */ + 0, /* Red field position */ + 0, /* Green mask size */ + 0, /* Green field position */ + 0, /* Blue mask size */ + 0, /* Blue field position */ + 0, /* Reserved mask size */ + 0, /* Reserved field position */ + 0, /* Direct color info */ +}; + +static SVGA_REGISTERS VbeMode_640x480x256_Registers = +{ + /* Miscellaneous Register */ + 0x63, + + /* Hidden Register */ + 0x00, + + /* Sequencer Registers */ + { + 0x03, 0x21, 0x0F, 0x00, 0x0E, 0x00, 0x12, 0x11, 0x00, 0x00, 0x18, 0x58, + 0x58, 0x58, 0x58, 0x98, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x2D + }, + + /* CRTC Registers */ + { + 0x5F, 0x4F, 0x4F, 0x80, 0x52, 0x1E, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xEA, 0x2C, 0xDF, 0x50, 0x40, 0xDF, 0x0B, 0xC3, + 0xFF, 0x00, 0x00, 0x22, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, + 0x80, 0x00, 0x20, 0xB8 + }, + + /* GC Registers */ + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF, 0x00, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 + }, + + /* AC Registers */ + { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 + } +}; static const VBE_MODE_INFO VbeMode_800x600x256_Info = { @@ -114,7 +195,7 @@ { 0x5C, 0x103 , &VbeMode_800x600x256_Info, &VbeMode_800x600x256_Registers }, { 0x5D, 0x104 , NULL /* TODO */ , NULL /* TODO */ }, { 0x5E, 0x100 , NULL /* TODO */ , NULL /* TODO */ }, - { 0x5F, 0x101 , NULL /* TODO */ , NULL /* TODO */ }, + { 0x5F, 0x101 , &VbeMode_640x480x256_Info, &VbeMode_640x480x256_Registers }, { 0x60, 0x105 , NULL /* TODO */ , NULL /* TODO */ }, { 0x64, 0x111 , NULL /* TODO */ , NULL /* TODO */ }, { 0x65, 0x114 , NULL /* TODO */ , NULL /* TODO */ },

1 0

[jgardou] 72495: [WIN32SS/USER32] - Do not mask exceptions from WndProc. If this makes programs crash, fine, fix it, but DON'T HIDE BUGS. - Use a wrappper (like wine does) to handle procs with bad ...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 20:04:01 2016 New Revision: 72495 URL: http://svn.reactos.org/svn/reactos?rev=72495&view=rev Log: [WIN32SS/USER32] - Do not mask exceptions from WndProc. If this makes programs crash, fine, fix it, but DON'T HIDE BUGS. - Use a wrappper (like wine does) to handle procs with bad calling conventions ROSTESTS-155 : Please retest, user32 got in the way and masked the exception handler the wine test installed Added: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S (with props) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -64,8 +64,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c include/user32.h) +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + windows/wndproc_fixup.S) +endif() + +add_asm_files(user32_asm ${ASM_SOURCE}) + add_library(user32 SHARED ${SOURCE} + ${user32_asm} user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -12,6 +12,22 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + + +#ifdef __i386__ +/* For bad applications which provide bad (non stdcall) WndProc */ +extern +__cdecl +LRESULT +CALL_EXTERN_WNDPROC( + WNDPROC WndProc, + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); +#else +# define CALL_EXTERN_WNDPROC(proc, h, m, w, l) proc(h, m, w, l) +#endif /* From wine: */ /* flag for messages that contain pointers */ @@ -1448,15 +1464,7 @@ if (PreResult) goto Exit; - _SEH2_TRY // wine does this. - { - Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); if (Hook && MsgOverride) { @@ -1497,15 +1505,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(hWnd, Msg, wParam, lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); if (Hook && MsgOverride) { @@ -1585,15 +1585,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(hWnd, Msg, wParam, lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); if (Hook && MsgOverride) { @@ -1641,16 +1633,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message, - UnicodeMsg.wParam, UnicodeMsg.lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); if (Hook && MsgOverride) { Added: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S (added) +++ trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS user32.dll + * FILE: win32ss/user/user32/windows/wndproc_fixup.S + * PURPOSE: Messages + * PROGRAMMER: JÃ©rÃ´me Gardou jerome.gardou(a)reactos.org + * LICENCE : LGPL, copyright Alexandre Julliard + */ + +#include <asm.inc> +#include <ks386.inc> + +/* Some applications provide invalid callbacks which don't follow the stdcall convention */ + +.code + +/* + * __cdecl + * LRESULT + * CALL_EXTERN_WNDPROC( + * WNDPROC WndProc, + * HWND hWnd, + * UINT Msg, + * WPARAM wParam, + * LPARAM lParam); + */ +PUBLIC _CALL_EXTERN_WNDPROC +FUNC _CALL_EXTERN_WNDPROC + FPO 0, 0, 0, 0, 0, FRAME_FPO + + push ebp + mov ebp, esp + + push edi + push esi + push ebp + + sub esp, 12 + + push dword ptr [ebp + 24] + push dword ptr [ebp + 20] + push dword ptr [ebp + 16] + push dword ptr [ebp + 12] + mov eax, dword ptr [ebp + 8] + + call eax + + lea esp, dword ptr [ebp - 12] + pop ebx + pop esi + pop edi + + leave + ret + +ENDFUNC Propchange: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 72494: [NTOS/MM] - Do not assert on transitions PTEs, we handle them just fine ROSTESTS-155
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 19:59:13 2016 New Revision: 72494 URL: http://svn.reactos.org/svn/reactos?rev=72494&view=rev Log: [NTOS/MM] - Do not assert on transitions PTEs, we handle them just fine ROSTESTS-155 Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Aug 28 19:59:13 2016 @@ -194,9 +194,8 @@ /* Attached processes can't expand their stack */ if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; - /* No support for transition PTEs yet */ - ASSERT(((TempPte.u.Soft.Transition == 1) && - (TempPte.u.Soft.Prototype == 0)) == FALSE); + /* No support for prototype PTEs yet */ + ASSERT(TempPte.u.Soft.Prototype == 0); /* Remove the guard page bit, and return a guard page violation */ TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE;

1 0

[jgardou] 72493: [NTOS/MM] - Properly chain events when reading a page from disk, aka don't wait on events allocated on the stack of another thread - Use proper type pointers, compilers sometimes h...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 19:53:27 2016 New Revision: 72493 URL: http://svn.reactos.org/svn/reactos?rev=72493&view=rev Log: [NTOS/MM] - Properly chain events when reading a page from disk, aka don't wait on events allocated on the stack of another thread - Use proper type pointers, compilers sometimes help making things right Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Aug 28 19:53:27 2016 @@ -882,10 +882,10 @@ PFN_NUMBER Page; NTSTATUS Status; MMPTE TempPte = *PointerPte; - KEVENT Event; PMMPFN Pfn1; ULONG PageFileIndex = TempPte.u.Soft.PageFileLow; ULONG_PTR PageFileOffset = TempPte.u.Soft.PageFileHigh; + ULONG Protection = TempPte.u.Soft.Protection; /* Things we don't support yet */ ASSERT(CurrentProcess > HYDRA_PROCESS); @@ -911,16 +911,10 @@ ASSERT(Pfn1->u1.Event == NULL); ASSERT(Pfn1->u3.e1.ReadInProgress == 0); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Pfn1->u1.Event = &Event; Pfn1->u3.e1.ReadInProgress = 1; /* We must write the PTE now as the PFN lock will be released while performing the IO operation */ - TempPte.u.Soft.Transition = 1; - TempPte.u.Soft.PageFileLow = 0; - TempPte.u.Soft.Prototype = 0; - TempPte.u.Trans.PageFrameNumber = Page; + MI_MAKE_TRANSITION_PTE(&TempPte, Page, Protection); MI_WRITE_INVALID_PTE(PointerPte, TempPte); @@ -934,7 +928,6 @@ *OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Nobody should have changed that while we were not looking */ - ASSERT(Pfn1->u1.Event == &Event); ASSERT(Pfn1->u3.e1.ReadInProgress == 1); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); @@ -946,27 +939,29 @@ Pfn1->u1.ReadStatus = Status; } - /* This is now a nice and normal PFN */ - Pfn1->u1.Event = NULL; + /* And the PTE can finally be valid */ + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, Page); + MI_WRITE_VALID_PTE(PointerPte, TempPte); + Pfn1->u3.e1.ReadInProgress = 0; - - /* And the PTE can finally be valid */ - MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, TempPte.u.Trans.Protection, Page); - MI_WRITE_VALID_PTE(PointerPte, TempPte); - - /* Waiters gonna wait */ - KeSetEvent(&Event, IO_NO_INCREMENT, FALSE); + /* Did someone start to wait on us while we proceeded ? */ + if (Pfn1->u1.Event) + { + /* Tell them we're done */ + KeSetEvent(Pfn1->u1.Event, IO_NO_INCREMENT, FALSE); + } return Status; } NTSTATUS NTAPI -MiResolveTransitionFault(IN PVOID FaultingAddress, +MiResolveTransitionFault(IN BOOLEAN StoreInstruction, + IN PVOID FaultingAddress, IN PMMPTE PointerPte, IN PEPROCESS CurrentProcess, IN KIRQL OldIrql, - OUT PVOID *InPageBlock) + OUT PKEVENT **InPageBlock) { PFN_NUMBER PageFrameIndex; PMMPFN Pfn1; @@ -999,11 +994,11 @@ ASSERT(Pfn1->u4.InPageError == 0); /* See if we should wait before terminating the fault */ - if (Pfn1->u3.e1.ReadInProgress == 1) - { - DPRINT1("The page is currently being read!\n"); - ASSERT(Pfn1->u1.Event != NULL); - *InPageBlock = Pfn1->u1.Event; + if ((Pfn1->u3.e1.ReadInProgress == 1) + || ((Pfn1->u3.e1.WriteInProgress == 1) && StoreInstruction)) + { + DPRINT1("The page is currently in a page transition !\n"); + *InPageBlock = &Pfn1->u1.Event; if (PointerPte == Pfn1->PteAddress) { DPRINT1("And this if for this particular PTE.\n"); @@ -1061,7 +1056,7 @@ } } - /* Build the transition PTE -- maybe a macro? */ + /* Build the final PTE */ ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Trans.Prototype == 0); ASSERT(PointerPte->u.Trans.Transition == 1); @@ -1107,7 +1102,7 @@ PMMPFN Pfn1; PFN_NUMBER PageFrameIndex; NTSTATUS Status; - PVOID InPageBlock = NULL; + PKEVENT* InPageBlock = NULL; ULONG Protection; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ @@ -1256,7 +1251,8 @@ { /* Resolve the transition fault */ ASSERT(OldIrql != MM_NOIRQL); - Status = MiResolveTransitionFault(Address, + Status = MiResolveTransitionFault(StoreInstruction, + Address, PointerProtoPte, Process, OldIrql, @@ -1543,22 +1539,38 @@ /* Is this a transition PTE */ if (TempPte.u.Soft.Transition) { - PVOID InPageBlock = NULL; + PKEVENT* InPageBlock = NULL; + PKEVENT PreviousPageEvent; + KEVENT CurrentPageEvent; + /* Lock the PFN database */ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Resolve */ - Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); + Status = MiResolveTransitionFault(StoreInstruction, Address, PointerPte, Process, LockIrql, &InPageBlock); ASSERT(NT_SUCCESS(Status)); + + if (InPageBlock != NULL) + { + /* Another thread is reading or writing this page. Put us into the waiting queue. */ + KeInitializeEvent(&CurrentPageEvent, NotificationEvent, FALSE); + PreviousPageEvent = *InPageBlock; + *InPageBlock = &CurrentPageEvent; + } /* And now release the lock and leave*/ KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); if (InPageBlock != NULL) { - /* The page is being paged in by another process */ - KeWaitForSingleObject(InPageBlock, WrPageIn, KernelMode, FALSE, NULL); + KeWaitForSingleObject(&CurrentPageEvent, WrPageIn, KernelMode, FALSE, NULL); + + /* Let's the chain go on */ + if (PreviousPageEvent) + { + KeSetEvent(PreviousPageEvent, IO_NO_INCREMENT, FALSE); + } } ASSERT(OldIrql == KeGetCurrentIrql());

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