[PATCH 5/7] regedit: Update search completion message handling

Hugh McMaster hugh.mcmaster at outlook.com
Sun Jan 29 05:57:36 CST 2017


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/edit.c     | 2 +-
 programs/regedit/framewnd.c | 2 +-
 programs/regedit/main.h     | 1 +
 programs/regedit/regedit.rc | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 332f741..55d7028 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -87,7 +87,7 @@ static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list a
     return ret;
 }
 
-static INT messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, ...)
+int messagebox(HWND hwnd, int buttons, int titleId, int resId, ...)
 {
     va_list ap;
     INT result;
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 018759e..0f0ce2f 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -773,7 +773,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                     SetFocus(g_pChildWnd->hTreeWnd);
                 }
             } else {
-                error_code_messagebox(hWnd, IDS_NOTFOUND, searchString);
+                messagebox(hWnd, MB_OK|MB_ICONINFORMATION, IDS_APP_TITLE, IDS_NOTFOUND, searchString);
             }
         }
         break;
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 87d2bff..6a091a6 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -143,6 +143,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath);
 extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox);
 extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName);
 extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName);
+int messagebox(HWND hwnd, int buttons, int titleId, int resId, ...);
 extern void error_code_messagebox(HWND hwnd, unsigned int msg_id, ...);
 
 /* hexedit.c */
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index c717deb..82b1d43 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -185,7 +185,7 @@ BEGIN
     IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
     IDS_NEWKEY              "New Key #%d"
     IDS_NEWVALUE            "New Value #%d"
-    IDS_NOTFOUND            "The search string '%1' was not found."
+    IDS_NOTFOUND            "Search complete. The string '%1' was not found."
 END
 
 STRINGTABLE
-- 
2.7.4




More information about the wine-patches mailing list