[ros-diffs] [winesync] 31770: Autosyncing with Wine HEAD

Author: winesync
Date: Mon Jan 14 15:26:48 2008
New Revision: 31770

URL: http://svn.reactos.org/svn/reactos?rev=31770&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/avifil32/acmstream.c
    trunk/reactos/dll/win32/avifil32/api.c
    trunk/reactos/dll/win32/avifil32/avifil32.rbuild
    trunk/reactos/dll/win32/avifil32/avifile.c
    trunk/reactos/dll/win32/avifil32/factory.c

Modified: trunk/reactos/dll/win32/avifil32/acmstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/acmstream.c (original)
+++ trunk/reactos/dll/win32/avifil32/acmstream.c Mon Jan 14 15:26:48 2008
@@ -729,7 +729,7 @@
   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);

Modified: trunk/reactos/dll/win32/avifil32/api.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/api.c (original)
+++ trunk/reactos/dll/win32/avifil32/api.c Mon Jan 14 15:26:48 2008
@@ -1065,9 +1065,9 @@
     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 @@
   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 @@
     HeapFree(GetProcessHeap(), 0, pSavedOptions);
   }
 
-  return (BOOL)ret;
+  return ret;
 }
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifil32.rbuild (original)
+++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild Mon Jan 14 15:26:48 2008
@@ -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>

Modified: trunk/reactos/dll/win32/avifil32/avifile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile.c (original)
+++ trunk/reactos/dll/win32/avifil32/avifile.c Mon Jan 14 15:26:48 2008
@@ -1795,7 +1795,7 @@
 	    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 @@
       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;
       }

Modified: trunk/reactos/dll/win32/avifil32/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/factory.c (original)
+++ trunk/reactos/dll/win32/avifil32/factory.c Mon Jan 14 15:26:48 2008
@@ -209,7 +209,7 @@
   switch (fdwReason) {
   case DLL_PROCESS_ATTACH:
     DisableThreadLibraryCalls(hInstDll);
-    AVIFILE_hModule = (HMODULE)hInstDll;
+    AVIFILE_hModule = hInstDll;
     break;
   case DLL_PROCESS_DETACH:
     break;