Alexander Nicolaysen Sørnes : wordpad: Display error box when richedit loading fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3161a3cd5dd1feec86cbc192a3c028bda5582d3e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3161a3cd5dd1feec86cbc192a3c028bda5582d3e

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Wed Jul 18 15:44:24 2007 +0200

wordpad: Display error box when richedit loading fails.

---

 programs/wordpad/De.rc      |    1 +
 programs/wordpad/En.rc      |    1 +
 programs/wordpad/Fr.rc      |    1 +
 programs/wordpad/Hu.rc      |    1 +
 programs/wordpad/Ko.rc      |    1 +
 programs/wordpad/Nl.rc      |    1 +
 programs/wordpad/No.rc      |    1 +
 programs/wordpad/Pl.rc      |    1 +
 programs/wordpad/Ru.rc      |    1 +
 programs/wordpad/Tr.rc      |    1 +
 programs/wordpad/resource.h |    1 +
 programs/wordpad/wordpad.c  |    7 ++++++-
 12 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc
index 4647a21..266db58 100644
--- a/programs/wordpad/De.rc
+++ b/programs/wordpad/De.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc
index 14c1a3e..208d600 100644
--- a/programs/wordpad/En.rc
+++ b/programs/wordpad/En.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc
index 14527e3..1ea4c4f 100644
--- a/programs/wordpad/Fr.rc
+++ b/programs/wordpad/Fr.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc
index c3b220d..7b9fa75 100644
--- a/programs/wordpad/Hu.rc
+++ b/programs/wordpad/Hu.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc
index 2712d52..d76cf4d 100644
--- a/programs/wordpad/Ko.rc
+++ b/programs/wordpad/Ko.rc
@@ -105,4 +105,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "¹®¼­"
     STRING_PROMPT_SAVE_CHANGES,  "'%s'ÀÇ ¹Ù²ï °ÍÀ» ÀúÀåÇÏ°Ú½À´Ï±î?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc
index 72a73c0..47f1d16 100644
--- a/programs/wordpad/Nl.rc
+++ b/programs/wordpad/Nl.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc
index 3e8a9a5..8f83a74 100644
--- a/programs/wordpad/No.rc
+++ b/programs/wordpad/No.rc
@@ -104,4 +104,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Dokument"
     STRING_PROMPT_SAVE_CHANGES,  "Lagre endringer i «%s»?"
     STRING_SEARCH_FINISHED,      "Ferdig med å søke i dokumentet."
+    STRING_LOAD_RICHED_FAILED,   "Klarte ikke laste RichEdit-biblioteket."
 END
diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc
index 1056375..185c4e6 100644
--- a/programs/wordpad/Pl.rc
+++ b/programs/wordpad/Pl.rc
@@ -105,4 +105,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc
index 800bf3f..1bb5b44 100644
--- a/programs/wordpad/Ru.rc
+++ b/programs/wordpad/Ru.rc
@@ -102,4 +102,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc
index fd25eaf..0fc5f09 100644
--- a/programs/wordpad/Tr.rc
+++ b/programs/wordpad/Tr.rc
@@ -106,4 +106,5 @@ BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
     STRING_SEARCH_FINISHED,      "Finished searching the document."
+    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
 END
diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h
index 8ee7156..5540a8d 100644
--- a/programs/wordpad/resource.h
+++ b/programs/wordpad/resource.h
@@ -85,3 +85,4 @@
 #define STRING_DEFAULT_FILENAME 1403
 #define STRING_PROMPT_SAVE_CHANGES 1404
 #define STRING_SEARCH_FINISHED 1405
+#define STRING_LOAD_RICHED_FAILED 1406
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 0c384bd..c91ad39 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -677,7 +677,12 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
     SendMessageW(hReBarWnd, RB_INSERTBAND, BANDID_FORMATBAR, (LPARAM)&rbb);
 
     hDLL = LoadLibraryW(wszRichEditDll);
-    assert(hDLL);
+    if(!hDLL)
+    {
+        MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle,
+                    MB_OK | MB_ICONEXCLAMATION);
+        PostQuitMessage(1);
+    }
 
     hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL,
       WS_CHILD|WS_VISIBLE|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL,