April 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_setup_target().
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 95fb8eaa148567f8a2b0194a67c98bc69ea5d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fb8eaa148567f8a2b0194a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:30 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_setup_target(). --- dlls/wined3d/context.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 640af0b..e3833fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2090,14 +2090,15 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } } -static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target) +static void context_setup_target(IWineD3DDeviceImpl *device, + struct wined3d_context *context, IWineD3DSurfaceImpl *target) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; const struct StateEntry *StateTable = device->StateTable; if (!target) return; - else if (context->current_rt == target) return; - render_offscreen = surface_is_offscreen((IWineD3DSurfaceImpl *)target); + else if ((IWineD3DSurfaceImpl *)context->current_rt == target) return; + render_offscreen = surface_is_offscreen(target); context_set_render_offscreen(context, StateTable, render_offscreen); @@ -2110,7 +2111,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont else { const struct wined3d_format_desc *old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; - const struct wined3d_format_desc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + const struct wined3d_format_desc *new = target->resource.format_desc; if (old->format != new->format) { @@ -2130,7 +2131,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont * has to be called with the old rendertarget active, otherwise a * wrong drawable is read. */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && context->current_rt != target) + && old_render_offscreen && (IWineD3DSurfaceImpl *)context->current_rt != target) { BOOL oldInDraw = device->isInDraw; @@ -2162,7 +2163,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont } context->draw_buffer_dirty = TRUE; - context->current_rt = target; + context->current_rt = (IWineD3DSurface *)target; } /***************************************************************************** @@ -2186,7 +2187,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf TRACE("device %p, target %p, usage %#x.\n", device, target, usage); context = FindContext(device, (IWineD3DSurfaceImpl *)target); - context_setup_target(device, context, target); + context_setup_target(device, context, (IWineD3DSurfaceImpl *)target); context_enter(context); if (!context->valid) return context;

1 0

Kirill Smelkov : wrc: Use INCLUDEDIR when compiling.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: f4ff08f483a4ea02688c35c71746639f5a583dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ff08f483a4ea02688c35c71… Author: Kirill Smelkov <kirr(a)mns.spb.ru> Date: Wed Apr 21 19:33:13 2010 +0400 wrc: Use INCLUDEDIR when compiling. --- tools/wrc/Makefile.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 77eeecb..d434fa7 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,10 +1,9 @@ -DEFS = -DINCLUDEDIR="\"$(includedir)\"" TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ -DEFS = -D__WINESRC__ $(EXTRADEFS) +DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" $(EXTRADEFS) PROGRAMS = wrc$(EXEEXT) wrc-installed MANPAGES = wrc.man

1 0

Huw Davies : fontforge: Enable the width of individual bitmap strikes to be altered.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: fontforge Branch: master Commit: 3d71a1e385d6e7f2bf53d1f563fb451e7f0806f7 URL: http://source.winehq.org/git/fontforge.git/?a=commit;h=3d71a1e385d6e7f2bf53… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 20 21:39:49 2010 +0100 fontforge: Enable the width of individual bitmap strikes to be altered. --- fontforge/bitmapview.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/fontforge/bitmapview.c b/fontforge/bitmapview.c index e9affea..5310298 100644 --- a/fontforge/bitmapview.c +++ b/fontforge/bitmapview.c @@ -898,8 +898,8 @@ static void BVSetWidth(BitmapView *bv, int x) { BDFFont *bdf; BDFChar *bc = bv->bc; + bc->width = x; if ( bv->bdf->sf->onlybitmaps ) { - bc->width = x; tot=0; cnt=0; for ( bdf = bv->bdf->sf->bitmaps; bdf!=NULL; bdf=bdf->next ) if ( bdf->glyphs[bc->orig_pos]) { @@ -910,8 +910,9 @@ static void BVSetWidth(BitmapView *bv, int x) { bc->sc->width = tot/cnt; bc->sc->widthset = true; } - BCCharChangedUpdate(bc); } + BCCharChangedUpdate(bc); + } static void BVSetVWidth(BitmapView *bv, int y) { @@ -919,18 +920,20 @@ static void BVSetVWidth(BitmapView *bv, int y) { BDFFont *bdf; BDFChar *bc = bv->bc; - if ( bv->bdf->sf->onlybitmaps && bv->bdf->sf->hasvmetrics ) { + if ( bv->bdf->sf->hasvmetrics ) { bc->vwidth = bv->bdf->ascent-y; - tot=0; cnt=0; - for ( bdf = bv->bdf->sf->bitmaps; bdf!=NULL; bdf=bdf->next ) - if ( bdf->glyphs[bc->orig_pos]) { - tot += bdf->glyphs[bc->orig_pos]->vwidth*1000/(bdf->ascent+bdf->descent); - ++cnt; - } - if ( cnt!=0 ) { - bc->sc->vwidth = tot/cnt; - bc->sc->widthset = true; - } + if ( bv->bdf->sf->onlybitmaps ) { + tot=0; cnt=0; + for ( bdf = bv->bdf->sf->bitmaps; bdf!=NULL; bdf=bdf->next ) + if ( bdf->glyphs[bc->orig_pos]) { + tot += bdf->glyphs[bc->orig_pos]->vwidth*1000/(bdf->ascent+bdf->descent); + ++cnt; + } + if ( cnt!=0 ) { + bc->sc->vwidth = tot/cnt; + bc->sc->widthset = true; + } + } BCCharChangedUpdate(bc); } } @@ -1008,12 +1011,11 @@ return; GDrawSetCursor(bv->v,ct_shift); /* otherwise we'll move the selection */ } - } else if ( bc->sc->parent->onlybitmaps && - event->u.mouse.x-bv->xoff > bc->width*bv->scale-3 && - event->u.mouse.x-bv->xoff < bc->width*bv->scale+3 ) { + } else if ( event->u.mouse.x-bv->xoff > bc->width*bv->scale-3 && + event->u.mouse.x-bv->xoff < bc->width*bv->scale+3 ) { bv->active_tool = bvt_setwidth; BVToolsSetCursor(bv,event->u.mouse.state|(1<<(7+event->u.mouse.button)), event->u.mouse.device ); - } else if ( bc->sc->parent->onlybitmaps && bc->sc->parent->hasvmetrics && + } else if ( bc->sc->parent->hasvmetrics && bv->height-event->u.mouse.y-bv->yoff > (bv->bdf->ascent-bc->vwidth)*bv->scale-3 && bv->height-event->u.mouse.y-bv->yoff < (bv->bdf->ascent-bc->vwidth)*bv->scale+3 ) { bv->active_tool = bvt_setvwidth; @@ -1535,8 +1537,6 @@ static void BVMenuSetWidth(GWindow gw,struct gmenuitem *mi,GEvent *g) { SplineChar *sc; int val; - if ( !bv->bdf->sf->onlybitmaps ) -return; if ( mi->mid==MID_SetWidth ) { sprintf( buffer,"%d",bv->bc->width); ret = gwwv_ask_string(_("Set Width..."),buffer,_("Set Width...")); @@ -1555,6 +1555,10 @@ return; else bv->bc->vwidth = val; BCCharChangedUpdate(bv->bc); + + if ( !bv->bdf->sf->onlybitmaps ) +return; + for ( bdf=bv->bdf->sf->bitmaps; bdf!=NULL; bdf=bdf->next ) if ( bdf->pixelsize > mysize ) return; @@ -1788,10 +1792,10 @@ static void mtlistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) { for ( mi = mi->sub; mi->ti.text!=NULL || mi->ti.line ; ++mi ) { switch ( mi->mid ) { case MID_SetWidth: - mi->ti.disabled = !bv->bdf->sf->onlybitmaps; + mi->ti.disabled = 0; break; case MID_SetVWidth: - mi->ti.disabled = !bv->bdf->sf->onlybitmaps || !bv->bdf->sf->hasvmetrics; + mi->ti.disabled = !bv->bdf->sf->hasvmetrics; break; } }

1 0

Maarten Lankhorst : wineesd.drv: Clean up loading.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 3c640ddacd275ad58184b6fde55ae9fc1094b3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c640ddacd275ad58184b6fde… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:33 2010 +0200 wineesd.drv: Clean up loading. --- dlls/wineesd.drv/audio.c | 19 +++++++++++++---- dlls/wineesd.drv/esound.c | 46 ++++++++++---------------------------------- dlls/wineesd.drv/esound.h | 34 --------------------------------- 3 files changed, 25 insertions(+), 74 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index a69949c..3d4225a 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -63,11 +63,14 @@ #include "ks.h" #include "ksguid.h" #include "ksmedia.h" -#include "esound.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif + #ifdef HAVE_ESD #include <esd.h> @@ -384,13 +387,17 @@ static void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi) wwi->stream_fd = -1; } +static int WAVE_loadcount; /****************************************************************** * ESD_WaveClose */ -LONG ESD_WaveClose(void) +static LONG ESD_WaveClose(void) { int iDevice; + if (--WAVE_loadcount) + return 1; + /* close all open devices */ for(iDevice = 0; iDevice < MAX_WAVEOUTDRV; iDevice++) { @@ -416,18 +423,20 @@ LONG ESD_WaveClose(void) * * Initialize internal structures from ESD server info */ -LONG ESD_WaveInit(void) +static LONG ESD_WaveInit(void) { int i; int fd; TRACE("called\n"); + if (WAVE_loadcount++) + return 1; /* Testing whether the esd host is alive. */ if ((fd = esd_open_sound(NULL)) < 0) { WARN("esd_open_sound() failed (%d)\n", errno); - return -1; + return 0; } esd_close(fd); @@ -497,7 +506,7 @@ LONG ESD_WaveInit(void) WInDev[i].caps.wReserved1 = 0; } - return 0; + return 1; } /****************************************************************** diff --git a/dlls/wineesd.drv/esound.c b/dlls/wineesd.drv/esound.c index c3455f4..64c0753 100644 --- a/dlls/wineesd.drv/esound.c +++ b/dlls/wineesd.drv/esound.c @@ -31,27 +31,6 @@ #include "wingdi.h" #include "winuser.h" #include "mmddk.h" -#include "esound.h" - -#ifdef HAVE_ESD - -/************************************************************************** - * ESD_drvOpen [internal] - */ -static LRESULT ESD_drvOpen(LPSTR str) -{ - return 1; -} - -/************************************************************************** - * ESD_drvClose [internal] - */ -static LRESULT ESD_drvClose(DWORD_PTR dwDevID) -{ - return 1; -} -#endif /* #ifdef HAVE_ESD */ - /************************************************************************** * DriverProc (WINEESD.@) @@ -59,24 +38,21 @@ static LRESULT ESD_drvClose(DWORD_PTR dwDevID) LRESULT CALLBACK ESD_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) { #ifdef HAVE_ESD - case DRV_LOAD: if (ESD_WaveInit()<0) return 0; - return 1; - case DRV_FREE: return ESD_WaveClose(); - case DRV_OPEN: return ESD_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return ESD_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; + 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; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; #endif default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + return 0; } } diff --git a/dlls/wineesd.drv/esound.h b/dlls/wineesd.drv/esound.h deleted file mode 100644 index e8ebd0e..0000000 --- a/dlls/wineesd.drv/esound.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Definition for EsounD drivers : wine multimedia system - * - * Copyright 2004 Zhangrong Huang <hzhr(a)users.sourceforge.net> - * - * 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_ESD_H -#define __WINE_ESD_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif - -extern LONG ESD_WaveInit(void); -extern LONG ESD_WaveClose(void); - -#endif /* __WINE_ESD_H */

1 0

Huw Davies : wineps.drv: Remove the unscaled font hack and read the outline directly from the font file .
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 76146568afc8c4b2c4fcd996429d3bb9133c12a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76146568afc8c4b2c4fcd9964… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 21 14:28:40 2010 +0100 wineps.drv: Remove the unscaled font hack and read the outline directly from the font file. --- dlls/wineps.drv/type1.c | 487 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 417 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76146568afc8c4b2c4fcd…

1 0

Maarten Lankhorst : wineoss.drv: Move opening devices to their respective xxxMessage functions.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: c0a602c2e944fed20d3d2d5f115b259e5248a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a602c2e944fed20d3d2d5f1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:31 2010 +0200 wineoss.drv: Move opening devices to their respective xxxMessage functions. --- dlls/wineoss.drv/audio.c | 16 ++++++++++++---- dlls/wineoss.drv/midi.c | 44 ++++++++++++++++++++++---------------------- dlls/wineoss.drv/mixer.c | 6 ++++-- dlls/wineoss.drv/mmaux.c | 6 ++++-- dlls/wineoss.drv/oss.c | 35 ++--------------------------------- dlls/wineoss.drv/oss.h | 12 ------------ 6 files changed, 44 insertions(+), 75 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ba42358..9c712c8 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1140,18 +1140,22 @@ static char* StrDup(const char* str, const char* def) return dst; } +static int WAVE_loadcount; + /****************************************************************** * OSS_WaveInit * * Initialize internal structures from OSS information */ -LRESULT OSS_WaveInit(void) +static LRESULT OSS_WaveInit(void) { char* str; unsigned int i; /* FIXME: Remove unneeded members of WOutDev and WInDev */ - TRACE("()\n"); + TRACE("(%i)\n", WAVE_loadcount); + if (WAVE_loadcount++) + return 1; str=getenv("AUDIODEV"); if (str!=NULL) @@ -1230,10 +1234,12 @@ LRESULT OSS_WaveInit(void) * * Delete/clear internal structures of OSS information */ -LRESULT OSS_WaveExit(void) +static LRESULT OSS_WaveExit(void) { int i; - TRACE("()\n"); + TRACE("(%i)\n", WAVE_loadcount); + if (--WAVE_loadcount) + return 1; for (i = 0; i < MAX_WAVEDRV; ++i) { @@ -3136,7 +3142,9 @@ DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: + return OSS_WaveInit(); case DRVM_EXIT: + return OSS_WaveExit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 0945e93..61d0383 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -170,23 +170,23 @@ static int MIDI_UnixToWindowsDeviceType(int type) } } +static int MIDI_loadcount; /************************************************************************** * OSS_MidiInit [internal] * * Initializes the MIDI devices information variables */ -LRESULT OSS_MidiInit(void) +static LRESULT OSS_MidiInit(void) { int i, status, numsynthdevs = 255, nummididevs = 255; struct synth_info sinfo; struct midi_info minfo; - static BOOL bInitDone = FALSE; - if (bInitDone) - return 0; + TRACE("(%i)\n", MIDI_loadcount); + if (MIDI_loadcount++) + return 1; TRACE("Initializing the MIDI variables.\n"); - bInitDone = TRUE; /* try to open device */ if (midiOpenSeq() == -1) { @@ -381,9 +381,12 @@ LRESULT OSS_MidiInit(void) * * Release the MIDI devices information variables */ -LRESULT OSS_MidiExit(void) +static LRESULT OSS_MidiExit(void) { - TRACE("()\n"); + TRACE("(%i)\n", MIDI_loadcount); + + if (--MIDI_loadcount) + return 1; ZeroMemory(MidiInDev, sizeof(MidiInDev)); ZeroMemory(MidiOutDev, sizeof(MidiOutDev)); @@ -1654,21 +1657,6 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } -#else /* HAVE_OSS_MIDI */ - -LRESULT OSS_MidiInit(void) -{ - TRACE("()\n"); - return FALSE; -} - -LRESULT OSS_MidiExit(void) -{ - TRACE("()\n"); - return 0; -} - - #endif /* HAVE_OSS_MIDI */ /*======================================================================* @@ -1686,7 +1674,9 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { #ifdef HAVE_OSS_MIDI case DRVM_INIT: + return OSS_MidiInit(); case DRVM_EXIT: + return OSS_MidiExit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ @@ -1711,6 +1701,10 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); +#else + case DRVM_INIT: + case MIDM_GETNUMDEVS: + return 0; #endif default: TRACE("Unsupported message\n"); @@ -1730,7 +1724,9 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { #ifdef HAVE_OSS_MIDI case DRVM_INIT: + return OSS_MidiInit(); case DRVM_EXIT: + return OSS_MidiExit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ @@ -1757,6 +1753,10 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); +#else + case DRVM_INIT: + case MODM_GETNUMDEVS: + return 0; #endif default: TRACE("Unsupported message\n"); diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index ac72c7a..9b6dacc 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -1433,7 +1433,7 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, /************************************************************************** * MIX_Init [internal] */ -LRESULT OSS_MixerInit(void) +static LRESULT OSS_MixerInit(void) { int i, mixer; @@ -1485,7 +1485,7 @@ LRESULT OSS_MixerInit(void) /************************************************************************** * MIX_Exit [internal] */ -LRESULT OSS_MixerExit(void) +static LRESULT OSS_MixerExit(void) { int i; @@ -1524,7 +1524,9 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: + return OSS_MixerInit(); case DRVM_EXIT: + return OSS_MixerExit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index ff62107..3554ffb 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -49,7 +49,7 @@ static int NumDev = 6; /*-----------------------------------------------------------------------*/ -LRESULT OSS_AuxInit(void) +static LRESULT OSS_AuxInit(void) { int mixer; TRACE("()\n"); @@ -66,7 +66,7 @@ LRESULT OSS_AuxInit(void) /*-----------------------------------------------------------------------*/ -LRESULT OSS_AuxExit(void) +static LRESULT OSS_AuxExit(void) { TRACE("()\n"); return 0; @@ -232,7 +232,9 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, #ifdef HAVE_OSS switch (wMsg) { case DRVM_INIT: + return OSS_AuxInit(); case DRVM_EXIT: + return OSS_AuxExit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 1d80272..2a54c73 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -33,37 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_OSS - -/************************************************************************** - * OSS_drvLoad [internal] - */ -static LRESULT OSS_drvLoad(void) -{ - TRACE("()\n"); - OSS_WaveInit(); - OSS_MidiInit(); - OSS_MixerInit(); - OSS_AuxInit(); - return 1; -} - -/************************************************************************** - * OSS_drvFree [internal] - */ -static LRESULT OSS_drvFree(void) -{ - TRACE("()\n"); - OSS_WaveExit(); - OSS_MidiExit(); - OSS_MixerExit(); - OSS_AuxExit(); - return 1; -} - -#endif - - /************************************************************************** * DriverProc (WINEOSS.1) */ @@ -75,8 +44,8 @@ LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch(wMsg) { #ifdef HAVE_OSS - case DRV_LOAD: return OSS_drvLoad(); - case DRV_FREE: return OSS_drvFree(); + case DRV_LOAD: + case DRV_FREE: case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/wineoss.drv/oss.h b/dlls/wineoss.drv/oss.h index c6a45ae..e1c9c89 100644 --- a/dlls/wineoss.drv/oss.h +++ b/dlls/wineoss.drv/oss.h @@ -37,15 +37,3 @@ #ifdef SNDCTL_DSP_STEREO # define HAVE_OSS #endif - -LRESULT OSS_WaveInit(void); -LRESULT OSS_WaveExit(void); - -LRESULT OSS_MidiInit(void); -LRESULT OSS_MidiExit(void); - -LRESULT OSS_MixerInit(void); -LRESULT OSS_MixerExit(void); - -LRESULT OSS_AuxInit(void); -LRESULT OSS_AuxExit(void);

1 0

Maarten Lankhorst : winejack.drv: Clean up loading.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 82e4c76d8c721013eb6b6087e9deaa88ca7a8269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e4c76d8c721013eb6b6087e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:32 2010 +0200 winejack.drv: Clean up loading. --- dlls/winejack.drv/audio.c | 14 ++++++++- dlls/winejack.drv/jack.c | 63 ++++++++++++-------------------------------- dlls/winejack.drv/jack.h | 3 -- 3 files changed, 29 insertions(+), 51 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index 512bc01..ffaffae 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -834,15 +834,19 @@ static void JACK_CloseWaveInDevice(WINE_WAVEIN* wwi) #endif } +static int WAVE_loadcount; + /****************************************************************** * JACK_WaveRelease * * */ -LONG JACK_WaveRelease(void) +static LONG JACK_WaveRelease(void) { int iDevice; + if (--WAVE_loadcount) + return 1; TRACE("closing all open waveout devices\n"); /* close all open output devices */ @@ -887,12 +891,14 @@ LONG JACK_WaveRelease(void) * * Initialize internal structures from JACK server info */ -LONG JACK_WaveInit(void) +static LONG JACK_WaveInit(void) { int i; CHAR szPname[MAXPNAMELEN]; TRACE("called\n"); + if (WAVE_loadcount++) + return 1; /* setup function pointers */ #define LOAD_FUNCPTR(f) if((fp_##f = wine_dlsym(jackhandle, #f, NULL, 0)) == NULL) goto sym_not_found; @@ -1665,7 +1671,9 @@ DWORD WINAPI JACK_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, switch (wMsg) { case DRVM_INIT: + return JACK_WaveInit(); case DRVM_EXIT: + return JACK_WaveRelease(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ @@ -2362,7 +2370,9 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, switch (wMsg) { case DRVM_INIT: + return JACK_WaveInit(); case DRVM_EXIT: + return JACK_WaveRelease(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/winejack.drv/jack.c b/dlls/winejack.drv/jack.c index 80794ae..ebcb6c7 100644 --- a/dlls/winejack.drv/jack.c +++ b/dlls/winejack.drv/jack.c @@ -49,20 +49,17 @@ 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) { - 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); - jackhandle = (void*)-1; - return 0; - } + FIXME("error loading the jack library %s, please install this library to use jack\n", + SONAME_LIBJACK); + return 0; } - return JACK_WaveInit(); + return 1; } /************************************************************************** @@ -73,10 +70,8 @@ static LRESULT JACK_drvFree(void) { TRACE("()\n"); - if(jackhandle && (jackhandle != (void*)-1)) + if(jackhandle) { - JACK_WaveRelease(); - TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL; @@ -85,31 +80,6 @@ static LRESULT JACK_drvFree(void) return 1; } -/************************************************************************** - * JACK_drvOpen [internal] - */ -static LRESULT JACK_drvOpen(LPSTR str) -{ - TRACE("(%s)\n", str); - /* if we were unable to load the jack library then fail the */ - /* driver open */ - if(!jackhandle) - { - FIXME("unable to open the jack library, returning 0\n"); - return 0; - } - - return 1; -} - -/************************************************************************** - * JACK_drvClose [internal] - */ -static LRESULT JACK_drvClose(DWORD_PTR dwDevID) -{ - TRACE("(%08lx)\n", dwDevID); - return 1; -} #endif /* #ifdef SONAME_LIBJACK */ @@ -136,16 +106,17 @@ LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, #ifdef SONAME_LIBJACK case DRV_LOAD: return JACK_drvLoad(); case DRV_FREE: return JACK_drvFree(); - case DRV_OPEN: return JACK_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return JACK_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: 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; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; #endif default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + return 0; } } diff --git a/dlls/winejack.drv/jack.h b/dlls/winejack.drv/jack.h index c53041d..5545f24 100644 --- a/dlls/winejack.drv/jack.h +++ b/dlls/winejack.drv/jack.h @@ -22,7 +22,4 @@ extern void *jackhandle; /* pointer to the libjack library */ -extern LONG JACK_WaveInit(void); -extern LONG JACK_WaveRelease(void); - #endif /* __WINE_JACK_H */

1 0

Maarten Lankhorst : winenas.drv: Move opening wave device to audio.c.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: ce91ee441ab57a1d13207a244ada756ee00260e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce91ee441ab57a1d13207a244… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:30 2010 +0200 winenas.drv: Move opening wave device to audio.c. --- dlls/winenas.drv/audio.c | 7 ++++--- dlls/winenas.drv/nas.c | 6 ++---- dlls/winenas.drv/nas.h | 28 ---------------------------- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 10d0b73..391ab40 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -81,7 +81,6 @@ #include "mmddk.h" #include "dsound.h" #include "dsdriver.h" -#include "nas.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -396,7 +395,7 @@ static void NAS_CloseDevice(WINE_WAVEOUT* wwo) /****************************************************************** * NAS_WaveClose */ -LONG NAS_WaveClose(void) +static LONG NAS_WaveClose(void) { nas_end(); /* free up nas server */ return 1; @@ -407,7 +406,7 @@ LONG NAS_WaveClose(void) * * Initialize internal structures from NAS server info */ -LONG NAS_WaveInit(void) +static LONG NAS_WaveInit(void) { int i; if (!nas_init()) return MMSYSERR_ERROR; @@ -1213,7 +1212,9 @@ DWORD WINAPI NAS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, switch (wMsg) { case DRVM_INIT: + return NAS_WaveInit(); case DRVM_EXIT: + return NAS_WaveClose(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/winenas.drv/nas.c b/dlls/winenas.drv/nas.c index 0cc2fc6..916e5b0 100644 --- a/dlls/winenas.drv/nas.c +++ b/dlls/winenas.drv/nas.c @@ -33,7 +33,6 @@ #include "wingdi.h" #include "winuser.h" #include "mmddk.h" -#include "nas.h" /************************************************************************** * DriverProc (WINENAS.@) @@ -43,9 +42,8 @@ LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, { switch(wMsg) { #ifdef HAVE_NAS - case DRV_LOAD: NAS_WaveInit(); - return 1; - case DRV_FREE: return NAS_WaveClose(); + case DRV_LOAD: + case DRV_FREE: case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/winenas.drv/nas.h b/dlls/winenas.drv/nas.h deleted file mode 100644 index 603d87b..0000000 --- a/dlls/winenas.drv/nas.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Definition for NAS driver : wine multimedia system - * - * Copyright 2002 Nicolas Escuder <n.escuder(a)alineanet.com> - * - * 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_NAS_H -#define __WINE_NAS_H - -extern LONG NAS_WaveInit(void); -extern LONG NAS_WaveClose(void); - -typedef unsigned int AFormat; - -#endif /* __WINE_NAS_H */

1 0

Maarten Lankhorst : winealsa.drv: Clean up DriverProc.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: ba7d2cd3ee988db55813f965677182124c8490a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7d2cd3ee988db55813f9656… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:27 2010 +0200 winealsa.drv: Clean up DriverProc. --- dlls/winealsa.drv/alsa.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 4ea1f1d..5ed7109 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -727,18 +727,19 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, #ifdef HAVE_ALSA case DRV_LOAD: ALSA_WaveInit(); ALSA_MidiInit(); - return 1; - case DRV_FREE: return 1; - case DRV_OPEN: return 1; - case DRV_CLOSE: return 1; - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; + 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, "ALSA MultiMedia Driver !", "ALSA Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; + case DRV_INSTALL: + case DRV_REMOVE: + return DRV_SUCCESS; #endif default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + return 0; } }

1 0

Maarten Lankhorst : winenas.drv: Clean up DriverProc.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 0ceed8beb17a69b14ff3b24d44a7c0d07c485846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ceed8beb17a69b14ff3b24d4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:29 2010 +0200 winenas.drv: Clean up DriverProc. --- dlls/winenas.drv/nas.c | 42 ++++++++++-------------------------------- 1 files changed, 10 insertions(+), 32 deletions(-) diff --git a/dlls/winenas.drv/nas.c b/dlls/winenas.drv/nas.c index aaf12cc..0cc2fc6 100644 --- a/dlls/winenas.drv/nas.c +++ b/dlls/winenas.drv/nas.c @@ -35,51 +35,29 @@ #include "mmddk.h" #include "nas.h" -#ifdef HAVE_NAS - -/************************************************************************** - * NAS_drvOpen [internal] - */ -static LRESULT NAS_drvOpen(LPSTR str) -{ - return 1; -} - -/************************************************************************** - * NAS_drvClose [internal] - */ -static LRESULT NAS_drvClose(DWORD_PTR dwDevID) -{ - return 1; -} -#endif /* #ifdef HAVE_NAS */ - - /************************************************************************** * DriverProc (WINENAS.@) */ LRESULT CALLBACK NAS_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) { #ifdef HAVE_NAS case DRV_LOAD: NAS_WaveInit(); -/* NAS_MidiInit(); FIXME: no midi */ return 1; case DRV_FREE: return NAS_WaveClose(); - case DRV_OPEN: return NAS_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return NAS_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; + 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: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; + case DRV_INSTALL: + case DRV_REMOVE: + return DRV_SUCCESS; #endif default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + return 0; } }

1 0