winmm: Don't include newlines in standard error messages.
Francois Gouget
fgouget at free.fr
Tue Jan 3 05:29:41 CST 2012
---
None of the other error strings have newlines so these two look like
errors. It's also strange that MMSYSERR_NOMEM was subtly different from
MCIERR_OUT_OF_MEMORY.
dlls/winmm/winmm.rc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winmm/winmm.rc b/dlls/winmm/winmm.rc
index 47416bc..4c9ac71 100644
--- a/dlls/winmm/winmm.rc
+++ b/dlls/winmm/winmm.rc
@@ -31,7 +31,7 @@ MMSYSERR_BADDEVICEID, "A device ID has been used that is out of range for your
MMSYSERR_NOTENABLED, "The driver was not enabled."
MMSYSERR_ALLOCATED, "The specified device is already in use. Wait until it is free, and then try again."
MMSYSERR_INVALHANDLE, "The specified device handle is invalid."
-MMSYSERR_NODRIVER, "There is no driver installed on your system!\n"
+MMSYSERR_NODRIVER, "There is no driver installed on your system!"
MMSYSERR_NOMEM, "Not enough memory available for this task. Quit one or more applications to increase available memory, and then try again."
MMSYSERR_NOTSUPPORTED, "This function is not supported. Use the Capabilities function to determine which functions and messages the driver supports."
MMSYSERR_BADERRNUM, "An error number was specified that is not defined in the system."
@@ -58,7 +58,7 @@ MCIERR_UNRECOGNIZED_KEYWORD, "The driver cannot recognize the specified command
MCIERR_UNRECOGNIZED_COMMAND, "The driver cannot recognize the specified command."
MCIERR_HARDWARE, "There is a problem with your media device. Make sure it is working correctly or contact the device manufacturer."
MCIERR_INVALID_DEVICE_NAME, "The specified device is not open or is not recognized by MCI."
-MCIERR_OUT_OF_MEMORY, "Not enough memory available for this task.\nQuit one or more applications to increase available memory, and then try again."
+MCIERR_OUT_OF_MEMORY, "Not enough memory available for this task. Quit one or more applications to increase available memory, and then try again."
MCIERR_DEVICE_OPEN, "The device name is already being used as an alias by this application. Use a unique alias."
MCIERR_CANNOT_LOAD_DRIVER, "There is an undetectable problem in loading the specified device driver."
MCIERR_MISSING_COMMAND_STRING, "No command was specified."
--
1.7.7.3
More information about the wine-patches
mailing list