April 2007 - Wine-commits - list.winehq.org

Yuval Fledel : schannel: Implement SpUserModeInitialize.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: cdb91ab7eea33d07633e732ccfa36dbf38b8cab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb91ab7eea33d07633e732cc… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Wed Apr 25 22:47:32 2007 +0300 schannel: Implement SpUserModeInitialize. --- dlls/schannel/Makefile.in | 3 +- dlls/schannel/schannel.spec | 2 +- dlls/schannel/usermode.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index e0de3b3..3cf48ef 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = secur32 kernel32 C_SRCS = \ lsamode.c \ - schannel_main.c + schannel_main.c \ + usermode.c @MAKE_DLL_RULES@ diff --git a/dlls/schannel/schannel.spec b/dlls/schannel/schannel.spec index 5c38050..c330c83 100644 --- a/dlls/schannel/schannel.spec +++ b/dlls/schannel/schannel.spec @@ -24,7 +24,7 @@ @ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stdcall SpLsaModeInitialize(long ptr ptr ptr) -@ stub SpUserModeInitialize +@ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate @ stub SslEmptyCacheA @ stub SslEmptyCacheW diff --git a/dlls/schannel/usermode.c b/dlls/schannel/usermode.c new file mode 100644 index 0000000..0713f82 --- /dev/null +++ b/dlls/schannel/usermode.c @@ -0,0 +1,85 @@ +/* + * User-mode functions of the SChannel security provider + * + * Copyright 2007 Yuval Fledel + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = +{ { + NULL, /* InstanceInit */ + NULL, /* InitUserModeContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* SealMessage */ + NULL, /* UnsealMessage */ + NULL, /* GetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteUserModeContext */ + NULL, /* FormatCredentials */ + NULL, /* MarshallSupplementalCreds */ + NULL, /* ExportContext */ + NULL, /* ImportContext */ + }, { + NULL, /* InstanceInit */ + NULL, /* InitUserModeContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* SealMessage */ + NULL, /* UnsealMessage */ + NULL, /* GetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteUserModeContext */ + NULL, /* FormatCredentials */ + NULL, /* MarshallSupplementalCreds */ + NULL, /* ExportContext */ + NULL, /* ImportContext */ + } +}; + +/*********************************************************************** + * SpUserModeInitialize (SCHANNEL.@) + */ +NTSTATUS WINAPI SpUserModeInitialize(ULONG LsaVersion, PULONG PackageVersion, + PSECPKG_USER_FUNCTION_TABLE *ppTables, PULONG pcTables) +{ + TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + *pcTables = 2; + *ppTables = secPkgUserTables; + + return STATUS_SUCCESS; +}

1 0

Yuval Fledel : schannel: Implement SpLsaModeInitialize and GetInfo.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 2f81737b1baf245acac9b034e89f9e58d7156e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f81737b1baf245acac9b034e… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Wed Apr 25 22:48:08 2007 +0300 schannel: Implement SpLsaModeInitialize and GetInfo. --- dlls/schannel/Makefile.in | 1 + dlls/schannel/lsamode.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/schannel/schannel.spec | 2 +- 3 files changed, 160 insertions(+), 1 deletions(-) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index bc67151..e0de3b3 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -6,6 +6,7 @@ MODULE = schannel.dll IMPORTS = secur32 kernel32 C_SRCS = \ + lsamode.c \ schannel_main.c @MAKE_DLL_RULES@ diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c new file mode 100644 index 0000000..b017eb9 --- /dev/null +++ b/dlls/schannel/lsamode.c @@ -0,0 +1,158 @@ +/* + * LSA-mode functions of the SChannel security provider + * + * Copyright 2007 Yuval Fledel + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" +#include "schannel.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +/*********************************************************************** + * SpGetInfoUnified + */ +static NTSTATUS WINAPI SpGetInfoUnified(PSecPkgInfoW PackageInfo) +{ + TRACE("(%p)\n", PackageInfo); + + PackageInfo->fCapabilities = SECPKG_FLAG_MUTUAL_AUTH | + SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | + SECPKG_FLAG_CONNECTION | SECPKG_FLAG_MULTI_REQUIRED | + SECPKG_FLAG_EXTENDED_ERROR | SECPKG_FLAG_IMPERSONATION | + SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; + PackageInfo->wVersion = 1; + PackageInfo->wRPCID = UNISP_RPC_ID; + PackageInfo->cbMaxToken = 0x4000; + PackageInfo->Name = (LPWSTR)UNISP_NAME_W; + PackageInfo->Comment = (LPWSTR)UNISP_NAME_W; + + return STATUS_SUCCESS; +} + +static SEC_WCHAR schannelCommentW[] = { 'S','c','h','a','n','n','e','l', + ' ','S','e','c','u','r','i','t','y',' ','P','a','c','k','a','g','e',0 }; + +/*********************************************************************** + * SpGetInfoSChannel + */ +static NTSTATUS WINAPI SpGetInfoSChannel(PSecPkgInfoW PackageInfo) +{ + TRACE("(%p)\n", PackageInfo); + + PackageInfo->fCapabilities = SECPKG_FLAG_MUTUAL_AUTH | + SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | + SECPKG_FLAG_CONNECTION | SECPKG_FLAG_MULTI_REQUIRED | + SECPKG_FLAG_EXTENDED_ERROR | SECPKG_FLAG_IMPERSONATION | + SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; + PackageInfo->wVersion = 1; + PackageInfo->wRPCID = UNISP_RPC_ID; + PackageInfo->cbMaxToken = 0x4000; + PackageInfo->Name = (LPWSTR)SCHANNEL_NAME_W; + PackageInfo->Comment = schannelCommentW; + + return STATUS_SUCCESS; +} + +static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = +{ { + NULL, /* InitializePackage */ + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + NULL, /* Initialize */ + NULL, /* Shutdown */ + SpGetInfoUnified, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* FreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* InitLsaModeContext */ + NULL, /* AcceptLsaModeContext */ + NULL, /* DeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SpSetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + }, { + NULL, /* InitializePackage */ + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + NULL, /* Initialize */ + NULL, /* Shutdown */ + SpGetInfoSChannel, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* FreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* InitLsaModeContext */ + NULL, /* AcceptLsaModeContext */ + NULL, /* DeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SpSetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + } +}; + +/*********************************************************************** + * SpLsaModeInitialize (SCHANNEL.@) + */ +NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, + PSECPKG_FUNCTION_TABLE *ppTables, PULONG pcTables) +{ + TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + + *PackageVersion = SECPKG_INTERFACE_VERSION_3; + *pcTables = 2; + *ppTables = secPkgFunctionTable; + + return STATUS_SUCCESS; +} diff --git a/dlls/schannel/schannel.spec b/dlls/schannel/schannel.spec index 7dd12fa..5c38050 100644 --- a/dlls/schannel/schannel.spec +++ b/dlls/schannel/schannel.spec @@ -23,7 +23,7 @@ @ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW @ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stdcall SealMessage(ptr long ptr long) secur32.SealMessage -@ stub SpLsaModeInitialize +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stub SpUserModeInitialize @ stub SslCrackCertificate @ stub SslEmptyCacheA

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_Prepare and MIDIIn_Unprepare.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 6ef7b129a90041837a5745fa2103b1fbc8553177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef7b129a90041837a5745fa2… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 23:04:23 2007 +0200 winecoreaudio: Implement MIDIIn_Prepare and MIDIIn_Unprepare. --- dlls/winecoreaudio.drv/midi.c | 51 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e9dd93e..98d7d8f 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -696,6 +696,52 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } +static DWORD MIDIIn_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + /* MS doc says that dwFlags must be set to zero, but (kinda funny) MS mciseq drivers + * asks to prepare MIDIHDR which dwFlags != 0. + * So at least check for the inqueue flag + */ + if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || + lpMidiHdr->dwBufferLength >= 0x10000ul) { + WARN("Invalid parameter %p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData, + lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + return MMSYSERR_INVALPARAM; + } + + lpMidiHdr->lpNext = 0; + lpMidiHdr->dwFlags |= MHDR_PREPARED; + lpMidiHdr->dwFlags &= ~MHDR_DONE; + return MMSYSERR_NOERROR; +} + +static DWORD MIDIIn_Unprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) { + WARN("Still playing\n"); + return MIDIERR_STILLPLAYING; + } + + lpMidiHdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -897,10 +943,9 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_PREPARE: + return MIDIIn_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_UNPREPARE: - TRACE("Unsupported message\n"); - return MMSYSERR_NOTSUPPORTED; - + return MIDIIn_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_GETDEVCAPS: return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS:

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_AddBuffer.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 8ca565b1921119b34c18ade5e790b054fdcb0955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca565b1921119b34c18ade5e… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 23:02:05 2007 +0200 winecoreaudio: Implement MIDIIn_AddBuffer. --- dlls/winecoreaudio.drv/midi.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 27b06cd..e9dd93e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -652,6 +652,50 @@ static DWORD MIDIIn_Close(WORD wDevID) return ret; } +static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (lpMidiHdr == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (sizeof(MIDIHDR) > dwSize) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (lpMidiHdr->dwBufferLength == 0) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) { + WARN("Still playing\n"); + return MIDIERR_STILLPLAYING; + } + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) { + WARN("Unprepared\n"); + return MIDIERR_UNPREPARED; + } + + EnterCriticalSection(&midiInLock); + if (sources[wDevID].lpQueueHdr == 0) { + sources[wDevID].lpQueueHdr = lpMidiHdr; + } else { + LPMIDIHDR ptr; + for (ptr = sources[wDevID].lpQueueHdr; + ptr->lpNext != 0; + ptr = (LPMIDIHDR)ptr->lpNext); + ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + } + LeaveCriticalSection(&midiInLock); + + return MMSYSERR_NOERROR; +} + static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -851,6 +895,7 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MIDM_CLOSE: return MIDIIn_Close(wDevID); case MIDM_ADDBUFFER: + return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_PREPARE: case MIDM_UNPREPARE: TRACE("Unsupported message\n");

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_Reset.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: e8c083f9d5d92c50ea384ce4e3303368d686ac31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c083f9d5d92c50ea384ce4e… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 22:56:10 2007 +0200 winecoreaudio: Implement MIDIIn_Reset. --- dlls/winecoreaudio.drv/midi.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 29bf875..27b06cd 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -699,6 +699,31 @@ static DWORD MIDIIn_Stop(WORD wDevID) return MMSYSERR_NOERROR; } +static DWORD MIDIIn_Reset(WORD wDevID) +{ + DWORD dwTime = GetTickCount(); + + TRACE("%d\n", wDevID); + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + EnterCriticalSection(&midiInLock); + while (sources[wDevID].lpQueueHdr) { + sources[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; + sources[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; + /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ + if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)sources[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { + WARN("Couldn't notify client\n"); + } + sources[wDevID].lpQueueHdr = (LPMIDIHDR)sources[wDevID].lpQueueHdr->lpNext; + } + LeaveCriticalSection(&midiInLock); + + return MMSYSERR_NOERROR; +} + /* * MIDI In Mach message handling */ @@ -839,8 +864,8 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw return MIDIIn_Start(wDevID); case MIDM_STOP: return MIDIIn_Stop(wDevID); - case MIDM_RESET: + return MIDIIn_Reset(wDevID); default: TRACE("Unsupported message\n"); }

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_Start and MIDIIn_Stop.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 0da11f99fd7706a18b05cb8f4366be490872b52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da11f99fd7706a18b05cb8f4… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 22:54:57 2007 +0200 winecoreaudio: Implement MIDIIn_Start and MIDIIn_Stop. --- dlls/winecoreaudio.drv/midi.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6ee1beb..29bf875 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -675,6 +675,30 @@ static DWORD MIDIIn_GetNumDevs(void) return MIDIIn_NumDevs; } +static DWORD MIDIIn_Start(WORD wDevID) +{ + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + sources[wDevID].state = 1; + sources[wDevID].startTime = GetTickCount(); + return MMSYSERR_NOERROR; +} + +static DWORD MIDIIn_Stop(WORD wDevID) +{ + TRACE("%d\n", wDevID); + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + sources[wDevID].state = 0; + return MMSYSERR_NOERROR; +} + /* * MIDI In Mach message handling */ @@ -811,9 +835,11 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS: return MIDIIn_GetNumDevs(); - case MIDM_START: + return MIDIIn_Start(wDevID); case MIDM_STOP: + return MIDIIn_Stop(wDevID); + case MIDM_RESET: default: TRACE("Unsupported message\n");

1 0

Andrew Talbot : dplayx: Constify some variables.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 43b278c5f184397ccb9ab6914c248764e72d4a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b278c5f184397ccb9ab6914… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Apr 26 22:45:27 2007 +0100 dplayx: Constify some variables. --- dlls/dplayx/dplay.c | 12 ++++++------ dlls/dplayx/dplayx_global.c | 20 ++++++++++---------- dlls/dplayx/dplayx_global.h | 4 ++-- dlls/dplayx/name_server.c | 2 +- dlls/dplayx/name_server.h | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 650adfd..17ebd00 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -54,12 +54,12 @@ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ); static lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* iface, LPDPID lpid, LPDPNAME lpName, DWORD dwFlags, HANDLE hEvent, BOOL bAnsi ); -static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, LPDPNAME lpSrc, BOOL bAnsi ); +static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi ); static void DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ); -static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, LPDPID lpid, - LPDPNAME lpName, DWORD dwFlags, +static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, const DPID *lpid, + const DPNAME *lpName, DWORD dwFlags, DPID idParent, BOOL bAnsi ); static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ); @@ -919,8 +919,8 @@ static HRESULT WINAPI DirectPlay2WImpl_Close } static -lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, LPDPID lpid, - LPDPNAME lpName, DWORD dwFlags, +lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, const DPID *lpid, + const DPNAME *lpName, DWORD dwFlags, DPID idParent, BOOL bAnsi ) { lpGroupData lpGData; @@ -1290,7 +1290,7 @@ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ) } /* Basic area for Dst must already be allocated */ -static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, LPDPNAME lpSrc, BOOL bAnsi ) +static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi ) { if( lpSrc == NULL ) { diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 13bf1e2..9ad9b3e 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -199,10 +199,10 @@ static DPSESSIONDESC2* sessionData = NULL; /* static DPSESSIONDESC2* sessionData[ numSupportedSessions ]; */ /* Function prototypes */ -static DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData ); -static DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData ); -static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src ); -static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ); +static DWORD DPLAYX_SizeOfLobbyDataA( const DPLCONNECTION *lpDplData ); +static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpDplData ); +static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ); +static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ); static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData ); static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData ); static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest, @@ -658,7 +658,7 @@ HRESULT DPLAYX_GetConnectionSettingsA } /* Assumption: Enough contiguous space was allocated at dest */ -void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src ) +void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { BYTE* lpStartOfFreeSpace; @@ -780,7 +780,7 @@ HRESULT DPLAYX_GetConnectionSettingsW } /* Assumption: Enough contiguous space was allocated at dest */ -void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ) +void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { BYTE* lpStartOfFreeSpace; @@ -855,7 +855,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ) HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags, DWORD dwAppID, - LPDPLCONNECTION lpConn ) + const DPLCONNECTION *lpConn ) { LPDPLAYX_LOBBYDATA lpDplData; @@ -917,7 +917,7 @@ HRESULT DPLAYX_SetConnectionSettingsA HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags, DWORD dwAppID, - LPDPLCONNECTION lpConn ) + const DPLCONNECTION *lpConn ) { LPDPLAYX_LOBBYDATA lpDplData; @@ -961,7 +961,7 @@ HRESULT DPLAYX_SetConnectionSettingsW return DP_OK; } -DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpConn ) +DWORD DPLAYX_SizeOfLobbyDataA( const DPLCONNECTION *lpConn ) { DWORD dwTotalSize = sizeof( DPLCONNECTION ); @@ -1008,7 +1008,7 @@ DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpConn ) return dwTotalSize; } -DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpConn ) +DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn ) { DWORD dwTotalSize = sizeof( DPLCONNECTION ); diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h index d7f7e73..a4d109a 100644 --- a/dlls/dplayx/dplayx_global.h +++ b/dlls/dplayx/dplayx_global.h @@ -38,10 +38,10 @@ HRESULT DPLAYX_GetConnectionSettingsW ( DWORD dwAppID, HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags, DWORD dwAppID, - LPDPLCONNECTION lpConn ); + const DPLCONNECTION *lpConn ); HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags, DWORD dwAppID, - LPDPLCONNECTION lpConn ); + const DPLCONNECTION *lpConn ); BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID ); BOOL DPLAYX_DestroyLobbyApplication( DWORD dwAppID ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index f46af67..e875c19 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -211,7 +211,7 @@ void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ) */ HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, DWORD dwFlags, - LPSPINITDATA lpSpData ) + const SPINITDATA *lpSpData ) { DPSP_ENUMSESSIONSDATA data; diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index ec2c298..2df4a3b 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -46,7 +46,7 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, DWORD dwFlags, - LPSPINITDATA lpSpData ); + const SPINITDATA *lpSpData ); BOOL NS_InitializeSessionCache( LPVOID* lplpNSInfo );

1 0

H. Verbeet : wined3d: Fix the return value for IWineD3DDeviceImpl_ColorFill .
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 3226ad451f7fdda40a0ccfdb63c850e7aa521a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3226ad451f7fdda40a0ccfdb6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Apr 27 00:17:54 2007 +0200 wined3d: Fix the return value for IWineD3DDeviceImpl_ColorFill. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aeb9963..f4f3002 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5218,7 +5218,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { color_fill_fbo(iface, pSurface, pRect, color); - return WINED3DERR_INVALIDCALL; + return WINED3D_OK; } else { /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx));

1 0

Emmanuel Maillard : winecoreaudio: Add MIDI In messages in MIDI_NotifyClient.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: efd18eed11af6cb94fbf4d93188fde528b955598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd18eed11af6cb94fbf4d931… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 21:34:46 2007 +0200 winecoreaudio: Add MIDI In messages in MIDI_NotifyClient. --- dlls/winecoreaudio.drv/midi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ff43a35..dd6e954 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -242,6 +242,11 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwP case MIM_ERROR: case MIM_LONGERROR: case MIM_MOREDATA: + dwCallBack = sources[wDevID].midiDesc.dwCallback; + uFlags = sources[wDevID].wFlags; + hDev = sources[wDevID].midiDesc.hMidi; + dwInstance = sources[wDevID].midiDesc.dwInstance; + break; default: WARN("Unsupported MSW-MIDI message %u\n", wMsg); return MMSYSERR_ERROR;

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIIn_Open and MIDIIn_Close.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 3930b756eba7f37fe0f834d4f1dc3017f996c86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3930b756eba7f37fe0f834d4f… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Thu Apr 26 21:38:40 2007 +0200 winecoreaudio: Implement MIDIIn_Open and MIDIIn_Close. --- dlls/winecoreaudio.drv/midi.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index dd6e954..17b4367 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -594,6 +594,65 @@ static DWORD MIDIOut_Reset(WORD wDevID) return MMSYSERR_NOERROR; } +static DWORD MIDIIn_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +{ + TRACE("wDevID=%d lpDesc=%p dwFlags=%08x\n", wDevID, lpDesc, dwFlags); + + if (lpDesc == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (sources[wDevID].midiDesc.hMidi != 0) { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if ((dwFlags & MIDI_IO_STATUS) != 0) { + WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); + dwFlags &= ~MIDI_IO_STATUS; + } + if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { + FIXME("Bad dwFlags\n"); + return MMSYSERR_INVALFLAG; + } + + sources[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + sources[wDevID].lpQueueHdr = NULL; + sources[wDevID].midiDesc = *lpDesc; + sources[wDevID].startTime = 0; + sources[wDevID].state = 0; + + return MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); +} + +static DWORD MIDIIn_Close(WORD wDevID) +{ + DWORD ret = MMSYSERR_NOERROR; + + TRACE("wDevID=%d\n", wDevID); + + if (wDevID >= MIDIIn_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if (sources[wDevID].midiDesc.hMidi == 0) { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (sources[wDevID].lpQueueHdr != 0) { + return MIDIERR_STILLPLAYING; + } + + ret = MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); + sources[wDevID].midiDesc.hMidi = 0; + return ret; +} + + /* * MIDI In Mach message handling */ @@ -717,7 +776,9 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case DRVM_DISABLE: return 0; case MIDM_OPEN: + return MIDIIn_Open(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: + return MIDIIn_Close(wDevID); case MIDM_ADDBUFFER: case MIDM_PREPARE: case MIDM_UNPREPARE:

1 0