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

Waldeck Schutzer schutzer at math.rutgers.edu
Tue Apr 1 11:01:59 CST 2003


Hi Eric,

I think this should fix this portability issue. I think it should 
probably be harmless to define CDROM_MSF for non-linux platforms since I 
suppse that is the prefered format for Windows. The proposed patch is 
attached.

Best,
Waldeck

Eric Pouech wrote:

> Alexandre Julliard wrote:
>
>> Gerald Pfeifer <pfeifer at dbai.tuwien.ac.at> writes:
>>
>>
>>> How about the following patch?
>>>
>>> It's needed for compilation on FreeBSD; in case it's not correct,
>>> how should we solve the problem?
>>
>>
>>
>> I think the code is wrong, we shouldn't store a Linux-only define in a
>> Windows structure, we should use a Windows define. Any one knows what
>> the right value should be?
>>
> the code is wrong (evil cut & paste IMO). we should use 
> IOCTL_CDROM_CURRENT_POSITION in FormatCode
>
> A+



-------------- next part --------------
Index: wine/dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.27
diff -u -p -r1.27 cdrom.c
--- wine/dlls/ntdll/cdrom.c	20 Mar 2003 21:59:50 -0000	1.27
+++ wine/dlls/ntdll/cdrom.c	1 Apr 2003 16:59:45 -0000
@@ -81,6 +81,9 @@
 #ifndef CD_FRAMES
   #define CD_FRAMES            75 /* frames per second */
 #endif
+#ifndef CDROM_MSF
+  #define CDROM_MSF		0x02
+#endif
 
 static const struct iocodexs
 {


More information about the wine-patches mailing list