March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : winealsa.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 255cc210b6bbc24cff0912782fe1dabce84c58c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255cc210b6bbc24cff0912782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:07:26 2011 +0200 winealsa.drv: Remove unnecessary ifdefs. --- configure | 5 +---- configure.ac | 3 +-- dlls/winealsa.drv/alsa.c | 6 ------ dlls/winealsa.drv/alsa.h | 2 +- dlls/winealsa.drv/dscapture.c | 4 ---- dlls/winealsa.drv/dsoutput.c | 4 ---- dlls/winealsa.drv/midi.c | 8 -------- dlls/winealsa.drv/mixer.c | 10 ---------- dlls/winealsa.drv/wavein.c | 16 ---------------- dlls/winealsa.drv/waveinit.c | 5 ----- dlls/winealsa.drv/waveout.c | 16 ---------------- include/config.h.in | 3 --- 12 files changed, 3 insertions(+), 79 deletions(-) diff --git a/configure b/configure index 3b5e8bd..507791f 100755 --- a/configure +++ b/configure @@ -10985,10 +10985,7 @@ int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL) } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -$as_echo "#define HAVE_ALSA 1" >>confdefs.h - - ALSALIBS="-lasound" + ALSALIBS="-lasound" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/configure.ac b/configure.ac index 326aa30..a59cae9 100644 --- a/configure.ac +++ b/configure.ac @@ -1513,8 +1513,7 @@ then #elif defined(HAVE_SYS_ASOUNDLIB_H) #include <sys/asoundlib.h> #endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], - [AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA 1.x including devel headers]) - ALSALIBS="-lasound"],[])]) + [ALSALIBS="-lasound"])]) fi dnl **** Check for capi4linux **** diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 122817c..dc0ef29 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -39,8 +39,6 @@ #include "alsa.h" -#ifdef HAVE_ALSA - #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -725,8 +723,6 @@ if (err<0) { \ return; } -#endif - /************************************************************************** * DriverProc (WINEALSA.@) */ @@ -737,7 +733,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ switch(wMsg) { -#ifdef HAVE_ALSA case DRV_LOAD: case DRV_FREE: case DRV_OPEN: @@ -750,7 +745,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case DRV_INSTALL: case DRV_REMOVE: return DRV_SUCCESS; -#endif default: return 0; } diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index d961dce..8c21b01 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -24,7 +24,7 @@ # error You must include config.h to use this header #endif -#if defined(HAVE_ALSA) && !defined(__ALSA_H) +#ifndef __ALSA_H #define __ALSA_H #ifdef interface diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 0b67749..edf8c13 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -54,8 +54,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef HAVE_ALSA - /* Notify timer checks every 10 ms with a resolution of 2 ms */ #define DS_TIME_DEL 10 #define DS_TIME_RES 2 @@ -1092,5 +1090,3 @@ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) *desc = WInDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 5ea43f4..ec219d9 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -58,8 +58,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef HAVE_ALSA - WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); typedef struct IDsDriverImpl IDsDriverImpl; @@ -959,5 +957,3 @@ DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) *desc = WOutDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 54ea2eb..7dd6c0f 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -53,8 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifdef HAVE_ALSA - #ifndef SND_SEQ_PORT_TYPE_PORT #define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ #endif @@ -1299,8 +1297,6 @@ static LONG ALSA_MidiInit(void) return TRUE; } -#endif - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -1310,7 +1306,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_ALSA case DRVM_INIT: ALSA_MidiInit(); case DRVM_EXIT: @@ -1338,7 +1333,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); -#endif default: TRACE("Unsupported message\n"); } @@ -1355,7 +1349,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_ALSA case DRVM_INIT: ALSA_MidiInit(); case DRVM_EXIT: @@ -1385,7 +1378,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); -#endif default: TRACE("Unsupported message\n"); } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 7d5b452..833d2ae 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); -#ifdef HAVE_ALSA - #define WINE_MIXER_MANUF_ID 0xAA #define WINE_MIXER_PRODUCT_ID 0x55 #define WINE_MIXER_VERSION 0x0100 @@ -1557,15 +1555,12 @@ static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PT return MMSYSERR_NOERROR; } -#endif /*HAVE_ALSA*/ - /************************************************************************** * mxdMessage (WINEALSA.3) */ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { -#ifdef HAVE_ALSA DWORD ret; TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2); @@ -1611,9 +1606,4 @@ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("Returning %08X\n", ret); return ret; -#else /*HAVE_ALSA*/ - TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - - return MMSYSERR_NOTENABLED; -#endif /*HAVE_ALSA*/ } diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 32442fa..3a2fad8 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -59,8 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - WINE_WAVEDEV *WInDev; DWORD ALSA_WidNumMallocedDevs; DWORD ALSA_WidNumDevs; @@ -778,17 +776,3 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } return MMSYSERR_NOTSUPPORTED; } - -#else /* HAVE_ALSA */ - -/************************************************************************** - * widMessage (WINEALSA.@) - */ -DWORD WINAPI ALSA_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 4ae93bb..fda1efc 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -25,9 +25,6 @@ */ #include "config.h" - -#ifdef HAVE_ALSA - #include "wine/port.h" #include <stdlib.h> @@ -1014,5 +1011,3 @@ void ALSA_WaveInit(void) if (key) RegCloseKey(key); } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index ac3db1a..127e50e 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -60,8 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - WINE_WAVEDEV *WOutDev; DWORD ALSA_WodNumMallocedDevs; DWORD ALSA_WodNumDevs; @@ -1180,17 +1178,3 @@ DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } return MMSYSERR_NOTSUPPORTED; } - -#else /* HAVE_ALSA */ - -/************************************************************************** - * wodMessage (WINEALSA.@) - */ -DWORD WINAPI ALSA_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif /* HAVE_ALSA */ diff --git a/include/config.h.in b/include/config.h.in index 44b6bb6..dbe35f9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H -/* Define if you have ALSA 1.x including devel headers */ -#undef HAVE_ALSA - /* Define to 1 if you have the <alsa/asoundlib.h> header file. */ #undef HAVE_ALSA_ASOUNDLIB_H

1 0

Alexandre Julliard : wineoss.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1644b258473e9b88008ac353793a1f14124af08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1644b258473e9b88008ac3537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:11:45 2011 +0200 wineoss.drv: Remove unnecessary ifdefs. --- dlls/wineoss.drv/Makefile.in | 3 +- dlls/wineoss.drv/audio.c | 56 ++++++++++++++++++++++--------------- dlls/wineoss.drv/audio.h | 4 -- dlls/wineoss.drv/dscapture.c | 15 ++++++--- dlls/wineoss.drv/dsrender.c | 15 ++++++--- dlls/wineoss.drv/midi.c | 11 ++++++- dlls/wineoss.drv/mixer.c | 22 ++++++-------- dlls/wineoss.drv/mmaux.c | 19 ++++++------ dlls/wineoss.drv/oss.c | 63 ------------------------------------------ dlls/wineoss.drv/oss.h | 39 -------------------------- 10 files changed, 84 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1644b258473e9b88008ac…

1 0

Alexandre Julliard : wineesd.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6eea1119af872147b676be900c9d9126b796d27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eea1119af872147b676be900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:12:59 2011 +0200 wineesd.drv: Remove unnecessary ifdefs. --- configure | 3 -- configure.ac | 3 +- dlls/wineesd.drv/Makefile.in | 3 +- dlls/wineesd.drv/audio.c | 39 +++++++++++++--------------- dlls/wineesd.drv/esound.c | 58 ------------------------------------------ include/config.h.in | 3 -- 6 files changed, 20 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 507791f..948058f 100755 --- a/configure +++ b/configure @@ -10799,9 +10799,6 @@ if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then : ESDLIBS="$ac_esd_libs" - -$as_echo "#define HAVE_ESD 1" >>confdefs.h - fi fi diff --git a/configure.ac b/configure.ac index a59cae9..5b6d018 100644 --- a/configure.ac +++ b/configure.ac @@ -1470,8 +1470,7 @@ then AC_CHECK_HEADER(esd.h, [AC_CHECK_LIB(esd,esd_open_sound, [AC_SUBST(ESDINCL, "$ac_esd_incl") - AC_SUBST(ESDLIBS, "$ac_esd_libs") - AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],, + AC_SUBST(ESDLIBS, "$ac_esd_libs")],, [$ac_esd_libs])]) CFLAGS="$save_CFLAGS" fi diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in index 52da94a..91d9731 100644 --- a/dlls/wineesd.drv/Makefile.in +++ b/dlls/wineesd.drv/Makefile.in @@ -4,7 +4,6 @@ EXTRAINCL = @ESDINCL@ EXTRALIBS = @ESDLIBS@ C_SRCS = \ - audio.c \ - esound.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9f7ff00..f7f190c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -71,8 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #include <sys/errno.h> #endif -#ifdef HAVE_ESD - #include <esd.h> /* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ @@ -2100,26 +2098,25 @@ DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -#else /* !HAVE_ESD */ - /************************************************************************** - * wodMessage (WINEESD.@) + * DriverProc (WINEESD.@) */ -DWORD WINAPI ESD_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** - * widMessage (WINEESD.6) - */ -DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + switch(wMsg) { + case DRV_LOAD: + case DRV_FREE: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_INSTALL: + case DRV_REMOVE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; + default: + return 0; + } } - -#endif /* HAVE_ESD */ diff --git a/dlls/wineesd.drv/esound.c b/dlls/wineesd.drv/esound.c deleted file mode 100644 index 64c0753..0000000 --- a/dlls/wineesd.drv/esound.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Wine Driver for EsounD Sound Server - * http://www.tux.org/~ricdude/EsounD.html - * - * Copyright 2004 Zhangrong Huang <hzhr(a)users.sourceforge.net> - * - * Code massively copied from Eric Pouech's OSS driver - * and Chris Morgan aRts driver - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" - -/************************************************************************** - * DriverProc (WINEESD.@) - */ -LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - switch(wMsg) { -#ifdef HAVE_ESD - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_INSTALL: - case DRV_REMOVE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; -#endif - default: - return 0; - } -} diff --git a/include/config.h.in b/include/config.h.in index dbe35f9..0c5a5f0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -104,9 +104,6 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE -/* Define if you have EsounD sound server */ -#undef HAVE_ESD - /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS

1 0

Alexandre Julliard : winenas.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 4c719464bc7d6016bbb1e0b76696b77b521109db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c719464bc7d6016bbb1e0b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:13:38 2011 +0200 winenas.drv: Remove unnecessary ifdefs. --- configure | 5 +--- configure.ac | 3 +- dlls/winenas.drv/Makefile.in | 3 +- dlls/winenas.drv/audio.c | 27 +++++++++++++----- dlls/winenas.drv/nas.c | 61 ------------------------------------------ include/config.h.in | 3 -- 6 files changed, 22 insertions(+), 80 deletions(-) diff --git a/configure b/configure index 948058f..75b990f 100755 --- a/configure +++ b/configure @@ -9039,10 +9039,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuCreateFlow" >&5 $as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; } if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then : - -$as_echo "#define HAVE_NAS 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5 $as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; } if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then : $as_echo_n "(cached) " >&6 diff --git a/configure.ac b/configure.ac index 5b6d018..ddbee8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,8 +1112,7 @@ OpenGL and Direct3D won't be supported.]) AC_CHECK_HEADERS(audio/audiolib.h, [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>]) AC_CHECK_LIB(audio,AuCreateFlow, - [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers]) - AC_CHECK_LIB(Xau,XauGetBestAuthByAddr, + [AC_CHECK_LIB(Xau,XauGetBestAuthByAddr, [NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"], [NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"], [$X_LIBS]) diff --git a/dlls/winenas.drv/Makefile.in b/dlls/winenas.drv/Makefile.in index 75a01a4..a324ea8 100644 --- a/dlls/winenas.drv/Makefile.in +++ b/dlls/winenas.drv/Makefile.in @@ -4,7 +4,6 @@ EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @NASLIBS@ C_SRCS = \ - audio.c \ - nas.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 9140da1..0c29e48 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -89,8 +89,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); /* Allow 1% deviation for sample rates (some ES137x cards) */ #define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0) -#ifdef HAVE_NAS - static AuServer *AuServ; #define MAX_WAVEOUTDRV (1) @@ -1489,14 +1487,27 @@ static int nas_end(void) return 1; } -#else /* !HAVE_NAS */ /************************************************************************** - * wodMessage (WINENAS.@) + * DriverProc (WINENAS.@) */ -DWORD WINAPI NAS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + switch(wMsg) { + case DRV_LOAD: + case DRV_FREE: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1; + case DRV_INSTALL: + case DRV_REMOVE: + return DRV_SUCCESS; + default: + return 0; + } } -#endif diff --git a/dlls/winenas.drv/nas.c b/dlls/winenas.drv/nas.c deleted file mode 100644 index 916e5b0..0000000 --- a/dlls/winenas.drv/nas.c +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * - * Wine Driver for NAS Network Audio System - * http://radscan.com/nas.html - * - * Copyright 2002 Nicolas Escuder <n.escuder(a)alineanet.com> - * - * Code massively copied from Eric Pouech's OSS driver - * and Chris Morgan aRts driver - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" - -/************************************************************************** - * DriverProc (WINENAS.@) - */ -LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - switch(wMsg) { -#ifdef HAVE_NAS - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1; - case DRV_INSTALL: - case DRV_REMOVE: - return DRV_SUCCESS; -#endif - default: - return 0; - } -} diff --git a/include/config.h.in b/include/config.h.in index 0c5a5f0..b7460cc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -503,9 +503,6 @@ /* Define to 1 if you have the <mpg123.h> header file. */ #undef HAVE_MPG123_H -/* Define if you have NAS including devel headers */ -#undef HAVE_NAS - /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H

1 0

Alexandre Julliard : winejack.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: d25763d4b6ad10713a33700dead3a8ff24d3380b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25763d4b6ad10713a33700de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:14:00 2011 +0200 winejack.drv: Remove unnecessary ifdefs. --- dlls/winejack.drv/Makefile.in | 3 +- dlls/winejack.drv/audio.c | 72 ++++++++++++++++-------- dlls/winejack.drv/jack.c | 122 ----------------------------------------- dlls/winejack.drv/jack.h | 25 -------- 4 files changed, 49 insertions(+), 173 deletions(-) diff --git a/dlls/winejack.drv/Makefile.in b/dlls/winejack.drv/Makefile.in index 6a074e9..e7263d3 100644 --- a/dlls/winejack.drv/Makefile.in +++ b/dlls/winejack.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winejack.drv IMPORTS = dxguid uuid winmm user32 C_SRCS = \ - audio.c \ - jack.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index da04824..ac8a0c0 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -51,7 +51,6 @@ #include "mmddk.h" #include "dsound.h" #include "dsdriver.h" -#include "jack.h" #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -63,8 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef SONAME_LIBJACK - #define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL; /* Function pointers for dynamic loading of libjack */ @@ -86,6 +83,8 @@ MAKE_FUNCPTR(jack_port_name); MAKE_FUNCPTR(jack_get_buffer_size); #undef MAKE_FUNCPTR +static void *jackhandle; + /* define the below to work around a bug in jack where closing a port */ /* takes a very long time, so to get around this we actually don't */ /* close the port when the device is closed but instead mark the */ @@ -2396,28 +2395,53 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -#else /* !SONAME_LIBJACK */ - /************************************************************************** - * widMessage (WINEJACK.6) + * DriverProc (WINEJACK.1) */ -DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** - * wodMessage (WINEJACK.7) - */ -DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: + jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); + if (!jackhandle) + { + FIXME("error loading the jack library %s, please install this library to use jack\n", + SONAME_LIBJACK); + return 0; + } + return 1; + case DRV_FREE: + if (jackhandle) + { + TRACE("calling wine_dlclose() on jackhandle\n"); + wine_dlclose(jackhandle, NULL, 0); + jackhandle = NULL; + } + return 1; + case DRV_OPEN: + case DRV_CLOSE: + case DRV_INSTALL: + case DRV_REMOVE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; + default: + return 0; + } } - -#endif /* SONAME_LIBJACK */ diff --git a/dlls/winejack.drv/jack.c b/dlls/winejack.drv/jack.c deleted file mode 100644 index ebcb6c7..0000000 --- a/dlls/winejack.drv/jack.c +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * Wine Driver for jack Sound Server - * http://jackit.sourceforge.net - * - * Copyright 2002 Chris Morgan - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "jack.h" -#include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jack); - -#ifdef SONAME_LIBJACK - -void *jackhandle = NULL; - -/************************************************************************** - * JACK_drvLoad [internal] - */ -static LRESULT JACK_drvLoad(void) -{ - TRACE("()\n"); - - /* dynamically load the jack library if not already loaded */ - jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); - TRACE("SONAME_LIBJACK == %s\n", SONAME_LIBJACK); - TRACE("jackhandle == %p\n", jackhandle); - if(!jackhandle) - { - FIXME("error loading the jack library %s, please install this library to use jack\n", - SONAME_LIBJACK); - return 0; - } - - return 1; -} - -/************************************************************************** - * JACK_drvFree [internal] - */ -/* unload the jack library on driver free */ -static LRESULT JACK_drvFree(void) -{ - TRACE("()\n"); - - if(jackhandle) - { - TRACE("calling wine_dlclose() on jackhandle\n"); - wine_dlclose(jackhandle, NULL, 0); - jackhandle = NULL; - } - - return 1; -} - -#endif /* #ifdef SONAME_LIBJACK */ - - -/************************************************************************** - * DriverProc (WINEJACK.1) - */ -LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", - dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : - wMsg == DRV_FREE ? "DRV_FREE" : - wMsg == DRV_OPEN ? "DRV_OPEN" : - wMsg == DRV_CLOSE ? "DRV_CLOSE" : - wMsg == DRV_ENABLE ? "DRV_ENABLE" : - wMsg == DRV_DISABLE ? "DRV_DISABLE" : - wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : - wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : - wMsg == DRV_INSTALL ? "DRV_INSTALL" : - wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", - wMsg, dwParam1, dwParam2); - - switch(wMsg) { -#ifdef SONAME_LIBJACK - case DRV_LOAD: return JACK_drvLoad(); - case DRV_FREE: return JACK_drvFree(); - case DRV_OPEN: - case DRV_CLOSE: - case DRV_INSTALL: - case DRV_REMOVE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; -#endif - default: - return 0; - } -} diff --git a/dlls/winejack.drv/jack.h b/dlls/winejack.drv/jack.h deleted file mode 100644 index 5545f24..0000000 --- a/dlls/winejack.drv/jack.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Definition for jack driver : wine multimedia system - * - * Copyright 2002 Chris Morgan - * - * 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 - */ - -#ifndef __WINE_JACK_H -#define __WINE_JACK_H - -extern void *jackhandle; /* pointer to the libjack library */ - -#endif /* __WINE_JACK_H */

1 0

Alexandre Julliard : winejoystick.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6a4c47c98d4bc24b164289f1744f5b260bc88133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c47c98d4bc24b164289f17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:14:20 2011 +0200 winejoystick.drv: Remove unnecessary ifdefs. --- dlls/winejoystick.drv/joystick.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 1f81353..df73b4c 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -76,8 +76,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); -#ifdef HAVE_LINUX_JOYSTICK_H - #define MAXJOYSTICK (JOYSTICKID2 + 30) typedef struct tagWINE_JSTCK { @@ -525,32 +523,3 @@ LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } } - -#else - -/************************************************************************** - * DriverProc (JOYSTICK.@) - */ -LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - /* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ - /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ - - switch(wMsg) { - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: return 0; - case DRV_CONFIGURE: MessageBoxA(0, "JoyStick MultiMedia Driver !", "JoyStick Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} - -#endif

1 0

Alexandre Julliard : winecoreaudio.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 41d9d0a2f351d983834422aba70ea44841fa974c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d9d0a2f351d983834422aba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:15:12 2011 +0200 winecoreaudio.drv: Remove unnecessary ifdefs. --- dlls/winecoreaudio.drv/audio.c | 27 --------------------------- dlls/winecoreaudio.drv/audiounit.c | 4 ---- dlls/winecoreaudio.drv/coreaudio.c | 6 +----- dlls/winecoreaudio.drv/coremidi.c | 3 --- dlls/winecoreaudio.drv/midi.c | 16 ---------------- dlls/winecoreaudio.drv/mixer.c | 11 ----------- 6 files changed, 1 insertions(+), 66 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 9fb11b1..faf4f54 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -59,9 +59,6 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); - -#if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) - WINE_DECLARE_DEBUG_CHANNEL(coreaudio); /* @@ -2547,27 +2544,3 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, if (needNotify) wodSendNotifyInputCompletionsMessage(wwi); return err; } - -#else - -/************************************************************************** - * widMessage (WINECOREAUDIO.6) - */ -DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** -* wodMessage (WINECOREAUDIO.7) -*/ -DWORD WINAPI CoreAudio_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index bd0ad17..bbe565f 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -20,8 +20,6 @@ #include "config.h" -#ifdef HAVE_AUDIOUNIT_AUDIOUNIT_H - #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H @@ -503,5 +501,3 @@ int SynthUnit_Close(AUGraph graph) return 1; } - -#endif diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0690afd..b065030 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifdef HAVE_COREAUDIO_COREAUDIO_H /************************************************************************** * CoreAudio_drvLoad [internal] @@ -80,7 +79,6 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID) TRACE("(%08x)\n", dwDevID); return 1; } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */ /************************************************************************** * DriverProc (WINECOREAUDIO.1) @@ -100,9 +98,8 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, wMsg == DRV_INSTALL ? "DRV_INSTALL" : wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", wMsg, dwParam1, dwParam2); - + switch(wMsg) { -#ifdef HAVE_COREAUDIO_COREAUDIO_H case DRV_LOAD: return CoreAudio_drvLoad(); case DRV_FREE: return CoreAudio_drvFree(); case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); @@ -113,7 +110,6 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; case DRV_INSTALL: return DRVCNF_RESTART; case DRV_REMOVE: return DRVCNF_RESTART; -#endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ea7d2fd..1733418 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -21,8 +21,6 @@ #include "config.h" -#ifdef HAVE_COREAUDIO_COREAUDIO_H - #include <CoreMIDI/CoreMIDI.h> #include <mach/mach_time.h> @@ -84,4 +82,3 @@ void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigne if (packet) MIDISend(port, dest, packetList); } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 071e937..a50fc78 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h> #define WINE_DEFINITIONS @@ -1021,18 +1020,3 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } -#else - -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 1e9faef..7a64aa4 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); -#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h> #include <CoreFoundation/CoreFoundation.h> @@ -1027,13 +1026,3 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return MMSYSERR_NOTSUPPORTED; } } - -#else - -DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - TRACE("(%04X, %04x, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif /* HAVE_COREAUDIO_COREAUDIO_H */

1 0

Konrad Rzepecki : msvcrt: Implement _mbsupr_s.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 0b3175cb24a6ae9c3a1f6c97c9cc24dea5b8a1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3175cb24a6ae9c3a1f6c97c… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:17:12 2011 +0100 msvcrt: Implement _mbsupr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 473f663..a4589e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1001,7 +1001,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9da91db..b491d87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -847,7 +847,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 96d4589..d1cae36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -835,7 +835,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5767242..081aa88 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1572,6 +1572,46 @@ unsigned char* CDECL _mbsupr(unsigned char* s) /********************************************************************* + * _mbsupr_s(MSVCRT.@) + */ +int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctoupper(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = toupper(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsspn (MSVCRT.@) */ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c324dea..e43c3f5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -783,7 +783,7 @@ # stub _mbstrnlen_l @ cdecl _mbsupr(str) # stub _mbsupr_l -# stub _mbsupr_s +@ cdecl _mbsupr_s(str long) # stub _mbsupr_s_l # stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dfa38e6..e231077 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -76,6 +76,7 @@ static int *p__mb_cur_max; static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); +static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1711,6 +1712,63 @@ static void test__mbsnbcat_s(void) "Expected the output buffer string to be \"\\0inosaurdu\" without ending null terminator\n"); } +static void test__mbsupr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbsupr_s) + { + win_skip("Skipping _mbsupr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbsupr_s(NULL, 0); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbsupr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbsupr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof("abcdefgh")); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh\0ijklmnop", sizeof("abcdefgh\0ijklmnop")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH\0ijklmnop", sizeof("ABCDEFGH\0ijklmnop")), + "Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1821,6 +1879,7 @@ START_TEST(string) p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); + p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1861,4 +1920,5 @@ START_TEST(string) test__mbsnbcat_s(); test__ultoa_s(); test__wcslwr_s(); + test__mbsupr_s(); }

1 0

André Hentschel : mscoree: Add stub implementation for CreateConfigStream.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 87429c72f67b08acbb254e6c1686d3f61b6d3e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87429c72f67b08acbb254e6c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 25 21:56:57 2011 +0100 mscoree: Add stub implementation for CreateConfigStream. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 8cf548d..63a14b6 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -28,7 +28,7 @@ @ stub CorIsLatestSvc @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc -@ stub CreateConfigStream +@ stdcall CreateConfigStream(wstr ptr) @ stub CreateDebuggingInterfaceFromVersion @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6f53c8f..9b5d401 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -422,6 +422,12 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi return FALSE; } +HRESULT WINAPI CreateConfigStream(LPCWSTR filename, IStream **stream) +{ + FIXME("(%s, %p): stub\n", debugstr_w(filename), stream); + return E_NOTIMPL; +} + HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface);

1 0

Roderick Colenbrander : wined3d: Check for ARB_fragment_program in arbfp_blit_supported.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: b2132202c77b0d56b68d2a0f4c0c1f6d637ab577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2132202c77b0d56b68d2a0f4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 22 19:02:27 2011 +0000 wined3d: Check for ARB_fragment_program in arbfp_blit_supported. --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d53e008..e495643 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7128,6 +7128,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum bli { enum complex_fixup src_fixup; + if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + return FALSE; + if (blit_op != BLIT_OP_BLIT) { TRACE("Unsupported blit_op=%d\n", blit_op);

1 0