Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=31770
This commit is contained in:
The Wine Synchronizer 2008-01-14 12:26:48 +00:00
parent 0c189da5cd
commit a348280fcc
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/avifil32/acmstream.c
View file

@ -729,7 +729,7 @@ static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This)
This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT;
SetRectEmpty(&This->sInfo.rcFrame);
/* convert positions ansd sizes to output format */
/* convert positions and sizes to output format */
CONVERT_STREAM_to_THIS(&This->sInfo.dwStart);
CONVERT_STREAM_to_THIS(&This->sInfo.dwLength);
CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize);

8
reactos/dll/win32/avifil32/api.c
View file

@ -1065,9 +1065,9 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
HeapFree(GetProcessHeap(), 0, lp);
return AVIERR_ERROR;
}
for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)) == S_OK;n++) {
for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) {
/* get CLSID to extension */
size = sizeof(szValue)/sizeof(szValue[0]);
size = sizeof(szValue);
if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK)
break;
@ -1116,7 +1116,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
for (n = 0; n <= count; n++) {
/* first the description */
if (n != 0) {
size = sizeof(szValue)/sizeof(szValue[0]);
size = sizeof(szValue);
if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) {
size = lstrlenW(szValue);
lstrcpynW(szFilter, szValue, cbFilter);
@ -1509,7 +1509,7 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStreams,
HeapFree(GetProcessHeap(), 0, pSavedOptions);
}
return (BOOL)ret;
return ret;
}
/***********************************************************************

2
reactos/dll/win32/avifil32/avifil32.rbuild
View file

@ -1,5 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<group>
<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true">
<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
<importlibrary definition="avifil32.spec.def" />
@ -32,3 +33,4 @@
<file>rsrc.rc</file>
<file>avifil32.spec</file>
</module>
</group>

4
reactos/dll/win32/avifil32/avifile.c
View file

@ -1795,7 +1795,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
if (str == NULL)
return AVIERR_MEMORY;
if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize)
if (mmioRead(This->hmmio, str, ck.cksize) != ck.cksize)
{
HeapFree(GetProcessHeap(), 0, str);
return AVIERR_FILEREAD;
@ -2249,7 +2249,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str,
ck.cksize, NULL, NULL);
if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) {
if (mmioWrite(This->hmmio, str, ck.cksize) != ck.cksize) {
HeapFree(GetProcessHeap(), 0, str);
return AVIERR_FILEWRITE;
}

2
reactos/dll/win32/avifil32/factory.c
View file

@ -209,7 +209,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDll);
AVIFILE_hModule = (HMODULE)hInstDll;
AVIFILE_hModule = hInstDll;
break;
case DLL_PROCESS_DETACH:
break;