Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 02/05: [MOUNTMGR] Query proper device when creating mount point
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=225a1e92bdc58314c831b… commit 225a1e92bdc58314c831b5d1c9f5a7d3358da8c9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:34:38 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:57 2019 +0200 [MOUNTMGR] Query proper device when creating mount point We must query the target device, and not the symbolic link we attempt to create. The later will always fail as it doesn't exist yet. This fixes MountMgrCreatePointWorker not working. --- drivers/filters/mountmgr/point.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 35fe8bb2435..a2469b0de82 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -44,7 +44,7 @@ MountMgrCreatePointWorker(IN PDEVICE_EXTENSION DeviceExtension, PDEVICE_INFORMATION DeviceInformation = NULL, DeviceInfo; /* Get device name */ - Status = QueryDeviceInformation(SymbolicLinkName, + Status = QueryDeviceInformation(DeviceName, &TargetDeviceName, NULL, NULL, NULL, NULL, NULL, NULL);

1 0

[reactos] 01/05: [MOUNTMGR] Remove cancel routine before completing pending IRP
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b650d2c3ef90cb7ea3fa… commit 7b650d2c3ef90cb7ea3fa0029ab2b75835f5fa5c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:29:37 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:57 2019 +0200 [MOUNTMGR] Remove cancel routine before completing pending IRP --- drivers/filters/mountmgr/notify.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filters/mountmgr/notify.c b/drivers/filters/mountmgr/notify.c index 97bc9470376..9a1e7885ac8 100644 --- a/drivers/filters/mountmgr/notify.c +++ b/drivers/filters/mountmgr/notify.c @@ -328,6 +328,7 @@ MountMgrNotify(IN PDEVICE_EXTENSION DeviceExtension) { NextEntry = RemoveHeadList(&(DeviceExtension->IrpListHead)); Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + IoSetCancelRoutine(Irp, NULL); InsertTailList(&CopyList, &(Irp->Tail.Overlay.ListEntry)); } IoReleaseCancelSpinLock(OldIrql);

1 0

[reactos] 01/01: [BROWSEUI][SHELLFIND] Update de-DE.rc CORE-16427
by Joachim Henze 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a01b272578e48ec9c0851… commit a01b272578e48ec9c0851c53f6ad0bbe3c5504d8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Oct 19 16:36:02 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Oct 19 16:36:02 2019 +0200 [BROWSEUI][SHELLFIND] Update de-DE.rc CORE-16427 Translate the new checkboxes text to german Addendum to 0.4.14-dev-60-g 103c87d2b9738b91d6eea37747be2bc343411042 --- dll/win32/browseui/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 3ac9989f67e..ef7cedde3b7 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -168,7 +168,7 @@ BEGIN DEFPUSHBUTTON "&Jetzt suchen", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE PUSHBUTTON "Abbrec&hen", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - AUTOCHECKBOX "Search Hidden Files and Folders", + AUTOCHECKBOX "Versteckte Elemente durchsuchen", IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8

1 0

[reactos] 01/01: [SHELLFIND] Add Hidden Files & Folders Selection. CORE-16427
by Doug Lyons 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=103c87d2b9738b91d6eea… commit 103c87d2b9738b91d6eea37747be2bc343411042 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Oct 13 18:48:08 2019 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 19 15:57:34 2019 +0200 [SHELLFIND] Add Hidden Files & Folders Selection. CORE-16427 --- dll/win32/browseui/lang/bg-BG.rc | 21 +++++---- dll/win32/browseui/lang/de-DE.rc | 21 +++++---- dll/win32/browseui/lang/en-US.rc | 21 +++++---- dll/win32/browseui/lang/es-ES.rc | 21 +++++---- dll/win32/browseui/lang/et-EE.rc | 21 +++++---- dll/win32/browseui/lang/fr-FR.rc | 21 +++++---- dll/win32/browseui/lang/he-IL.rc | 21 +++++---- dll/win32/browseui/lang/hi-IN.rc | 21 +++++---- dll/win32/browseui/lang/id-ID.rc | 21 +++++---- dll/win32/browseui/lang/it-IT.rc | 21 +++++---- dll/win32/browseui/lang/ja-JP.rc | 21 +++++---- dll/win32/browseui/lang/pl-PL.rc | 21 +++++---- dll/win32/browseui/lang/pt-BR.rc | 21 +++++---- dll/win32/browseui/lang/pt-PT.rc | 21 +++++---- dll/win32/browseui/lang/ro-RO.rc | 21 +++++---- dll/win32/browseui/lang/ru-RU.rc | 21 +++++---- dll/win32/browseui/lang/sq-AL.rc | 21 +++++---- dll/win32/browseui/lang/tr-TR.rc | 21 +++++---- dll/win32/browseui/lang/uk-UA.rc | 21 +++++---- dll/win32/browseui/lang/zh-CN.rc | 21 +++++---- dll/win32/browseui/lang/zh-TW.rc | 21 +++++---- dll/win32/browseui/resource.h | 1 + dll/win32/browseui/shellfind/CFindFolder.cpp | 70 ++++++++++++++++++++++++++-- dll/win32/browseui/shellfind/CSearchBar.cpp | 38 +++++++++++++++ dll/win32/browseui/shellfind/shellfind.h | 1 + 25 files changed, 358 insertions(+), 193 deletions(-) diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index ad5937ccb42..1ccbc75b544 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -138,19 +138,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 5d2f14cf53f..3ac9989f67e 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -156,19 +156,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Suche nach allen oder einigen der folgenden Kriterien.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "Dateiname oder &Ordnername:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Dateiname oder &Ordnername:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Enthaltener Text:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "&Enthaltener Text:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Suchen in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Suchen in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "&Jetzt suchen", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "Abbrec&hen", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Jetzt suchen", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Abbrec&hen", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index b2e4063f3c0..e2d51923637 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -156,19 +156,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index 75bcf79790e..28b5d40bc7b 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -146,19 +146,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 8c9ee044ae1..1c644d2e184 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -145,19 +145,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 8651a672a29..2bb5d7f0ff4 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -156,19 +156,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Chercher en fonction d'un ou de tous les critères suivants.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "Tout ou partie du &nom de fichier :", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Tout ou partie du &nom de fichier :", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "Un &mot ou une phrase dans le fichier :", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Un &mot ou une phrase dans le fichier :", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Chercher dans :", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Chercher dans :", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Che&rcher", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Arrêter", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Che&rcher", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Arrêter", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index cfe09cdbb53..6bbabc19e28 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -140,19 +140,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "חפש לפי חלק או כל כללי החיפוש המופיעים למטה.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "ח&לק משם הקובץ או כולו:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "ח&לק משם הקובץ או כולו:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&מילה או ביטוי בקובץ:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "&מילה או ביטוי בקובץ:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&חפש ב:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&חפש ב:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "&חפש", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&עצור", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&חפש", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&עצור", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index bfaace1cb0f..f9c55ff3709 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -138,19 +138,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc index e51148805a3..955809cccc7 100644 --- a/dll/win32/browseui/lang/id-ID.rc +++ b/dll/win32/browseui/lang/id-ID.rc @@ -156,19 +156,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 75054d87060..bb2384481cb 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -138,19 +138,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 22c66a5873c..43c46bf8c56 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -156,19 +156,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 314fb6baf36..f0c033eff89 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -146,19 +146,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Wyszukiwanie według dowolnego lub wszystkich kryteriów wymienionych poniżej.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "Cała nazwa pliku lu&b jej część:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Cała nazwa pliku lu&b jej część:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "Wyraz lub &fraza w pliku:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Wyraz lub &fraza w pliku:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "Szu&kaj w:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "Szu&kaj w:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Wy&szukaj", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Zatrzymaj", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Wy&szukaj", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Zatrzymaj", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 2d5174e8c1a..55e1bebde05 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -140,19 +140,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 6886bafec8d..9f4fbc19e33 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -140,19 +140,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index 9a0962b7cba..22702a9a4b6 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -140,19 +140,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index cfe7d49bd06..76ee2d043bf 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -147,19 +147,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Поиск по одному или нескольким критериям.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "Полное или &частичное имя файла:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "Полное или &частичное имя файла:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "С&лово или фраза в файле:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "С&лово или фраза в файле:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "П&оиск в:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "П&оиск в:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Най&ти", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "Остановит&ь", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Най&ти", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Остановит&ь", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 17a9e42ee62..631ea5928bb 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -157,19 +157,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index 0131050e4f9..e652a5cb37b 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -140,19 +140,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index a7bd6a33de7..9bc13c71524 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -146,19 +146,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 91973e5af28..2627baaf12b 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -159,19 +159,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 557032657e9..bb526dbc3d6 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -159,19 +159,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 - EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 - EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 - CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 + LTEXT "&Look in:", -1, 10, 75, 500, 10 + CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 + AUTOCHECKBOX "Search Hidden Files and Folders", + IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END /* Accelerators */ diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index bc9ad642b6a..8f032f2b7cd 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -164,6 +164,7 @@ #define IDC_SEARCH_BUTTON 1004 #define IDC_SEARCH_STOP_BUTTON 1005 #define IDC_SEARCH_COMBOBOX 1006 +#define IDC_SEARCH_HIDDEN 1007 #define IDS_SEARCHINVALID 4518 #define IDS_COL_NAME 8976 #define IDS_COL_LOCATION 8977 diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index dcac0c0c60c..5509f38f78b 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -160,6 +160,7 @@ struct _SearchData CStringW szFileName; CStringA szQueryA; CStringW szQueryW; + BOOL SearchHidden; CComPtr<CFindFolder> pFindFolder; }; @@ -235,6 +236,33 @@ static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) return uMatches; } +static BOOL FileNameMatch(LPCWSTR FindDataFileName, _SearchData *pSearchData) +{ + if (pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindDataFileName, pSearchData->szFileName)) + { + return TRUE; + } + return FALSE; +} + +static BOOL ContentsMatch(LPCWSTR szPath, _SearchData *pSearchData) +{ + if (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData)) + { + return TRUE; + } + return FALSE; +} + +static BOOL AttribHiddenMatch(DWORD FileAttributes, _SearchData *pSearchData) +{ + if (!(FileAttributes & FILE_ATTRIBUTE_HIDDEN) || (pSearchData->SearchHidden)) + { + return TRUE; + } + return FALSE; +} + static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) { if (WaitForSingleObject(pSearchData->hStopEvent, 0) != WAIT_TIMEOUT) @@ -260,8 +288,8 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { CStringW status; - if ((pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindData.cFileName, pSearchData->szFileName)) - && (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData))) + if (FileNameMatch(FindData.cFileName, pSearchData) + && AttribHiddenMatch(FindData.dwFileAttributes, pSearchData)) { PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath)); uTotalFound++; @@ -271,8 +299,9 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) uTotalFound += RecursiveFind(szPath, pSearchData); } - else if ((pSearchData->szFileName.IsEmpty() || PathMatchSpecW(FindData.cFileName, pSearchData->szFileName)) - && (pSearchData->szQueryA.IsEmpty() || SearchFile(szPath, pSearchData))) + else if (FileNameMatch(FindData.cFileName, pSearchData) + && AttribHiddenMatch(FindData.dwFileAttributes, pSearchData) + && ContentsMatch(szPath, pSearchData)) { uTotalFound++; PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath)); @@ -325,6 +354,11 @@ void CFindFolder::NotifyConnections(DISPID id) LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + HKEY hkey; + DWORD size = sizeof(DWORD); + DWORD result; + DWORD SearchHiddenValue = 0; + if (!lParam) return 0; @@ -341,8 +375,36 @@ LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & pSearchData->szFileName = pSearchParams->szFileName; pSearchData->szQueryA = pSearchParams->szQuery; pSearchData->szQueryW = pSearchParams->szQuery; + pSearchData->SearchHidden = pSearchParams->SearchHidden; SHFree(pSearchParams); + TRACE("pSearchParams->SearchHidden is '%d'.\n", pSearchData->SearchHidden); + + if (pSearchData->SearchHidden) + SearchHiddenValue = 1; + else + SearchHiddenValue = 0; + + /* Placing the code to save the changed settings to the registry here has the effect of not saving any changes */ + /* to the registry unless the user clicks on the "Search" button. This is the same as what we see in Windows. */ + result = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, KEY_SET_VALUE, &hkey); + if (result == ERROR_SUCCESS) + { + if (RegSetValueExW(hkey, L"SearchHidden", NULL, REG_DWORD, (const BYTE*)&SearchHiddenValue, size) == ERROR_SUCCESS) + { + TRACE("SearchHidden is '%d'.\n", SearchHiddenValue); + } + else + { + ERR("RegSetValueEx for \"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SearchHidden\" Failed.\n"); + } + RegCloseKey(hkey); + } + else + { + ERR("RegOpenKey for \"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\" Failed.\n"); + } + if (m_hStopEvent) SetEvent(m_hStopEvent); pSearchData->hStopEvent = m_hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); diff --git a/dll/win32/browseui/shellfind/CSearchBar.cpp b/dll/win32/browseui/shellfind/CSearchBar.cpp index 5e7117193d4..b7d97123798 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.cpp +++ b/dll/win32/browseui/shellfind/CSearchBar.cpp @@ -32,6 +32,41 @@ CSearchBar::~CSearchBar() LRESULT CSearchBar::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + HKEY hkey; + DWORD dwType; + DWORD size = sizeof(DWORD); + DWORD result; + DWORD SearchHiddenValue = 0; + + result = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, KEY_QUERY_VALUE, &hkey); + if (result == ERROR_SUCCESS) + { + if (RegQueryValueEx(hkey, L"SearchHidden", NULL, &dwType, (LPBYTE)&SearchHiddenValue, &size) == ERROR_SUCCESS) + { + if ((dwType != REG_DWORD) || (size != sizeof(DWORD))) + { + ERR("RegQueryKey for \"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SearchHidden\" returned error(s).\n"); + SearchHiddenValue = 1; + } + else + { + TRACE("SearchHidden is '%d'.\n", SearchHiddenValue); + } + } + else + { + ERR("RegQueryKey for \"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SearchHidden\" Failed.\n"); + } + RegCloseKey(hkey); + } + else + ERR("RegOpenKey for \"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\" Failed.\n"); + + if (SearchHiddenValue != 0) + CheckDlgButton(IDC_SEARCH_HIDDEN, BST_CHECKED); + else + CheckDlgButton(IDC_SEARCH_HIDDEN, BST_UNCHECKED); + SetSearchInProgress(FALSE); HWND hCombobox = GetDlgItem(IDC_SEARCH_COMBOBOX); @@ -129,6 +164,9 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC CComHeapPtr<SearchStart> pSearchStart(static_cast<SearchStart *>(CoTaskMemAlloc(sizeof(SearchStart)))); GetDlgItemText(IDC_SEARCH_FILENAME, pSearchStart->szFileName, _countof(pSearchStart->szFileName)); GetDlgItemText(IDC_SEARCH_QUERY, pSearchStart->szQuery, _countof(pSearchStart->szQuery)); + + pSearchStart->SearchHidden = IsDlgButtonChecked(IDC_SEARCH_HIDDEN); + if (!GetAddressEditBoxPath(pSearchStart->szPath)) { ShellMessageBoxW(_AtlBaseModule.GetResourceInstance(), m_hWnd, MAKEINTRESOURCEW(IDS_SEARCHINVALID), MAKEINTRESOURCEW(IDS_SEARCHLABEL), MB_OK | MB_ICONERROR, pSearchStart->szPath); diff --git a/dll/win32/browseui/shellfind/shellfind.h b/dll/win32/browseui/shellfind/shellfind.h index c955cf192b1..93256cb7970 100644 --- a/dll/win32/browseui/shellfind/shellfind.h +++ b/dll/win32/browseui/shellfind/shellfind.h @@ -36,6 +36,7 @@ struct SearchStart WCHAR szPath[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szQuery[MAX_PATH]; + BOOL SearchHidden; }; #endif /* _SHELLFIND_PCH_ */

1 0

[reactos] 01/01: [WSHTCPIP] Print IOCTL as hexa value
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c290ae21c77317c741ec4… commit c290ae21c77317c741ec4c37fe03f0b75ab35623 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 11:46:24 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 12:04:40 2019 +0200 [WSHTCPIP] Print IOCTL as hexa value --- dll/win32/wshtcpip/wshtcpip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/wshtcpip/wshtcpip.c b/dll/win32/wshtcpip/wshtcpip.c index 22e27efe24d..a66166c2e8f 100644 --- a/dll/win32/wshtcpip/wshtcpip.c +++ b/dll/win32/wshtcpip/wshtcpip.c @@ -365,7 +365,7 @@ WSHIoctl( UNIMPLEMENTED; - DPRINT1("Ioctl: Unknown IOCTL code: %d\n", IoControlCode); + DPRINT1("Ioctl: Unknown IOCTL code: %x\n", IoControlCode); return WSAEINVAL; }

1 0

[reactos] 01/01: [MSAFD] SizeOf*Buffer: Type is ULONG, not INT/DWORD
by Serge Gautherie 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8236e3fa9ca353fe9e2d… commit a8236e3fa9ca353fe9e2d147ef45bcdc4b713dce Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 17 12:33:29 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 10:50:03 2019 +0200 [MSAFD] SizeOf*Buffer: Type is ULONG, not INT/DWORD --- dll/win32/msafd/misc/dllmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index 4f01f6f2883..4f8e76c10a3 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -2638,12 +2638,12 @@ WSPGetSockOpt(IN SOCKET Handle, case SO_RCVBUF: Buffer = &Socket->SharedData->SizeOfRecvBuffer; - BufferSize = sizeof(INT); + BufferSize = sizeof(ULONG); break; case SO_SNDBUF: Buffer = &Socket->SharedData->SizeOfSendBuffer; - BufferSize = sizeof(INT); + BufferSize = sizeof(ULONG); break; case SO_ACCEPTCONN: @@ -2860,7 +2860,7 @@ WSPSetSockOpt( return NO_ERROR; case SO_SNDBUF: - if (optlen < sizeof(DWORD)) + if (optlen < sizeof(ULONG)) { if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; @@ -2884,7 +2884,7 @@ WSPSetSockOpt( return NO_ERROR; case SO_RCVBUF: - if (optlen < sizeof(DWORD)) + if (optlen < sizeof(ULONG)) { if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR;

1 0

[reactos] 01/01: [GDI32] Update Gdi Driver Header.
by jimtabor 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=333b8f19a4af478329a19… commit 333b8f19a4af478329a19d3246c8919460c98573 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Fri Oct 18 23:49:13 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Fri Oct 18 23:49:13 2019 -0500 [GDI32] Update Gdi Driver Header. Patch by : Akihiro Sagawa : Implement GetCharWidthInfo(). https://source.winehq.org/git/wine.git/commit/1128587fd262f9ad476b49e7837ac… --- win32ss/gdi/gdi32/include/wine/gdi_driver.h | 3 ++- win32ss/gdi/gdi32/wine/enhmfdrv/dc.c | 1 + win32ss/gdi/gdi32/wine/enhmfdrv/init.c | 1 + win32ss/gdi/gdi32/wine/mfdrv/init.c | 1 + win32ss/gdi/gdi32/wine/path.c | 1 + win32ss/gdi/gdi32/wine/rosglue.c | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/include/wine/gdi_driver.h b/win32ss/gdi/gdi32/include/wine/gdi_driver.h index fcf3de9d889..cd6350e4977 100644 --- a/win32ss/gdi/gdi32/include/wine/gdi_driver.h +++ b/win32ss/gdi/gdi32/include/wine/gdi_driver.h @@ -101,6 +101,7 @@ struct gdi_dc_funcs BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + BOOL (*pGetCharWidthInfo)(PHYSDEV,PVOID); INT (*pGetDeviceCaps)(PHYSDEV,INT); BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); DWORD (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD); @@ -197,7 +198,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 46 +#define WINE_GDI_DRIVER_VERSION 49 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ diff --git a/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c b/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c index b5b472e86d6..eabfaeaab8c 100644 --- a/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c +++ b/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c @@ -858,6 +858,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ #ifdef __REACTOS__ EMFDRV_GetDeviceCaps, //// Work around HACK. #else diff --git a/win32ss/gdi/gdi32/wine/enhmfdrv/init.c b/win32ss/gdi/gdi32/wine/enhmfdrv/init.c index ce9d9fb333b..47debb0543a 100644 --- a/win32ss/gdi/gdi32/wine/enhmfdrv/init.c +++ b/win32ss/gdi/gdi32/wine/enhmfdrv/init.c @@ -73,6 +73,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/win32ss/gdi/gdi32/wine/mfdrv/init.c b/win32ss/gdi/gdi32/wine/mfdrv/init.c index 50f8ba3b4e7..8c24f783f1d 100644 --- a/win32ss/gdi/gdi32/wine/mfdrv/init.c +++ b/win32ss/gdi/gdi32/wine/mfdrv/init.c @@ -136,6 +136,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/win32ss/gdi/gdi32/wine/path.c b/win32ss/gdi/gdi32/wine/path.c index 5cf9d3ae80a..4b5e3dd5fe7 100644 --- a/win32ss/gdi/gdi32/wine/path.c +++ b/win32ss/gdi/gdi32/wine/path.c @@ -476,6 +476,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/win32ss/gdi/gdi32/wine/rosglue.c b/win32ss/gdi/gdi32/wine/rosglue.c index d1b5038f27d..b537b90e419 100644 --- a/win32ss/gdi/gdi32/wine/rosglue.c +++ b/win32ss/gdi/gdi32/wine/rosglue.c @@ -89,6 +89,7 @@ static const struct gdi_dc_funcs DummyPhysDevFuncs = (PVOID)NULL_Unused, //BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); (PVOID)NULL_Unused, //BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); (PVOID)NULL_Unused, //BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + (PVOID)NULL_Unused, //BOOL (*pGetCharWidthInfo)(PHYSDEV,void*); (PVOID)NULL_Unused, //INT (*pGetDeviceCaps)(PHYSDEV,INT); (PVOID)NULL_Unused, //BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); (PVOID)NULL_Unused, //DWORD (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD);

1 0

[reactos] 01/01: Revert "[NTOS:KDBG] Use CONTEXT instead of KTRAP_FRAME"
by Hervé Poussineau 18 Oct '19

18 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=739037675374f4c4c125c… commit 739037675374f4c4c125caf844b31d04c00634e7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Oct 19 00:12:41 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Oct 19 00:14:12 2019 +0200 Revert "[NTOS:KDBG] Use CONTEXT instead of KTRAP_FRAME" This reverts commit e5bffe49da21f5faf2a88a0983ad4876d388e0ea. CORE-16231 --- ntoskrnl/include/internal/kd.h | 2 +- ntoskrnl/kdbg/kdb.c | 115 +++++++++++------------------------------ ntoskrnl/kdbg/kdb.h | 11 ++-- ntoskrnl/kdbg/kdb_cli.c | 10 ++-- ntoskrnl/kdbg/kdb_expr.c | 6 +-- ntoskrnl/kdbg/kdb_symbols.c | 2 +- 6 files changed, 47 insertions(+), 99 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index c336d3e0062..162ece58f71 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -59,7 +59,7 @@ KdbSymProcessSymbols( BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PCONTEXT Context + IN PKTRAP_FRAME Context ); NTSTATUS diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index 5611de62ed6..6b9d4695581 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -134,92 +134,40 @@ KiEspToTrapFrame( static VOID KdbpTrapFrameToKdbTrapFrame( - PCONTEXT Context, PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) { - if (Context) - { - KdbTrapFrame->Tf = *Context; - } - else - { - ASSERT(TrapFrame); - - RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME)); - KdbTrapFrame->Tf.Dr0 = TrapFrame->Dr0; - KdbTrapFrame->Tf.Dr1 = TrapFrame->Dr1; - KdbTrapFrame->Tf.Dr2 = TrapFrame->Dr2; - KdbTrapFrame->Tf.Dr3 = TrapFrame->Dr3; - KdbTrapFrame->Tf.Dr6 = TrapFrame->Dr6; - KdbTrapFrame->Tf.Dr7 = TrapFrame->Dr7; - KdbTrapFrame->Tf.SegGs = TrapFrame->SegGs; - KdbTrapFrame->Tf.SegEs = TrapFrame->SegEs; - KdbTrapFrame->Tf.SegDs = TrapFrame->SegDs; - KdbTrapFrame->Tf.Edx = TrapFrame->Edx; - KdbTrapFrame->Tf.Ecx = TrapFrame->Ecx; - KdbTrapFrame->Tf.Eax = TrapFrame->Eax; - KdbTrapFrame->Tf.SegFs = TrapFrame->SegFs; - KdbTrapFrame->Tf.Edi = TrapFrame->Edi; - KdbTrapFrame->Tf.Esi = TrapFrame->Esi; - KdbTrapFrame->Tf.Ebx = TrapFrame->Ebx; - KdbTrapFrame->Tf.Ebp = TrapFrame->Ebp; - KdbTrapFrame->Tf.Eip = TrapFrame->Eip; - KdbTrapFrame->Tf.SegCs = TrapFrame->SegCs; - KdbTrapFrame->Tf.EFlags = TrapFrame->EFlags; - KdbTrapFrame->Tf.Esp = KiEspFromTrapFrame(TrapFrame); - KdbTrapFrame->Tf.SegSs = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); - - KdbTrapFrame->Cr0 = __readcr0(); - KdbTrapFrame->Cr2 = __readcr2(); - KdbTrapFrame->Cr3 = __readcr3(); - KdbTrapFrame->Cr4 = __readcr4(); - - /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ - } + /* Copy the TrapFrame only up to Eflags and zero the rest*/ + RtlCopyMemory(&KdbTrapFrame->Tf, TrapFrame, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); + RtlZeroMemory((PVOID)((ULONG_PTR)&KdbTrapFrame->Tf + FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)), + sizeof(KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); + + KdbTrapFrame->Cr0 = __readcr0(); + KdbTrapFrame->Cr2 = __readcr2(); + KdbTrapFrame->Cr3 = __readcr3(); + KdbTrapFrame->Cr4 = __readcr4(); + + KdbTrapFrame->Tf.HardwareEsp = KiEspFromTrapFrame(TrapFrame); + KdbTrapFrame->Tf.HardwareSegSs = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); + + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } static VOID KdbpKdbTrapFrameToTrapFrame( PKDB_KTRAP_FRAME KdbTrapFrame, - PCONTEXT Context, PKTRAP_FRAME TrapFrame) { - if (Context) - { - /* Update context */ - *Context = KdbTrapFrame->Tf; - } - - if (TrapFrame) - { - TrapFrame->Dr0 = KdbTrapFrame->Tf.Dr0; - TrapFrame->Dr1 = KdbTrapFrame->Tf.Dr1; - TrapFrame->Dr2 = KdbTrapFrame->Tf.Dr2; - TrapFrame->Dr3 = KdbTrapFrame->Tf.Dr3; - TrapFrame->Dr6 = KdbTrapFrame->Tf.Dr6; - TrapFrame->Dr7 = KdbTrapFrame->Tf.Dr7; - TrapFrame->SegGs = KdbTrapFrame->Tf.SegGs; - TrapFrame->SegEs = KdbTrapFrame->Tf.SegEs; - TrapFrame->SegDs = KdbTrapFrame->Tf.SegDs; - TrapFrame->Edx = KdbTrapFrame->Tf.Edx; - TrapFrame->Ecx = KdbTrapFrame->Tf.Ecx; - TrapFrame->Eax = KdbTrapFrame->Tf.Eax; - TrapFrame->SegFs = KdbTrapFrame->Tf.SegFs; - TrapFrame->Edi = KdbTrapFrame->Tf.Edi; - TrapFrame->Esi = KdbTrapFrame->Tf.Esi; - TrapFrame->Ebx = KdbTrapFrame->Tf.Ebx; - TrapFrame->Ebp = KdbTrapFrame->Tf.Ebp; - TrapFrame->Eip = KdbTrapFrame->Tf.Eip; - TrapFrame->SegCs = KdbTrapFrame->Tf.SegCs; - TrapFrame->EFlags = KdbTrapFrame->Tf.EFlags; - KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.SegSs); - KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.Esp); - - /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ - - /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ - } + /* Copy the TrapFrame only up to Eflags and zero the rest*/ + RtlCopyMemory(TrapFrame, &KdbTrapFrame->Tf, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); + + /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ + + KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareSegSs); + KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareEsp); + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } static VOID @@ -237,8 +185,8 @@ KdbpKdbTrapFrameFromKernelStack( KdbTrapFrame->Tf.Esi = StackPtr[5]; KdbTrapFrame->Tf.Ebx = StackPtr[6]; KdbTrapFrame->Tf.Eip = StackPtr[7]; - KdbTrapFrame->Tf.Esp = (ULONG) (StackPtr + 8); - KdbTrapFrame->Tf.SegSs = KGDT_R0_DATA; + KdbTrapFrame->Tf.HardwareEsp = (ULONG) (StackPtr + 8); + KdbTrapFrame->Tf.HardwareSegSs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegCs = KGDT_R0_CODE; KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA; @@ -1378,10 +1326,9 @@ KdbEnterDebuggerException( IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, IN KPROCESSOR_MODE PreviousMode, IN PCONTEXT Context, - IN OUT PKTRAP_FRAME InitialTrapFrame, + IN OUT PKTRAP_FRAME TrapFrame, IN BOOLEAN FirstChance) { - PKTRAP_FRAME TrapFrame = InitialTrapFrame; KDB_ENTER_CONDITION EnterCondition; KD_CONTINUE_TYPE ContinueType = kdHandleException; PKDB_BREAKPOINT BreakPoint; @@ -1500,7 +1447,7 @@ KdbEnterDebuggerException( if (BreakPoint->Condition) { /* Setup the KDB trap frame */ - KdbpTrapFrameToKdbTrapFrame(Context, InitialTrapFrame, &KdbTrapFrame); + KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); ull = 0; if (!KdbpRpnEvaluateParsedExpression(BreakPoint->Condition, &KdbTrapFrame, &ull, NULL, NULL)) @@ -1661,7 +1608,7 @@ KdbEnterDebuggerException( KdbCurrentTrapFrame = &KdbTrapFrame; /* Setup the KDB trap frame */ - KdbpTrapFrameToKdbTrapFrame(Context, InitialTrapFrame, &KdbTrapFrame); + KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); /* Enter critical section */ OldEflags = __readeflags(); @@ -1708,8 +1655,8 @@ KdbEnterDebuggerException( KeUnstackDetachProcess(&KdbApcState); } - /* Update the exception Context/TrapFrame */ - KdbpKdbTrapFrameToTrapFrame(&KdbTrapFrame, Context, InitialTrapFrame); + /* Update the exception TrapFrame */ + KdbpKdbTrapFrameToTrapFrame(&KdbTrapFrame, TrapFrame); /* Decrement the entry count */ InterlockedDecrement(&KdbEntryCount); diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index f87381a9fa2..b6419079e61 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -12,11 +12,12 @@ /* from kdb.c */ typedef struct _KDB_KTRAP_FRAME { - CONTEXT Tf; - ULONG Cr0; - ULONG Cr2; - ULONG Cr3; - ULONG Cr4; + KTRAP_FRAME Tf; + ULONG Cr0; + ULONG Cr1; /* reserved/unused */ + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; } KDB_KTRAP_FRAME, *PKDB_KTRAP_FRAME; typedef enum _KDB_BREAKPOINT_TYPE diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index e4921e488e9..e4da9d78903 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -849,7 +849,7 @@ KdbpCmdRegs( ULONG Argc, PCHAR Argv[]) { - PCONTEXT Tf = &KdbCurrentTrapFrame->Tf; + PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf; INT i; static const PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5", " ZF", " SF", " TF", " IF", " DF", " OF", @@ -868,7 +868,7 @@ KdbpCmdRegs( " ESI 0x%08x EDI 0x%08x\n" " EBP 0x%08x\n", Tf->SegCs & 0xFFFF, Tf->Eip, - Tf->SegSs, Tf->Esp, + Tf->HardwareSegSs, Tf->HardwareEsp, Tf->Eax, Tf->Ebx, Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, @@ -966,7 +966,7 @@ KdbpCmdRegs( KdbpPrint("GS 0x%04x Index 0x%04x %cDT RPL%d\n", Tf->SegGs, Tf->SegGs >> 3, (Tf->SegGs & (1 << 2)) ? 'L' : 'G', Tf->SegGs & 3); KdbpPrint("SS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->SegSs, Tf->SegSs >> 3, (Tf->SegSs & (1 << 2)) ? 'L' : 'G', Tf->SegSs & 3); + Tf->HardwareSegSs, Tf->HardwareSegSs >> 3, (Tf->HardwareSegSs & (1 << 2)) ? 'L' : 'G', Tf->HardwareSegSs & 3); } else /* dregs */ { @@ -986,7 +986,7 @@ KdbpCmdRegs( static BOOLEAN KdbpTrapFrameFromPrevTss( - PCONTEXT TrapFrame) + PKTRAP_FRAME TrapFrame) { ULONG_PTR Eip, Ebp; KDESCRIPTOR Gdtr; @@ -1075,7 +1075,7 @@ KdbpCmdBackTrace( ULONGLONG Result = 0; ULONG_PTR Frame = KdbCurrentTrapFrame->Tf.Ebp; ULONG_PTR Address; - CONTEXT TrapFrame; + KTRAP_FRAME TrapFrame; if (Argc >= 2) { diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index 9e3d15c6b20..de856536e08 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -106,7 +106,7 @@ RpnStack = static const struct { PCHAR Name; - ULONG Offset; + UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = @@ -119,14 +119,14 @@ RegisterToTrapFrame[] = {"edx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edx)}, {"esi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esi)}, {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edi)}, - {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esp)}, + {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareEsp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareEsp)}, {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebp)}, {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegCs), 2 }, /* Use only the lower 2 bytes */ {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegDs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegDs)}, {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegEs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegEs)}, {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegFs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegFs)}, {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegGs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegGs)}, - {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegSs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegSs)}, + {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareSegSs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareSegSs)}, {"dr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr0)}, {"dr1", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr1), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr1)}, {"dr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr2)}, diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 07f55eba1ca..1b2d8f695c8 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -147,7 +147,7 @@ KdbpSymUnicodeToAnsi(IN PUNICODE_STRING Unicode, BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PCONTEXT Context) + IN PKTRAP_FRAME Context) { PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG_PTR RelativeAddress;

1 0

[reactos] 01/01: [MOUNTMGR] QueryPointsFromMemory: take into account the multiple MOUNTMGR_MOUNT_POINT
by Pierre Schweitzer 17 Oct '19

17 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da92ac67bc7f664840a2… commit 2da92ac67bc7f664840a21f1d55e87192828ae06 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 17 22:40:23 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 17 22:42:47 2019 +0200 [MOUNTMGR] QueryPointsFromMemory: take into account the multiple MOUNTMGR_MOUNT_POINT This fixes returning too small structure on an IOCTL_MOUNTMGR_QUERY_POINTS call. The multiple MOUNTMGR_MOUNT_POINT structures were ignored and thus the data of the first one were erased by the multiple structures. MountMgr now returns consistent output on this IOCTL call. --- drivers/filters/mountmgr/point.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 26c263eec08..35fe8bb2435 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -336,9 +336,9 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, MountPoints = (PMOUNTMGR_MOUNT_POINTS)Irp->AssociatedIrp.SystemBuffer; /* Ensure we set output to let user reallocate! */ - MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSize; + MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSymLinks * sizeof(MOUNTMGR_MOUNT_POINT) + TotalSize; MountPoints->NumberOfMountPoints = TotalSymLinks; - Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSize; + Irp->IoStatus.Information = MountPoints->Size; if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) { @@ -353,8 +353,8 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, } /* Now, start putting mount points */ + TotalSize = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSymLinks * sizeof(MOUNTMGR_MOUNT_POINT); TotalSymLinks = 0; - TotalSize = 0; for (DeviceEntry = DeviceExtension->DeviceListHead.Flink; DeviceEntry != &(DeviceExtension->DeviceListHead); DeviceEntry = DeviceEntry->Flink) @@ -391,16 +391,12 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, { SymlinkInformation = CONTAINING_RECORD(SymlinksEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); - - MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameOffset = sizeof(MOUNTMGR_MOUNT_POINTS) + - TotalSize; + MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameOffset = TotalSize; MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameLength = SymlinkInformation->Name.Length; - MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = sizeof(MOUNTMGR_MOUNT_POINTS) + - SymlinkInformation->Name.Length + + MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = SymlinkInformation->Name.Length + TotalSize; MountPoints->MountPoints[TotalSymLinks].UniqueIdLength = DeviceInformation->UniqueId->UniqueIdLength; - MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset = sizeof(MOUNTMGR_MOUNT_POINTS) + - SymlinkInformation->Name.Length + + MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset = SymlinkInformation->Name.Length + DeviceInformation->UniqueId->UniqueIdLength + TotalSize; MountPoints->MountPoints[TotalSymLinks].DeviceNameLength = DeviceInformation->DeviceName.Length;

1 0

[reactos] 01/01: [CODEOWNERS] Add /drivers/filters/*/ entries
by Serge Gautherie 17 Oct '19

17 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41eb4b6d0af2e19df8a9c… commit 41eb4b6d0af2e19df8a9c3278229595c3ed45259 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Oct 5 23:53:48 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 17 20:04:48 2019 +0200 [CODEOWNERS] Add /drivers/filters/*/ entries Also add Pierre's Jira username. --- CODEOWNERS | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index ea5916ff9e9..571825b6a90 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -107,7 +107,7 @@ /sdk/tools/xml2sdb/ @learn-more # Cache Manager -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /modules/rostests/kmtests/ntos_cc/ @HeisSpiter /ntoskrnl/cc/ @HeisSpiter @@ -130,14 +130,19 @@ /dll/win32/mspatcha/ @learn-more # File Systems -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained # C: Also see "Upstream File Systems" /drivers/filesystems/ @HeisSpiter /sdk/lib/fslib/ @HeisSpiter +# Filesystem Filter Manager +# M: gedmurphy, Ged, Ged Murphy +# S: Maintained +/drivers/filters/fltmgr/ @gedmurphy + # File Systems Run Time Library -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /modules/rostests/kmtests/ntos_fsrtl/ @HeisSpiter /modules/rostests/kmtests/novp_fsrtl/ @HeisSpiter @@ -164,7 +169,7 @@ # Kernel # M: -# R: HeisSpiter, Pierre Schweitzer +# R: HeisSpiter, Heis Spiter, Pierre Schweitzer # R: ThFabba, Thomas Faber # R: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained @@ -177,6 +182,11 @@ /dll/3rdparty/mbedtls/ @ThFabba /sdk/include/reactos/libs/mbedtls/ @ThFabba +# Mount Point Manager +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer +# S: Maintained +/drivers/filters/mountmgr/ @HeisSpiter + # Network Drivers # M: # R: ThFabba, Thomas Faber @@ -191,14 +201,14 @@ /drivers/network/dd/e1000/ @ThFabba @Extravert-ir # Network File Systems kernel libraries -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /sdk/lib/drivers/rdbsslib/ @HeisSpiter /sdk/lib/drivers/rxce/ @HeisSpiter # NTDLL # M: -# R: HeisSpiter, Pierre Schweitzer +# R: HeisSpiter, Heis Spiter, Pierre Schweitzer # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # R: tkreuzer, ThePhysicist, Timo Kreuzer @@ -218,13 +228,13 @@ /modules/rostests/kmtests/ @ThFabba # ROS internals tools -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /modules/rosapps/applications/rosinternals/ @HeisSpiter # Run-Time Library (RTL) # M: -# R: HeisSpiter, Pierre Schweitzer +# R: HeisSpiter, Heis Spiter, Pierre Schweitzer # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # R: tkreuzer, ThePhysicist, Timo Kreuzer @@ -243,7 +253,7 @@ /drivers/storage/ide/uniata/ @ThFabba # Upstream File Systems -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Upstream /base/services/nfsd/ @HeisSpiter /dll/np/nfs/ @HeisSpiter @@ -269,25 +279,25 @@ /sdk/include/reactos/drivers/usbport/ @ThFabba @Extravert-ir # Virtual CD-ROM -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /modules/rosapps/applications/cmdutils/vcdcli/ @HeisSpiter /modules/rosapps/applications/vcdcontroltool/ @HeisSpiter /modules/rosapps/drivers/vcdrom/ @HeisSpiter # Virtual Floppy Disk -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Upstream /modules/rosapps/applications/cmdutils/vfdcmd/ @HeisSpiter /modules/rosapps/drivers/vfd/ @HeisSpiter # Win32 file functions -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Maintained /dll/win32/kernel32/client/file/ @HeisSpiter # Windows Network File Systems functions -# M: HeisSpiter, Pierre Schweitzer +# M: HeisSpiter, Heis Spiter, Pierre Schweitzer # S: Upstream /dll/win32/mpr/wnet.c @HeisSpiter

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019