February 2010 - Wine-Commits

Huw Davies : gdi32: Zero pad the facename buffer so that we don' t write uninitialized data to the metafile.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 1ff1e1116147a7364be51c629e22f0c0c79a165f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff1e1116147a7364be51c629… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 3 14:33:06 2010 +0000 gdi32: Zero pad the facename buffer so that we don't write uninitialized data to the metafile. Found by Valgrind. --- dlls/gdi32/mfdrv/objects.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index a7a442b..c6a68ca 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -365,6 +365,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)]; METARECORD *mr = (METARECORD *)&buffer; LOGFONT16 *font16; + INT written; mr->rdSize = (sizeof(METARECORD) + sizeof(LOGFONT16) - 2) / 2; mr->rdFunction = META_CREATEFONTINDIRECT; @@ -383,8 +384,9 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo font16->lfClipPrecision = logfont->lfClipPrecision; font16->lfQuality = logfont->lfQuality; font16->lfPitchAndFamily = logfont->lfPitchAndFamily; - WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE, NULL, NULL ); - font16->lfFaceName[LF_FACESIZE-1] = 0; + written = WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE - 1, NULL, NULL ); + /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ + memset(font16->lfFaceName + written, 0, LF_FACESIZE - written); if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) return 0;

1 0

Jacek Caban : mshtml: Improved debugstr_variant implementation.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 9a92f9cb4a477bbf0609be13f8d41d979612ea04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a92f9cb4a477bbf0609be13f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 3 16:17:29 2010 +0100 mshtml: Improved debugstr_variant implementation. --- dlls/mshtml/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1e30066..f54c6e3 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -439,11 +439,14 @@ HRESULT WINAPI DllUnregisterServer(void) const char *debugstr_variant(const VARIANT *v) { + if(!v) + return "(null)"; + switch(V_VT(v)) { case VT_EMPTY: - return wine_dbg_sprintf("{VT_EMPTY}"); + return "{VT_EMPTY}"; case VT_NULL: - return wine_dbg_sprintf("{VT_NULL}"); + return "{VT_NULL}"; case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); case VT_R8:

1 0

Nikolay Sivov : Add stub msxml4.dll.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 4f1d040eaf7ecdd519848f75485b7844dda2b82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1d040eaf7ecdd519848f754… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 03:49:37 2010 +0300 Add stub msxml4.dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/msxml4/Makefile.in | 14 ++++++++++++++ dlls/msxml4/main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msxml4/msxml4.spec | 4 ++++ 5 files changed, 67 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2cd384d..f60272d 100755 --- a/configure +++ b/configure @@ -16222,6 +16222,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/msxml3/tests/Makefile: dlls/msxml3/tests/Makefile.in dlls/Maketest.rules config.status" ac_config_files="$ac_config_files dlls/msxml3/tests/Makefile" +ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/msxml4/Makefile" +test "x$enable_msxml4" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msxml4" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/msxml4/Makefile: dlls/msxml4/Makefile.in dlls/Makedll.rules config.status" +ac_config_files="$ac_config_files dlls/msxml4/Makefile" + ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ nddeapi/libnddeapi.$IMPLIBEXT" ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES @@ -19896,6 +19904,7 @@ do "dlls/mswsock/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;; "dlls/msxml3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msxml3/Makefile" ;; "dlls/msxml3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msxml3/tests/Makefile" ;; + "dlls/msxml4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msxml4/Makefile" ;; "dlls/nddeapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/nddeapi/Makefile" ;; "dlls/netapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/netapi32/Makefile" ;; "dlls/netapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/netapi32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8016dd7..24aac13 100644 --- a/configure.ac +++ b/configure.ac @@ -2391,6 +2391,7 @@ WINE_CONFIG_DLL(msvideo.dll16,enable_win16) WINE_CONFIG_DLL(mswsock,,[mswsock]) WINE_CONFIG_DLL(msxml3) WINE_CONFIG_TEST(dlls/msxml3/tests) +WINE_CONFIG_DLL(msxml4) WINE_CONFIG_DLL(nddeapi,,[nddeapi]) WINE_CONFIG_DLL(netapi32,,[netapi32]) WINE_CONFIG_TEST(dlls/netapi32/tests) diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in new file mode 100644 index 0000000..093e67d --- /dev/null +++ b/dlls/msxml4/Makefile.in @@ -0,0 +1,14 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msxml4.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msxml4/main.c b/dlls/msxml4/main.c new file mode 100644 index 0000000..761184b --- /dev/null +++ b/dlls/msxml4/main.c @@ -0,0 +1,39 @@ +/* + * MSXML4 entry point + * + * Copyright 2010 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + return TRUE; +} diff --git a/dlls/msxml4/msxml4.spec b/dlls/msxml4/msxml4.spec new file mode 100644 index 0000000..3685aa2 --- /dev/null +++ b/dlls/msxml4/msxml4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stub -private DllGetClassObject +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer

1 0

Dan Kegel : reg.exe: Handle setting DWORD registry values.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 7de394d6abe11761e3672b22c1def23aff8324b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de394d6abe11761e3672b22c… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Feb 3 06:04:55 2010 -0800 reg.exe: Handle setting DWORD registry values. --- programs/reg/reg.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 07dbdbf..f65a3c8 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -124,6 +124,21 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r lstrcpyW((LPWSTR)out_data,data); break; } + case REG_DWORD: + { + LPWSTR rest; + DWORD val; + val = strtolW(data, &rest, 0); + if (rest == data) { + static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0}; + reg_printfW(nonnumber); + break; + } + *reg_count = sizeof(DWORD); + out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + ((LPDWORD)out_data)[0] = val; + break; + } default: { static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0};

1 0

Nikolay Sivov : msxml3: Fix a debug channel and comment copypaste.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: d3aacce6053def071e04302333d90047d4e369f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3aacce6053def071e0430233… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 17:21:51 2010 +0300 msxml3: Fix a debug channel and comment copypaste. --- dlls/msxml3/regsvr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index c8ae753..d9b47dd 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -47,7 +47,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* * Near the bottom of this file are the exported DllRegisterServer and @@ -702,7 +702,7 @@ static struct progid const progid_list[] = { }; /*********************************************************************** - * DllRegisterServer (OLEAUT32.@) + * DllRegisterServer (MSXML3.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -729,7 +729,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (OLEAUT32.@) + * DllUnregisterServer (MSXML3.@) */ HRESULT WINAPI DllUnregisterServer(void) {

1 0

Paul Vriens : gdiplus/tests: Fix a test failure.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 73c244052e13700d71f2a07369c89455e24f86ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c244052e13700d71f2a0736… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 3 14:19:02 2010 +0100 gdiplus/tests: Fix a test failure. --- dlls/gdiplus/tests/image.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 10dc21e..d752f16 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -30,6 +30,18 @@ #define expect(expected, got) ok((UINT)(got) == (UINT)(expected), "Expected %.8x, got %.8x\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + return TRUE; +} + static void expect_guid(REFGUID expected, REFGUID got, int line, BOOL todo) { WCHAR bufferW[39]; @@ -1468,7 +1480,7 @@ static void test_gamma(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff20ffff, color); + todo_wine ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0

Jörg Höhle : winecoreaudio: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 9c8ce89bf03827a78462fd66d218bfa765eda4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8ce89bf03827a78462fd66d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 3 09:58:12 2010 +0100 winecoreaudio: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask. --- dlls/winecoreaudio.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e66d435..b6b26ea 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -191,8 +191,8 @@ LONG CoreAudio_MIDIInit(void) destinations[i].caps.wPid = 0x0001; destinations[i].caps.vDriverVersion = 0x0001; destinations[i].caps.dwSupport = 0; - destinations[i].caps.wVoices = 16; - destinations[i].caps.wNotes = 16; + destinations[i].caps.wVoices = 0; + destinations[i].caps.wNotes = 0; } return DRV_SUCCESS; }

1 0

Nikolay Sivov : shell32: Fix a debug channel.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 9de35af881738bc79d6e382f9681918aa363c55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de35af881738bc79d6e382f9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 17:30:26 2010 +0300 shell32: Fix a debug channel. --- dlls/shell32/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index a23190e..8ae513f 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -39,7 +39,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(shell); /* * Near the bottom of this file are the exported DllRegisterServer and

1 0

Nikolay Sivov : itss: Fix typo in registry entry creation.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 87e89995ee6b31a517cdce655ec95de577788d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e89995ee6b31a517cdce655… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 17:13:40 2010 +0300 itss: Fix typo in registry entry creation. --- dlls/itss/itss.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/itss.inf b/dlls/itss/itss.inf index eeefbbb..22a1215 100644 --- a/dlls/itss/itss.inf +++ b/dlls/itss/itss.inf @@ -43,7 +43,7 @@ HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32","ThreadingModel",,"Both" HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,,"" HKCR,"CLSID\%CLSID_ITSProtocol%\ProgID",,,"MSITFS1.0" -HKCR,"CLSID\%CLSID_ITSProtocol%%\VersionIndependentProgID",,,"MSITFS" +HKCR,"CLSID\%CLSID_ITSProtocol%\VersionIndependentProgID",,,"MSITFS" HKCR,"ITSProtocol","Microsoft InfoTech Protocols for IE 4.0" HKCR,"ITSProtocol\CLSID",,,"%CLSID_ITSProtocol%"

1 0

Jörg Höhle : winealsa: Ignore failure to notify MIDI clients.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 3825abbbb7e7339f9eac28bad57fa5c9bbb87cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3825abbbb7e7339f9eac28bad… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 3 07:36:11 2010 +0100 winealsa: Ignore failure to notify MIDI clients. --- dlls/winealsa.drv/midi.c | 55 +++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 39 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 33d5783..e792c65 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -172,8 +172,8 @@ static int MIDI_AlsaToWindowsDeviceType(unsigned int type) /************************************************************************** * MIDI_NotifyClient [internal] */ -static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { DWORD dwCallBack; UINT uFlags; @@ -188,8 +188,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) - return MMSYSERR_BADDEVICEID; + if (wDevID > MODM_NumDevs) return; dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; uFlags = MidiOutDev[wDevID].wFlags; @@ -204,8 +203,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, case MIM_ERROR: case MIM_LONGERROR: case MIM_MOREDATA: - if (wDevID > MIDM_NumDevs) - return MMSYSERR_BADDEVICEID; + if (wDevID > MIDM_NumDevs) return; dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; uFlags = MidiInDev[wDevID].wFlags; @@ -213,12 +211,11 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; break; default: - WARN("Unsupported MSW-MIDI message %u\n", wMsg); - return MMSYSERR_ERROR; + ERR("Unsupported MSW-MIDI message %u\n", wMsg); + return; } - return DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ? - 0 : MMSYSERR_ERROR; + DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } static int midi_warn = 1; @@ -394,8 +391,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) - WARN("Couldn't notify client\n"); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } } else { FIXME("Sysex data received but no buffer to store it!\n"); @@ -414,9 +410,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) } if (toSend != 0) { TRACE("Sending event %08x (from %d %d)\n", toSend, ev->source.client, ev->source.port); - if (MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } snd_seq_free_event(ev); @@ -512,10 +506,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; - if (MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } @@ -558,10 +549,7 @@ static DWORD midClose(WORD wDevID) midiCloseSeq(); MidiInDev[wDevID].bufsize = 0; - if (MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; return ret; @@ -660,10 +648,8 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_LONGDATA, + (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect); @@ -773,10 +759,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; - if (MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -820,10 +803,7 @@ static DWORD modClose(WORD wDevID) MidiOutDev[wDevID].lpExtra = 0; MidiOutDev[wDevID].bufsize = 0; - if (MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret; } @@ -1032,10 +1012,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); return MMSYSERR_NOERROR; }

1 0