diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 4f806255a14..614b676ac13 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -190,8 +190,8 @@ DirectSoundCaptureEnumerateA( err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD)&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) + "Primary Sound Capture Driver",desc.szDrvname,lpContext); + if (lpDSEnumCallback(NULL, "Primary Sound Capture Driver", desc.szDrvname, lpContext) == FALSE) return DS_OK; } } @@ -203,8 +203,8 @@ DirectSoundCaptureEnumerateA( err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&capture_guids[wid]),desc.szDesc,desc.szDrvName,lpContext); - if (lpDSEnumCallback(&capture_guids[wid], desc.szDesc, desc.szDrvName, lpContext) == FALSE) + debugstr_guid(&capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); + if (lpDSEnumCallback(&capture_guids[wid], desc.szDesc, desc.szDrvname, lpContext) == FALSE) return DS_OK; } } @@ -252,10 +252,10 @@ DirectSoundCaptureEnumerateW( err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Capture Driver",desc.szDrvName,lpContext); + "Primary Sound Capture Driver",desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, "Primary Sound Capture Driver", -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE) return DS_OK; @@ -269,10 +269,10 @@ DirectSoundCaptureEnumerateW( err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&capture_guids[wid]),desc.szDesc,desc.szDrvName,lpContext); + debugstr_guid(&capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); if (lpDSEnumCallback((LPGUID)&capture_guids[wid], wDesc, wName, lpContext) == FALSE) return DS_OK; @@ -570,8 +570,8 @@ IDirectSoundCaptureImpl_Initialize( if (err == DS_OK) { This->drvcaps.dwFlags = 0; - strncpy(This->drvdesc.szDrvName, wic.szPname, - sizeof(This->drvdesc.szDrvName)); + strncpy(This->drvdesc.szDrvname, wic.szPname, + sizeof(This->drvdesc.szDrvname)); This->drvcaps.dwFlags |= DSCCAPS_EMULDRIVER; This->drvcaps.dwFormats = wic.dwFormats; diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index c22adce3b07..5d0193ae3ad 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -325,8 +325,8 @@ HRESULT WINAPI DirectSoundEnumerateA( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Driver",desc.szDrvName,lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Driver", desc.szDrvName, lpContext) == FALSE) + "Primary Sound Driver",desc.szDrvname,lpContext); + if (lpDSEnumCallback(NULL, "Primary Sound Driver", desc.szDrvname, lpContext) == FALSE) return DS_OK; } } @@ -338,8 +338,8 @@ HRESULT WINAPI DirectSoundEnumerateA( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&renderer_guids[wod]),desc.szDesc,desc.szDrvName,lpContext); - if (lpDSEnumCallback(&renderer_guids[wod], desc.szDesc, desc.szDrvName, lpContext) == FALSE) + debugstr_guid(&renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext); + if (lpDSEnumCallback(&renderer_guids[wod], desc.szDesc, desc.szDrvname, lpContext) == FALSE) return DS_OK; } } @@ -386,10 +386,10 @@ HRESULT WINAPI DirectSoundEnumerateW( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Driver",desc.szDrvName,lpContext); + "Primary Sound Driver",desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, "Primary Sound Driver", -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE) return DS_OK; @@ -403,10 +403,10 @@ HRESULT WINAPI DirectSoundEnumerateW( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&renderer_guids[wod]),desc.szDesc,desc.szDrvName,lpContext); + debugstr_guid(&renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); if (lpDSEnumCallback(&renderer_guids[wod], wDesc, wName, lpContext) == FALSE) return DS_OK; diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index ad5d9f55b66..cbab460e4e4 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -21,14 +21,13 @@ #include -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" #include "winnls.h" +#include "vfwmsgs.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" @@ -37,6 +36,12 @@ #include "initguid.h" #include "dsconf.h" +#ifdef NONAMELESSSTRUCT +# define S(x) (x).s +#else +# define S(x) (x) +#endif + WINE_DEFAULT_DEBUG_CHANNEL(dsound); @@ -101,10 +106,10 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get( DSPROPERTY prop; HRESULT hres; - prop.s.Set = *guidPropSet; - prop.s.Id = dwPropID; - prop.s.Flags = 0; /* unused */ - prop.s.InstanceId = (ULONG)This->dsb->dsound; + S(prop).Set = *guidPropSet; + S(prop).Id = dwPropID; + S(prop).Flags = 0; /* unused */ + S(prop).InstanceId = (ULONG)This->dsb->dsound; hres = IDsDriverPropertySet_Get(ps, &prop, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned); @@ -137,10 +142,10 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set( DSPROPERTY prop; HRESULT hres; - prop.s.Set = *guidPropSet; - prop.s.Id = dwPropID; - prop.s.Flags = 0; /* unused */ - prop.s.InstanceId = (ULONG)This->dsb->dsound; + S(prop).Set = *guidPropSet; + S(prop).Id = dwPropID; + S(prop).Flags = 0; /* unused */ + S(prop).InstanceId = (ULONG)This->dsb->dsound; hres = IDsDriverPropertySet_Set(ps,&prop,pInstanceData,cbInstanceData,pPropData,cbPropData); IDsDriverPropertySet_Release(ps); @@ -380,9 +385,9 @@ static HRESULT WINAPI DSPROPERTY_Description1( if (err == DS_OK) { PIDSDRIVER drv = NULL; strncpy(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA) - 1); - strncpy(ppd->ModuleA, desc.szDrvName, sizeof(ppd->ModuleA) - 1); + strncpy(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA) - 1); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD)&drv, 0)); if (err == DS_OK && drv) ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; @@ -409,9 +414,9 @@ static HRESULT WINAPI DSPROPERTY_Description1( if (err == DS_OK) { PIDSCDRIVER drv; strncpy(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA) - 1); - strncpy(ppd->ModuleA, desc.szDrvName, sizeof(ppd->ModuleA) - 1); + strncpy(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA) - 1); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD)&drv,0)); if (err == DS_OK && drv) ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; @@ -439,9 +444,9 @@ static HRESULT WINAPI DSPROPERTY_Description1( if (err == DS_OK) { PIDSDRIVER drv = NULL; strncpy(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA) - 1); - strncpy(ppd->ModuleA, desc.szDrvName, sizeof(ppd->ModuleA) - 1); + strncpy(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA) - 1); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD)&drv, 0)); if (err == DS_OK && drv) ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; @@ -470,9 +475,9 @@ static HRESULT WINAPI DSPROPERTY_Description1( if (err == DS_OK) { PIDSDRIVER drv = NULL; strncpy(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA) - 1); - strncpy(ppd->ModuleA, desc.szDrvName, sizeof(ppd->ModuleA) - 1); + strncpy(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA) - 1); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); err = mmErr(waveInMessage((HWAVEIN)wod, DRV_QUERYDSOUNDIFACE, (DWORD)&drv, 0)); if (err == DS_OK && drv) ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; @@ -546,11 +551,11 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA( PIDSDRIVER drv = NULL; /* FIXME: this is a memory leak */ CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1); - CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvName) + 1); + CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1); CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1); strcpy(szDescription, desc.szDesc); - strcpy(szModule, desc.szDrvName); + strcpy(szModule, desc.szDrvname); strcpy(szInterface, "Interface"); ppd->Description = szDescription; @@ -582,11 +587,11 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA( PIDSCDRIVER drv; /* FIXME: this is a memory leak */ CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1); - CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvName) + 1); + CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1); CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1); strcpy(szDescription, desc.szDesc); - strcpy(szModule, desc.szDrvName); + strcpy(szModule, desc.szDrvname); strcpy(szInterface, "Interface"); ppd->Description = szDescription; @@ -619,11 +624,11 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA( PIDSDRIVER drv = NULL; /* FIXME: this is a memory leak */ CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1); - CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvName) + 1); + CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1); CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1); strcpy(szDescription, desc.szDesc); - strcpy(szModule, desc.szDrvName); + strcpy(szModule, desc.szDrvname); strcpy(szInterface, "Interface"); ppd->Description = szDescription; @@ -705,7 +710,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW( WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 ); ppd->Description = wDescription; @@ -741,7 +746,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW( WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 ); ppd->Description = wDescription; @@ -778,7 +783,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW( WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 ); ppd->Description = wDescription; @@ -849,7 +854,7 @@ static HRESULT WINAPI DSPROPERTY_EnumerateA( data.WaveDeviceId = wod; data.DeviceId = renderer_guids[wod]; data.Description = desc.szDesc; - data.Module = desc.szDrvName; + data.Module = desc.szDrvname; err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); if (err == DS_OK) { WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); @@ -879,7 +884,7 @@ static HRESULT WINAPI DSPROPERTY_EnumerateA( data.WaveDeviceId = wid; data.DeviceId = capture_guids[wid]; data.Description = desc.szDesc; - data.Module = desc.szDrvName; + data.Module = desc.szDrvname; err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); if (err == DS_OK) { WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); @@ -950,7 +955,7 @@ static HRESULT WINAPI DSPROPERTY_EnumerateW( data.DeviceId = renderer_guids[wod]; MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); data.Description = wDescription; data.Module = wModule; @@ -984,7 +989,7 @@ static HRESULT WINAPI DSPROPERTY_EnumerateW( data.DeviceId = capture_guids[wid]; MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 ); + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); data.Description = wDescription; data.Module = wModule; diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 3cc8200de6b..7df7cb485a6 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -707,7 +707,7 @@ LONG ALSA_WaveInit(void) wwo->caps.dwFormats = 0x00000000; wwo->caps.dwSupport = WAVECAPS_VOLUME; strcpy(wwo->ds_desc.szDesc, "WineALSA DirectSound Driver"); - strcpy(wwo->ds_desc.szDrvName, "winealsa.drv"); + strcpy(wwo->ds_desc.szDrvname, "winealsa.drv"); if (!wine_dlopen("libasound.so.2", RTLD_LAZY|RTLD_GLOBAL, NULL, 0)) { @@ -821,7 +821,7 @@ LONG ALSA_WaveInit(void) wwi->caps.dwFormats = 0x00000000; wwi->caps.dwSupport = WAVECAPS_VOLUME; strcpy(wwi->ds_desc.szDesc, "WineALSA DirectSound Driver"); - strcpy(wwi->ds_desc.szDrvName, "winealsa.drv"); + strcpy(wwi->ds_desc.szDrvname, "winealsa.drv"); snd_pcm_info_alloca(&info); snd_pcm_hw_params_alloca(&hw_params); diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c index 25630c5218a..1826baf44fc 100644 --- a/dlls/winmm/winearts/audio.c +++ b/dlls/winmm/winearts/audio.c @@ -2111,7 +2111,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) { memset(desc, 0, sizeof(*desc)); strcpy(desc->szDesc, "Wine aRts DirectSound Driver"); - strcpy(desc->szDrvName, "winearts.drv"); + strcpy(desc->szDrvname, "winearts.drv"); return MMSYSERR_NOERROR; } diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c index 8a09f63c0b3..ec30db0be33 100644 --- a/dlls/winmm/wineaudioio/audio.c +++ b/dlls/winmm/wineaudioio/audio.c @@ -1501,7 +1501,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES pDesc->dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT | DSDDESC_USESYSTEMMEMORY | DSDDESC_DONTNEEDPRIMARYLOCK; strcpy(pDesc->szDesc,"Wine AudioIO DirectSound Driver"); - strcpy(pDesc->szDrvName,"wineaudioio.drv"); + strcpy(pDesc->szDrvname,"wineaudioio.drv"); pDesc->dnDevNode = WOutDev[This->wDevID].waveDesc.dnDevNode; pDesc->wVxdId = 0; pDesc->wReserved = 0; @@ -1678,7 +1678,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) { memset(desc, 0, sizeof(*desc)); strcpy(desc->szDesc, "Wine LIBAUDIOIO DirectSound Driver"); - strcpy(desc->szDrvName, "wineaudioio.drv"); + strcpy(desc->szDrvname, "wineaudioio.drv"); return MMSYSERR_NOERROR; } @@ -2250,7 +2250,7 @@ static DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) { memset(desc, 0, sizeof(*desc)); strcpy(desc->szDesc, "Wine LIBAUDIOIO DirectSound Driver"); - strcpy(desc->szDrvName, "wineaudioio.drv"); + strcpy(desc->szDrvname, "wineaudioio.drv"); return MMSYSERR_NOERROR; } diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c index 5e931a8493a..c6373225557 100644 --- a/dlls/winmm/winejack/audio.c +++ b/dlls/winmm/winejack/audio.c @@ -1795,7 +1795,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) { memset(desc, 0, sizeof(*desc)); strcpy(desc->szDesc, "Wine jack DirectSound Driver"); - strcpy(desc->szDrvName, "winejack.drv"); + strcpy(desc->szDrvname, "winejack.drv"); return MMSYSERR_NOERROR; } diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 917683f2a58..25f4122a3ee 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -1297,7 +1297,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) { memset(desc, 0, sizeof(*desc)); strcpy(desc->szDesc, "Wine NAS DirectSound Driver"); - strcpy(desc->szDrvName, "winenas.drv"); + strcpy(desc->szDrvname, "winenas.drv"); return MMSYSERR_NOERROR; } diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index aee2451ba72..00670a22c5f 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -687,7 +687,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) mixer_info info; if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) { strncpy(ossdev->ds_desc.szDesc, info.name, sizeof(info.name)); - strcpy(ossdev->ds_desc.szDrvName, "wineoss.drv"); + strcpy(ossdev->ds_desc.szDrvname, "wineoss.drv"); MultiByteToWideChar(CP_ACP, 0, info.name, sizeof(info.name), ossdev->out_caps.szPname, sizeof(ossdev->out_caps.szPname) / sizeof(WCHAR)); diff --git a/include/dsdriver.h b/include/dsdriver.h index 1336f71631d..64a0d550986 100644 --- a/include/dsdriver.h +++ b/include/dsdriver.h @@ -62,7 +62,7 @@ typedef struct _DSDRIVERDESC { DWORD dwFlags; CHAR szDesc[256]; - CHAR szDrvName[256]; + CHAR szDrvname[256]; DWORD dnDevNode; WORD wVxdId; WORD wReserved;