From a348280fcc127bb6d751c0c2f9693b6ee9d4b4a2 Mon Sep 17 00:00:00 2001
From: The Wine Synchronizer <winesync@svn.reactos.org>
Date: Mon, 14 Jan 2008 12:26:48 +0000
Subject: [PATCH] Autosyncing with Wine HEAD

svn path=/trunk/; revision=31770
---
 reactos/dll/win32/avifil32/acmstream.c     | 2 +-
 reactos/dll/win32/avifil32/api.c           | 8 ++++----
 reactos/dll/win32/avifil32/avifil32.rbuild | 2 ++
 reactos/dll/win32/avifil32/avifile.c       | 4 ++--
 reactos/dll/win32/avifil32/factory.c       | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/win32/avifil32/acmstream.c b/reactos/dll/win32/avifil32/acmstream.c
index 1501f41e298..47013ef7de5 100644
--- a/reactos/dll/win32/avifil32/acmstream.c
+++ b/reactos/dll/win32/avifil32/acmstream.c
@@ -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);
diff --git a/reactos/dll/win32/avifil32/api.c b/reactos/dll/win32/avifil32/api.c
index 40279662719..465164aa030 100644
--- a/reactos/dll/win32/avifil32/api.c
+++ b/reactos/dll/win32/avifil32/api.c
@@ -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;
 }
 
 /***********************************************************************
diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index 1aa8f6fa045..fc17645da54 100644
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -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>
diff --git a/reactos/dll/win32/avifil32/avifile.c b/reactos/dll/win32/avifil32/avifile.c
index a23e326771f..b97fd783bd5 100644
--- a/reactos/dll/win32/avifil32/avifile.c
+++ b/reactos/dll/win32/avifil32/avifile.c
@@ -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;
       }
diff --git a/reactos/dll/win32/avifil32/factory.c b/reactos/dll/win32/avifil32/factory.c
index ae717c879e1..40e4c68d571 100644
--- a/reactos/dll/win32/avifil32/factory.c
+++ b/reactos/dll/win32/avifil32/factory.c
@@ -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;