PATCH: /dlls/ntdll/cdrom.c -- portability breakage

[Gerald Pfeifer]

On Thu, 20 Feb 2003, Waldeck Schutzer wrote:
> Thank you for reporting this issue of portability breach. I appologize
> for the inconvenience. Your correction seems sound, but I think there is
> no need to remove the trace line which can be useful for debugging
> cdrom.c. Just change it the way I'm proposing below and it should be
> portable.

Thanks for your quick response!  I noticed that Alexandre has applied
the patch with the improvement you suggested (so also thanks to him). ;-)

Unfortunately, I missed one detail: CDROM_MSF is not defined on FreeBSD;
I'm not sure whether the following really is correct, but FWIW it fixes
compilation.

Gerald (who had been offline for three weeks)

ChangeLog:
Only use CDROM_MSF is defined.

Index: cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.26
diff -u -3 -p -r1.26 cdrom.c
--- cdrom.c	25 Feb 2003 03:56:21 -0000	1.26
+++ cdrom.c	14 Mar 2003 17:51:33 -0000
@@ -1045,7 +1045,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
     if (i <= toc.FirstTrack || i > toc.LastTrack+1)
       return STATUS_INVALID_PARAMETER;
     i--;
-    cp->FormatCode = CDROM_MSF;
+#ifdef CDROM_MSF
+    cp->FormatCode = CDROM_MSF;
+#endif
     cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
     cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
     cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;