November 2009 - Wine-commits

Rob Shearman : msdaps: Clear *pcPropertySets value in IDBProperties_GetProperties_Stub to fix a test .
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 36dae82a68de27eb61310247e03c10da6efa49ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dae82a68de27eb61310247e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:37:14 2009 +0000 msdaps: Clear *pcPropertySets value in IDBProperties_GetProperties_Stub to fix a test. --- dlls/msdaps/usrmarshal.c | 1 + dlls/oledb32/tests/marshal.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8e15862..0624c3a 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -122,6 +122,7 @@ HRESULT __RPC_STUB IDBProperties_GetProperties_Stub(IDBProperties* This, ULONG c TRACE("(%p, %d, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); + *pcPropertySets = 0; *ppErrorInfoRem = NULL; hr = IDBProperties_GetProperties(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 587b8b6..39d8448 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -165,7 +165,6 @@ static HRESULT WINAPI Test_DBProperties_GetProperties( DBPROPSET **prgPropertySets) { ok(cPropertyIDSets == 0, "Expected cPropertyIDSets to be 0 instead of %d\n", cPropertyIDSets); - todo_wine ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets); *pcPropertySets = 1; *prgPropertySets = CoTaskMemAlloc(sizeof(DBPROPSET));

1 0

Rob Shearman : rpcrt4: Ignore the network address for ncalrpc in is_epm_destination_local.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: b49512ecaf202e3380925bc0bb56e81f057314c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49512ecaf202e3380925bc0b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:39:48 2009 +0000 rpcrt4: Ignore the network address for ncalrpc in is_epm_destination_local. The network address is ignored in the transport code, so it doesn't make sense to take it into account here. --- dlls/rpcrt4/rpc_epmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index c1b8d1d..b81367e 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -108,8 +108,8 @@ static inline BOOL is_epm_destination_local(RPC_BINDING_HANDLE handle) const char *protseq = bind->Protseq; const char *network_addr = bind->NetworkAddr; - return ((!strcmp(protseq, "ncalrpc") && !network_addr) || - (!strcmp(protseq, "ncacn_np") && + return (!strcmp(protseq, "ncalrpc") || + (!strcmp(protseq, "ncacn_np") && (!network_addr || !strcmp(network_addr, ".")))); }

1 0

Rob Shearman : rpcrt4: Don' t crash with a NULL binding handle in RpcBindingFree.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: cdc10a8d3b262f5010c0f78ce4053c363ff151a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc10a8d3b262f5010c0f78ce… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:40:26 2009 +0000 rpcrt4: Don't crash with a NULL binding handle in RpcBindingFree. --- dlls/rpcrt4/rpc_binding.c | 7 +++++-- dlls/rpcrt4/tests/rpc.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index b264b9a..212e201 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -785,8 +785,11 @@ RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); - status = RPCRT4_ReleaseBinding(*Binding); - if (status == RPC_S_OK) *Binding = 0; + if (*Binding) + status = RPCRT4_ReleaseBinding(*Binding); + else + status = RPC_S_INVALID_BINDING; + if (status == RPC_S_OK) *Binding = NULL; return status; } diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 01d7392..0f742b2 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -800,6 +800,17 @@ static void test_UuidCreate(void) } } +static void test_RpcBindingFree(void) +{ + RPC_BINDING_HANDLE binding = NULL; + RPC_STATUS status; + + status = RpcBindingFree(&binding); + ok(status == RPC_S_INVALID_BINDING, + "RpcBindingFree should have retured RPC_S_INVALID_BINDING instead of %d\n", + status); +} + START_TEST( rpc ) { UuidConversionAndComparison(); @@ -811,4 +822,5 @@ START_TEST( rpc ) test_I_RpcExceptionFilter(); test_RpcStringBindingFromBinding(); test_UuidCreate(); + test_RpcBindingFree(); }

1 0

Paul Vriens : advapi32/tests: Fix a test failure with Wow64.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: e32218fd3c78eb2eb8cde18d70c25b671ae3076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32218fd3c78eb2eb8cde18d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 16 11:59:57 2009 +0100 advapi32/tests: Fix a test failure with Wow64. --- dlls/advapi32/tests/eventlog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d7e2dba..f94b0a7 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -31,13 +31,19 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static void init_function_pointers(void) { HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + + pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64RevertWow64FsRedirection"); } static void create_backup(const char *filename) @@ -945,6 +951,7 @@ static void test_autocreation(void) char *p; char sources[sizeof(eventsources)]; char sysdir[MAX_PATH]; + void *redir = 0; RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); RegOpenKeyA(key, eventlogname, &eventkey); @@ -974,6 +981,10 @@ static void test_autocreation(void) RegCloseKey(eventkey); RegCloseKey(key); + /* The directory that holds the eventlog files could be redirected */ + if (pWow64DisableWow64FsRedirection) + pWow64DisableWow64FsRedirection(&redir); + /* On Windows we also automatically get an eventlog file */ GetSystemDirectoryA(sysdir, sizeof(sysdir)); @@ -994,6 +1005,9 @@ static void test_autocreation(void) ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); + + if (pWow64RevertWow64FsRedirection) + pWow64RevertWow64FsRedirection(redir); } static void cleanup_eventlog(void)

1 0

Jörg Höhle : winmm: MCI_ALL_DEVICE_ID(MCIDEVICEID ) is not a 16bit entity in MCI32.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 65011132e5347cbce7a51c291286effde651f85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65011132e5347cbce7a51c291… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 14 14:40:04 2009 +0100 winmm: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a 16bit entity in MCI32. --- dlls/winmm/mci.c | 8 ++++---- include/mmsystem.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 9198f87..c46c4c5 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -99,7 +99,7 @@ static inline LPWSTR str_dup_upper( LPCWSTR str ) /************************************************************************** * MCI_GetDriver [internal] */ -static LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) +static LPWINE_MCIDRIVER MCI_GetDriver(UINT wDevID) { LPWINE_MCIDRIVER wmd = 0; @@ -1669,7 +1669,7 @@ errCleanUp: /************************************************************************** * MCI_Close [internal] */ -static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { DWORD dwRet; LPWINE_MCIDRIVER wmd; @@ -1677,7 +1677,7 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); /* Every device must handle MCI_NOTIFY on its own. */ - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { while (MciDrivers) { /* Retrieve the device ID under lock, but send the message without, * the driver might be calling some winmm functions from another @@ -1894,7 +1894,7 @@ DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dw dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); break; default: - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { FIXME("unhandled MCI_ALL_DEVICE_ID\n"); dwRet = MCIERR_CANNOT_USE_ALL; } else { diff --git a/include/mmsystem.h b/include/mmsystem.h index 39f70a1..dd9723a 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -1809,7 +1809,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,DWORD*); #define MCI_USER_MESSAGES (0x400 + DRV_MCI_FIRST) -#define MCI_ALL_DEVICE_ID 0xFFFF +#define MCI_ALL_DEVICE_ID 0xFFFFFFFF #define MCI_DEVTYPE_VCR (MCI_STRING_OFFSET + 1) #define MCI_DEVTYPE_VIDEODISC (MCI_STRING_OFFSET + 2)

1 0

Jörg Höhle : winmm/tests: Print symbolic MCIERR_ names.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 18971c94b6bd14888cc2c415d34fde97301e7862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18971c94b6bd14888cc2c415d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 14 17:51:41 2009 +0100 winmm/tests: Print symbolic MCIERR_ names. --- dlls/winmm/tests/mci.c | 198 ++++++++++++++++++++++++----------------------- 1 files changed, 101 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18971c94b6bd14888cc2c…

1 0

Jörg Höhle : winmm: Enable more MCI waveaudio tests.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7ade23e300d4bbe1a88b64b6f60c5c0bc711bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ade23e300d4bbe1a88b64b6f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 22 08:53:30 2009 +0200 winmm: Enable more MCI waveaudio tests. --- dlls/winmm/tests/mci.c | 140 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 116 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ade23e300d4bbe1a88b6…

1 0

André Hentschel : winedump: Add ARM support.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 0c652a5a5c4988e365eb660d1acbc572bb2f1f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c652a5a5c4988e365eb660d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 14:31:59 2009 +0100 winedump: Add ARM support. --- tools/winedump/minidump.c | 3 +++ tools/winedump/pe.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 76aaa58..2ea4c54 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -284,6 +284,9 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_PPC: str = "PowerPC"; break; + case PROCESSOR_ARCHITECTURE_ARM: + str = "ARM"; + break; default: str = "???"; break; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 077109d..9761215 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -61,6 +61,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_POWERPC: return "PowerPC"; case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; + case IMAGE_FILE_MACHINE_ARM: return "ARM"; } return "???"; }

1 0

Maarten Lankhorst : dsound: Implement DirectSoundCaptureEnumerateA on top of DirectSoundCaptureEnumerateW .
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 708eaaa6be40dd99bdd10b348e586f0f0791f137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708eaaa6be40dd99bdd10b348… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:30:49 2009 +0100 dsound: Implement DirectSoundCaptureEnumerateA on top of DirectSoundCaptureEnumerateW. --- dlls/dsound/dsound_main.c | 42 ++++++------------------------------------ 1 files changed, 6 insertions(+), 36 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index eaeb778..bfb8708 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -400,51 +400,21 @@ HRESULT WINAPI DirectSoundEnumerateW( * Success: DS_OK * Failure: DSERR_INVALIDPARAM */ -HRESULT WINAPI -DirectSoundCaptureEnumerateA( +HRESULT WINAPI DirectSoundCaptureEnumerateA( LPDSENUMCALLBACKA lpDSEnumCallback, LPVOID lpContext) { - unsigned devs, wid; - DSDRIVERDESC desc; - GUID guid; - int err; - - TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext ); + struct morecontext context; if (lpDSEnumCallback == NULL) { - WARN("invalid parameter: lpDSEnumCallback == NULL\n"); + WARN("invalid parameter: lpDSEnumCallback == NULL\n"); return DSERR_INVALIDPARAM; } - devs = waveInGetNumDevs(); - if (devs > 0) { - if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) { - for (wid = 0; wid < devs; ++wid) { - if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Capture Driver",desc.szDrvname,lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Capture Driver", desc.szDrvname, lpContext) == FALSE) - return DS_OK; - } - } - } - } - } - - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); - if (lpDSEnumCallback(&DSOUND_capture_guids[wid], desc.szDesc, desc.szDrvname, lpContext) == FALSE) - return DS_OK; - } - } + context.callA = lpDSEnumCallback; + context.data = lpContext; - return DS_OK; + return DirectSoundCaptureEnumerateW(a_to_w_callback, &context); } /***************************************************************************

1 0

Maarten Lankhorst : dsound: Move duplex definitions to duplex.c.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: a8f587e8dec383deeef3386dc516bc9d59999da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f587e8dec383deeef3386dc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:55:58 2009 +0100 dsound: Move duplex definitions to duplex.c. --- dlls/dsound/dsound_private.h | 51 ------------------------------------------ dlls/dsound/duplex.c | 43 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 51 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e028358..e1567e5 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -52,11 +52,6 @@ typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; -typedef struct IDirectSoundFullDuplexImpl IDirectSoundFullDuplexImpl; -typedef struct IDirectSoundFullDuplex_IUnknown IDirectSoundFullDuplex_IUnknown; -typedef struct IDirectSoundFullDuplex_IDirectSound IDirectSoundFullDuplex_IDirectSound; -typedef struct IDirectSoundFullDuplex_IDirectSound8 IDirectSoundFullDuplex_IDirectSound8; -typedef struct IDirectSoundFullDuplex_IDirectSoundCapture IDirectSoundFullDuplex_IDirectSoundCapture; typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl; typedef struct IDirectSoundCaptureNotifyImpl IDirectSoundCaptureNotifyImpl; typedef struct IDirectSound3DListenerImpl IDirectSound3DListenerImpl; @@ -310,52 +305,6 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( LPCDSCBUFFERDESC lpcDSCBufferDesc); /***************************************************************************** - * IDirectSoundFullDuplex implementation structure - */ -struct IDirectSoundFullDuplexImpl -{ - /* IUnknown fields */ - const IDirectSoundFullDuplexVtbl *lpVtbl; - LONG ref; - - /* IDirectSoundFullDuplexImpl fields */ - DirectSoundDevice *renderer_device; - DirectSoundCaptureDevice *capture_device; - - LPUNKNOWN pUnknown; - LPDIRECTSOUND pDS; - LPDIRECTSOUND8 pDS8; - LPDIRECTSOUNDCAPTURE pDSC; -}; - -/***************************************************************************** - * IDirectSoundFullDuplex COM components - */ -struct IDirectSoundFullDuplex_IUnknown { - const IUnknownVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSound { - const IDirectSoundVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSound8 { - const IDirectSound8Vtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSoundCapture { - const IDirectSoundCaptureVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -/***************************************************************************** * IDirectSound3DListener implementation structure */ struct IDirectSound3DListenerImpl diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 1fe6bbc..8fbf1d6 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -37,6 +37,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +/***************************************************************************** + * IDirectSoundFullDuplex implementation structure + */ +typedef struct IDirectSoundFullDuplexImpl +{ + /* IUnknown fields */ + const IDirectSoundFullDuplexVtbl *lpVtbl; + LONG ref; + + /* IDirectSoundFullDuplexImpl fields */ + DirectSoundDevice *renderer_device; + DirectSoundCaptureDevice *capture_device; + + LPUNKNOWN pUnknown; + LPDIRECTSOUND pDS; + LPDIRECTSOUND8 pDS8; + LPDIRECTSOUNDCAPTURE pDSC; +} IDirectSoundFullDuplexImpl; + +typedef struct IDirectSoundFullDuplex_IUnknown { + const IUnknownVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IUnknown; + +typedef struct IDirectSoundFullDuplex_IDirectSound { + const IDirectSoundVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSound; + +typedef struct IDirectSoundFullDuplex_IDirectSound8 { + const IDirectSound8Vtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSound8; + +typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { + const IDirectSoundCaptureVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSoundCapture; + /******************************************************************************* * IUnknown */

1 0