Autosyncing with Wine HEAD

svn path=/trunk/; revision=30855

reactos/dll/win32/avifil32/api.c

@@ -550,7 +550,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
  *		AVIStreamFindSample	(AVIFIL32.@)
  *		AVIStreamFindSample	(AVIFILE.163)
  */
-HRESULT WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, DWORD flags)
+LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags)
 {
   TRACE("(%p,%d,0x%X)\n", pstream, pos, flags);
 
@@ -1913,7 +1913,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
 	  hres = AVIStreamReadFormat(pInStreams[curStream], sInfo.dwStart,
 				     lpBuffer, &lBufferSize);
 	  if (FAILED(hres))
-	    return hres;
+	    goto error;
 	  AVIStreamSetFormat(pOutStreams[curStream], sInfo.dwStart,
 			     lpBuffer, lBufferSize);
 

reactos/dll/win32/avifil32/avifil32.rbuild

@@ -1,14 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <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" />
 	<include base="avifil32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
-	<define name="__USE_W32API" />
+	<define name="WINVER">0x600</define>
-	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
 	<library>wine</library>
 	<library>msacm32</library>
 	<library>msvfw32</library>

reactos/dll/win32/avifil32/avifil32_ros.diff

@@ -63,8 +63,8 @@ Index: rsrc.rc
 ===================================================================
 --- rsrc.rc	(revision 23782)
 +++ rsrc.rc	(working copy)
-@@ -54,3 +54,4 @@
+@@ -55,3 +55,4 @@
- #include "avifile_Ru.rc"
  #include "avifile_Si.rc"
+ #include "avifile_Sv.rc"
  #include "avifile_Tr.rc"
 +#include "avifile_Uk.rc"

reactos/dll/win32/avifil32/avifile.c

@@ -1018,14 +1018,15 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
       lppc->peNew[n].peFlags = 0;
     }
 
-    if (mmioSeek(This->paf->hmmio, This->paf->dwNextFramePos, SEEK_SET) == -1)
+    if (mmioSeek(This->paf->hmmio, This->paf->dwNextFramePos, SEEK_SET) == -1 ||
-      return AVIERR_FILEWRITE;
+        mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK ||
-    if (mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK)
+        mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize ||
-      return AVIERR_FILEWRITE;
+        mmioAscend(This->paf->hmmio, &ck, 0) != S_OK)
-    if (mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize)
+    {
-      return AVIERR_FILEWRITE;
+      HeapFree(GetProcessHeap(), 0, lppc);
-    if (mmioAscend(This->paf->hmmio, &ck, 0) != S_OK)
       return AVIERR_FILEWRITE;
+    }
+
     This->paf->dwNextFramePos += ck.cksize + 2 * sizeof(DWORD);
 
     HeapFree(GetProcessHeap(), 0, lppc);
@@ -1939,6 +1940,7 @@ static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD off
       HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pStream->nIdxFrames * sizeof(AVIINDEXENTRY));
     if (pStream->idxFrames == NULL && pStream->nIdxFrames > 0) {
       pStream->nIdxFrames = 0;
+      HeapFree(GetProcessHeap(), 0, lp);
       return AVIERR_MEMORY;
     }
   }

reactos/dll/win32/avifil32/avifile_Fr.rc

@@ -34,7 +34,7 @@ BEGIN
     AUTOCHECKBOX    "&Imbriquer à chaque",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
     EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
     LTEXT           "images",-1,104,43,36,9
-    LTEXT           "Format actuel :",-1,3,56,53,9
+    LTEXT           "Format actuel :",-1,3,56,53,9
     LTEXT           "Cet espace est à louer",IDC_FORMATTEXT,55,56,90,26
     DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
     PUSHBUTTON      "Annuler",IDCANCEL,145,61,45,14
@@ -42,7 +42,7 @@ END
 
 STRINGTABLE DISCARDABLE
 {
-  IDS_WAVESTREAMFORMAT	"Waveform: %s"
+  IDS_WAVESTREAMFORMAT	"Waveform : %s"
   IDS_WAVEFILETYPE	"Waveform"
   IDS_ALLMULTIMEDIA	"Tous les fichiers multimédias"
   IDS_ALLFILES		"Tous les fichier (*.*)@*.*"

reactos/dll/win32/avifil32/avifile_Pl.rc

@@ -32,7 +32,7 @@ BEGIN
     EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
     LTEXT           "klatek",-1,104,43,36,9
     LTEXT           "Wybrany format:",-1,2,56,53,9
-    LTEXT           "Zarezerwownae miejsce",IDC_FORMATTEXT,55,56,90,26
+    LTEXT           "Zarezerwowane miejsce",IDC_FORMATTEXT,55,56,90,26
     DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
     PUSHBUTTON      "Anuluj",IDCANCEL,145,61,45,14
 END

reactos/dll/win32/avifil32/avifile_Sv.rc

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2007 Daniel Nylander
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Komprimeringsalternativ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Välj en ström:",-1,2,5,114,10
+    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL |
+                    WS_TABSTOP
+    PUSHBUTTON      "A&lternativ...",IDC_OPTIONS,145,17,45,14
+    AUTOCHECKBOX    "&Interfoliera varje",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "frames",-1,104,43,36,9
+    LTEXT           "Aktuellt format:",-1,3,56,53,9
+    LTEXT           "Detta utrymme uthyres",IDC_FORMATTEXT,55,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,145,61,45,14
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_WAVESTREAMFORMAT	"Vågform: %s"
+  IDS_WAVEFILETYPE	"Vågform"
+  IDS_ALLMULTIMEDIA	"Alla multimediafiler"
+  IDS_ALLFILES		"Alla filer (*.*)@*.*"
+  IDS_VIDEO		"video"
+  IDS_AUDIO		"ljud"
+  IDS_AVISTREAMFORMAT	"%s %s #%d"
+  IDS_AVIFILETYPE	"Wine AVI-standardfilhanterare"
+  IDS_UNCOMPRESSED      "okomprimerad"
+}

reactos/dll/win32/avifil32/regsvr.c

@@ -116,9 +116,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
 static LONG register_progid(WCHAR const *clsid,
 			    char const *progid, char const *curver_progid,
 			    char const *name, char const *extra);
-static LONG recursive_delete_key(HKEY key);
-static LONG recursive_delete_keyA(HKEY base, char const *name);
-static LONG recursive_delete_keyW(HKEY base, WCHAR const *name);
 
 /***********************************************************************
  *		register_interfaces
@@ -207,7 +204,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
 	WCHAR buf[39];
 
 	StringFromGUID2(list->iid, buf, 39);
-	res = recursive_delete_keyW(interface_key, buf);
+        res = RegDeleteTreeW(interface_key, buf);
+        if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
     }
 
     RegCloseKey(interface_key);
@@ -314,16 +312,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
 	WCHAR buf[39];
 
 	StringFromGUID2(list->clsid, buf, 39);
-	res = recursive_delete_keyW(coclass_key, buf);
+        res = RegDeleteTreeW(coclass_key, buf);
+        if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 
 	if (list->progid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid);
+            res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
+            if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 	}
 
 	if (list->viprogid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid);
+            res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
+            if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 	}
     }
@@ -435,70 +436,6 @@ error_close_progid_key:
     return res;
 }
 
-/***********************************************************************
- *		recursive_delete_key
- */
-static LONG recursive_delete_key(HKEY key)
-{
-    LONG res;
-    WCHAR subkey_name[MAX_PATH];
-    DWORD cName;
-    HKEY subkey;
-
-    for (;;) {
-	cName = sizeof(subkey_name) / sizeof(WCHAR);
-	res = RegEnumKeyExW(key, 0, subkey_name, &cName,
-			    NULL, NULL, NULL, NULL);
-	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
-	    res = ERROR_SUCCESS; /* presumably we're done enumerating */
-	    break;
-	}
-	res = RegOpenKeyExW(key, subkey_name, 0,
-			    KEY_READ | KEY_WRITE, &subkey);
-	if (res == ERROR_FILE_NOT_FOUND) continue;
-	if (res != ERROR_SUCCESS) break;
-
-	res = recursive_delete_key(subkey);
-	RegCloseKey(subkey);
-	if (res != ERROR_SUCCESS) break;
-    }
-
-    if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0);
-    return res;
-}
-
-/***********************************************************************
- *		recursive_delete_keyA
- */
-static LONG recursive_delete_keyA(HKEY base, char const *name)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key);
-    if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
-    if (res != ERROR_SUCCESS) return res;
-    res = recursive_delete_key(key);
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		recursive_delete_keyW
- */
-static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key);
-    if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
-    if (res != ERROR_SUCCESS) return res;
-    res = recursive_delete_key(key);
-    RegCloseKey(key);
-    return res;
-}
-
 /***********************************************************************
  *		coclass list
  */

reactos/dll/win32/avifil32/rsrc.rc

@@ -53,5 +53,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "avifile_Pt.rc"
 #include "avifile_Ru.rc"
 #include "avifile_Si.rc"
+#include "avifile_Sv.rc"
 #include "avifile_Tr.rc"
 #include "avifile_Uk.rc"