Changeset 104 for trunk/common_functions/message.c

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• common_functions/message.c (modified) (8 diffs)

trunk/common_functions/message.c

@@ -11 +11 @@
   WinMessageBox(HWND_DESKTOP,0,
                 "The resource DLL which contains all the dialogs, graphics and messages cannot be loaded. \
-Please check your installation.",
-"Problem with class installation",12345,
+                \nPlease check your installation.",
+                "Problem with class installation",12345,
                 MB_OK|MB_MOVEABLE|MB_ERROR);
 }
@@ -23 +23 @@
     At least I suspect this happens on system where the MM classes don't work.
     Instead there's a new function errorResourceVerbose() which may be called when we
-    know, the WPS is up and running. 
+    know, the WPS is up and running.
    */
   WinMessageBox(HWND_DESKTOP,0,
@@ -51 +51 @@
 /*                                                  */
 /*!!*************************************************/
-ULONG messageBox( char* text, ULONG ulTextID , LONG lSizeText,
-                  char* title, ULONG ulTitleID, LONG lSizeTitle,
+ULONG messageBox( PSZ text, ULONG ulTextID , LONG lSizeText,
+                  PSZ title, ULONG ulTitleID, LONG lSizeTitle,
                   HMODULE hResource, HWND hwnd, ULONG ulFlags)
 {
@@ -67 +67 @@
 }
 
-static ULONG mBox( char* text, ULONG ulTextID , LONG lSizeText,
-                   char* title, ULONG ulTitleID, LONG lSizeTitle,
+static ULONG mBox( PSZ text, ULONG ulTextID , LONG lSizeText,
+                   PSZ title, ULONG ulTitleID, LONG lSizeTitle,
                    HMODULE hResource, HWND hwnd, ULONG ulFlags)
 {
@@ -183 +183 @@
 ULONG MsgShowMessageBox(HWND hwnd, ULONG ulIDTitle, ULONG ulIDText, HMODULE hModule, ULONG ulFlag)
 {
-  char* pText;
-  char* pTitle;
+  PSZ pText;
+  PSZ pTitle;
   ULONG rc;
 
@@ -223 +223 @@
 /*                                                  */
 /*!!*************************************************/
-BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd)
+BOOL getMessage(PSZ text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd)
 {
   if(!WinLoadString(WinQueryAnchorBlock(hwnd),hResource,ulID,lSizeText,text)) {
-    strcpy(text,"");
+    strcpy((PCHAR)text,"");
     return FALSE;
   }
@@ -250 +250 @@
 /*                                                           */
 /*!!**********************************************************/
-BOOL MsgGetMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd)
+BOOL MsgGetMessage(PSZ text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd)
 {
   return getMessage( text, ulID, lSizeText, hResource, hwnd);
@@ -258 +258 @@
 {
   WinMessageBox(HWND_DESKTOP,0,
-                "This helper shouldn't be started by hand. It is called by the multimedia classes. \
-If you didn't launch the helper by hand you may have found a bug. Please contact the author.",
+                "This helper shouldn't be started by hand. \
+                \nIt is called by the multimedia classes. \
+                \nIf you didn't launch the helper by hand you may have found a bug. \
+                \nPlease contact the author.",
                 "Problem with multimedia classes",12345,
                 MB_OK|MB_MOVEABLE|MB_ERROR);