December 2005 - Wine-commits

Eric Pouech : dbghelp: Final touch on StackWalk64 so that it works.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: 7b11aacbae2aca90f8b1059795ee849c69b43523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b11aacbae2aca90f8b1059… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:31 2005 +0100 dbghelp: Final touch on StackWalk64 so that it works. --- dlls/dbghelp/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index b393e89..3719542 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -492,6 +492,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_64to32(&frame64->AddrPC, &frame32.AddrPC); addr_64to32(&frame64->AddrReturn, &frame32.AddrReturn); + addr_64to32(&frame64->AddrFrame, &frame32.AddrFrame); addr_64to32(&frame64->AddrStack, &frame32.AddrStack); addr_64to32(&frame64->AddrBStore, &frame32.AddrBStore); frame32.FuncTableEntry = frame64->FuncTableEntry; /* FIXME */ @@ -513,6 +514,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_32to64(&frame32.AddrPC, &frame64->AddrPC); addr_32to64(&frame32.AddrReturn, &frame64->AddrReturn); + addr_32to64(&frame32.AddrFrame, &frame64->AddrFrame); addr_32to64(&frame32.AddrStack, &frame64->AddrStack); addr_32to64(&frame32.AddrBStore, &frame64->AddrBStore); frame64->FuncTableEntry = frame32.FuncTableEntry; /* FIXME */ @@ -523,7 +525,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp frame64->Reserved[2] = (ULONG)frame32.Reserved[2]; /* we don't handle KdHelp */ - return FALSE; + return ret; } /******************************************************************

1 0

Detlef Riekenberg : winspool: Document the monitor functions.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: a521947e3dc37e461ecc317bd75be400a405dc60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a521947e3dc37e461ecc317… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 11:33:52 2005 +0100 winspool: Document the monitor functions. --- dlls/winspool/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index a54fe32..f1d05c1 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1119,6 +1119,8 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte /****************************************************************** * AddMonitorA [WINSPOOL.@] * + * See AddMonitorW. + * */ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1129,6 +1131,24 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWO /****************************************************************************** * AddMonitorW [WINSPOOL.@] + * + * Install a Printmonitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (Must be 2) + * pMonitors [I] PTR to MONITOR_INFO_2 + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1166,6 +1186,8 @@ DeletePrinterDriverW (LPWSTR pName, LPWS /****************************************************************** * DeleteMonitorA [WINSPOOL.@] * + * See DeleteMonitorW. + * */ BOOL WINAPI DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) @@ -1179,6 +1201,20 @@ DeleteMonitorA (LPSTR pName, LPSTR pEnvi /****************************************************************** * DeleteMonitorW [WINSPOOL.@] * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) @@ -4837,6 +4873,8 @@ BOOL WINAPI EnumFormsW( HANDLE hPrinter, /***************************************************************************** * EnumMonitorsA [WINSPOOL.@] * + * See EnumMonitorsW. + * */ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) @@ -4850,6 +4888,23 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D /***************************************************************************** * EnumMonitorsW [WINSPOOL.@] * + * Enumerate available Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1:Win9x+NT or 2:NT only) + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * only a Stub + * */ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)

1 0

Vincent Béron : Sort entries in win16.api and win32.api
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: e78997a7f9a7e80c551605cb6793d53837b3d033 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e78997a7f9a7e80c551605c… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 11:33:42 2005 +0100 Sort entries in win16.api and win32.api --- tools/winapi/win16.api | 221 +++++++++++++++++----------------- tools/winapi/win32.api | 314 ++++++++++++++++++++++++------------------------ 2 files changed, 267 insertions(+), 268 deletions(-)

1 0

Raphael Junqueira : x11drv: cleanup not longer used data on X11DRV_PDEVICE.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: 7b5571cc8c3de9107f14e7406485dfe222fffcb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b5571cc8c3de9107f14e74… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:12 2005 +0100 x11drv: cleanup not longer used data on X11DRV_PDEVICE. --- dlls/x11drv/init.c | 2 -- dlls/x11drv/x11drv.h | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 9524c9b..69cfa02 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -164,8 +164,6 @@ BOOL X11DRV_DeleteDC( X11DRV_PDEVICE *ph DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); - while (physDev->used_visuals-- > 0) - XFree(physDev->visuals[physDev->used_visuals]); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index df6ed32..21b28d5 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -140,8 +140,6 @@ typedef struct int depth; /* bit depth of the DC */ int exposures; /* count of graphics exposures operations */ struct dce *dce; /* opaque pointer to DCE */ - XVisualInfo *visuals[MAX_PIXELFORMATS]; - int used_visuals; int current_pf; XRENDERINFO xrender; } X11DRV_PDEVICE;

1 0

Raphael Junqueira : x11drv: Add more useful traces on SetPixelFormat (and no more FIXME).
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: 88cda5643d0a1278780843d865ba46ad35bb00a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88cda5643d0a1278780843d… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:33 2005 +0100 x11drv: Add more useful traces on SetPixelFormat (and no more FIXME). --- dlls/x11drv/opengl.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 8c49aa0..7660b0e 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -124,6 +124,7 @@ MAKE_FUNCPTR(glXChooseFBConfig) MAKE_FUNCPTR(glXGetFBConfigAttrib) MAKE_FUNCPTR(glXCreateGLXPixmap) MAKE_FUNCPTR(glXDestroyGLXPixmap) +/* MAKE_FUNCPTR(glXQueryDrawable) */ #undef MAKE_FUNCPTR static BOOL has_opengl(void) @@ -491,14 +492,35 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC GLXFBConfig cur_cfg; int value; int gl_test = 0; - + + /* + * How to test if hdc current drawable is compatible (visual/FBConfig) ? + * + * in case of root window created HDCs we crash here :( + * + Drawable drawable = get_drawable( physDev->hdc ); + TRACE(" drawable (%p,%p) have :\n", drawable, root_window); + pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &value); + TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_VISUAL_ID, (unsigned int*) &value); + TRACE(" - VISUAL_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &value); + TRACE(" - WIDTH as %d\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &value); + TRACE(" - HEIGHT as %d\n", tmp); + */ cfgs_fmt = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &nCfgs_fmt); cur_cfg = cfgs_fmt[iPixelFormat - 1]; gl_test = pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); } else { - FIXME("have FBCONFIG_ID %x\n", value); + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); } XFree(cfgs_fmt); }

1 0

Louis Lenders : gdi: Added stub for AddFontMemResourceEx.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: ca1c26b9d3afaa32437b09ed0d95e42c99ec0c2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca1c26b9d3afaa32437b09e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Dec 6 11:32:41 2005 +0100 gdi: Added stub for AddFontMemResourceEx. --- dlls/gdi/font.c | 9 +++++++++ dlls/gdi/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 1b10ad9..f94bda1 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2883,6 +2883,15 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR } /*********************************************************************** + * AddFontMemResourceEx (GDI32.@) + */ +HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) +{ + FIXME("(%p,%08lx,%p,%p): stub\n", pbFont, cbFont, pdv, pcFonts); + return NULL; +} + +/*********************************************************************** * RemoveFontResourceExA (GDI32.@) */ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index c52c458..c71adc6 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -7,7 +7,7 @@ @ stdcall AbortDoc(long) @ stdcall AbortPath(long) -# @ stub AddFontMemResourceEx +@ stdcall AddFontMemResourceEx(ptr long ptr ptr) @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr)

1 0

Alexandre Julliard : mlang: Properly declare the interface uuids.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: 9f55a518a20a0604d287a1038b6c95ea992d4d0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f55a518a20a0604d287a10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 11:32:17 2005 +0100 mlang: Properly declare the interface uuids. --- include/mlang.idl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index 397baa5..698d2e1 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -27,6 +27,7 @@ cpp_quote("#endif") [ object, + uuid(359f3443-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangCodePages : IUnknown @@ -51,6 +52,7 @@ interface IMLangCodePages : IUnknown [ object, + uuid(359f3441-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangFontLink : IMLangCodePages @@ -74,6 +76,7 @@ interface IMLangFontLink : IMLangCodePag [ object, + uuid(ae5f1430-388b-11d2-8380-00c04f8f5da1), pointer_default(unique) ] interface IEnumScript : IUnknown @@ -171,6 +174,7 @@ interface IEnumScript : IUnknown [ object, + uuid(275c23e3-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IEnumCodePage : IUnknown @@ -270,6 +274,7 @@ interface IMLangConvertCharset : IUnknow [ object, + uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), pointer_default(unique) ] interface IEnumRfc1766 : IUnknown @@ -300,6 +305,7 @@ interface IEnumRfc1766 : IUnknown [ object, + uuid(275c23e1-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IMultiLanguage : IUnknown @@ -379,6 +385,7 @@ interface IMultiLanguage : IUnknown [ object, + uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a), pointer_default(unique) ] interface IMultiLanguage2 : IUnknown @@ -564,11 +571,3 @@ cpp_quote("STDAPI IsConvertINetStringAva cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);") cpp_quote("STDAPI ConvertINetUnicodeToMultiByte(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT);") - -cpp_quote("DEFINE_GUID(IID_IMLangCodePages, 0x359F3443,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMLangFontLink, 0x359F3441,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage2, 0xDCCFC164,0x2B38,0x11d2,0xB7,0xEC,0x00,0xC0,0x4F,0x8F,0x5D,0x9A);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumCodePage, 0x275c23e3,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumScript, 0xae5f1430,0x388b,0x11d2,0x83,0x80,0x00,0xc0,0x4f,0x8f,0x5d,0xa1);") -cpp_quote("DEFINE_GUID(IID_IEnumRfc1766, 0x3dc39d1d,0xc030,0x11d0,0xb8,0x1b,0x00,0xc0,0x4f,0xc9,0xb3,0x1f);")

1 0

Dmitry Timoshkov : mlang: Implement IEnumRfc1766 interface.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: ef35d28999c330d746a95c57b6e5798554b75ba9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef35d28999c330d746a95c5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 6 10:58:57 2005 +0100 mlang: Implement IEnumRfc1766 interface. --- dlls/mlang/mlang.c | 246 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/mlang/tests/mlang.c | 29 +++++ include/mlang.idl | 4 + 3 files changed, 266 insertions(+), 13 deletions(-)

1 0

Robert Reif : winmm: Allow sound card drivers to be opened more than once.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: ce4fdfdbcd8c502b17687085605a0d6641ef988c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce4fdfdbcd8c502b1768708… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:25 2005 +0100 winmm: Allow sound card drivers to be opened more than once. --- dlls/winmm/winealsa/alsa.c | 13 +------------ dlls/winmm/winearts/arts.c | 12 +----------- dlls/winmm/wineaudioio/audioio.c | 13 +------------ dlls/winmm/wineesd/esound.c | 12 +----------- dlls/winmm/winenas/nas.c | 12 +----------- dlls/winmm/wineoss/oss.c | 13 +------------ 6 files changed, 6 insertions(+), 69 deletions(-) diff --git a/dlls/winmm/winealsa/alsa.c b/dlls/winmm/winealsa/alsa.c index 06dc4bc..781d43c 100644 --- a/dlls/winmm/winealsa/alsa.c +++ b/dlls/winmm/winealsa/alsa.c @@ -32,18 +32,11 @@ #ifdef HAVE_ALSA -static struct WINE_ALSA* alsa = NULL; - /************************************************************************** * ALSA_drvOpen [internal] */ static LRESULT ALSA_drvOpen(LPSTR str) { - if (alsa) - return 0; - - /* I know, this is ugly, but who cares... */ - alsa = (struct WINE_ALSA*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT ALSA_drvOpen(LPSTR str) */ static LRESULT ALSA_drvClose(DWORD_PTR dwDevID) { - if (alsa) { - alsa = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/winearts/arts.c b/dlls/winmm/winearts/arts.c index 36506db..7f9d1ac 100644 --- a/dlls/winmm/winearts/arts.c +++ b/dlls/winmm/winearts/arts.c @@ -33,18 +33,12 @@ #include "arts.h" #ifdef HAVE_ARTS -static int arts = 0; /************************************************************************** * ARTS_drvOpen [internal] */ static LRESULT ARTS_drvOpen(LPSTR str) { - if (arts) - return 0; - - /* I know, this is ugly, but who cares... */ - arts = 1; return 1; } @@ -53,11 +47,7 @@ static LRESULT ARTS_drvOpen(LPSTR str) */ static LRESULT ARTS_drvClose(DWORD_PTR dwDevID) { - if (arts) { - arts = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ARTS */ diff --git a/dlls/winmm/wineaudioio/audioio.c b/dlls/winmm/wineaudioio/audioio.c index f946710..aa43c69 100644 --- a/dlls/winmm/wineaudioio/audioio.c +++ b/dlls/winmm/wineaudioio/audioio.c @@ -32,8 +32,6 @@ #ifdef HAVE_LIBAUDIOIO -static struct WINE_LIBAUDIOIO* audioio = NULL; - extern LONG LIBAUDIOIO_WaveInit(void); /************************************************************************** @@ -41,11 +39,6 @@ extern LONG LIBAUDIOIO_WaveInit(void); */ static LRESULT LIBAUDIOIO_drvOpen(LPSTR str) { - if (audioio) - return 0; - - /* I know, this is ugly, but who cares... */ - audioio = (struct WINE_LIBAUDIOIO*)1; return 1; } @@ -54,11 +47,7 @@ static LRESULT LIBAUDIOIO_drvOpen(LPSTR */ static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID) { - if (audioio) { - audioio = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/wineesd/esound.c b/dlls/winmm/wineesd/esound.c index 702dbe5..091a8e4 100644 --- a/dlls/winmm/wineesd/esound.c +++ b/dlls/winmm/wineesd/esound.c @@ -34,18 +34,12 @@ #include "esound.h" #ifdef HAVE_ESD -static int esd = 0; /************************************************************************** * ESD_drvOpen [internal] */ static LRESULT ESD_drvOpen(LPSTR str) { - if (esd) - return 0; - - /* I know, this is ugly, but who cares... */ - esd = 1; return 1; } @@ -54,11 +48,7 @@ static LRESULT ESD_drvOpen(LPSTR str) */ static LRESULT ESD_drvClose(DWORD_PTR dwDevID) { - if (esd) { - esd = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ESD */ diff --git a/dlls/winmm/winenas/nas.c b/dlls/winmm/winenas/nas.c index 9b7b026..02f3474 100644 --- a/dlls/winmm/winenas/nas.c +++ b/dlls/winmm/winenas/nas.c @@ -36,18 +36,12 @@ #include "nas.h" #ifdef HAVE_NAS -static int nas = 0; /************************************************************************** * NAS_drvOpen [internal] */ static LRESULT NAS_drvOpen(LPSTR str) { - if (nas) - return 0; - - /* I know, this is ugly, but who cares... */ - nas = 1; return 1; } @@ -56,11 +50,7 @@ static LRESULT NAS_drvOpen(LPSTR str) */ static LRESULT NAS_drvClose(DWORD_PTR dwDevID) { - if (nas) { - nas = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_NAS */ diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index d1437b5..8526f42 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -32,18 +32,11 @@ #ifdef HAVE_OSS -static struct WINE_OSS* oss = NULL; - /************************************************************************** * OSS_drvOpen [internal] */ static LRESULT OSS_drvOpen(LPSTR str) { - if (oss) - return 0; - - /* I know, this is ugly, but who cares... */ - oss = (struct WINE_OSS*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT OSS_drvOpen(LPSTR str) */ static LRESULT OSS_drvClose(DWORD_PTR dwDevID) { - if (oss) { - oss = NULL; - return 1; - } - return 0; + return 1; } #endif

1 0

Robert Reif : winmm: Allow sound card driver to be opened more than once.
by Alexandre Julliard 06 Dec '05

06 Dec '05

Module: wine Branch: refs/heads/master Commit: 3020d1a4ca442e9299dd2652912e96f1c2f3845f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3020d1a4ca442e9299dd265… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:38 2005 +0100 winmm: Allow sound card driver to be opened more than once. TRACE cleanups. --- dlls/winmm/winejack/jack.c | 84 ++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 54 deletions(-) diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index 363c9fb..d5e12ba 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jack); #ifdef HAVE_JACK_JACK_H -static int jack = 0; - -/* set this to zero or one to enable or disable tracing in here */ #ifndef SONAME_LIBJACK #define SONAME_LIBJACK "libjack.so" @@ -53,17 +50,17 @@ void *jackhandle = NULL; */ static LRESULT JACK_drvLoad(void) { - TRACE("JACK_drvLoad()\n"); + TRACE("()\n"); /* dynamically load the jack library if not already loaded */ if(!jackhandle) { jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); - TRACE("JACK_drvLoad: SONAME_LIBJACK == %s\n", SONAME_LIBJACK); - TRACE("JACK_drvLoad: jackhandle == %p\n", jackhandle); + TRACE("SONAME_LIBJACK == %s\n", SONAME_LIBJACK); + TRACE("jackhandle == %p\n", jackhandle); if(!jackhandle) { - FIXME("JACK_drvLoad: error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); + FIXME("error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); jackhandle = (void*)-1; return 0; } @@ -78,11 +75,11 @@ static LRESULT JACK_drvLoad(void) /* unload the jack library on driver free */ static LRESULT JACK_drvFree(void) { - TRACE("JACK_drvFree()\n"); + TRACE("()\n"); if(jackhandle && (jackhandle != (void*)-1)) { - TRACE("JACK_drvFree: calling wine_dlclose() on jackhandle\n"); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL; } @@ -95,23 +92,15 @@ static LRESULT JACK_drvFree(void) */ 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("JACK_drvOpen: unable to open the jack library, returning 0\n"); + FIXME("unable to open the jack library, returning 0\n"); return 0; } - if (jack) - { - FIXME("JACK_drvOpen: jack != 0 (already open), returning 0\n"); - return 0; - } - - /* I know, this is ugly, but who cares... */ - TRACE("JACK_drvOpen: opened jack(set jack = 1), returning 1\n"); - jack = 1; return 1; } @@ -120,15 +109,8 @@ static LRESULT JACK_drvOpen(LPSTR str) */ static LRESULT JACK_drvClose(DWORD_PTR dwDevID) { - if (jack) - { - TRACE("JACK_drvClose: jack is nonzero, setting jack to 0 and returning 1\n"); - jack = 0; - return 1; - } - - TRACE("JACK_drvClose: jack is zero(closed), returning 0\n"); - return 0; + TRACE("(%08lx)\n", dwDevID); + return 1; } #endif /* #ifdef HAVE_JACK_JACK_H */ @@ -139,37 +121,31 @@ static LRESULT JACK_drvClose(DWORD_PTR d LRESULT CALLBACK JACK_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); */ + 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 HAVE_JACK_JACK_H - case DRV_LOAD: - TRACE("JACK_DriverProc: DRV_LOAD\n"); - return JACK_drvLoad(); - case DRV_FREE: - TRACE("JACK_DriverProc: DRV_FREE\n"); - return JACK_drvFree(); - case DRV_OPEN: - TRACE("JACK_DriverProc: DRV_OPEN\n"); - return JACK_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: - TRACE("JACK_DriverProc: DRV_CLOSE\n"); - return JACK_drvClose(dwDevID); - case DRV_ENABLE: - TRACE("JACK_DriverProc: DRV_ENABLE\n"); - return 1; - case DRV_DISABLE: - TRACE("JACK_DriverProc: DRV_DISABLE\n"); - return 1; + 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_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; - case DRV_INSTALL: - TRACE("JACK_DriverProc: DRV_INSTALL\n"); - return DRVCNF_RESTART; - case DRV_REMOVE: - TRACE("JACK_DriverProc: DRV_REMOVE\n"); - return DRVCNF_RESTART; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; #endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);

1 0