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

Author: winesync
Date: Wed Mar 14 17:13:17 2007
New Revision: 26079

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

Modified:
    trunk/reactos/dll/win32/avifil32/api.c
    trunk/reactos/dll/win32/avifil32/avifil32_ros.diff
    trunk/reactos/dll/win32/avifil32/avifile_It.rc
    trunk/reactos/dll/win32/avifil32/avifile_Pt.rc
    trunk/reactos/dll/win32/avifil32/extrachunk.c
    trunk/reactos/dll/win32/avifil32/extrachunk.h
    trunk/reactos/dll/win32/avifil32/factory.c
    trunk/reactos/dll/win32/avifil32/tmpfile.c

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 Wed Mar 14 17:13:17 2007
@@ -185,7 +185,7 @@
  */
 void WINAPI AVIFileExit(void) {
   /* need to free ole32.dll if we are the last exit call */
-  /* OleUnitialize() */
+  /* OleUninitialize() */
   FIXME("(): stub!\n");
 }
 

Modified: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifil32_ros.diff (original)
+++ trunk/reactos/dll/win32/avifil32/avifil32_ros.diff Wed Mar 14 17:13:17 2007
@@ -13,3 +13,58 @@
  #ifndef DIBWIDTHBYTES
  #define WIDTHBYTES(i)     (((i+31)&(~31))/8)
  #define DIBWIDTHBYTES(bi) WIDTHBYTES((bi).biWidth * (bi).biBitCount)
+Index: avifile_Uk.rc
+===================================================================
+--- avifile_Uk.rc	(revision 23782)
++++ avifile_Uk.rc	(working copy)
+@@ -0,0 +1,40 @@
++/*
++ * PROJECT:         AVI File support library
++ * LICENSE:         GPL - See COPYING in the top level directory
++ * FILE:            dll/win32/avifil32/avifile_Uk.rc
++ * PURPOSE:         Ukraianian resource file for avifil32
++ * TRANSLATOR:      Artem Reznikov
++ */
++
++LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
++
++IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
++STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
++CAPTION "Ïàðàìåòðè ñòèñíåííÿ"
++FONT 8, "MS Shell Dlg"
++BEGIN
++    LTEXT           "&Îáåð³òü ïîò³ê:",-1,2,5,114,10
++    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
++                    WS_TABSTOP
++    PUSHBUTTON      "Ï&àðàìåòðè...",IDC_OPTIONS,145,17,45,14
++    AUTOCHECKBOX    "&²íòåðâàë
÷åðãóâàííÿ",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
++    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
++    LTEXT           "êàäð³â",-1,104,43,36,9
++    LTEXT           "Ïîòî÷íèé ôîðìàò:",-1,3,56,53,9
++    LTEXT           "Öå ì³ñöå çäàºòüñÿ â îðåíäó",IDC_FORMATTEXT,55,56,90,26
++    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
++    PUSHBUTTON      "Ñêàñóâàòè",IDCANCEL,145,61,45,14
++END
++
++STRINGTABLE DISCARDABLE
++{
++  IDS_WAVESTREAMFORMAT	"Çâóêîâèé ïîò³ê: %s"
++  IDS_WAVEFILETYPE	"Çâóêîâèé ïîò³ê"
++  IDS_ALLMULTIMEDIA	"Óñ³ ìóëüòèìåä³éí³ ôàéëè"
++  IDS_ALLFILES		"Óñ³ ôàéëè (*.*)(a)*.*"
++  IDS_VIDEO		"â³äåî"
++  IDS_AUDIO		"àóä³î"
++  IDS_AVISTREAMFORMAT	"%s %s #%d"
++  IDS_AVIFILETYPE	"Wine îáðîáíèê AVI-ôàéë³â çà çàìîâ÷óâàííÿì"
++  IDS_UNCOMPRESSED      "áåç ñòèñíåííÿ"
++}
++
+Index: rsrc.rc
+===================================================================
+--- rsrc.rc	(revision 23782)
++++ rsrc.rc	(working copy)
+@@ -54,3 +54,4 @@
+ #include "avifile_Ru.rc"
+ #include "avifile_Si.rc"
+ #include "avifile_Tr.rc"
++#include "avifile_Uk.rc"

Modified: trunk/reactos/dll/win32/avifil32/avifile_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile_It.rc (original)
+++ trunk/reactos/dll/win32/avifil32/avifile_It.rc Wed Mar 14 17:13:17 2007
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile_Pt.rc (original)
+++ trunk/reactos/dll/win32/avifil32/avifile_Pt.rc Wed Mar 14 17:13:17 2007
@@ -1,5 +1,6 @@
 /*
  * Copyright 2003 Marcelo Duarte
+ * Copyright 2006 Américo José Melo
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
@@ -36,6 +37,29 @@
     PUSHBUTTON      "Cancelar",IDCANCEL,145,61,45,14
 END
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Opções de compressão"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Escolha a stream:",-1,2,5,114,10
+    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL |
+                    WS_TABSTOP
+    PUSHBUTTON      "&Opções...",IDC_OPTIONS,145,17,45,14
+    AUTOCHECKBOX    "&Interlaçar a todos
os",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "molduras",-1,104,43,36,9
+    LTEXT           "Formato actual:",-1,3,56,53,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,145,61,45,14
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
   IDS_WAVESTREAMFORMAT	"Formato wave: %s"
@@ -48,3 +72,18 @@
   IDS_AVIFILETYPE	"Wine AVI-manipulador padrão de arquivo"
   IDS_UNCOMPRESSED      "sem compressão"
 }
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_WAVESTREAMFORMAT	"Formato wave: %s"
+  IDS_WAVEFILETYPE	"Formato wave"
+  IDS_ALLMULTIMEDIA	"Todos os ficheiros multimédia"
+  IDS_ALLFILES		"Todos os ficheiros (*.*)(a)*.*"
+  IDS_VIDEO		"vídeo"
+  IDS_AUDIO		"áudio"
+  IDS_AVISTREAMFORMAT	"%s %s #%d"
+  IDS_AVIFILETYPE	"Manipulador AVI Wine predefinido"
+  IDS_UNCOMPRESSED      "sem compressão"
+}

Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.c (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.c Wed Mar 14 17:13:17 2007
@@ -29,8 +29,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 /* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,
-		       LPLONG size)
+HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size)
 {
   LPBYTE lp;
   DWORD  cb;
@@ -68,8 +67,7 @@
 }
 
 /* writes a chunk into the extrachunk-structure */
-HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,
-			LONG size)
+HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG size)
 {
   LPDWORD lp;
 

Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.h (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.h Wed Mar 14 17:13:17 2007
@@ -35,10 +35,10 @@
 } EXTRACHUNKS, *LPEXTRACHUNKS;
 
 /* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size);
+HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size);
 
 /* writes a chunk into the extrachunk-structure */
-HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LONG size);
+HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);
 
 /* reads a chunk fomr the HMMIO into the extrachunk-structure */
 HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck);

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 Wed Mar 14 17:13:17 2007
@@ -40,8 +40,8 @@
 
 HMODULE AVIFILE_hModule   = NULL;
 
-BOOL    AVIFILE_bLocked   = FALSE;
-UINT    AVIFILE_uUseCount = 0;
+static BOOL    AVIFILE_bLocked;
+static UINT    AVIFILE_uUseCount;
 
 static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID
riid,LPVOID *ppobj);
 static ULONG   WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface);

Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/tmpfile.c (original)
+++ trunk/reactos/dll/win32/avifil32/tmpfile.c Wed Mar 14 17:13:17 2007
@@ -112,7 +112,7 @@
     {
       register DWORD tmp;
 
-      tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), \
+      tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength),
 		   tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000);
       if (tmpFile->fInfo.dwLength < tmp)
 	tmpFile->fInfo.dwLength = tmp;