wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

rpc problems with kohan2 installer.
by Oliver Stieber 25 Jul '05

25 Jul '05

Hi, I picked up a copy of Kohan 2, but I can't get it to install it looks like an RPC error. trace:rpc:I_RpcSend (0x7bc84e18) trace:rpc:RPCRT4_OpenBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_Receive buffer length = 12 trace:rpc:I_RpcGetBuffer (0x7ba8a6e4): BufferLength=12 trace:rpc:I_RpcGetBuffer Buffer=0x7bc44978 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_process_packet freeing Buffer=0x7bc84ed8 trace:rpc:RPCRT4_DestroyBinding binding: 0x7bc84e50 trace:rpc:I_RpcFreeBuffer (0x7bc84e18) Buffer=0x7bc850d0 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bcae5f8) trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc36cf0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc36cf0) warn:rpc:RPCRT4_Receive Short read of header, 0/16 bytes warn:rpc:RPCRT4_io_thread receive failed with error 6c0 trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc435d0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc435d0) trace:ole:rpc_sendreceive_thread completed with status 0x0 trace:ole:DllMain 0x7b7c0000 0x3 (nil) trace:ole:DllMain 0x7b570000 0x3 (nil) trace:ole:CoWaitForMultipleHandles waiting for rpc completion or window message trace:ole:CoWaitForMultipleHandles -- 0x00000000 trace:ole:RpcChannelBuffer_SendReceive RPC call status: 0x0 trace:ole:RpcChannelBuffer_SendReceive -- 0x00000000 trace:ole:deserialize_param vt 26 at 0x7ba8a760 trace:ole:deserialize_param vt 3 at 0x7ba8c3d0 trace:ole:ITypeInfo_fnRelease (0x7bc880c0)->(6) trace:ole:ITypeLib2_fnRelease (0x7bc39748)->(8) ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

2 2

Re: hhctrl: Add the WebBrowser implementation [take 5]
by Alexandre Julliard 25 Jul '05

25 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > +typedef struct IOleInPlaceFrameImpl > +{ > + IOleInPlaceFrame frame; > + HWND window; > +} IOleInPlaceFrameImpl; > + > +typedef struct IOleInPlaceSiteImpl > +{ > + IOleInPlaceSite inplace; > + IOleInPlaceFrameImpl frame; > +} IOleInPlaceSiteImpl; > + > +typedef struct IOleClientSiteImpl > +{ > + IOleClientSite client; > + IOleInPlaceSiteImpl inplace; > + IDocHostUIHandler ui; > +} IOleClientSiteImpl; You should define a single structure with multiple vtbl pointers, and compute the This pointer based on structure offsets. Look at how this is done in other places, like shelllink.c for instance. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hhctrl: Add the remaining commands to HtmlHelp
by Alexandre Julliard 25 Jul '05

25 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > Hey, > > Changelog > * Add the remaining commands to HtmlHelp. That switch is not supposed to list all the commands, it's here to only display the message box on calls caused by direct user action, to avoid spamming the user with message boxes. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: theming "framework"
by Frank Richter 25 Jul '05

25 Jul '05

On 16.07.2005 01:13, Frank Richter wrote: > Frank Richter <frank.richter(a)gmail.com> > Added some generic code to allow subclassing(for the purpose of theming) > of standard controls. What are the issues with this one? -f.r.

2 1

Re: hhctrl: Add the CHM implemenation
by Dmitry Timoshkov 25 Jul '05

25 Jul '05

"James Hawkins" <truiken(a)gmail.com> wrote: > --- /dev/null 2005-07-23 07:02:07.637731864 -0500 > +++ dlls/hhctrl.ocx/itss.h 2005-07-25 01:09:16.000000000 -0500 > @@ -0,0 +1,302 @@ > +/*** Autogenerated by WIDL 0.1 from itss.idl - Do not edit ***/ Probably we need to move itss.idl to include/ so that a generated itss.h could be accessed globally. > + hr = pStorage->lpVtbl->OpenStream(pStorage, stringsW, NULL, STGM_READ, 0, &pStream); Please use IStorage_OpenStream macro here and similar macros instead of accessing vtable directly. -- Dmitry.

2 2

Writing tests when creating patches
by Paul Vriens 24 Jul '05

24 Jul '05

Hi, I've noticed that in the past weeks there were several patches that contained a remark like: - checked on on windows - compared with native - ... Wouldn't it be nice if tests accompanied these fixes? Do we have some guidelines in this? I know that writing tests is not everybody's hobby. Cheers, Paul.

2 1

Wine causing strange messages in Linux dmesg log
by Chris Rankin 24 Jul '05

24 Jul '05

Hi, Ever since (approx) when the winecfg tool became active, a Windows tool that examined IDE capabilities has stopped working. Instead, the following messages are being written into the dmesg log: hdc: write_intr: wrong transfer direction! hdd: write_intr: wrong transfer direction! hdc is a DVD-ROM drive, whereas hdd is a CD-RW drive, and the tool (DiscInfo.exe v1.5.5) tries to use SPTI. However, the tool identified both as hard disks. Does anyone have any ideas what's broken, please? Cheers, Chris ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

1 0

QuickTime Problems
by Andrew Neil Ramage 24 Jul '05

24 Jul '05

I installed the latest RPM release for SuSE 9.3 on my new laptop. Having installed Quick Time, I tried to view some .mov files (trailers) Anyone know what is wrong ? The output to the command window I started wine from is below. andrew@apollo:~/.wine/drive_c/Program Files/QuickTime> wine QuickTimePlayer.exe Sample.mov fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x403bf200)->(00000000,00000008) fixme:font:CreateScalableFontResourceA (0,"c:\\windows\\QTFont.for","c:\\windows\\QTFont.qfn",(null)): stub fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 67 (X_PolyRectangle) Resource id in failed request: 0x4200007 Serial number of failed request: 13172 Current serial number in output stream: 13199 andrew@apollo:~/.wine/drive_c/Program Files/QuickTime> -- Andrew You can be the captain I will draw the chart Sailing into destiny Closer to the heart Closer to the Heart by Rush (A Farewell to Kings, 1977) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Re: Treat LDAP as X for macro detection in winapi_check
by Alexandre Julliard 24 Jul '05

24 Jul '05

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > Since we don't use HAVE_LDAP_H, it's an exception as well. There's no reason not to use HAVE_LDAP_H for header checks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: fix lots of missings-declarations warnings (reworked)
by Alexandre Julliard 24 Jul '05

24 Jul '05

Stefan Huehner <stefan(a)huehner.org> writes: > [old message] > this patch adds prototypes for the functions in opengl_norm.c which are > prefixed with 'wine_'. As this file is generated from the make_opengl > script this was also modified to emit this additional lines as it > already did for opengl_ext.c. This patch fixes 374 missing-declarations > warnings. At the cost of adding 374 useless prototypes... We really don't want to do that, it's perfectly legitimate in that case that the functions don't have a declaration, that's why the warning is not turned on by default. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Just a couple of queries.. Why are you passing the offset to GetMemory? I can't see there ever being a need for it IWineD3DVertexBufferImpl_GetMemory(foo) + offset should be fine > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs I should have added, this patch is good to go in though.... > > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Hi, I've got debugged and tested VBO support with full support for vertex shaders to go in soon, but I'm trying to stabilize d3d before pushing performance features. > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: glu32: fix some of -Wmissing-declarations warinings
by Vincent Béron 23 Jul '05

23 Jul '05

Le sam 23/07/2005 à 12:06, Stefan Huehner a écrit : [snip] 2 small nits: > --- /dev/null 2005-03-29 14:09:30.000000000 +0200 > +++ dlls/glu32/glu_local.h 2005-07-23 16:55:03.000000000 +0200 > @@ -0,0 +1,104 @@ > +/* A line indicating what this file is for, along with a copyright assignment, would be good. > + * 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. [snip] How about a double include protection? (I know there's only one .c file in which it is included and that it's not likely to change, but I still recommend using one.) Vincent

1 0

Re: Move 16bit header to include/wine
by Francois Gouget 23 Jul '05

23 Jul '05

On Fri, 22 Jul 2005, Vincent Béron wrote: > Similar to previous one, only this time it's a whole file. I don't know > if current PSDK still carry it, in which case maybe we want to keep it > where it is? It's still present in the main directory of the XP-SP2 PSDK. So I think it should remain where it is. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ In theory, theory and practice are the same, but in practice they're different.

1 0

Thought you all should know....
by Dustin Navea 23 Jul '05

23 Jul '05

To the PC reporters and journalists that this email gets sent to, this should probably be sent to people on your lists, pending further research on your part. I got this from the EFF (for those that dont know, thats the Electronic Frontires Foundation, the guys that monitor your privacy), and for those that dont care, just delete this.. I just figured you all should know.. ---Contents of the message below--- * Is Your Printer Spying On You? Help EFF Watch the Watchers Imagine that every time you printed a document, it automatically included a secret code that could be used to identify the printer - and potentially, the person who used it. Sounds like something from an episode of "Alias," right? Unfortunately, the scenario isn't fictional. In an effort to identify counterfeiters, the US government has succeeded in persuading some color laser printer manufacturers to encode each page with identifying information. That means that without your knowledge or consent, an act you assume is private could become public. A communication tool you're using in everyday life could become a tool for government surveillance. And what's worse, there are no laws to prevent abuse. The ACLU recently issued a report revealing that the FBI has amassed more than 1,100 pages of documents on the organization since 2001, as well as documents concerning other non-violent groups, including Greenpeace and United for Peace and Justice. In the current political climate, it's not hard to imagine the government using the ability to determine who may have printed what document for purposes other than identifying counterfeiters. Yet there are no laws to stop the Secret Service - or for that matter, any other governmental agency or private company - from using printer codes to secretly trace the origin of non-currency documents. We're unaware of any printer manufacturer that has a privacy policy that would protect you, and no law regulates what people can do with the information once it's turned over. And that doesn't even reach the issue of how such a privacy-invasive tool could be developed and implemented in printers without the public becoming aware of it in the first place. With nothing on the books, we lack tools to stop the privacy and anonymity violations this technology enables. For this reason, EFF is gathering information about what printers are revealing and how - a necessary precursor to any legal challenge or new legislation to protect your privacy. And we could use your help. In the preliminary research paper linked below, we explain what we've observed so far, briefly explore the privacy implications, and ask you to print and send us test sheets from your color laser printer and/or a color laser printer at your local print shop. That way, we can watch the watchers and ensure that your privacy isn't compromised in ways that harm your fundamental constitutional rights. In addition to documenting what printers are revealing, EFF is filing a Freedom of Information Act (FOIA) request, and we will keep you updated on what we discover. In the meantime, we urge you to participate in this research project and pass the word along. Thank you for your support! EFF paper: "Investigating Machine Identification Code Technology in Color Laser Printers": <http://www.eff.org/Privacy/printers/wp.php> Directions for printing test sheets: <http://www.eff.org/Privacy/printers/wp.php#testsheets> PC World: "Government Uses Color Laser Printer Technology to Track Documents": <http://www.pcworld.com/news/article/0,aid,118664,00.asp> ACLU: "FBI Is Keeping Documents on ACLU and Other Peaceful Groups": <http://www.aclu.org/SafeandFree/SafeandFree.cfm?ID=18784&c=206>

1 0

Re: RICHED20: EM_SETZOOM / EM_GETZOOM implementation
by Dimi Paun 22 Jul '05

22 Jul '05

From: "Phil Krylov" <phil(a)newstar.rinet.ru> > Added EM_GETZOOM and EM_SETZOOM RichEdit message handlers. > + case EM_GETZOOM: > + if (!wParam || !lParam) > + return FALSE; > + *(int *)wParam = editor->nZoomNumerator; > + *(int *)lParam = editor->nZoomDenominator; > + return TRUE; I don't know what Windows does, but it may also do: + case EM_GETZOOM: + if (wParam) *(int *)wParam = editor->nZoomNumerator; + if (lParam) *(int *)lParam = editor->nZoomDenominator; + return TRUE; Have you checked? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 1

Re: Fix the ldap_search_sA/W prototypes
by Hans Leidekker 22 Jul '05

22 Jul '05

On Friday 22 July 2005 19:34, Francois Gouget wrote: @ cdecl ldap_search_s(ptr str long str ptr long) ldap_search_sA -@ cdecl ldap_search_sA(ptr str long str ptr long) -@ cdecl ldap_search_sW(ptr wstr long wstr ptr long) +@ cdecl ldap_search_sA(ptr str long str ptr long ptr) +@ cdecl ldap_search_sW(ptr wstr long wstr ptr long ptr) ldap_search_s also needs the extra argument. -Hans

1 0

Re: [wined3d] drawprint tidyup initilization of strided data.
by Dimi Paun 22 Jul '05

22 Jul '05

> +#define SET_STRIDED (_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ > +break; > + > +#define SET_STRIDED_(_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ This is pretty ugly: the resulting code doesn't look like C. In fact, it looks rather magical.For example, why pass in _usage as a param to the macro, just to get rid of the case _usage: which you actually want outside the macro for readability. Also, accessing the magic strided, data, element, stride directly is very weird, and problematic. The casual user wouldn't know what hit him :) I say let it be as is. If you really want the macro, something like this would be better: +#define SET_STRIDED_(_strided, _name, _data, _element, _stride) \ +_strided->u.s._name.lpData = _data; \ +_strided->u.s._name.dwType = _element->Type; \ +_strided->u.s._name.dwStride = _stride; -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 4

Re: [HHCTRL #2] Add the WebBrowser implementation [RESEND]
by Alexandre Julliard 22 Jul '05

22 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > Hey, > > Is there anything wrong with this? > > Changelog > * Add the WebBrowser implementation. Yes, it doesn't build because of some missing header (hhctrl.h IIRC). Also, splitting patches is good, but don't overdo it, if you have a C file and its associated header it makes no sense to send them as two separate patches, each one is useless without the other. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Move mcicda to the top-level dlls directory
by Eric Pouech 22 Jul '05

22 Jul '05

check out the http://wiki.winehq.org/FlattenDllDirectories page on Wine wiki, you'll get all the correct names (in some cases, windows changed from 16 bit drivers to 32 bit drivers) btw, our default settings should also be changed accordingly A+ ----- Original Message ----- From: Rémi Assailly To: wine-patches(a)winehq.org Sent: Friday, July 22, 2005 3:43 PM Subject: Move mcicda to the top-level dlls directory Hi all I saw that WinXP kept mciseq.drv, mciwave.drv and mciavi.drv. Should we do the same thing or just keep the dlls files ? Changelog: Moved mcicda to the top-level dlls directory. ------------------------------------------------------------------------------ diff -Nru wine/configure winedev/configure --- wine/configure 2005-07-21 20:36:42.000000000 +0200 +++ winedev/configure 2005-07-22 14:45:10.000000000 +0200 @@ -20203,7 +20203,7 @@ MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mcicda/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -20816,6 +20816,7 @@ "dlls/lzexpand/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/lzexpand/tests/Makefile" ;; "dlls/mapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; "dlls/mapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; + "dlls/mcicda/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mcicda/Makefile" ;; "dlls/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/midimap/Makefile" ;; "dlls/mlang/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;; "dlls/mlang/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; @@ -20926,7 +20927,6 @@ "dlls/winmm/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/joystick/Makefile" ;; "dlls/winmm/mcianim/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mcianim/Makefile" ;; "dlls/winmm/mciavi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciavi/Makefile" ;; - "dlls/winmm/mcicda/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mcicda/Makefile" ;; "dlls/winmm/mciseq/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciseq/Makefile" ;; "dlls/winmm/mciwave/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciwave/Makefile" ;; "dlls/winmm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; diff -Nru wine/configure.ac winedev/configure.ac --- wine/configure.ac 2005-07-21 20:36:42.000000000 +0200 +++ winedev/configure.ac 2005-07-22 14:44:01.000000000 +0200 @@ -1612,6 +1612,7 @@ dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile +dlls/mcicda/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile @@ -1722,7 +1723,6 @@ dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile -dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile diff -Nru wine/dlls/Makefile.in winedev/dlls/Makefile.in --- wine/dlls/Makefile.in 2005-07-21 20:36:42.000000000 +0200 +++ winedev/dlls/Makefile.in 2005-07-22 14:43:11.000000000 +0200 @@ -70,6 +70,7 @@ kernel \ lzexpand \ mapi32 \ + mcicda \ midimap \ mlang \ mmdevldr.vxd \ @@ -154,7 +155,6 @@ winmm/joystick \ winmm/mcianim \ winmm/mciavi \ - winmm/mcicda \ winmm/mciseq \ winmm/mciwave \ winmm/wavemap \ @@ -316,7 +316,7 @@ mapi32.dll.so \ mcianim.drv.so \ mciavi.drv.so \ - mcicda.drv.so \ + mcicda.dll.so \ mciseq.drv.so \ mciwave.drv.so \ midimap.dll.so \ @@ -647,8 +647,8 @@ mciavi.drv.so: winmm/mciavi/mciavi.drv.so $(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@ -mcicda.drv.so: winmm/mcicda/mcicda.drv.so - $(RM) $@ && $(LN_S) winmm/mcicda/mcicda.drv.so $@ +mcicda.dll.so: winmm/mcicda/mcicda.dll.so + $(RM) $@ && $(LN_S) winmm/mcicda/mcicda.dll.so $@ mciseq.drv.so: winmm/mciseq/mciseq.drv.so $(RM) $@ && $(LN_S) winmm/mciseq/mciseq.drv.so $@ @@ -1717,7 +1717,7 @@ mapi32/mapi32.dll.so: mapi32 winmm/mcianim/mcianim.drv.so: winmm/mcianim winmm/mciavi/mciavi.drv.so: winmm/mciavi -winmm/mcicda/mcicda.drv.so: winmm/mcicda +mcicda/mcicda.dll.so: mcicda winmm/mciseq/mciseq.drv.so: winmm/mciseq winmm/mciwave/mciwave.drv.so: winmm/mciwave midimap/midimap.dll.so: midimap diff -Nru wine/dlls/mcicda/.cvsignore winedev/dlls/mcicda/.cvsignore --- wine/dlls/mcicda/.cvsignore 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/.cvsignore 2005-07-22 14:41:22.000000000 +0200 @@ -0,0 +1,2 @@ +Makefile +mcicda.dll.dbg.c diff -Nru wine/dlls/mcicda/Makefile.in winedev/dlls/mcicda/Makefile.in --- wine/dlls/mcicda/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/Makefile.in 2005-07-22 14:41:07.000000000 +0200 @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mcicda.dll +IMPORTS = winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + mcicda.c + +@MAKE_DLL_RULES@ + +### Dependencies: diff -Nru wine/dlls/mcicda/mcicda.c winedev/dlls/mcicda/mcicda.c --- wine/dlls/mcicda/mcicda.c 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/mcicda.c 2005-02-09 23:26:26.000000000 +0100 @@ -0,0 +1,1053 @@ +/* -*- tab-width: 8; c-basic-offset: 4 -*- */ +/* + * MCI driver for audio CD (MCICDA) + * + * Copyright 1994 Martin Ayotte + * Copyright 1998-99 Eric Pouech + * Copyright 2000 Andreas Mohr + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ntstatus.h" +#include "wownt32.h" +#include "mmddk.h" +#include "winioctl.h" +#include "ntddstor.h" +#include "ntddcdrm.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mcicda); + +#define CDFRAMES_PERSEC 75 +#define CDFRAMES_PERMIN (CDFRAMES_PERSEC * 60) +#define FRAME_OF_ADDR(a) ((a)[1] * CDFRAMES_PERMIN + (a)[2] * CDFRAMES_PERSEC + (a)[3]) +#define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address) + +typedef struct { + UINT wDevID; + int nUseCount; /* Incremented for each shared open */ + BOOL fShareable; /* TRUE if first open was shareable */ + WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ + HANDLE hCallback; /* Callback handle for pending notification */ + DWORD dwTimeFormat; + HANDLE handle; +} WINE_MCICDAUDIO; + +/*-----------------------------------------------------------------------*/ + +/************************************************************************** + * MCICDA_drvOpen [internal] + */ +static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) +{ + WINE_MCICDAUDIO* wmcda; + + if (!modp) return 0xFFFFFFFF; + + wmcda = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCICDAUDIO)); + + if (!wmcda) + return 0; + + wmcda->wDevID = modp->wDeviceID; + mciSetDriverData(wmcda->wDevID, (DWORD)wmcda); + modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; + modp->wType = MCI_DEVTYPE_CD_AUDIO; + return modp->wDeviceID; +} + +/************************************************************************** + * MCICDA_drvClose [internal] + */ +static DWORD MCICDA_drvClose(DWORD dwDevID) +{ + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); + + if (wmcda) { + HeapFree(GetProcessHeap(), 0, wmcda); + mciSetDriverData(dwDevID, 0); + } + return (dwDevID == 0xFFFFFFFF) ? 1 : 0; +} + +/************************************************************************** + * MCICDA_GetOpenDrv [internal] + */ +static WINE_MCICDAUDIO* MCICDA_GetOpenDrv(UINT wDevID) +{ + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); + + if (wmcda == NULL || wmcda->nUseCount == 0) { + WARN("Invalid wDevID=%u\n", wDevID); + return 0; + } + return wmcda; +} + +/************************************************************************** + * MCICDA_GetStatus [internal] + */ +static DWORD MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda) +{ + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + DWORD br; + DWORD mode = MCI_MODE_NOT_READY; + + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; + } else { + switch (data.CurrentPosition.Header.AudioStatus) + { + case AUDIO_STATUS_IN_PROGRESS: mode = MCI_MODE_PLAY; break; + case AUDIO_STATUS_PAUSED: mode = MCI_MODE_PAUSE; break; + case AUDIO_STATUS_NO_STATUS: + case AUDIO_STATUS_PLAY_COMPLETE: mode = MCI_MODE_STOP; break; + case AUDIO_STATUS_PLAY_ERROR: + case AUDIO_STATUS_NOT_SUPPORTED: + default: + break; + } + } + return mode; +} + +/************************************************************************** + * MCICDA_GetError [internal] + */ +static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) +{ + switch (GetLastError()) + { + case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; + case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; + default: + FIXME("Unknown mode %lx\n", GetLastError()); + } + return MCIERR_DRIVER_INTERNAL; +} + +/************************************************************************** + * MCICDA_CalcFrame [internal] + */ +static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime) +{ + DWORD dwFrame = 0; + UINT wTrack; + CDROM_TOC toc; + DWORD br; + BYTE* addr; + + TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime); + + switch (wmcda->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + dwFrame = ((dwTime - 1) * CDFRAMES_PERSEC + 500) / 1000; + TRACE("MILLISECONDS %lu\n", dwFrame); + break; + case MCI_FORMAT_MSF: + TRACE("MSF %02u:%02u:%02u\n", + MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), MCI_MSF_FRAME(dwTime)); + dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime); + dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime); + dwFrame += MCI_MSF_FRAME(dwTime); + break; + case MCI_FORMAT_TMSF: + default: /* unknown format ! force TMSF ! ... */ + wTrack = MCI_TMSF_TRACK(dwTime); + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) + return 0; + if (wTrack < toc.FirstTrack || wTrack > toc.LastTrack) + return 0; + TRACE("MSF %02u-%02u:%02u:%02u\n", + MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime), + MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime)); + addr = toc.TrackData[wTrack - toc.FirstTrack].Address; + TRACE("TMSF trackpos[%u]=%d:%d:%d\n", + wTrack, addr[1], addr[2], addr[3]); + dwFrame = CDFRAMES_PERMIN * (addr[1] + MCI_TMSF_MINUTE(dwTime)) + + CDFRAMES_PERSEC * (addr[2] + MCI_TMSF_SECOND(dwTime)) + + addr[3] + MCI_TMSF_FRAME(dwTime); + break; + } + return dwFrame; +} + +/************************************************************************** + * MCICDA_CalcTime [internal] + */ +static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LPDWORD lpRet) +{ + DWORD dwTime = 0; + UINT wTrack; + UINT wMinutes; + UINT wSeconds; + UINT wFrames; + CDROM_TOC toc; + DWORD br; + + TRACE("(%p, %08lX, %lu);\n", wmcda, tf, dwFrame); + + switch (tf) { + case MCI_FORMAT_MILLISECONDS: + dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC + 1; + TRACE("MILLISECONDS %lu\n", dwTime); + *lpRet = 0; + break; + case MCI_FORMAT_MSF: + wMinutes = dwFrame / CDFRAMES_PERMIN; + wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; + wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; + dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); + TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n", + wMinutes, wSeconds, wFrames, dwTime); + *lpRet = MCI_COLONIZED3_RETURN; + break; + case MCI_FORMAT_TMSF: + default: /* unknown format ! force TMSF ! ... */ + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) + return 0; + if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || + dwFrame > FRAME_OF_TOC(toc, toc.LastTrack + 1)) { + ERR("Out of range value %lu [%u,%u]\n", + dwFrame, FRAME_OF_TOC(toc, toc.FirstTrack), + FRAME_OF_TOC(toc, toc.LastTrack + 1)); + *lpRet = 0; + return 0; + } + for (wTrack = toc.FirstTrack; wTrack <= toc.LastTrack; wTrack++) { + if (FRAME_OF_TOC(toc, wTrack) > dwFrame) + break; + } + wTrack--; + dwFrame -= FRAME_OF_TOC(toc, wTrack); + wMinutes = dwFrame / CDFRAMES_PERMIN; + wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; + wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; + dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames); + TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); + *lpRet = MCI_COLONIZED4_RETURN; + break; + } + return dwTime; +} + +static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms); +static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); + +/************************************************************************** + * MCICDA_Open [internal] + */ +static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) +{ + DWORD dwDeviceID; + DWORD ret = MCIERR_HARDWARE; + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); + WCHAR root[7], drive = 0; + int count; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); + + if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + dwDeviceID = lpOpenParms->wDeviceID; + + if (wmcda->nUseCount > 0) { + /* The driver is already open on this channel */ + /* If the driver was opened shareable before and this open specifies */ + /* shareable then increment the use count */ + if (wmcda->fShareable && (dwFlags & MCI_OPEN_SHAREABLE)) + ++wmcda->nUseCount; + else + return MCIERR_MUST_USE_SHAREABLE; + } else { + wmcda->nUseCount = 1; + wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE; + } + if (dwFlags & MCI_OPEN_ELEMENT) { + if (dwFlags & MCI_OPEN_ELEMENT_ID) { + WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort\n", (DWORD)lpOpenParms->lpstrElementName); + return MCIERR_NO_ELEMENT_ALLOWED; + } + TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); + if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || + (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) + { + WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", + debugstr_w(lpOpenParms->lpstrElementName)); + ret = MCIERR_NO_ELEMENT_ALLOWED; + goto the_error; + } + drive = toupper(lpOpenParms->lpstrElementName[0]); + root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; + if (GetDriveTypeW(root) != DRIVE_CDROM) + { + ret = MCIERR_INVALID_DEVICE_NAME; + goto the_error; + } + } + else + { + /* drive letter isn't passed... get the dwDeviceID'th cdrom in the system */ + root[0] = 'A'; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; + for (count = 0; root[0] <= 'Z'; root[0]++) + { + if (GetDriveTypeW(root) == DRIVE_CDROM && ++count >= dwDeviceID) + { + drive = root[0]; + break; + } + } + if (!drive) + { + ret = MCIERR_INVALID_DEVICE_ID; + goto the_error; + } + } + + wmcda->wNotifyDeviceID = dwDeviceID; + wmcda->dwTimeFormat = MCI_FORMAT_MSF; + + /* now, open the handle */ + root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; + wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (wmcda->handle != INVALID_HANDLE_VALUE) + return 0; + + the_error: + --wmcda->nUseCount; + return ret; +} + +/************************************************************************** + * MCICDA_Close [internal] + */ +static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (--wmcda->nUseCount == 0) { + CloseHandle(wmcda->handle); + } + return 0; +} + +/************************************************************************** + * MCICDA_GetDevCaps [internal] + */ +static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, + LPMCI_GETDEVCAPS_PARMS lpParms) +{ + DWORD ret = 0; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + if (dwFlags & MCI_GETDEVCAPS_ITEM) { + TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); + + switch (lpParms->dwItem) { + case MCI_GETDEVCAPS_CAN_RECORD: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_HAS_AUDIO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_HAS_VIDEO: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_DEVICE_TYPE: + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_CD_AUDIO, MCI_DEVTYPE_CD_AUDIO); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_USES_FILES: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_COMPOUND_DEVICE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_EJECT: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_PLAY: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_SAVE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + default: + ERR("Unsupported %lx devCaps item\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } else { + TRACE("No GetDevCaps-Item !\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); + return ret; +} + +static DWORD CDROM_Audio_GetSerial(CDROM_TOC* toc) +{ + unsigned long serial = 0; + int i; + WORD wMagic; + DWORD dwStart, dwEnd; + + /* + * wMagic collects the wFrames from track 1 + * dwStart, dwEnd collect the beginning and end of the disc respectively, in + * frames. + * There it is collected for correcting the serial when there are less than + * 3 tracks. + */ + wMagic = toc->TrackData[0].Address[3]; + dwStart = FRAME_OF_TOC(*toc, toc->FirstTrack); + + for (i = 0; i <= toc->LastTrack - toc->FirstTrack; i++) { + serial += (toc->TrackData[i].Address[1] << 16) | + (toc->TrackData[i].Address[2] << 8) | toc->TrackData[i].Address[3]; + } + dwEnd = FRAME_OF_TOC(*toc, toc->LastTrack + 1); + + if (toc->LastTrack - toc->FirstTrack + 1 < 3) + serial += wMagic + (dwEnd - dwStart); + + return serial; +} + + +/************************************************************************** + * MCICDA_Info [internal] + */ +static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) +{ + LPCWSTR str = NULL; + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD ret = 0; + WCHAR buffer[16]; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL || lpParms->lpstrReturn == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); + + if (dwFlags & MCI_INFO_PRODUCT) { + static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; + str = wszAudioCd; + } else if (dwFlags & MCI_INFO_MEDIA_UPC) { + ret = MCIERR_NO_IDENTITY; + } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { + DWORD res = 0; + CDROM_TOC toc; + DWORD br; + static const WCHAR wszLu[] = {'%','l','u',0}; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + + res = CDROM_Audio_GetSerial(&toc); + sprintfW(buffer, wszLu, res); + str = buffer; + } else { + WARN("Don't know this info command (%lu)\n", dwFlags); + ret = MCIERR_UNRECOGNIZED_COMMAND; + } + if (str) { + if (lpParms->dwRetSize <= strlenW(str)) { + lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); + ret = MCIERR_PARAM_OVERFLOW; + } else { + strcpyW(lpParms->lpstrReturn, str); + } + } else { + *lpParms->lpstrReturn = 0; + } + TRACE("=> %s (%ld)\n", debugstr_w(lpParms->lpstrReturn), ret); + return ret; +} + +/************************************************************************** + * MCICDA_Status [internal] + */ +static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD idx; + DWORD ret = 0; + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + CDROM_TOC toc; + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + if (dwFlags & MCI_STATUS_ITEM) { + TRACE("dwItem = %lx\n", lpParms->dwItem); + switch (lpParms->dwItem) { + case MCI_STATUS_CURRENT_TRACK: + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) + { + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = data.CurrentPosition.TrackNumber; + TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn); + break; + case MCI_STATUS_LENGTH: + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (dwFlags & MCI_TRACK) { + TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + return MCIERR_OUTOFRANGE; + idx = lpParms->dwTrack - toc.FirstTrack; + lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - + FRAME_OF_TOC(toc, lpParms->dwTrack); + /* Windows returns one frame less than the total track length for the + last track on the CD. See CDDB HOWTO. Verified on Win95OSR2. */ + if (lpParms->dwTrack == toc.LastTrack) + lpParms->dwReturn--; + } else { + /* Sum of the lengths of all of the tracks. Inherits the + 'off by one frame' behavior from the length of the last track. + See above comment. */ + lpParms->dwReturn = FRAME_OF_TOC(toc, toc.LastTrack + 1) - + FRAME_OF_TOC(toc, toc.FirstTrack) - 1; + } + lpParms->dwReturn = MCICDA_CalcTime(wmcda, + (wmcda->dwTimeFormat == MCI_FORMAT_TMSF) + ? MCI_FORMAT_MSF : wmcda->dwTimeFormat, + lpParms->dwReturn, + &ret); + TRACE("LENGTH=%lu !\n", lpParms->dwReturn); + break; + case MCI_STATUS_MODE: + lpParms->dwReturn = MCICDA_GetStatus(wmcda); + TRACE("MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn); + lpParms->dwReturn = MAKEMCIRESOURCE(lpParms->dwReturn, lpParms->dwReturn); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_MEDIA_PRESENT: + lpParms->dwReturn = (MCICDA_GetStatus(wmcda) == MCI_MODE_OPEN) ? + MAKEMCIRESOURCE(FALSE, MCI_FALSE) : MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_STATUS_MEDIA_PRESENT =%c!\n", LOWORD(lpParms->dwReturn) ? 'Y' : 'N'); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_NUMBER_OF_TRACKS: + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; + TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn); + if (lpParms->dwReturn == (WORD)-1) + return MCICDA_GetError(wmcda); + break; + case MCI_STATUS_POSITION: + if (dwFlags & MCI_STATUS_START) { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack); + TRACE("get MCI_STATUS_START !\n"); + } else if (dwFlags & MCI_TRACK) { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + return MCIERR_OUTOFRANGE; + lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); + TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); + } else { + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); + } + lpParms->dwReturn = MCICDA_CalcTime(wmcda, wmcda->dwTimeFormat, lpParms->dwReturn, &ret); + TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn); + break; + case MCI_STATUS_READY: + TRACE("MCI_STATUS_READY !\n"); + switch (MCICDA_GetStatus(wmcda)) + { + case MCI_MODE_NOT_READY: + case MCI_MODE_OPEN: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + break; + default: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + break; + } + TRACE("MCI_STATUS_READY=%u!\n", LOWORD(lpParms->dwReturn)); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_TIME_FORMAT: + lpParms->dwReturn = MAKEMCIRESOURCE(wmcda->dwTimeFormat, MCI_FORMAT_RETURN_BASE + wmcda->dwTimeFormat); + TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn)); + ret = MCI_RESOURCE_RETURNED; + break; + case 4001: /* FIXME: for bogus FullCD */ + case MCI_CDA_STATUS_TYPE_TRACK: + if (!(dwFlags & MCI_TRACK)) + ret = MCIERR_MISSING_PARAMETER; + else { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + ret = MCIERR_OUTOFRANGE; + else + lpParms->dwReturn = (toc.TrackData[lpParms->dwTrack - toc.FirstTrack].Control & 0x04) ? + MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO; + } + TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%ld\n", lpParms->dwTrack, lpParms->dwReturn); + break; + default: + FIXME("unknown command %08lX !\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } else { + WARN("not MCI_STATUS_ITEM !\n"); + } + return ret; +} + +/************************************************************************** + * MCICDA_SkipDataTracks [internal] + */ +static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame) +{ + int i; + DWORD br; + CDROM_TOC toc; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + /* Locate first track whose starting frame is bigger than frame */ + for(i=toc.FirstTrack;i<=toc.LastTrack+1;i++) + if ( FRAME_OF_TOC(toc, i) > *frame ) break; + if (i <= toc.FirstTrack && i>toc.LastTrack+1) { + i = 0; /* requested address is out of range: go back to start */ + *frame = FRAME_OF_TOC(toc,toc.FirstTrack); + } + else + i--; + /* i points to last track whose start address is not greater than frame. + * Now skip non-audio tracks */ + for(;i<=toc.LastTrack+1;i++) + if ( ! (toc.TrackData[i-toc.FirstTrack].Control & 4) ) + break; + /* The frame will be an address in the next audio track or + * address of lead-out. */ + if ( FRAME_OF_TOC(toc, i) > *frame ) + *frame = FRAME_OF_TOC(toc, i); + return 0; +} + +/************************************************************************** + * MCICDA_Play [internal] + */ +static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD ret = 0, start, end; + DWORD br; + CDROM_PLAY_AUDIO_MSF play; + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + CDROM_TOC toc; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; + + if (wmcda == NULL) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_FROM) { + start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) + return ret; + TRACE("MCI_FROM=%08lX -> %lu \n", lpParms->dwFrom, start); + } else { + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + start = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) + return ret; + } + if (dwFlags & MCI_TO) { + end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); + TRACE("MCI_TO=%08lX -> %lu \n", lpParms->dwTo, end); + } else { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + end = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; + } + TRACE("Playing from %lu to %lu\n", start, end); + play.StartingM = start / CDFRAMES_PERMIN; + play.StartingS = (start / CDFRAMES_PERSEC) % 60; + play.StartingF = start % CDFRAMES_PERSEC; + play.EndingM = end / CDFRAMES_PERMIN; + play.EndingS = (end / CDFRAMES_PERSEC) % 60; + play.EndingF = end % CDFRAMES_PERSEC; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), + NULL, 0, &br, NULL)) { + ret = MCIERR_HARDWARE; + } else if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + /* + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + */ + } + return ret; +} + +/************************************************************************** + * MCICDA_Stop [internal] + */ +static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Pause [internal] + */ +static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Resume [internal] + */ +static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Seek [internal] + */ +static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) +{ + DWORD at; + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + CDROM_SEEK_AUDIO_MSF seek; + DWORD br, ret; + CDROM_TOC toc; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + switch (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)) { + case MCI_SEEK_TO_START: + TRACE("Seeking to start\n"); + at = FRAME_OF_TOC(toc,toc.FirstTrack); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + case MCI_SEEK_TO_END: + TRACE("Seeking to end\n"); + at = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + case MCI_TO: + TRACE("Seeking to %lu\n", lpParms->dwTo); + at = MCICDA_CalcFrame(wmcda, lpParms->dwTo); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + default: + TRACE("Unknown seek action %08lX\n", + (dwFlags & ~(MCI_NOTIFY|MCI_WAIT))); + return MCIERR_UNSUPPORTED_FUNCTION; + } + seek.M = at / CDFRAMES_PERMIN; + seek.S = (at / CDFRAMES_PERSEC) % 60; + seek.F = at % CDFRAMES_PERSEC; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), + NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_SetDoor [internal] + */ +static DWORD MCICDA_SetDoor(UINT wDevID, BOOL open) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE"); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, + (open) ? IOCTL_STORAGE_EJECT_MEDIA : IOCTL_STORAGE_LOAD_MEDIA, + NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + return 0; +} + +/************************************************************************** + * MCICDA_Set [internal] + */ +static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SET_DOOR_OPEN) { + MCICDA_SetDoor(wDevID, TRUE); + } + if (dwFlags & MCI_SET_DOOR_CLOSED) { + MCICDA_SetDoor(wDevID, FALSE); + } + + /* only functions which require valid lpParms below this line ! */ + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + /* + TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat); + TRACE("dwAudio=%08lX\n", lpParms->dwAudio); + */ + if (dwFlags & MCI_SET_TIME_FORMAT) { + switch (lpParms->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + TRACE("MCI_FORMAT_MILLISECONDS !\n"); + break; + case MCI_FORMAT_MSF: + TRACE("MCI_FORMAT_MSF !\n"); + break; + case MCI_FORMAT_TMSF: + TRACE("MCI_FORMAT_TMSF !\n"); + break; + default: + WARN("bad time format !\n"); + return MCIERR_BAD_TIME_FORMAT; + } + wmcda->dwTimeFormat = lpParms->dwTimeFormat; + } + if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", + lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * DriverProc (MCICDA.@) + */ +LONG CALLBACK MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, + DWORD dwParam1, DWORD dwParam2) +{ + switch(wMsg) { + case DRV_LOAD: return 1; + case DRV_FREE: return 1; + case DRV_OPEN: return MCICDA_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); + case DRV_CLOSE: return MCICDA_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "MCI audio CD driver !", "Wine Driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + } + + if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; + + switch (wMsg) { + case MCI_OPEN_DRIVER: return MCICDA_Open(dwDevID, dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); + case MCI_CLOSE_DRIVER: return MCICDA_Close(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_GETDEVCAPS: return MCICDA_GetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); + case MCI_INFO: return MCICDA_Info(dwDevID, dwParam1, (LPMCI_INFO_PARMSW)dwParam2); + case MCI_STATUS: return MCICDA_Status(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); + case MCI_SET: return MCICDA_Set(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2); + case MCI_PLAY: return MCICDA_Play(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2); + case MCI_STOP: return MCICDA_Stop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_PAUSE: return MCICDA_Pause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_RESUME: return MCICDA_Resume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_SEEK: return MCICDA_Seek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); + /* commands that should report an error as they are not supported in + * the native version */ + case MCI_SET_DOOR_CLOSED: + case MCI_SET_DOOR_OPEN: + case MCI_LOAD: + case MCI_SAVE: + case MCI_FREEZE: + case MCI_PUT: + case MCI_REALIZE: + case MCI_UNFREEZE: + case MCI_UPDATE: + case MCI_WHERE: + case MCI_STEP: + case MCI_SPIN: + case MCI_ESCAPE: + case MCI_COPY: + case MCI_CUT: + case MCI_DELETE: + case MCI_PASTE: + case MCI_WINDOW: + TRACE("Unsupported command [0x%lx]\n", wMsg); + break; + case MCI_OPEN: + case MCI_CLOSE: + ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n"); + break; + default: + TRACE("Sending msg [0x%lx] to default driver proc\n", wMsg); + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } + return MCIERR_UNRECOGNIZED_COMMAND; +} + +/*-----------------------------------------------------------------------*/ diff -Nru wine/dlls/mcicda/mcicda.spec winedev/dlls/mcicda/mcicda.spec --- wine/dlls/mcicda/mcicda.spec 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/mcicda.spec 2002-06-21 21:15:50.000000000 +0200 @@ -0,0 +1 @@ +@ stdcall DriverProc(long long long long long) MCICDA_DriverProc diff -Nru wine/dlls/winmm/mcicda/.cvsignore winedev/dlls/winmm/mcicda/.cvsignore --- wine/dlls/winmm/mcicda/.cvsignore 2004-03-24 04:36:45.000000000 +0100 +++ winedev/dlls/winmm/mcicda/.cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Makefile -mcicda.drv.dbg.c diff -Nru wine/dlls/winmm/mcicda/Makefile.in winedev/dlls/winmm/mcicda/Makefile.in --- wine/dlls/winmm/mcicda/Makefile.in 2005-02-09 23:26:26.000000000 +0100 +++ winedev/dlls/winmm/mcicda/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = mcicda.drv -IMPORTS = winmm user32 kernel32 -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - mcicda.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff -Nru wine/dlls/winmm/mcicda/mcicda.c winedev/dlls/winmm/mcicda/mcicda.c --- wine/dlls/winmm/mcicda/mcicda.c 2005-02-09 23:26:26.000000000 +0100 +++ winedev/dlls/winmm/mcicda/mcicda.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1053 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * MCI driver for audio CD (MCICDA) - * - * Copyright 1994 Martin Ayotte - * Copyright 1998-99 Eric Pouech - * Copyright 2000 Andreas Mohr - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ntstatus.h" -#include "wownt32.h" -#include "mmddk.h" -#include "winioctl.h" -#include "ntddstor.h" -#include "ntddcdrm.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mcicda); - -#define CDFRAMES_PERSEC 75 -#define CDFRAMES_PERMIN (CDFRAMES_PERSEC * 60) -#define FRAME_OF_ADDR(a) ((a)[1] * CDFRAMES_PERMIN + (a)[2] * CDFRAMES_PERSEC + (a)[3]) -#define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address) - -typedef struct { - UINT wDevID; - int nUseCount; /* Incremented for each shared open */ - BOOL fShareable; /* TRUE if first open was shareable */ - WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ - HANDLE hCallback; /* Callback handle for pending notification */ - DWORD dwTimeFormat; - HANDLE handle; -} WINE_MCICDAUDIO; - -/*-----------------------------------------------------------------------*/ - -/************************************************************************** - * MCICDA_drvOpen [internal] - */ -static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) -{ - WINE_MCICDAUDIO* wmcda; - - if (!modp) return 0xFFFFFFFF; - - wmcda = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCICDAUDIO)); - - if (!wmcda) - return 0; - - wmcda->wDevID = modp->wDeviceID; - mciSetDriverData(wmcda->wDevID, (DWORD)wmcda); - modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; - modp->wType = MCI_DEVTYPE_CD_AUDIO; - return modp->wDeviceID; -} - -/************************************************************************** - * MCICDA_drvClose [internal] - */ -static DWORD MCICDA_drvClose(DWORD dwDevID) -{ - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); - - if (wmcda) { - HeapFree(GetProcessHeap(), 0, wmcda); - mciSetDriverData(dwDevID, 0); - } - return (dwDevID == 0xFFFFFFFF) ? 1 : 0; -} - -/************************************************************************** - * MCICDA_GetOpenDrv [internal] - */ -static WINE_MCICDAUDIO* MCICDA_GetOpenDrv(UINT wDevID) -{ - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); - - if (wmcda == NULL || wmcda->nUseCount == 0) { - WARN("Invalid wDevID=%u\n", wDevID); - return 0; - } - return wmcda; -} - -/************************************************************************** - * MCICDA_GetStatus [internal] - */ -static DWORD MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda) -{ - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - DWORD br; - DWORD mode = MCI_MODE_NOT_READY; - - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; - } else { - switch (data.CurrentPosition.Header.AudioStatus) - { - case AUDIO_STATUS_IN_PROGRESS: mode = MCI_MODE_PLAY; break; - case AUDIO_STATUS_PAUSED: mode = MCI_MODE_PAUSE; break; - case AUDIO_STATUS_NO_STATUS: - case AUDIO_STATUS_PLAY_COMPLETE: mode = MCI_MODE_STOP; break; - case AUDIO_STATUS_PLAY_ERROR: - case AUDIO_STATUS_NOT_SUPPORTED: - default: - break; - } - } - return mode; -} - -/************************************************************************** - * MCICDA_GetError [internal] - */ -static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) -{ - switch (GetLastError()) - { - case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; - case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; - default: - FIXME("Unknown mode %lx\n", GetLastError()); - } - return MCIERR_DRIVER_INTERNAL; -} - -/************************************************************************** - * MCICDA_CalcFrame [internal] - */ -static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime) -{ - DWORD dwFrame = 0; - UINT wTrack; - CDROM_TOC toc; - DWORD br; - BYTE* addr; - - TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime); - - switch (wmcda->dwTimeFormat) { - case MCI_FORMAT_MILLISECONDS: - dwFrame = ((dwTime - 1) * CDFRAMES_PERSEC + 500) / 1000; - TRACE("MILLISECONDS %lu\n", dwFrame); - break; - case MCI_FORMAT_MSF: - TRACE("MSF %02u:%02u:%02u\n", - MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), MCI_MSF_FRAME(dwTime)); - dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime); - dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime); - dwFrame += MCI_MSF_FRAME(dwTime); - break; - case MCI_FORMAT_TMSF: - default: /* unknown format ! force TMSF ! ... */ - wTrack = MCI_TMSF_TRACK(dwTime); - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) - return 0; - if (wTrack < toc.FirstTrack || wTrack > toc.LastTrack) - return 0; - TRACE("MSF %02u-%02u:%02u:%02u\n", - MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime), - MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime)); - addr = toc.TrackData[wTrack - toc.FirstTrack].Address; - TRACE("TMSF trackpos[%u]=%d:%d:%d\n", - wTrack, addr[1], addr[2], addr[3]); - dwFrame = CDFRAMES_PERMIN * (addr[1] + MCI_TMSF_MINUTE(dwTime)) + - CDFRAMES_PERSEC * (addr[2] + MCI_TMSF_SECOND(dwTime)) + - addr[3] + MCI_TMSF_FRAME(dwTime); - break; - } - return dwFrame; -} - -/************************************************************************** - * MCICDA_CalcTime [internal] - */ -static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LPDWORD lpRet) -{ - DWORD dwTime = 0; - UINT wTrack; - UINT wMinutes; - UINT wSeconds; - UINT wFrames; - CDROM_TOC toc; - DWORD br; - - TRACE("(%p, %08lX, %lu);\n", wmcda, tf, dwFrame); - - switch (tf) { - case MCI_FORMAT_MILLISECONDS: - dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC + 1; - TRACE("MILLISECONDS %lu\n", dwTime); - *lpRet = 0; - break; - case MCI_FORMAT_MSF: - wMinutes = dwFrame / CDFRAMES_PERMIN; - wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; - wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); - TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n", - wMinutes, wSeconds, wFrames, dwTime); - *lpRet = MCI_COLONIZED3_RETURN; - break; - case MCI_FORMAT_TMSF: - default: /* unknown format ! force TMSF ! ... */ - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) - return 0; - if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || - dwFrame > FRAME_OF_TOC(toc, toc.LastTrack + 1)) { - ERR("Out of range value %lu [%u,%u]\n", - dwFrame, FRAME_OF_TOC(toc, toc.FirstTrack), - FRAME_OF_TOC(toc, toc.LastTrack + 1)); - *lpRet = 0; - return 0; - } - for (wTrack = toc.FirstTrack; wTrack <= toc.LastTrack; wTrack++) { - if (FRAME_OF_TOC(toc, wTrack) > dwFrame) - break; - } - wTrack--; - dwFrame -= FRAME_OF_TOC(toc, wTrack); - wMinutes = dwFrame / CDFRAMES_PERMIN; - wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; - wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames); - TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); - *lpRet = MCI_COLONIZED4_RETURN; - break; - } - return dwTime; -} - -static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms); -static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); - -/************************************************************************** - * MCICDA_Open [internal] - */ -static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) -{ - DWORD dwDeviceID; - DWORD ret = MCIERR_HARDWARE; - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); - WCHAR root[7], drive = 0; - int count; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); - - if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - dwDeviceID = lpOpenParms->wDeviceID; - - if (wmcda->nUseCount > 0) { - /* The driver is already open on this channel */ - /* If the driver was opened shareable before and this open specifies */ - /* shareable then increment the use count */ - if (wmcda->fShareable && (dwFlags & MCI_OPEN_SHAREABLE)) - ++wmcda->nUseCount; - else - return MCIERR_MUST_USE_SHAREABLE; - } else { - wmcda->nUseCount = 1; - wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE; - } - if (dwFlags & MCI_OPEN_ELEMENT) { - if (dwFlags & MCI_OPEN_ELEMENT_ID) { - WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort\n", (DWORD)lpOpenParms->lpstrElementName); - return MCIERR_NO_ELEMENT_ALLOWED; - } - TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || - (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) - { - WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", - debugstr_w(lpOpenParms->lpstrElementName)); - ret = MCIERR_NO_ELEMENT_ALLOWED; - goto the_error; - } - drive = toupper(lpOpenParms->lpstrElementName[0]); - root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; - if (GetDriveTypeW(root) != DRIVE_CDROM) - { - ret = MCIERR_INVALID_DEVICE_NAME; - goto the_error; - } - } - else - { - /* drive letter isn't passed... get the dwDeviceID'th cdrom in the system */ - root[0] = 'A'; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; - for (count = 0; root[0] <= 'Z'; root[0]++) - { - if (GetDriveTypeW(root) == DRIVE_CDROM && ++count >= dwDeviceID) - { - drive = root[0]; - break; - } - } - if (!drive) - { - ret = MCIERR_INVALID_DEVICE_ID; - goto the_error; - } - } - - wmcda->wNotifyDeviceID = dwDeviceID; - wmcda->dwTimeFormat = MCI_FORMAT_MSF; - - /* now, open the handle */ - root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; - wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != INVALID_HANDLE_VALUE) - return 0; - - the_error: - --wmcda->nUseCount; - return ret; -} - -/************************************************************************** - * MCICDA_Close [internal] - */ -static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (--wmcda->nUseCount == 0) { - CloseHandle(wmcda->handle); - } - return 0; -} - -/************************************************************************** - * MCICDA_GetDevCaps [internal] - */ -static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, - LPMCI_GETDEVCAPS_PARMS lpParms) -{ - DWORD ret = 0; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - - if (dwFlags & MCI_GETDEVCAPS_ITEM) { - TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); - - switch (lpParms->dwItem) { - case MCI_GETDEVCAPS_CAN_RECORD: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_AUDIO: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_VIDEO: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_DEVICE_TYPE: - lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_CD_AUDIO, MCI_DEVTYPE_CD_AUDIO); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_USES_FILES: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_COMPOUND_DEVICE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_EJECT: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_PLAY: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_SAVE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - default: - ERR("Unsupported %lx devCaps item\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - TRACE("No GetDevCaps-Item !\n"); - return MCIERR_UNRECOGNIZED_COMMAND; - } - TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); - return ret; -} - -static DWORD CDROM_Audio_GetSerial(CDROM_TOC* toc) -{ - unsigned long serial = 0; - int i; - WORD wMagic; - DWORD dwStart, dwEnd; - - /* - * wMagic collects the wFrames from track 1 - * dwStart, dwEnd collect the beginning and end of the disc respectively, in - * frames. - * There it is collected for correcting the serial when there are less than - * 3 tracks. - */ - wMagic = toc->TrackData[0].Address[3]; - dwStart = FRAME_OF_TOC(*toc, toc->FirstTrack); - - for (i = 0; i <= toc->LastTrack - toc->FirstTrack; i++) { - serial += (toc->TrackData[i].Address[1] << 16) | - (toc->TrackData[i].Address[2] << 8) | toc->TrackData[i].Address[3]; - } - dwEnd = FRAME_OF_TOC(*toc, toc->LastTrack + 1); - - if (toc->LastTrack - toc->FirstTrack + 1 < 3) - serial += wMagic + (dwEnd - dwStart); - - return serial; -} - - -/************************************************************************** - * MCICDA_Info [internal] - */ -static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) -{ - LPCWSTR str = NULL; - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD ret = 0; - WCHAR buffer[16]; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); - - if (dwFlags & MCI_INFO_PRODUCT) { - static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; - str = wszAudioCd; - } else if (dwFlags & MCI_INFO_MEDIA_UPC) { - ret = MCIERR_NO_IDENTITY; - } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { - DWORD res = 0; - CDROM_TOC toc; - DWORD br; - static const WCHAR wszLu[] = {'%','l','u',0}; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - - res = CDROM_Audio_GetSerial(&toc); - sprintfW(buffer, wszLu, res); - str = buffer; - } else { - WARN("Don't know this info command (%lu)\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; - } - TRACE("=> %s (%ld)\n", debugstr_w(lpParms->lpstrReturn), ret); - return ret; -} - -/************************************************************************** - * MCICDA_Status [internal] - */ -static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD idx; - DWORD ret = 0; - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - CDROM_TOC toc; - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - if (dwFlags & MCI_STATUS_ITEM) { - TRACE("dwItem = %lx\n", lpParms->dwItem); - switch (lpParms->dwItem) { - case MCI_STATUS_CURRENT_TRACK: - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) - { - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = data.CurrentPosition.TrackNumber; - TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn); - break; - case MCI_STATUS_LENGTH: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (dwFlags & MCI_TRACK) { - TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - return MCIERR_OUTOFRANGE; - idx = lpParms->dwTrack - toc.FirstTrack; - lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - - FRAME_OF_TOC(toc, lpParms->dwTrack); - /* Windows returns one frame less than the total track length for the - last track on the CD. See CDDB HOWTO. Verified on Win95OSR2. */ - if (lpParms->dwTrack == toc.LastTrack) - lpParms->dwReturn--; - } else { - /* Sum of the lengths of all of the tracks. Inherits the - 'off by one frame' behavior from the length of the last track. - See above comment. */ - lpParms->dwReturn = FRAME_OF_TOC(toc, toc.LastTrack + 1) - - FRAME_OF_TOC(toc, toc.FirstTrack) - 1; - } - lpParms->dwReturn = MCICDA_CalcTime(wmcda, - (wmcda->dwTimeFormat == MCI_FORMAT_TMSF) - ? MCI_FORMAT_MSF : wmcda->dwTimeFormat, - lpParms->dwReturn, - &ret); - TRACE("LENGTH=%lu !\n", lpParms->dwReturn); - break; - case MCI_STATUS_MODE: - lpParms->dwReturn = MCICDA_GetStatus(wmcda); - TRACE("MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn); - lpParms->dwReturn = MAKEMCIRESOURCE(lpParms->dwReturn, lpParms->dwReturn); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_MEDIA_PRESENT: - lpParms->dwReturn = (MCICDA_GetStatus(wmcda) == MCI_MODE_OPEN) ? - MAKEMCIRESOURCE(FALSE, MCI_FALSE) : MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_STATUS_MEDIA_PRESENT =%c!\n", LOWORD(lpParms->dwReturn) ? 'Y' : 'N'); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_NUMBER_OF_TRACKS: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn); - if (lpParms->dwReturn == (WORD)-1) - return MCICDA_GetError(wmcda); - break; - case MCI_STATUS_POSITION: - if (dwFlags & MCI_STATUS_START) { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack); - TRACE("get MCI_STATUS_START !\n"); - } else if (dwFlags & MCI_TRACK) { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - return MCIERR_OUTOFRANGE; - lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); - TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); - } else { - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); - } - lpParms->dwReturn = MCICDA_CalcTime(wmcda, wmcda->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn); - break; - case MCI_STATUS_READY: - TRACE("MCI_STATUS_READY !\n"); - switch (MCICDA_GetStatus(wmcda)) - { - case MCI_MODE_NOT_READY: - case MCI_MODE_OPEN: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - break; - default: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - break; - } - TRACE("MCI_STATUS_READY=%u!\n", LOWORD(lpParms->dwReturn)); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_TIME_FORMAT: - lpParms->dwReturn = MAKEMCIRESOURCE(wmcda->dwTimeFormat, MCI_FORMAT_RETURN_BASE + wmcda->dwTimeFormat); - TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn)); - ret = MCI_RESOURCE_RETURNED; - break; - case 4001: /* FIXME: for bogus FullCD */ - case MCI_CDA_STATUS_TYPE_TRACK: - if (!(dwFlags & MCI_TRACK)) - ret = MCIERR_MISSING_PARAMETER; - else { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - ret = MCIERR_OUTOFRANGE; - else - lpParms->dwReturn = (toc.TrackData[lpParms->dwTrack - toc.FirstTrack].Control & 0x04) ? - MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO; - } - TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%ld\n", lpParms->dwTrack, lpParms->dwReturn); - break; - default: - FIXME("unknown command %08lX !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - WARN("not MCI_STATUS_ITEM !\n"); - } - return ret; -} - -/************************************************************************** - * MCICDA_SkipDataTracks [internal] - */ -static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame) -{ - int i; - DWORD br; - CDROM_TOC toc; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - /* Locate first track whose starting frame is bigger than frame */ - for(i=toc.FirstTrack;i<=toc.LastTrack+1;i++) - if ( FRAME_OF_TOC(toc, i) > *frame ) break; - if (i <= toc.FirstTrack && i>toc.LastTrack+1) { - i = 0; /* requested address is out of range: go back to start */ - *frame = FRAME_OF_TOC(toc,toc.FirstTrack); - } - else - i--; - /* i points to last track whose start address is not greater than frame. - * Now skip non-audio tracks */ - for(;i<=toc.LastTrack+1;i++) - if ( ! (toc.TrackData[i-toc.FirstTrack].Control & 4) ) - break; - /* The frame will be an address in the next audio track or - * address of lead-out. */ - if ( FRAME_OF_TOC(toc, i) > *frame ) - *frame = FRAME_OF_TOC(toc, i); - return 0; -} - -/************************************************************************** - * MCICDA_Play [internal] - */ -static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD ret = 0, start, end; - DWORD br; - CDROM_PLAY_AUDIO_MSF play; - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - CDROM_TOC toc; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; - - if (wmcda == NULL) - return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_FROM) { - start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) - return ret; - TRACE("MCI_FROM=%08lX -> %lu \n", lpParms->dwFrom, start); - } else { - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - start = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) - return ret; - } - if (dwFlags & MCI_TO) { - end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); - TRACE("MCI_TO=%08lX -> %lu \n", lpParms->dwTo, end); - } else { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - end = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; - } - TRACE("Playing from %lu to %lu\n", start, end); - play.StartingM = start / CDFRAMES_PERMIN; - play.StartingS = (start / CDFRAMES_PERSEC) % 60; - play.StartingF = start % CDFRAMES_PERSEC; - play.EndingM = end / CDFRAMES_PERMIN; - play.EndingS = (end / CDFRAMES_PERSEC) % 60; - play.EndingF = end % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), - NULL, 0, &br, NULL)) { - ret = MCIERR_HARDWARE; - } else if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - /* - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - */ - } - return ret; -} - -/************************************************************************** - * MCICDA_Stop [internal] - */ -static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Pause [internal] - */ -static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Resume [internal] - */ -static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Seek [internal] - */ -static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) -{ - DWORD at; - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - CDROM_SEEK_AUDIO_MSF seek; - DWORD br, ret; - CDROM_TOC toc; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - switch (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)) { - case MCI_SEEK_TO_START: - TRACE("Seeking to start\n"); - at = FRAME_OF_TOC(toc,toc.FirstTrack); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - case MCI_SEEK_TO_END: - TRACE("Seeking to end\n"); - at = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - case MCI_TO: - TRACE("Seeking to %lu\n", lpParms->dwTo); - at = MCICDA_CalcFrame(wmcda, lpParms->dwTo); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - default: - TRACE("Unknown seek action %08lX\n", - (dwFlags & ~(MCI_NOTIFY|MCI_WAIT))); - return MCIERR_UNSUPPORTED_FUNCTION; - } - seek.M = at / CDFRAMES_PERMIN; - seek.S = (at / CDFRAMES_PERSEC) % 60; - seek.F = at % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), - NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_SetDoor [internal] - */ -static DWORD MCICDA_SetDoor(UINT wDevID, BOOL open) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE"); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, - (open) ? IOCTL_STORAGE_EJECT_MEDIA : IOCTL_STORAGE_LOAD_MEDIA, - NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - return 0; -} - -/************************************************************************** - * MCICDA_Set [internal] - */ -static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_SET_DOOR_OPEN) { - MCICDA_SetDoor(wDevID, TRUE); - } - if (dwFlags & MCI_SET_DOOR_CLOSED) { - MCICDA_SetDoor(wDevID, FALSE); - } - - /* only functions which require valid lpParms below this line ! */ - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - /* - TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat); - TRACE("dwAudio=%08lX\n", lpParms->dwAudio); - */ - if (dwFlags & MCI_SET_TIME_FORMAT) { - switch (lpParms->dwTimeFormat) { - case MCI_FORMAT_MILLISECONDS: - TRACE("MCI_FORMAT_MILLISECONDS !\n"); - break; - case MCI_FORMAT_MSF: - TRACE("MCI_FORMAT_MSF !\n"); - break; - case MCI_FORMAT_TMSF: - TRACE("MCI_FORMAT_TMSF !\n"); - break; - default: - WARN("bad time format !\n"); - return MCIERR_BAD_TIME_FORMAT; - } - wmcda->dwTimeFormat = lpParms->dwTimeFormat; - } - if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", - lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * DriverProc (MCICDA.@) - */ -LONG CALLBACK MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) -{ - switch(wMsg) { - case DRV_LOAD: return 1; - case DRV_FREE: return 1; - case DRV_OPEN: return MCICDA_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); - case DRV_CLOSE: return MCICDA_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "MCI audio CD driver !", "Wine Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - } - - if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; - - switch (wMsg) { - case MCI_OPEN_DRIVER: return MCICDA_Open(dwDevID, dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); - case MCI_CLOSE_DRIVER: return MCICDA_Close(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_GETDEVCAPS: return MCICDA_GetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); - case MCI_INFO: return MCICDA_Info(dwDevID, dwParam1, (LPMCI_INFO_PARMSW)dwParam2); - case MCI_STATUS: return MCICDA_Status(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); - case MCI_SET: return MCICDA_Set(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2); - case MCI_PLAY: return MCICDA_Play(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2); - case MCI_STOP: return MCICDA_Stop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_PAUSE: return MCICDA_Pause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_RESUME: return MCICDA_Resume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_SEEK: return MCICDA_Seek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); - /* commands that should report an error as they are not supported in - * the native version */ - case MCI_SET_DOOR_CLOSED: - case MCI_SET_DOOR_OPEN: - case MCI_LOAD: - case MCI_SAVE: - case MCI_FREEZE: - case MCI_PUT: - case MCI_REALIZE: - case MCI_UNFREEZE: - case MCI_UPDATE: - case MCI_WHERE: - case MCI_STEP: - case MCI_SPIN: - case MCI_ESCAPE: - case MCI_COPY: - case MCI_CUT: - case MCI_DELETE: - case MCI_PASTE: - case MCI_WINDOW: - TRACE("Unsupported command [0x%lx]\n", wMsg); - break; - case MCI_OPEN: - case MCI_CLOSE: - ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n"); - break; - default: - TRACE("Sending msg [0x%lx] to default driver proc\n", wMsg); - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } - return MCIERR_UNRECOGNIZED_COMMAND; -} - -/*-----------------------------------------------------------------------*/ diff -Nru wine/dlls/winmm/mcicda/mcicda.drv.spec winedev/dlls/winmm/mcicda/mcicda.drv.spec --- wine/dlls/winmm/mcicda/mcicda.drv.spec 2002-06-21 21:15:50.000000000 +0200 +++ winedev/dlls/winmm/mcicda/mcicda.drv.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -@ stdcall DriverProc(long long long long long) MCICDA_DriverProc diff -Nru wine/tools/winapi/win32.api winedev/tools/winapi/win32.api --- wine/tools/winapi/win32.api 2005-07-21 20:36:44.000000000 +0200 +++ winedev/tools/winapi/win32.api 2005-07-22 14:47:09.000000000 +0200 @@ -1806,7 +1806,7 @@ HDRVR LONG -%%mcicda.drv +%%mcicda.dll %long diff -Nru wine/tools/wine.inf winedev/tools/wine.inf --- wine/tools/wine.inf 2005-06-29 20:29:00.000000000 +0200 +++ winedev/tools/wine.inf 2005-07-22 14:46:50.000000000 +0200 @@ -208,7 +208,7 @@ [MCI] HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv" -HKLM,%Mci32Str%,"CDAudio",,"mcicda.drv" +HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll" HKLM,%Mci32Str%,"Sequencer",,"mciseq.drv" HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv" @@ -2065,7 +2065,7 @@ system.ini, mci,,"MPEGVideo=mciqtz.drv" system.ini, mci,,"MPEGVideo2=mciqtz.drv" system.ini, mci,,"avivideo=mciavi.drv" -system.ini, mci,,"cdaudio=mcicda.drv" +system.ini, mci,,"cdaudio=mcicda.dll" system.ini, mci,,"sequencer=mciseq.drv" system.ini, mci,,"vcr=mcivisca.drv" system.ini, mci,,"; videodisc=mcipionr.drv"

1 0

Re: [ntdll/tests/info.c] Skip test if needed
by Felix Nawothnig 22 Jul '05

22 Jul '05

Paul Vriens wrote: > every now and then one of the tests failed. Probably because a process is > not longer there. You could spawn a child-process in the test which would be more reliable (or you could query the current process - that's what I do in the psapi tests)... Felix

2 1

Re: PATCH: EnumProps16 do not enumerate non strings
by Alexandre Julliard 22 Jul '05

22 Jul '05

Marcus Meissner <meissner(a)suse.de> writes: > In 2001 when windows/property.c moved to dlls/user/property.c additionaly > EnumProps16 gained the ability to enumerate non-string atoms. > > This brings a 16 bit application I have here to crash in > repne scansb es:(di), so it clearly expects get only strings. > > Ciao, Marcus > > Changelog: > Do not enumerate non-strings in EnumProp16. That ability was added specifically for 16-bit apps, so I don't think it should be removed. Probably the problem is because of some Wine internal property. Can you find out which property is causing trouble? -- Alexandre Julliard julliard(a)winehq.org

2 1

winrash and ntservice
by Paul Walker 22 Jul '05

22 Jul '05

I just joined this list and noticed the nt service messages (below) I haven't investigated what winrash is, but _assuming_ that you need it as a service on NT, then the problem appears to be that it needs to display windows (or interact with the user somehow). The main problem will be that services run on their own desktop (unique to the service, not the logon, screensaver or iteractive desktops). A message box can be displayed on the interactive desktop by using the MB_SERVICE_NOTIFICATION flag with MessageBox(). To actually display some more complex UI, you need to create the window on the correct desktop. Check MSDN (msdn.microsoft.com) for details, but the following is what is probably required: 1. Call OpenInputDesktop(). 2. Call SetThreadDesktop() to allow the current thread to use that desktop. 3. Create your windows etc. Note the security risk msdn notes for SetThreadDesktop. This is because the service is probably running as a priviledged user (the LocalSystem account unless specified otherwise). It will need the elevated priviledges to attach to the desktop which will have an ACL that only allows the current logged in user). Hope that's enough to get someone working on this (sorry, I'm not volunteering :-( Robert Shearman wrote: >> >> >> Only on Win95/98/ME. > > > > I thought we'd fixed the problems with running it as a service on NT > so that it could again be run automatically? > Not as far as i know. It was recommended to mark the winrash service as "allowed to interact with desktop" or some such. It didn't help though. //Jakob

2 1

Changing DLL imports in wine
by Damjan Jovanovic 22 Jul '05

22 Jul '05

I'd like to know if there are any functions in Wine for changing the function pointer values in a DLL's (or, for that matter, an executable's) import table at the time it is loaded. ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

3 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel