Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NETSHELL] Repair "Network Connection 'State' does nothing" CORE-18844
by Joachim Henze 19 Feb '23

19 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5cd42c1ea8c2106a1a15… commit a5cd42c1ea8c2106a1a15dde66530d6f3b4ae02e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Feb 19 18:44:21 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Feb 19 18:44:51 2023 +0100 [NETSHELL] Repair "Network Connection 'State' does nothing" CORE-18844 It regressed in master by 0.4.15-dev-5613-g 7a17c7d9adadf88eafc382d792771bea5fc412f8 It was the only place within the ros sources where message WM_SHOWSTATUSDLG was sent also from code. And therefore the only one that needed to be updated as well. --- dll/shellext/netshell/lanstatusui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index a2c8d37dcc6..1c57801b736 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -1027,7 +1027,7 @@ CLanStatus::ShowStatusDialogByCLSID(const GUID *pguidCmdGroup) { if (IsEqualGUID(pItem->guidItem, *pguidCmdGroup)) { - SendMessageW(pItem->hwndDlg, WM_SHOWSTATUSDLG, 0, WM_LBUTTONDOWN); + SendMessageW(pItem->hwndDlg, WM_SHOWSTATUSDLG, 0, WM_LBUTTONUP); return S_OK; } pItem = pItem->pNext;

1 0

[reactos] 01/01: [SYSDM] Fix french translation and layout (#4992)
by Gabriel Grondin 19 Feb '23

19 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e400bd0861a6f022ffad2… commit e400bd0861a6f022ffad2c4a720c2c11c53b27b3 Author: Gabriel Grondin <gglinnk(a)protonmail.com> AuthorDate: Sun Feb 19 18:29:08 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 19 18:29:08 2023 +0100 [SYSDM] Fix french translation and layout (#4992) Based on earlier PR #4704 - Fixed alignment for too long text. - Improved translation. - Minor adjustments. CORE-18381 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Kyle Katarn <contact(a)kcsoftwares.com> --- dll/cpl/sysdm/lang/fr-FR.rc | 122 ++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 44578748964..661943010c3 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -28,17 +28,17 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Matériel" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Gestionnaire de Périphériques", IDC_STATIC, 6, 7, 244, 61 + GROUPBOX "Gestionnaire de périphériques", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON - LTEXT "Le Gestionnaire de Périphériques liste tous les périphériques matériels de votre ordinateur. Utiliser le Gestionnaire de périphériques pour changer les propriétés d'un périphérique.", IDC_STATIC, 42, 18, 204, 24 - PUSHBUTTON "&Gestionnaire de Périphériques...", IDC_HARDWARE_DEVICE_MANAGER, 135, 48, 110, 14 + LTEXT "Le Gestionnaire de périphériques liste tous les périphériques matériels de votre ordinateur. Utiliser le Gestionnaire de périphériques pour changer les propriétés d'un périphérique.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "&Gestionnaire de périphériques...", IDC_HARDWARE_DEVICE_MANAGER, 135, 48, 110, 14 GROUPBOX "Assistant Matériel", IDC_STATIC, 6, 79, 244, 61 ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON - LTEXT "L'Assistant Matériel vous aide à installer, désinstaller, réparer, débrancher, éjecter et configurer votre matériel.", IDC_STATIC, 42, 90, 204, 24 + LTEXT "L'Assistant matériel vous aide à installer, désinstaller, réparer, débrancher, éjecter et configurer votre matériel.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Assistant Matériel...", IDC_HARDWARE_WIZARD, 135, 120, 110, 14 GROUPBOX "Profils Matériels", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON - LTEXT "Les Profils Matériels sont un moyen de paramétrer et d'enregistrer différentes configurations matérielles.", IDC_STATIC, 42, 160, 204, 24 + LTEXT "Les profils matériels vous offrent la possibilité de définir et d'enregistrer plusieurs configurations matérielles.", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "&Profils Matériels...", IDC_HARDWARE_PROFILE, 135, 190, 110, 14 END @@ -48,18 +48,18 @@ CAPTION "Avancé" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Les privilèges administrateur sont requis pour la plupart de ces paramètres.", IDC_STATIC, 12, 5, 236, 8 - GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 + GROUPBOX "Performances", IDC_STATIC, 6, 18, 244, 50 LTEXT "Les options de performance contrôlent comment les applications utilisent la mémoire, ce qui affecte la vitesse de l'ordinateur.", IDC_STATIC, 16, 29, 210, 25 - PUSHBUTTON "Réglages", IDC_PERFOR, 194, 48, 50, 15 - GROUPBOX "Profils Utilisateurs", IDC_STATIC, 6, 75, 244, 48 + PUSHBUTTON "&Paramètres", IDC_PERFOR, 194, 48, 50, 15 + GROUPBOX "Profils des utilisateurs", IDC_STATIC, 6, 75, 244, 48 LTEXT "Réglages liés à votre compte utilsateur.", IDC_STATIC, 16, 88, 210, 20 - PUSHBUTTON "Réglages", IDC_USERPROFILE, 194, 103, 50, 15 + PUSHBUTTON "P&aramètres", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "Démarrage et Récupération", IDC_STATIC, 6, 131, 244, 52 - LTEXT "Les options Démarrage et Récupération indiquent à l'ordinateur comment démarrer et quoi faire si une erreur empêche l'ordinateur de s'arrêter.", IDC_STATIC, 16, 144, 210, 27 - PUSHBUTTON "Réglages", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "Paramètres système", IDC_SYSSETTINGS, 6, 192, 75, 15 - PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 83, 192, 90, 15 - PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 175, 192, 75, 15 + LTEXT "Les options de démarrage et récupération indiquent à l'ordinateur comment démarrer et quoi faire si une erreur empêche l'ordinateur de s'arrêter.", IDC_STATIC, 16, 144, 210, 27 + PUSHBUTTON "Para&mètres", IDC_STAREC, 194, 162, 50, 15 + PUSHBUTTON "Paramètres &système", IDC_SYSSETTINGS, 6, 192, 75, 15 + PUSHBUTTON "&Variables d'environnement", IDC_ENVVAR, 83, 192, 95, 15 + PUSHBUTTON "&Rapport d'erreurs", IDC_ERRORREPORT, 180, 192, 70, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 @@ -80,18 +80,18 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON LTEXT "Vous pouvez paramétrer des profils matériels pour différentes configurations matérielles. Au démarrage, vous pouvez choisir le profil désiré.", IDC_STATIC, 46, 11, 188, 25 - LTEXT "Profils Matériels disponibles:", IDC_STATIC, 8, 41, 120, 8 + LTEXT "Profils &matériels disponibles :", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "&Propriétés", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED - PUSHBUTTON "&Copier", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Copi&er", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED PUSHBUTTON "&Renommer", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED - PUSHBUTTON "&Effacer", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED - GROUPBOX "Sélection de Profils Matériels ", IDC_STATIC, 7, 130, 240, 75 - LTEXT "Quand ReactOS démarre :", IDC_STATIC, 14, 142, 210, 8 - AUTORADIOBUTTON "&Attendre la sélection d'un profil matériel", IDC_HRDPROFWAIT, 14, 158, 145, 8, WS_GROUP - AUTORADIOBUTTON "&Sélectionner le premier profil si aucun profil n'est sélectionné", IDC_HRDPROFSELECT, 14, 173, 215, 8 + PUSHBUTTON "S&upprimer", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED + GROUPBOX "Sélection de profils matériels ", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Au démarrage de ReactOS :", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "A&ttendre que l'utilisateur sélectionne un profil matériel", IDC_HRDPROFWAIT, 14, 158, 220, 8, WS_GROUP + AUTORADIOBUTTON "&Sélectionner le premier profil listé en l'absence de sélection après", IDC_HRDPROFSELECT, 14, 173, 220, 8 LTEXT "secondes", IDC_STATIC, 65, 187, 35, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | @@ -153,10 +153,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON LTEXT "Les Profils Utilisateurs contiennent les réglages et autres informations liées à votre compte. Un profil différent peut être créé sur chaque ordinateur utilisé, ou vous pouvez sélectionner un profil mobile qui sera le même sur chaque ordinateur.", IDC_STATIC, 40, 11, 204, 35 - LTEXT "Profils enregistrés sur cet ordinateur :", IDC_STATIC, 16, 51, 204, 9 + LTEXT "&Profils enregistrés sur cet ordinateur :", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE - PUSHBUTTON "Chan&ger le type", IDC_USERPROFILE_CHANGE, 80, 155, 60, 15 + PUSHBUTTON "&Modifier le type", IDC_USERPROFILE_CHANGE, 80, 155, 60, 15 PUSHBUTTON "&Supprimer", IDC_USERPROFILE_DELETE, 145, 155, 50, 15 PUSHBUTTON "&Copier vers...", IDC_USERPROFILE_COPY, 200, 155, 50, 15 CONTROL "Pour créer des <A>Profils Utilisateurs</A>, ouvrir dans le Panneau de Configuration.", @@ -198,29 +198,29 @@ CAPTION "Démarrage et Récupération" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Démarrage du système", IDC_STATIC, 7, 12, 238, 95 - LTEXT "Système d'exploitation par défaut :", IDC_STATIC, 14, 26, 110, 8 + LTEXT "&Système d'exploitation par défaut :", IDC_STATIC, 14, 26, 110, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Affiche la liste des systèmes pendant :", IDC_STRECLIST, 14, 56, 150, 8 + AUTOCHECKBOX "A&fficher la liste des systèmes d'exploitation pendant :", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondes", IDC_STATIC, 210, 56, 30, 8 - AUTOCHECKBOX "Affiche les options de récupération pendant :", IDC_STRRECREC, 14, 70, 163, 8 + AUTOCHECKBOX "Aff&icher les options de récupération pendant :", IDC_STRRECREC, 14, 70, 163, 8 EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondes", IDC_STATIC, 210, 70, 30, 8 - LTEXT "Pour éditer le fichier d'options de démarrage manuellement, cliquer sur Éditer.", IDC_STATIC, 14, 85, 187, 18 - PUSHBUTTON "&Éditer", IDC_STRRECEDIT, 188, 87, 50, 14 - GROUPBOX "Erreur Système", IDC_STATIC, 7, 111, 238, 140 - AUTOCHECKBOX "&Écrire un événement dans le journal système", IDC_STRRECWRITEEVENT, 14, 124, 160, 10 - AUTOCHECKBOX "Envoyer une alerte administrative", IDC_STRRECSENDALERT, 14, 138, 148, 10 - AUTOCHECKBOX "Redémarrer automatiquement", IDC_STRRECRESTART, 14, 152, 145, 10 - GROUPBOX "Écrire les informations de débogage", IDC_STATIC, 12, 167, 227, 76 + LTEXT "Cliquez sur Modifier pour modifier les options de démarrage.", IDC_STATIC, 14, 85, 187, 18 + PUSHBUTTON "&Modifier", IDC_STRRECEDIT, 188, 87, 50, 14 + GROUPBOX "Défailllance du système", IDC_STATIC, 7, 111, 238, 140 + AUTOCHECKBOX "Écrire un é&vénement dans le journal système", IDC_STRRECWRITEEVENT, 14, 124, 160, 10 + AUTOCHECKBOX "Envoyer une a&lerte d'administration", IDC_STRRECSENDALERT, 14, 138, 148, 10 + AUTOCHECKBOX "&Redémarrer automatiquement", IDC_STRRECRESTART, 14, 152, 145, 10 + GROUPBOX "Écriture des informations de débogage", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST | WS_TABSTOP - LTEXT "Fichier Cliché :", IDC_STATIC, 17, 202, 150, 8 + LTEXT "Fichier de l'image mémoire :", IDC_STATIC, 17, 202, 150, 8 EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL - AUTOCHECKBOX "&Écraser tout fichier existant", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + AUTOCHECKBOX "R&emplacer tous les fichiers existants", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 258, 50, 15 PUSHBUTTON "Annuler", IDCANCEL, 195, 258, 50, 15 END @@ -230,7 +230,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "Mémoire virtuelle" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Lecteur [Nom de Volume]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "&Lecteur [Nom de Volume]", IDC_STATIC, 12, 5, 96, 9 LTEXT "Taille du fichier d'échange (Mo)", IDC_STATIC, 115, 5, 99, 9 LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS GROUPBOX "Taille du fichier d'échange pour le disque sélectionné", IDC_DRIVEGROUP, 10, 70, 204, 104 @@ -238,16 +238,16 @@ BEGIN LTEXT "%s", IDC_DRIVE, 88, 80, 100, 9 LTEXT "Espace disponible :", IDC_STATIC, 20, 92, 66, 9 LTEXT "%s", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "Taille initiale (Mo) :", -1, 22, 118, 72, 9 - LTEXT "Taille maximale (Mo) :", -1, 22, 131, 72, 9 + LTEXT "Taille &initiale (Mo) :", -1, 22, 118, 72, 9 + LTEXT "Taille &maximale (Mo) :", -1, 22, 131, 72, 9 AUTORADIOBUTTON "&Taille personnalisée", IDC_CUSTOM, 20, 105, 75, 9, WS_GROUP - AUTORADIOBUTTON "&Taille &gérée par le système", IDC_SYSMANSIZE, 20, 145, 100, 9 - AUTORADIOBUTTON "Aucun fichier d'échange", IDC_NOPAGEFILE, 20, 158, 100,9 + AUTORADIOBUTTON "Taille gérée par le &système", IDC_SYSMANSIZE, 20, 145, 100, 9 + AUTORADIOBUTTON "Aucu&n fichier d'échange", IDC_NOPAGEFILE, 20, 158, 100,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE - PUSHBUTTON "Définir", IDC_SET, 158, 154, 50, 15 + PUSHBUTTON "&Définir", IDC_SET, 158, 154, 50, 15 GROUPBOX "Taille totale du fichier d'échange pour tous les lecteurs", IDC_TOTALGROUP, 10, 177, 204, 46 - LTEXT "Minimum alloué :", IDC_STATIC, 18, 188, 58, 9 + LTEXT "Minimum autorisée :", IDC_STATIC, 18, 188, 58, 9 LTEXT "%s", IDC_MINIMUM, 90, 188, 100, 9 LTEXT "Recommandée :", IDC_STATIC, 18, 199, 52, 9 LTEXT "%s", IDC_RECOMMENDED, 90, 199, 100, 9 @@ -263,18 +263,18 @@ CAPTION "Variables d'environnement" FONT 8, "MS Shell Dlg" BEGIN SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP - GROUPBOX "Variables utilisateur", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 + GROUPBOX "Varia&bles utilisateur", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nouvelle...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 - PUSHBUTTON "&Éditer...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&Modifier...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Supprimer", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variables système", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 + GROUPBOX "&Variables système", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE - PUSHBUTTON "Nou&velle...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 - PUSHBUTTON "Édi&ter...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 - PUSHBUTTON "Su&pprimer", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + PUSHBUTTON "N&ouvelle...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "Mo&difier...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "S&upprimer", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP PUSHBUTTON "Annuler", IDCANCEL, 195, 224, 50, 14 END @@ -291,8 +291,8 @@ BEGIN EDITTEXT IDC_VARIABLE_VALUE, 80, 30, 284, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 314, 50, 50, 14 - PUSHBUTTON "Browse &Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 - PUSHBUTTON "Browse &Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 + PUSHBUTTON "Parcourir le &répertoire...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 90, 14 + PUSHBUTTON "Parcourir le &fichier...", IDC_BUTTON_BROWSE_FILE, 101, 50, 90, 14 END IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 @@ -302,14 +302,14 @@ FONT 8, "MS Shell Dlg" BEGIN SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | - LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE - PUSHBUTTON "&New", IDC_BUTTON_NEW, 242, 10, 50, 14 - PUSHBUTTON "&Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 - PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 - PUSHBUTTON "Move &Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 - PUSHBUTTON "Move D&own", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 - PUSHBUTTON "Edit &text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 194, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "&Nouveau", IDC_BUTTON_NEW, 212, 10, 80, 14 + PUSHBUTTON "Mo&difier", IDC_BUTTON_EDIT, 212, 30, 80, 14 + PUSHBUTTON "&Parcourir...", IDC_BUTTON_BROWSE_FOLDER, 212, 50, 80, 14 + PUSHBUTTON "&Supprimer", IDC_BUTTON_DELETE, 212, 70, 80, 14 + PUSHBUTTON "Déplacer vers le ha&ut", IDC_BUTTON_MOVE_UP, 212, 100, 80, 14 + PUSHBUTTON "Déplacer vers le &bas", IDC_BUTTON_MOVE_DOWN, 212, 120, 80, 14 + PUSHBUTTON "Modifier le &texte...", IDC_BUTTON_EDIT_TEXT, 212, 150, 80, 14 DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 242, 228, 50, 14 END @@ -367,7 +367,7 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Attention" - IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." - IDS_ENVIRONMENT_WARNING_TITLE "System Properties" - IDS_FILE_BROWSE_FILTER "All Files (*.*)\0*.*\0" + IDS_ENVIRONMENT_WARNING "Les modifications apportées dans cette boite de dialogue seront ignorées, et cette valeur sera alors modifiée en tant que texte." + IDS_ENVIRONMENT_WARNING_TITLE "Propriétés système" + IDS_FILE_BROWSE_FILTER "Tous les fichiers (*.*)\0*.*\0" END

1 0

[reactos] 01/01: [AUDIOSRV] Overhaul logging interfaces CORE-16912 (#5067)
by Joachim Henze 18 Feb '23

18 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9672dc50479f42c6da51b… commit 9672dc50479f42c6da51b426618f05a9394a9ef2 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sat Feb 18 18:28:30 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 18 18:28:30 2023 +0100 [AUDIOSRV] Overhaul logging interfaces CORE-16912 (#5067) --- base/services/audiosrv/CMakeLists.txt | 3 +- base/services/audiosrv/audiosrv.h | 13 +++----- base/services/audiosrv/debug.c | 33 -------------------- base/services/audiosrv/main.c | 50 ++++++++++++++++--------------- base/services/audiosrv/pnp.c | 18 +++++------ base/services/audiosrv/pnp_list_lock.c | 9 +++--- base/services/audiosrv/pnp_list_manager.c | 47 +++++++++++++---------------- base/services/audiosrv/services.c | 28 +++++++++-------- 8 files changed, 79 insertions(+), 122 deletions(-) diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt index 979161a36c2..094f948ce93 100644 --- a/base/services/audiosrv/CMakeLists.txt +++ b/base/services/audiosrv/CMakeLists.txt @@ -5,11 +5,10 @@ list(APPEND SOURCE pnp_list_lock.c pnp.c services.c - debug.c audiosrv.h) add_executable(audiosrv ${SOURCE} audiosrv.rc) set_module_type(audiosrv win32cui UNICODE) -add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32 ntdll) add_pch(audiosrv audiosrv.h SOURCE) add_cd_file(TARGET audiosrv DESTINATION reactos/system32 FOR all) diff --git a/base/services/audiosrv/audiosrv.h b/base/services/audiosrv/audiosrv.h index 567465717e8..e143f11b230 100644 --- a/base/services/audiosrv/audiosrv.h +++ b/base/services/audiosrv/audiosrv.h @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/audiosrv.h - * PURPOSE: Audio Service (private header) - * COPYRIGHT: Copyright 2007 Andrew Greenwood + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service (private header) + * COPYRIGHT: Copyright 2007 Andrew Greenwood */ #ifndef _AUDIOSRV_PCH_ @@ -62,10 +61,6 @@ HandleDeviceEvent( BOOL StartSystemAudioServices(VOID); -/* Debugging */ - -void logmsg(char* string, ...); - #endif #endif /* _AUDIOSRV_PCH_ */ diff --git a/base/services/audiosrv/debug.c b/base/services/audiosrv/debug.c deleted file mode 100644 index c19aada3538..00000000000 --- a/base/services/audiosrv/debug.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Service debugging (simply logs to a file) */ - -#include "audiosrv.h" - -#include <stdio.h> - -// FIXME: Disabled to work around CORE-16814 (and CORE-16912). -// #define ENABLE_LOGMSG_FILE - -void logmsg(char* string, ...) -{ - va_list args; - -#ifdef ENABLE_LOGMSG_FILE - FILE* debug_file = fopen("c:\\audiosrv-debug.txt", "a"); - - if (debug_file) - { - va_start(args, string); - vfprintf(debug_file, string, args); - va_end(args); - fclose(debug_file); - } - else -#endif - { - char buf[256]; - va_start(args, string); - vsprintf(buf, string, args); - OutputDebugStringA(buf); - va_end(args); - } -} diff --git a/base/services/audiosrv/main.c b/base/services/audiosrv/main.c index efbff7dc81e..5a5157f0e3d 100644 --- a/base/services/audiosrv/main.c +++ b/base/services/audiosrv/main.c @@ -1,13 +1,15 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/main.c - * PURPOSE: Audio Service - * COPYRIGHT: Copyright 2007 Andrew Greenwood + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service + * COPYRIGHT: Copyright 2007 Andrew Greenwood */ #include "audiosrv.h" +#define NDEBUG +#include <debug.h> + SERVICE_STATUS_HANDLE service_status_handle; SERVICE_STATUS service_status; @@ -34,19 +36,19 @@ ServiceControlHandler( { case SERVICE_CONTROL_INTERROGATE : { - logmsg("* Interrogation\n"); + DPRINT("* Interrogation\n"); return NO_ERROR; } case SERVICE_CONTROL_STOP : case SERVICE_CONTROL_SHUTDOWN : { - logmsg("* Service Stop/Shutdown request received\n"); + DPRINT("* Service Stop/Shutdown request received\n"); - logmsg("Unregistering device notifications\n"); + DPRINT("Unregistering device notifications\n"); UnregisterDeviceNotifications(); - logmsg("Destroying audio device list\n"); + DPRINT("Destroying audio device list\n"); DestroyAudioDeviceList(); service_status.dwCurrentState = SERVICE_STOP_PENDING; @@ -57,14 +59,14 @@ ServiceControlHandler( SetServiceStatus(service_status_handle, &service_status); - logmsg("* Service stopped\n"); + DPRINT("* Service stopped\n"); return NO_ERROR; } case SERVICE_CONTROL_DEVICEEVENT : { - logmsg("* Device Event\n"); + DPRINT("* Device Event\n"); return HandleDeviceEvent(dwEventType, lpEventData); } @@ -78,16 +80,16 @@ ServiceControlHandler( VOID CALLBACK ServiceMain(DWORD argc, LPWSTR argv) { - logmsg("* Service starting\n"); - logmsg("Registering service control handler...\n"); + DPRINT("* Service starting\n"); + DPRINT("Registering service control handler\n"); service_status_handle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, ServiceControlHandler, NULL); - logmsg("Service status handle %d\n", service_status_handle); + DPRINT("Service status handle %d\n", service_status_handle); if (!service_status_handle) { - logmsg("Failed to register service control handler\n"); + DPRINT("Failed to register service control handler\n"); /* FIXME - we should fail */ } @@ -103,23 +105,23 @@ ServiceMain(DWORD argc, LPWSTR argv) service_status.dwCurrentState = SERVICE_START_PENDING; SetServiceStatus(service_status_handle, &service_status); - logmsg("Creating audio device list\n"); + DPRINT("Creating audio device list\n"); /* This creates the audio device list and mutex */ if (!CreateAudioDeviceList(AUDIO_LIST_MAX_SIZE)) { - logmsg("Failed to create audio device list\n"); + DPRINT("Failed to create audio device list\n"); service_status.dwCurrentState = SERVICE_STOPPED; service_status.dwWin32ExitCode = -1; SetServiceStatus(service_status_handle, &service_status); return; } - logmsg("Registering for device notifications\n"); + DPRINT("Registering for device notifications\n"); /* We want to know when devices are added/removed */ if (!RegisterForDeviceNotifications()) { /* FIXME: This is not fatal at present as ROS does not support this */ - logmsg("Failed to register for device notifications\n"); + DPRINT("Failed to register for device notifications\n"); /* DestroyAudioDeviceList(); @@ -134,11 +136,11 @@ ServiceMain(DWORD argc, LPWSTR argv) InitializeFakeDevice(); - logmsg("Processing existing devices\n"); + DPRINT("Processing existing devices\n"); /* Now find any devices that already exist on the system */ if (!ProcessExistingDevices()) { - logmsg("Could not process existing devices\n"); + DPRINT("Could not process existing devices\n"); UnregisterDeviceNotifications(); DestroyAudioDeviceList(); @@ -148,7 +150,7 @@ ServiceMain(DWORD argc, LPWSTR argv) return; } - logmsg("* Service started\n"); + DPRINT("* Service started\n"); /* Tell SCM we are now running, and we may be stopped */ service_status.dwCurrentState = SERVICE_RUNNING; service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP; @@ -163,9 +165,9 @@ int wmain(VOID) { NULL, NULL } }; - logmsg("Audio Service main()\n"); + DPRINT("Audio Service main()\n"); if (!StartServiceCtrlDispatcherW(service_table)) - logmsg("StartServiceCtrlDispatcher failed\n"); + DPRINT("StartServiceCtrlDispatcher failed\n"); return 0; } diff --git a/base/services/audiosrv/pnp.c b/base/services/audiosrv/pnp.c index 7db8a550569..26a2fae9449 100644 --- a/base/services/audiosrv/pnp.c +++ b/base/services/audiosrv/pnp.c @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/pnp.c - * PURPOSE: Audio Service Plug and Play - * COPYRIGHT: Copyright 2007 Andrew Greenwood + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service Plug and Play + * COPYRIGHT: Copyright 2007 Andrew Greenwood */ #include "audiosrv.h" @@ -15,6 +14,9 @@ #include <ks.h> #include <ksmedia.h> +#define NDEBUG +#include <debug.h> + static HDEVNOTIFY device_notification_handle = NULL; /* @@ -42,8 +44,6 @@ ProcessExistingDevices(VOID) NULL, NULL); -/* printf("%s:\n", ClassString); */ - interface_data.cbSize = sizeof(interface_data); interface_data.Reserved = 0; @@ -60,7 +60,7 @@ ProcessExistingDevices(VOID) if ( ! detail_data ) { - logmsg("ProcessExistingDevices() failed to allocate detail_data\n"); + DPRINT("failed to allocate detail_data\n"); return TRUE; } @@ -143,7 +143,7 @@ RegisterForDeviceNotifications(VOID) DEVICE_NOTIFY_ALL_INTERFACE_CLASSES*/); if (!device_notification_handle) { - logmsg("RegisterDeviceNotification() failed with error %d\n", GetLastError()); + DPRINT("failed with error %d\n", GetLastError()); } return ( device_notification_handle != NULL ); diff --git a/base/services/audiosrv/pnp_list_lock.c b/base/services/audiosrv/pnp_list_lock.c index ea6224a6ed3..209c4bc9f5d 100644 --- a/base/services/audiosrv/pnp_list_lock.c +++ b/base/services/audiosrv/pnp_list_lock.c @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/pnp_list_lock.c - * PURPOSE: Audio Service Plug and Play list locking mechanism - * COPYRIGHT: Copyright 2007 Andrew Greenwood + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service Plug and Play list locking mechanism + * COPYRIGHT: Copyright 2007 Andrew Greenwood */ #include "audiosrv.h" diff --git a/base/services/audiosrv/pnp_list_manager.c b/base/services/audiosrv/pnp_list_manager.c index 0854d69eb4a..b477a2b1923 100644 --- a/base/services/audiosrv/pnp_list_manager.c +++ b/base/services/audiosrv/pnp_list_manager.c @@ -1,13 +1,15 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/pnp_list_manager.c - * PURPOSE: Audio Service List Manager - * COPYRIGHT: Copyright 2007 Andrew Greenwood + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service List Manager + * COPYRIGHT: Copyright 2007 Andrew Greenwood */ #include "audiosrv.h" +#define NDEBUG +#include <debug.h> + /* Device descriptor */ @@ -20,12 +22,10 @@ CreateDeviceDescriptor(WCHAR* path, BOOL is_enabled) int path_length = WideStringSize(path); int size = sizeof(PnP_AudioDevice) + path_length; -/* printf("path_length %d, total %d\n", path_length, size);*/ - device = malloc(size); if (! device) { - logmsg("Failed to create a device descriptor (malloc fail)\n"); + DPRINT("Failed to malloc device descriptor\n"); return NULL; } @@ -64,15 +64,10 @@ AppendAudioDeviceToList(PnP_AudioDevice* device) LockAudioDeviceList(); -/* - printf("list size is %d\n", audio_device_list->size); - printf("device info size is %d bytes\n", device_info_size); -*/ - /* We DON'T want to overshoot the end of the buffer! */ if (audio_device_list->size + device_info_size > audio_device_list->max_size) { - /*printf("max_size would be exceeded! Failing...\n");*/ + /*DPRINT("failed, max_size would be exceeded\n");*/ UnlockAudioDeviceList(); @@ -90,7 +85,7 @@ AppendAudioDeviceToList(PnP_AudioDevice* device) UnlockAudioDeviceList(); - logmsg("Device added to list\n"); + DPRINT("Device added to list\n"); return TRUE; } @@ -98,11 +93,9 @@ AppendAudioDeviceToList(PnP_AudioDevice* device) BOOL CreateAudioDeviceList(DWORD max_size) { -/* printf("Initializing memory device list lock\n");*/ - if (!InitializeAudioDeviceListLock()) { - /*printf("Failed!\n");*/ + /*DPRINT("Failed\n");*/ return FALSE; } @@ -111,7 +104,7 @@ CreateAudioDeviceList(DWORD max_size) turning up before we're ready... */ LockAudioDeviceList(); - logmsg("Creating file mapping\n"); + DPRINT("Creating file mapping\n"); /* Expose our device list to the world */ device_list_file = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, @@ -121,7 +114,7 @@ CreateAudioDeviceList(DWORD max_size) AUDIO_LIST_NAME); if (!device_list_file) { - logmsg("Creation of audio device list failed (err %d)\n", GetLastError()); + DPRINT("Creation of audio device list failed (err %d)\n", GetLastError()); UnlockAudioDeviceList(); KillAudioDeviceListLock(); @@ -129,7 +122,7 @@ CreateAudioDeviceList(DWORD max_size) return FALSE; } - logmsg("Mapping view of file\n"); + DPRINT("Mapping view of file\n"); /* Of course, we'll need to access the list ourselves */ audio_device_list = MapViewOfFile(device_list_file, FILE_MAP_WRITE, @@ -138,7 +131,7 @@ CreateAudioDeviceList(DWORD max_size) max_size); if (!audio_device_list) { - logmsg("MapViewOfFile FAILED (err %d)\n", GetLastError()); + DPRINT("MapViewOfFile FAILED (err %d)\n", GetLastError()); CloseHandle(device_list_file); device_list_file = NULL; @@ -159,7 +152,7 @@ CreateAudioDeviceList(DWORD max_size) UnlockAudioDeviceList(); - logmsg("Device list created\n"); + DPRINT("Device list created\n"); return TRUE; } @@ -167,20 +160,20 @@ CreateAudioDeviceList(DWORD max_size) VOID DestroyAudioDeviceList(VOID) { - logmsg("Destroying device list\n"); + DPRINT("Destroying device list\n"); LockAudioDeviceList(); - /*printf("Unmapping view\n");*/ + /*DPRINT("Unmapping view\n");*/ UnmapViewOfFile(audio_device_list); audio_device_list = NULL; - /*printf("Closing memory mapped file\n");*/ + /*DPRINT("Closing memory mapped file\n");*/ CloseHandle(device_list_file); device_list_file = NULL; UnlockAudioDeviceList(); - /*printf("Killing devlist lock\n");*/ + /*DPRINT("Killing devlist lock\n");*/ KillAudioDeviceListLock(); } diff --git a/base/services/audiosrv/services.c b/base/services/audiosrv/services.c index 68c14835e06..c6af09cd551 100644 --- a/base/services/audiosrv/services.c +++ b/base/services/audiosrv/services.c @@ -1,13 +1,15 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/audiosrv/services.c - * PURPOSE: Audio Service Plug and Play - * COPYRIGHT: Copyright 2009 Johannes Anderwald + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Audio Service Plug and Play + * COPYRIGHT: Copyright 2009 Johannes Anderwald */ #include "audiosrv.h" +#define NDEBUG +#include <debug.h> + BOOL WaitForService( SC_HANDLE hService, @@ -21,7 +23,7 @@ WaitForService( { if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) { - logmsg("QueryServiceStatusEx failed %x\n", GetLastError()); + DPRINT("QueryServiceStatusEx failed %x\n", GetLastError()); break; } @@ -32,7 +34,7 @@ WaitForService( } while (Index++ < RetryCount); - logmsg("Timeout while waiting for service to become ready %p\n", hService); + DPRINT("Timeout while waiting for service to become ready %p\n", hService); return FALSE; } @@ -49,13 +51,13 @@ StartAudioService( hService = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); if (!hService) { - logmsg("Failed to open service %S %x\n", ServiceName, GetLastError()); + DPRINT("Failed to open service %S %x\n", ServiceName, GetLastError()); return FALSE; } if (!StartService(hService, 0, NULL)) { - logmsg("Failed to start service %S %x\n", ServiceName, GetLastError()); + DPRINT("Failed to start service %S %x\n", ServiceName, GetLastError()); CloseServiceHandle(hService); return FALSE; } @@ -71,18 +73,18 @@ StartSystemAudioServices(VOID) { SC_HANDLE hSCManager; - logmsg("Starting system audio services\n"); + DPRINT("Starting system audio services\n"); hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (!hSCManager) { - logmsg("Failed to open service manager %x\n", GetLastError()); + DPRINT("Failed to open service manager %x\n", GetLastError()); return FALSE; } - logmsg("Starting sysaudio service\n"); + DPRINT("Starting sysaudio service\n"); StartAudioService(hSCManager, L"sysaudio", 20); - logmsg("Starting wdmaud service\n"); + DPRINT("Starting wdmaud service\n"); StartAudioService(hSCManager, L"wdmaud", 20); CloseServiceHandle(hSCManager);

1 0

[reactos] 01/01: [NOTEPAD] Simplify FileExists function (#5079)
by Katayama Hirofumi MZ 18 Feb '23

18 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=504bf68e2a031b93fa612… commit 504bf68e2a031b93fa612dcc56d036cc9430193e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 18 21:40:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 18 21:40:11 2023 +0900 [NOTEPAD] Simplify FileExists function (#5079) Simplify FileExists helper function by using GetFileAttributes function. CORE-18837 --- base/applications/notepad/dialog.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index bc692321417..0b76b4711fd 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -228,13 +228,7 @@ static void AlertPrintError(void) */ BOOL FileExists(LPCTSTR szFilename) { - WIN32_FIND_DATA entry; - HANDLE hFile; - - hFile = FindFirstFile(szFilename, &entry); - FindClose(hFile); - - return (hFile != INVALID_HANDLE_VALUE); + return GetFileAttributes(szFilename) != INVALID_FILE_ATTRIBUTES; } BOOL HasFileExtension(LPCTSTR szFilename)

1 0

[reactos] 01/01: [MCIAVI32] Media Player: Don't open empty files (#5063)
by Atharva Kulkarni 18 Feb '23

18 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebc69d089f7cb3168caf4… commit ebc69d089f7cb3168caf4de80d8f97feca7df37d Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Sat Feb 18 16:03:58 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 18 19:33:58 2023 +0900 [MCIAVI32] Media Player: Don't open empty files (#5063) Opening an empty file in media player could cause a crash. CORE-18669 --- dll/win32/mciavi32/mmoutput.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/mciavi32/mmoutput.c b/dll/win32/mciavi32/mmoutput.c index ee0481c59c7..ca060574e01 100644 --- a/dll/win32/mciavi32/mmoutput.c +++ b/dll/win32/mciavi32/mmoutput.c @@ -398,6 +398,13 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } + + /* Empty file */ + if (alb.numVideoFrames == 0) { + WARN("NumVideoFrames: %u, Empty or possibly corrupt video file"); + return FALSE; + } + if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", wma->dwPlayableVideoFrames, alb.numVideoFrames); @@ -613,6 +620,11 @@ double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { + if (wma->dwCurrVideoFrame >= wma->dwPlayableVideoFrames) { + ERR("Invalid frame requested. Current : %u Total Playable %u\n", wma->dwCurrVideoFrame, wma->dwPlayableVideoFrames); + return 0; + } + if (!wma->lpVideoIndex[wma->dwCurrVideoFrame].dwOffset) return 0;

1 0

[reactos] 01/01: [IP] Allow 0xFFFF as Valid Network Port Number (#5074)
by Doug Lyons 17 Feb '23

17 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=874d317a7104e01571ea3… commit 874d317a7104e01571ea39b56d3d603246937fda Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Fri Feb 17 16:11:00 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 18 00:11:00 2023 +0200 [IP] Allow 0xFFFF as Valid Network Port Number (#5074) * Allow 0xFFFF as valid port number * Note possible reason for failure in TCPAllocatePort * Return NtStatus error on TCP/IP out-of-ports failure * Replace unavailable "ERR" with "DbgPrint" --- drivers/network/tcpip/ip/transport/tcp/accept.c | 12 ++++++++---- drivers/network/tcpip/ip/transport/tcp/tcp.c | 16 +++++++++++----- drivers/network/tcpip/tcpip/fileobjs.c | 19 +++++++++++-------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/network/tcpip/ip/transport/tcp/accept.c b/drivers/network/tcpip/ip/transport/tcp/accept.c index 62c96cf5f33..4d12c527fae 100644 --- a/drivers/network/tcpip/ip/transport/tcp/accept.c +++ b/drivers/network/tcpip/ip/transport/tcp/accept.c @@ -77,10 +77,14 @@ NTSTATUS TCPListen(PCONNECTION_ENDPOINT Connection, UINT Backlog) if (NT_SUCCESS(Status)) { /* Allocate the port in the port bitmap */ - Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - - /* This should never fail */ - ASSERT(Connection->AddressFile->Port != 0xFFFF); + UINT AllocatedPort = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + /* This should never fail unless all ports are in use */ + if (AllocatedPort == (UINT) -1) + { + DbgPrint("ERR: No more ports available.\n"); + return STATUS_TOO_MANY_ADDRESSES; + } + Connection->AddressFile->Port = AllocatedPort; } } } diff --git a/drivers/network/tcpip/ip/transport/tcp/tcp.c b/drivers/network/tcpip/ip/transport/tcp/tcp.c index 604ce11bd62..cd28ffaf71a 100644 --- a/drivers/network/tcpip/ip/transport/tcp/tcp.c +++ b/drivers/network/tcpip/ip/transport/tcp/tcp.c @@ -214,7 +214,7 @@ NTSTATUS TCPStartup(VOID) { NTSTATUS Status; - Status = PortsStartup( &TCPPorts, 1, 0xfffe ); + Status = PortsStartup(&TCPPorts, 1, 0xffff); if (!NT_SUCCESS(Status)) { return Status; @@ -370,6 +370,8 @@ NTSTATUS TCPConnect /* Check if we had an unspecified port */ if (!Connection->AddressFile->Port) { + UINT AllocatedPort; + /* We did, so we need to copy back the port */ Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); if (!NT_SUCCESS(Status)) @@ -379,10 +381,14 @@ NTSTATUS TCPConnect } /* Allocate the port in the port bitmap */ - Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - - /* This should never fail */ - ASSERT(Connection->AddressFile->Port != 0xFFFF); + AllocatedPort = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + /* This should never fail unless all ports are in use */ + if (AllocatedPort == (UINT) -1) + { + DbgPrint("ERR: No more ports available.\n"); + return STATUS_TOO_MANY_ADDRESSES; + } + Connection->AddressFile->Port = AllocatedPort; } connaddr.addr = RemoteAddress.Address.IPv4Address; diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index d926abed97e..d3dee752efa 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -404,6 +404,7 @@ NTSTATUS FileOpenAddress( PVOID Options) { PADDRESS_FILE AddrFile; + UINT AllocatedPort; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); @@ -472,14 +473,15 @@ NTSTATUS FileOpenAddress( if (Address->Address[0].Address[0].sin_port) { /* The client specified an explicit port so we force a bind to this */ - AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + AllocatedPort = TCPAllocatePort(Address->Address[0].Address[0].sin_port); /* Check for bind success */ - if (AddrFile->Port == 0xffff) + if (AllocatedPort == (UINT)-1) { ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); return STATUS_ADDRESS_ALREADY_EXISTS; } + AddrFile->Port = AllocatedPort; /* Sanity check */ ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port); @@ -487,14 +489,15 @@ NTSTATUS FileOpenAddress( else if (!AddrIsUnspecified(&AddrFile->Address)) { /* The client is trying to bind to a local address so allocate a port now too */ - AddrFile->Port = TCPAllocatePort(0); + AllocatedPort = TCPAllocatePort(0); /* Check for bind success */ - if (AddrFile->Port == 0xffff) + if (AllocatedPort == (UINT)-1) { ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); return STATUS_ADDRESS_ALREADY_EXISTS; } + AddrFile->Port = AllocatedPort; } else { @@ -509,16 +512,16 @@ NTSTATUS FileOpenAddress( case IPPROTO_UDP: TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); + AllocatedPort = UDPAllocatePort(Address->Address[0].Address[0].sin_port); if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) + AllocatedPort != Address->Address[0].Address[0].sin_port) || + AllocatedPort == (UINT)-1) { ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); return STATUS_ADDRESS_ALREADY_EXISTS; } + AddrFile->Port = AllocatedPort; TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port,

1 0

[reactos] 01/01: [NOTEPAD] Follow-up of #5076 (621439d)
by Katayama Hirofumi MZ 17 Feb '23

17 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fdbc80e58a7be90a77a9… commit 1fdbc80e58a7be90a77a980968f086e7a697b16b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 17 15:17:34 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Feb 17 15:17:44 2023 +0900 [NOTEPAD] Follow-up of #5076 (621439d) - Add DIALOG_StatusBarUpdateAll() and use it. - Fix the status bar initial contents. --- base/applications/notepad/dialog.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 3f863c19179..bc692321417 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -165,6 +165,14 @@ static VOID DIALOG_StatusBarUpdateEncoding(VOID) SendMessageW(Globals.hStatusBar, SB_SETTEXTW, SBPART_ENCODING, (LPARAM)szText); } +static VOID DIALOG_StatusBarUpdateAll(VOID) +{ + DIALOG_StatusBarAlignParts(); + DIALOG_StatusBarUpdateCaretPos(); + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); +} + int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFlags) { TCHAR szMessage[MAX_STRING_LEN]; @@ -462,13 +470,11 @@ VOID DoOpenFile(LPCTSTR szFileName) UpdateWindowCaption(TRUE); NOTEPAD_EnableSearchMenu(); - /* Update line endings and encoding on the status bar */ - DIALOG_StatusBarUpdateLineEndings(); - DIALOG_StatusBarUpdateEncoding(); - done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); + + DIALOG_StatusBarUpdateAll(); } VOID DIALOG_FileNew(VOID) @@ -479,6 +485,7 @@ VOID DIALOG_FileNew(VOID) SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); NOTEPAD_EnableSearchMenu(); + DIALOG_StatusBarUpdateAll(); } } @@ -626,11 +633,7 @@ BOOL DIALOG_FileSaveAs(VOID) if (DoSaveFile()) { UpdateWindowCaption(TRUE); - - /* Update line endings and encoding on the status bar */ - DIALOG_StatusBarUpdateLineEndings(); - DIALOG_StatusBarUpdateEncoding(); - + DIALOG_StatusBarUpdateAll(); return TRUE; } else @@ -942,9 +945,7 @@ VOID DoShowHideStatusBar(VOID) ShowWindow(Globals.hStatusBar, (Globals.bShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); /* Update status bar contents */ - DIALOG_StatusBarUpdateCaretPos(); - DIALOG_StatusBarUpdateLineEndings(); - DIALOG_StatusBarUpdateEncoding(); + DIALOG_StatusBarUpdateAll(); } VOID DoCreateEditWindow(VOID)

1 0

[reactos] 01/01: [BROWSEUI] Add CAddressEditBox::RefreshAddress and use it (#5062)
by Katayama Hirofumi MZ 17 Feb '23

17 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb67913156f6a7b2a734c… commit bb67913156f6a7b2a734cf4dc2ce2c9c09b3c6df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 17 12:29:30 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 17 12:29:30 2023 +0900 [BROWSEUI] Add CAddressEditBox::RefreshAddress and use it (#5062) Follow-up of #5026 [BROWSEUI] Execute command line from address bar. Elegantly reset the address bar after command line execution. CORE-15453 --- dll/win32/browseui/addresseditbox.cpp | 120 +++++++++++++++------------------- dll/win32/browseui/addresseditbox.h | 1 + 2 files changed, 53 insertions(+), 68 deletions(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index e1faf69b38f..6051b43fb5b 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -104,6 +104,52 @@ BOOL CAddressEditBox::GetComboBoxText(CComHeapPtr<WCHAR>& pszText) return fCombobox.GetWindowText(pszText, cchMax); } +HRESULT CAddressEditBox::RefreshAddress() +{ + /* Get the current pidl of the browser */ + CComHeapPtr<ITEMIDLIST> absolutePIDL; + HRESULT hr = GetAbsolutePidl(&absolutePIDL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* Fill the combobox */ + ATLASSERT(absolutePIDL != NULL); + PopulateComboBox(absolutePIDL); + + /* Get pShellFolder and pidlChild */ + CComPtr<IShellFolder> pShellFolder; + PCITEMID_CHILD pidlChild; + hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &pShellFolder), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* Get ready to set the displayed item */ + COMBOBOXEXITEMW item = { CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM }; + item.iItem = -1; /* -1 to specify the displayed item */ + item.iImage = SHMapPIDLToSystemImageListIndex(pShellFolder, pidlChild, &item.iSelectedImage); + + /* Set the path if filesystem; otherwise use the name */ + WCHAR szPathOrName[MAX_PATH]; + if (!SHGetPathFromIDListW(absolutePIDL, szPathOrName)) + { + STRRET ret; + hr = pShellFolder->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = StrRetToBufW(&ret, pidlChild, szPathOrName, _countof(szPathOrName)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + item.pszText = szPathOrName; + + /* Ownership of absolutePIDL will be moved to fCombobox. See CBEN_DELETEITEM */ + item.lParam = reinterpret_cast<LPARAM>(absolutePIDL.Detach()); + + fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); /* Set it! */ + return S_OK; +} + HRESULT CAddressEditBox::GetAbsolutePidl(PIDLIST_ABSOLUTE *pAbsolutePIDL) { CComPtr<IBrowserService> isb; @@ -150,10 +196,7 @@ BOOL CAddressEditBox::ExecuteCommandLine() if (!::ShellExecuteExW(&info)) /* Execute! */ return FALSE; - /* Execution succeeded. Reset the combobox. */ - if (dir[0] != UNICODE_NULL) - fCombobox.SetWindowText(dir); - + RefreshAddress(); return TRUE; } @@ -350,6 +393,7 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent( else if (endEdit->iWhy == CBENF_ESCAPE) { /* Reset the contents of the combo box */ + RefreshAddress(); } } else if (hdr->code == CBEN_DELETEITEM) @@ -407,13 +451,6 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::GetIDsOfNames( HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - CComPtr<IShellFolder> sf; - HRESULT hr; - PIDLIST_ABSOLUTE absolutePIDL; - LPCITEMIDLIST pidlChild; - STRRET ret; - WCHAR buf[4096]; - if (pDispParams == NULL) return E_INVALIDARG; @@ -421,67 +458,14 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID ri { case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: - if (pidlLastParsed) - ILFree(pidlLastParsed); - pidlLastParsed = NULL; - - /* Get the current pidl of the browser */ - hr = GetAbsolutePidl(&absolutePIDL); - if (FAILED(hr)) - return hr; - - if (!absolutePIDL) { - ERR("Got no PIDL, investigate me!\n"); - return S_OK; + ILFree(pidlLastParsed); + pidlLastParsed = NULL; } - /* Fill the combobox */ - PopulateComboBox(absolutePIDL); - - /* Find the current item in the combobox and select it */ - CComPtr<IShellFolder> psfDesktop; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; - - hr = psfDesktop->GetDisplayNameOf(absolutePIDL, SHGDN_FORADDRESSBAR, &ret); - if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; - - hr = StrRetToBufW(&ret, absolutePIDL, buf, 4095); - if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; - - int index = SendMessageW(hComboBoxEx, CB_FINDSTRINGEXACT, 0, (LPARAM)buf); - if (index != -1) - SendMessageW(hComboBoxEx, CB_SETCURSEL, index, 0); - - /* Add the item that will be visible when the combobox is not expanded */ - hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = StrRetToBufW(&ret, pidlChild, buf, 4095); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - INT indexClosed, indexOpen; - indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - - COMBOBOXEXITEMW item = {0}; - item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = -1; - item.iImage = indexClosed; - item.iSelectedImage = indexOpen; - item.pszText = buf; - item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); + RefreshAddress(); + break; } return S_OK; } diff --git a/dll/win32/browseui/addresseditbox.h b/dll/win32/browseui/addresseditbox.h index 1f0e003d06a..336f38ff0c9 100644 --- a/dll/win32/browseui/addresseditbox.h +++ b/dll/win32/browseui/addresseditbox.h @@ -51,6 +51,7 @@ private: HRESULT GetAbsolutePidl(PIDLIST_ABSOLUTE *pAbsolutePIDL); BOOL ExecuteCommandLine(); BOOL GetComboBoxText(CComHeapPtr<WCHAR>& pszText); + HRESULT RefreshAddress(); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *);

1 0

[reactos] 01/01: [NOTEPAD] Fix and simplify Status Bar handling (#5076)
by Katayama Hirofumi MZ 17 Feb '23

17 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=621439d6f22a4d9f1746f… commit 621439d6f22a4d9f1746f34b8a8b04a0020bead1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 17 09:23:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 17 09:23:25 2023 +0900 [NOTEPAD] Fix and simplify Status Bar handling (#5076) - Rename DoCreateStatusBar as DoShowHideStatusBar. - Simplify WM_SIZE handler. - Enable/disable CMD_STATUSBAR menu item correctly. - Make DoShowHideStatusBar independent from DoCreateEditWindow. --- base/applications/notepad/dialog.c | 98 +++++++----------------------------- base/applications/notepad/dialog.h | 2 +- base/applications/notepad/main.c | 72 +++++++------------------- base/applications/notepad/settings.c | 5 +- 4 files changed, 36 insertions(+), 141 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 8233082be1b..3f863c19179 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -911,17 +911,13 @@ VOID DIALOG_EditTimeDate(VOID) SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szText); } -VOID DoCreateStatusBar(VOID) +VOID DoShowHideStatusBar(VOID) { - RECT rc; - RECT rcstatus; - BOOL bStatusBarVisible; - /* Check if status bar object already exists. */ - if (Globals.hStatusBar == NULL) + if (Globals.bShowStatusBar && Globals.hStatusBar == NULL) { /* Try to create the status bar */ - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | CCS_BOTTOM | SBARS_SIZEGRIP, NULL, Globals.hMainWnd, CMD_STATUSBAR_WND_ID); @@ -936,59 +932,17 @@ VOID DoCreateStatusBar(VOID) LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH - 1); } - /* Set status bar visiblity according to the settings. */ - if ((Globals.bWrapLongLines != FALSE) || (Globals.bShowStatusBar == FALSE)) - { - bStatusBarVisible = FALSE; - ShowWindow(Globals.hStatusBar, SW_HIDE); - } - else - { - bStatusBarVisible = TRUE; - ShowWindow(Globals.hStatusBar, SW_SHOW); - SendMessage(Globals.hStatusBar, WM_SIZE, 0, 0); - } - - /* Set check state in show status bar item. */ - if (bStatusBarVisible) - { - CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); - } - else - { - CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_UNCHECKED); - } - - /* Update menu mar with the previous changes */ - DrawMenuBar(Globals.hMainWnd); + /* Update layout of controls */ + PostMessageW(Globals.hMainWnd, WM_SIZE, 0, 0); - /* Sefety test is edit control exists */ - if (Globals.hEdit != NULL) - { - /* Retrieve the sizes of the controls */ - GetClientRect(Globals.hMainWnd, &rc); - GetClientRect(Globals.hStatusBar, &rcstatus); - - /* If status bar is currently visible, update dimensions of edit control */ - if (bStatusBarVisible) - rc.bottom -= (rcstatus.bottom - rcstatus.top); - - /* Resize edit control to right size. */ - MoveWindow(Globals.hEdit, - rc.left, - rc.top, - rc.right - rc.left, - rc.bottom - rc.top, - TRUE); - } + if (Globals.hStatusBar == NULL) + return; - /* Set the status bar for multiple-text output */ - DIALOG_StatusBarAlignParts(); + /* Update visibility of status bar */ + ShowWindow(Globals.hStatusBar, (Globals.bShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); - /* Update content with current row/column text */ + /* Update status bar contents */ DIALOG_StatusBarUpdateCaretPos(); - - /* Update line endings and encoding on the status bar */ DIALOG_StatusBarUpdateLineEndings(); DIALOG_StatusBarUpdateEncoding(); } @@ -1032,17 +986,7 @@ VOID DoCreateEditWindow(VOID) } /* Update wrap status into the main menu and recover style flags */ - if (Globals.bWrapLongLines) - { - dwStyle = EDIT_STYLE_WRAP; - EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - } else { - dwStyle = EDIT_STYLE; - EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_ENABLED); - } - - /* Update previous changes */ - DrawMenuBar(Globals.hMainWnd); + dwStyle = (Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE); /* Create the new edit control */ Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, @@ -1057,7 +1001,6 @@ VOID DoCreateEditWindow(VOID) NULL, Globals.hInstance, NULL); - if (Globals.hEdit == NULL) { if (pTemp) @@ -1087,28 +1030,22 @@ VOID DoCreateEditWindow(VOID) GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - /* Create/update status bar */ - DoCreateStatusBar(); - /* Finally shows new edit control and set focus into it. */ ShowWindow(Globals.hEdit, SW_SHOW); SetFocus(Globals.hEdit); + + /* Re-arrange controls */ + PostMessageW(Globals.hMainWnd, WM_SIZE, 0, 0); } VOID DIALOG_EditWrap(VOID) { Globals.bWrapLongLines = !Globals.bWrapLongLines; - if (Globals.bWrapLongLines) - { - EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - } - else - { - EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_ENABLED); - } + EnableMenuItem(Globals.hMenu, CMD_GOTO, (Globals.bWrapLongLines ? MF_GRAYED : MF_ENABLED)); DoCreateEditWindow(); + DoShowHideStatusBar(); } VOID DIALOG_SelectFont(VOID) @@ -1274,8 +1211,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID) VOID DIALOG_ViewStatusBar(VOID) { Globals.bShowStatusBar = !Globals.bShowStatusBar; - - DoCreateStatusBar(); + DoShowHideStatusBar(); } VOID DIALOG_HelpContents(VOID) diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index 3d5572cfad7..5b9967af0ad 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -67,5 +67,5 @@ BOOL FileExists(LPCTSTR szFilename); BOOL HasFileExtension(LPCTSTR szFilename); BOOL DoCloseFile(VOID); VOID DoOpenFile(LPCTSTR szFileName); -VOID DoCreateStatusBar(VOID); +VOID DoShowHideStatusBar(VOID); VOID DoCreateEditWindow(VOID); diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 81908e303f2..2768d87fa8d 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -285,13 +285,8 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) UNREFERENCED_PARAMETER(index); - CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, - MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); - if (!Globals.bWrapLongLines) - { - CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, - MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); - } + CheckMenuItem(menu, CMD_WRAP, (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(menu, CMD_STATUSBAR, (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); EnableMenuItem(menu, CMD_UNDO, SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, @@ -304,7 +299,6 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) EnableMenuItem(menu, CMD_SELECT_ALL, GetWindowTextLength(Globals.hEdit) ? MF_ENABLED : MF_GRAYED); - DrawMenuBar(Globals.hMainWnd); } LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -394,56 +388,24 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: { - if ((Globals.bShowStatusBar != FALSE) && (Globals.bWrapLongLines == FALSE)) - { - RECT rcStatusBar; - HDWP hdwp; - - if (!GetWindowRect(Globals.hStatusBar, &rcStatusBar)) - break; - - hdwp = BeginDeferWindowPos(2); - if (hdwp == NULL) - break; - - hdwp = DeferWindowPos(hdwp, - Globals.hEdit, - NULL, - 0, - 0, - LOWORD(lParam), - HIWORD(lParam) - (rcStatusBar.bottom - rcStatusBar.top), - SWP_NOZORDER | SWP_NOMOVE); - - if (hdwp == NULL) - break; + RECT rc; + GetClientRect(hWnd, &rc); - hdwp = DeferWindowPos(hdwp, - Globals.hStatusBar, - NULL, - 0, - 0, - LOWORD(lParam), - LOWORD(wParam), - SWP_NOZORDER); + if (Globals.bShowStatusBar) + { + RECT rcStatus; + SendMessageW(Globals.hStatusBar, WM_SIZE, 0, 0); + GetWindowRect(Globals.hStatusBar, &rcStatus); + rc.bottom -= rcStatus.bottom - rcStatus.top; + } - if (hdwp == NULL) - break; - - EndDeferWindowPos(hdwp); + MoveWindow(Globals.hEdit, 0, 0, rc.right, rc.bottom, TRUE); + if (Globals.bShowStatusBar) + { /* Align status bar parts, only if the status bar resize operation succeeds */ DIALOG_StatusBarAlignParts(); } - else - SetWindowPos(Globals.hEdit, - NULL, - 0, - 0, - LOWORD(lParam), - HIWORD(lParam), - SWP_NOZORDER | SWP_NOMOVE); - break; } @@ -467,10 +429,11 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) DoOpenFile(szFileName); break; } - case WM_CHAR: + case WM_INITMENUPOPUP: NOTEPAD_InitMenuPopup((HMENU)wParam, lParam); break; + default: if (msg == aFINDMSGSTRING) { @@ -669,6 +632,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh } DoCreateEditWindow(); + DoShowHideStatusBar(); NOTEPAD_InitData(); DIALOG_FileNew(); @@ -677,8 +641,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh UpdateWindow(Globals.hMainWnd); DragAcceptFiles(Globals.hMainWnd, TRUE); - DIALOG_ViewStatusBar(); - if (!HandleCommandLine(cmdline)) { return 0; diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index d0295937b43..0031e14f9b0 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -157,9 +157,6 @@ void NOTEPAD_LoadSettingsFromRegistry(void) Globals.main_rect.right = Globals.main_rect.left + dx; Globals.main_rect.bottom = Globals.main_rect.top + dy; - /* invert value because DIALOG_ViewStatusBar will be called to show it */ - Globals.bShowStatusBar = !Globals.bShowStatusBar; - if (dwPointSize != 0) Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); else @@ -170,7 +167,7 @@ void NOTEPAD_LoadSettingsFromRegistry(void) else { /* If no settings are found in the registry, then use default values */ - Globals.bShowStatusBar = FALSE; + Globals.bShowStatusBar = TRUE; Globals.bWrapLongLines = FALSE; SetRect(&Globals.lMargins, 750, 1000, 750, 1000);

1 0

[reactos] 01/01: [NTUSER] Optimize Window Snap Disabling (#5061)
by Joachim Henze 16 Feb '23

16 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d04e148d1c49975de0803… commit d04e148d1c49975de0803299055a47eedbc94487 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Feb 16 19:33:37 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 16 19:33:37 2023 +0100 [NTUSER] Optimize Window Snap Disabling (#5061) --- win32ss/user/ntuser/defwnd.c | 48 +++++++++++++++------------------- win32ss/user/ntuser/nonclient.c | 57 +++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 62 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 05a1db08877..81ece247b78 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -404,18 +404,18 @@ UserPaintCaption(PWND pWnd, INT Flags) { if (pWnd->state & WNDS_HASCAPTION && pWnd->head.pti->MessageQueue == gpqForeground) Flags |= DC_ACTIVE; - /* + /* * When themes are not enabled we can go on and paint the non client area. * However if we do that with themes enabled we will draw a classic frame. * This is solved by sending a themes specific message to notify the themes - * engine that the caption needs to be redrawn + * engine that the caption needs to be redrawn. */ if (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) { - /* + /* * This will cause uxtheme to either paint the themed caption or call * RealUserDrawCaption in order to draw the classic caption when themes - * are disabled but the themes service is enabled + * are disabled but the themes service is enabled. */ TRACE("UDCB Flags %08x\n", Flags); co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCUAHDRAWCAPTION, Flags, 0); @@ -440,7 +440,7 @@ DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) HICON hIcon, hIconSmall, hIconOld; if ( wParam > ICON_SMALL2 ) - { + { EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -544,9 +544,6 @@ IntDefWindowProc( PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); LRESULT lResult = 0; USER_REFERENCE_ENTRY Ref; - BOOL IsTaskBar; - DWORD Style; - DWORD ExStyle; if (Msg > WM_USER) return 0; @@ -792,32 +789,27 @@ IntDefWindowProc( co_IntSendMessage(UserHMGetHandle(Wnd), WM_CONTEXTMENU, (WPARAM)UserHMGetHandle(Wnd), MAKELPARAM(-1, -1)); } } - if (IS_KEY_DOWN(gafAsyncKeyState, VK_LWIN) || IS_KEY_DOWN(gafAsyncKeyState, VK_RWIN)) + if (g_bWindowSnapEnabled && (IS_KEY_DOWN(gafAsyncKeyState, VK_LWIN) || IS_KEY_DOWN(gafAsyncKeyState, VK_RWIN))) { + BOOL IsTaskBar; + DWORD StyleTB; + DWORD ExStyleTB; HWND hwndTop = UserGetForegroundWindow(); PWND topWnd = UserGetWindowObject(hwndTop); - /* Test for typical TaskBar ExStyle Values */ - ExStyle = (topWnd->ExStyle & WS_EX_TOOLWINDOW); - TRACE("ExStyle is '%x'.\n", ExStyle); - - /* Test for typical TaskBar Style Values */ - Style = (topWnd->style & (WS_POPUP | WS_VISIBLE | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); - TRACE("Style is '%x'.\n", Style); - - /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ - IsTaskBar = (Style == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) - && (ExStyle == WS_EX_TOOLWINDOW); - TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + // We want to forbid snapping operations on the TaskBar + // We use a heuristic for detecting the TaskBar Wnd by its typical Style & ExStyle Values + ExStyleTB = (topWnd->ExStyle & WS_EX_TOOLWINDOW); + StyleTB = (topWnd->style & (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); + IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) + && (ExStyleTB == WS_EX_TOOLWINDOW); + TRACE("ExStyle=%x Style=%x IsTaskBar=%d\n", ExStyleTB, StyleTB, IsTaskBar); - if (topWnd && !IsTaskBar) /* Second test is so we are not touching the Taskbar */ + if (topWnd && !IsTaskBar) { - if ((topWnd->style & WS_THICKFRAME) == 0 || !g_bWindowSnapEnabled) - { + if ((topWnd->style & WS_THICKFRAME) == 0) return 0; - } - + if (wParam == VK_DOWN) { if (topWnd->style & WS_MAXIMIZE) @@ -835,7 +827,7 @@ IntDefWindowProc( else if (wParam == VK_UP) { RECT currentRect; - if ((topWnd->InternalPos.NormalRect.right == topWnd->InternalPos.NormalRect.left) || + if ((topWnd->InternalPos.NormalRect.right == topWnd->InternalPos.NormalRect.left) || (topWnd->InternalPos.NormalRect.top == topWnd->InternalPos.NormalRect.bottom)) { currentRect = topWnd->rcWindow; diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index ab7d00143b4..69291c50adb 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -256,8 +256,6 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) //PMONITOR mon = 0; Don't port sync from wine!!! This breaks explorer task bar sizing!! // The task bar can grow in size and can not reduce due to the change // in the work area. - DWORD ExStyleTB, StyleTB; - BOOL IsTaskBar; Style = pwnd->style; ExStyle = pwnd->ExStyle; @@ -393,35 +391,33 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) if (!co_IntGetPeekMessage(&msg, 0, 0, 0, PM_REMOVE, TRUE)) break; if (IntCallMsgFilter( &msg, MSGF_SIZE )) continue; - /* Exit on button-up */ - if (msg.message == WM_LBUTTONUP) - { - /* Test for typical TaskBar ExStyle Values */ - ExStyleTB = (ExStyle & WS_EX_TOOLWINDOW); - TRACE("ExStyle is '%x'.\n", ExStyleTB); + if (msg.message == WM_KEYDOWN && (msg.wParam == VK_RETURN || msg.wParam == VK_ESCAPE)) + break; // Exit on Return or Esc - /* Test for typical TaskBar Style Values */ - StyleTB = (Style & (WS_POPUP | WS_VISIBLE | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); - TRACE("Style is '%x'.\n", StyleTB); + if (!g_bWindowSnapEnabled && (msg.message == WM_LBUTTONUP)) + { // If no WindowSnapEnabled: Exit on button-up immediately + break; + } + else if (g_bWindowSnapEnabled && msg.message == WM_LBUTTONUP) + { // If WindowSnapEnabled: Decide whether to snap before exiting + DWORD ExStyleTB, StyleTB; + BOOL IsTaskBar; - /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ + // We want to forbid snapping operations on the TaskBar + // We use a heuristic for detecting the TaskBar Wnd by its typical Style & ExStyle Values + ExStyleTB = (ExStyle & WS_EX_TOOLWINDOW); + StyleTB = (Style & (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) && (ExStyleTB == WS_EX_TOOLWINDOW); - TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + TRACE("ExStyle=%x Style=%x IsTaskBar=%d\n", ExStyleTB, StyleTB, IsTaskBar); // check for snapping if was moved by caption - if (hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0) + if (!IsTaskBar && hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0) { RECT snapRect; BOOL doSideSnap = FALSE; UserSystemParametersInfo(SPI_GETWORKAREA, 0, &snapRect, 0); - /* if this is the taskbar, then we want to just exit */ - if (IsTaskBar || !g_bWindowSnapEnabled) - { - break; - } // snap to left if (pt.x <= snapRect.left) { @@ -434,7 +430,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) snapRect.left = (snapRect.right - snapRect.left) / 2 + snapRect.left; doSideSnap = TRUE; } - + if (doSideSnap) { co_WinPosSetWindowPos(pwnd, @@ -458,13 +454,6 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) } break; } - - /* Exit on Return or Esc */ - if (msg.message == WM_KEYDOWN && - (msg.wParam == VK_RETURN || msg.wParam == VK_ESCAPE)) - { - break; - } if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE)) { @@ -1285,7 +1274,7 @@ LRESULT NC_HandleNCCalcSize( PWND Wnd, WPARAM wparam, RECTL *Rect, BOOL Suspende SIZE WindowBorders; RECT OrigRect; LONG Style = Wnd->style; - LONG exStyle = Wnd->ExStyle; + LONG exStyle = Wnd->ExStyle; if (Rect == NULL) { @@ -1662,7 +1651,7 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam) { PMENU SysMenu = IntGetSystemMenu(pWnd, FALSE); UINT state = IntGetMenuState(SysMenu ? UserHMGetHandle(SysMenu) : NULL, SC_CLOSE, MF_BYCOMMAND); - + /* If the close item of the sysmenu is disabled or not present do nothing */ if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF)) break; @@ -1674,12 +1663,12 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam) case HTBOTTOM: { RECT sizingRect = pWnd->rcWindow, mouseRect; - + if (pWnd->ExStyle & WS_EX_MDICHILD) break; - + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0); - + co_WinPosSetWindowPos(pWnd, NULL, sizingRect.left, @@ -1700,7 +1689,7 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam) * * Handle a WM_NCRBUTTONDOWN message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCRButtonDown( PWND pwnd, WPARAM wParam, LPARAM lParam ) +LRESULT NC_HandleNCRButtonDown(PWND pwnd, WPARAM wParam, LPARAM lParam) { MSG msg; INT hittest = wParam;

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