=?UTF-8?Q?J=C3=B6rg=20H=C3=B6hle=20?=: winmm: Turn some MCI parser ERR into FIXME.

Alexandre Julliard julliard at winehq.org
Tue Oct 30 13:27:35 CDT 2012


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

Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date:   Thu Sep 20 17:13:24 2012 +0200

winmm: Turn some MCI parser ERR into FIXME.

---

 dlls/winmm/mci.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 1448b16..8f26c1e 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -1099,7 +1099,7 @@ static	DWORD	MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd,
 		break;
 	    case MCI_RETURN:
 		if (offset != _offset) {
-		    ERR("MCI_RETURN not in first position\n");
+		    FIXME("MCI_RETURN not in first position\n");
 		    return MCIERR_PARSER_INTERNAL;
 		}
 	    }
@@ -1186,7 +1186,7 @@ static	DWORD	MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd,
 	    return MCIERR_UNRECOGNIZED_COMMAND;
 	}
 	if (offset == MCI_DATA_SIZE) {
-	    ERR("Internal data[] buffer overflow\n");
+	    FIXME("Internal data[] buffer overflow\n");
 	    return MCIERR_PARSER_INTERNAL;
 	}
     }
@@ -1304,7 +1304,7 @@ static	DWORD	MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret
 	    snprintfW(lpstrRet, uRetLen, fmt_d4, data[0], data[1], data[2], data[3]);
 	    break;
         }
-	default:		ERR("oops\n");
+	default:		FIXME("Unknown MCI return type %d\n", retType);
 	}
     }
     return LOWORD(dwRet);
@@ -1507,7 +1507,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
         break;
 #endif
     default:
-	ERR("oops\n");
+	FIXME("Unknown MCI return type %d\n", retType);
+	dwRet = MCIERR_PARSER_INTERNAL;
+	goto errCleanUp;
     }
 
     TRACE("verb=%s on dev=%s; offset=%d\n", 
@@ -1536,7 +1538,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
     case MCI_OPEN:
 	if (strcmpW(verb, wszOpen)) {
 	    FIXME("Cannot open with command %s\n", debugstr_w(verb));
-	    dwRet = MCIERR_INTERNAL;
+	    dwRet = MCIERR_DRIVER_INTERNAL;
 	    wMsg = 0;
 	    goto errCleanUp;
 	}




More information about the wine-cvs mailing list