ntdll/cdrom : implement CDROM_Verify to work on Mac OS X, with comment (try 3)
--- dlls/ntdll/cdrom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..6a6d8e0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1121,6 +1121,10 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; +#elif defined(__APPLE__) + /* At this point, we know that we have media, because in Mac OS X, the + * device file is only created when media is present. */ + return STATUS_SUCCESS; #else FIXME("not supported on this O/S\n"); return STATUS_NOT_SUPPORTED; -- 1.7.3.2
Loïc, Your mailer seems to have mangled your patch with line wrapping. There are some suggestions on Wine's SubmittingPatches wiki page for avoiding this. Primarily, you should attach the patch to your email. If you already did that, then you may need to use a different mailer. For example, Mail.app used to mess up even attached patches, although it doesn't for me anymore. (I don't know if that's because Mail.app changed or if git-format-patch changes.) When it used to be a problem, I had to use Thunderbird to send my Wine patches. Cheers, Ken On Jan 23, 2011, at 3:47 AM, Loïc Maury wrote:
--- dlls/ntdll/cdrom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..6a6d8e0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1121,6 +1121,10 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; +#elif defined(__APPLE__) + /* At this point, we know that we have media, because in Mac OS X, the + * device file is only created when media is present. */ + return STATUS_SUCCESS; #else FIXME("not supported on this O/S\n"); return STATUS_NOT_SUPPORTED; -- 1.7.3.2
On 25 January 2011 00:29, Ken Thomases <ken(a)codeweavers.com> wrote:
Your mailer seems to have mangled your patch with line wrapping. There are some suggestions on Wine's SubmittingPatches wiki page for avoiding this. Primarily, you should attach the patch to your email. If you already did that, then you may need to use a different mailer. For example, Mail.app used to mess up even attached patches, although it doesn't for me anymore. (I don't know if that's because Mail.app changed or if git-format-patch changes.) When it used to be a problem, I had to use Thunderbird to send my Wine patches.
Just use git format-patch for sending patches, if possible. Mail clients are just terrible, and using git format-patch avoids a lot of the common issues. If you send more than one or two patches it's usually faster too.
On 1/24/11 4:51 PM, Henri Verbeet wrote:
On 25 January 2011 00:29, Ken Thomases <ken(a)codeweavers.com> wrote:
Your mailer seems to have mangled your patch with line wrapping. There are some suggestions on Wine's SubmittingPatches wiki page for avoiding this. Primarily, you should attach the patch to your email. If you already did that, then you may need to use a different mailer. For example, Mail.app used to mess up even attached patches, although it doesn't for me anymore. (I don't know if that's because Mail.app changed or if git-format-patch changes.) When it used to be a problem, I had to use Thunderbird to send my Wine patches.
Just use git format-patch for sending patches, if possible. Uh, you mean git send-email, right? All git format-patch does is, well, format patches so they can be sent by a mail client.
Chip
On Tue, Jan 25, 2011 at 12:29 AM, Ken Thomases <ken(a)codeweavers.com> wrote:
Loïc,
Your mailer seems to have mangled your patch with line wrapping. There are some suggestions on Wine's SubmittingPatches wiki page for avoiding this. Primarily, you should attach the patch to your email. If you already did that, then you may need to use a different mailer. For example, Mail.app used to mess up even attached patches, although it doesn't for me anymore. (I don't know if that's because Mail.app changed or if git-format-patch changes.) When it used to be a problem, I had to use Thunderbird to send my Wine patches.
Thank you for advices, I will use Thunderbird. Loïc
participants (4)
-
Charles Davis -
Henri Verbeet -
Ken Thomases -
Loïc Maury