Module: wine Branch: master Commit: d223716b7bcde8839c741d83865b95c990a8abcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d223716b7bcde8839c741d8386...
Author: Francois Gouget fgouget@free.fr Date: Sun Oct 14 14:36:00 2007 +0200
msdmo: Fix the DMOGetName() prototype.
---
dlls/msdmo/dmoreg.c | 4 ++-- include/dmoreg.h | 2 +- tools/winapi/win32.api | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index c207a3e..25bb759 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -291,7 +291,7 @@ lend: * * Get DMP Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR* szName) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) { WCHAR szguid[64]; HRESULT hres; @@ -311,7 +311,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR* szName) if (ERROR_SUCCESS != hres) goto lend;
- count = 80 * sizeof(WCHAR); /* 80 by API definition */ + count = sizeof(szName); hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count);
diff --git a/include/dmoreg.h b/include/dmoreg.h index c352790..66966f9 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -44,7 +44,7 @@ HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD, const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**); HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*, ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*); -HRESULT WINAPI DMOGetName(REFCLSID,WCHAR*); +HRESULT WINAPI DMOGetName(REFCLSID,WCHAR[80]);
DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, 0x57f2db8b,0xe6bb,0x4513,0x9d,0x43,0xdc,0xd2,0xa6,0x59,0x31,0x25); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index bd6bcfd..d64e006 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2664,7 +2664,7 @@ ULONG * %wstr
LPCWSTR -WCHAR * +WCHAR[80]
%%msg711.acm