Autosyncing with Wine HEAD

svn path=/trunk/; revision=34326

diff --git a/reactos/dll/win32/avifil32/api.c b/reactos/dll/win32/avifil32/api.c
index b7b21b9..12eb1b7 100644 (file)
--- a/reactos/dll/win32/avifil32/api.c
+++ b/reactos/dll/win32/avifil32/api.c
@@ -1524,7 +1524,7 @@ HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions)
   if (nStreams < 0 || ppOptions == NULL)
     return AVIERR_BADPARAM;
 
-  for (; nStreams > 0; nStreams--) {
+  for (nStreams--; nStreams >= 0; nStreams--) {
     if (ppOptions[nStreams] != NULL) {
       ppOptions[nStreams]->dwFlags &= ~AVICOMPRESSF_VALID;
 

diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index cf9e0a4..854672b 100644 (file)
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -23,6 +23,7 @@
        <file>rsrc.rc</file>
        <file>avifil32.spec</file>
        <library>wine</library>
+       <library>uuid</library>
        <library>msacm32</library>
        <library>msvfw32</library>
        <library>winmm</library>
@@ -30,7 +31,6 @@
        <library>user32</library>
        <library>advapi32</library>
        <library>kernel32</library>
-       <library>uuid</library>
        <library>ntdll</library>
 </module>
 </group>

diff --git a/reactos/dll/win32/avifil32/avifile_Cs.rc b/reactos/dll/win32/avifil32/avifile_Cs.rc
index 25d4ce5..86dac3f 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Cs.rc
+++ b/reactos/dll/win32/avifil32/avifile_Cs.rc
@@ -24,22 +24,22 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavení komprese"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Vyber datový proud:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Vyber datový proud:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "V&olby...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "Prolo\9e&it ka\9edých",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "rámcù",-1,104,43,36,9
-    LTEXT           "Souèasný formát:",-1,3,56,53,9
-    LTEXT           "Zbývající místo",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "Budi\9e",IDOK,145,42,45,14
-    PUSHBUTTON      "Zru\9ait",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "V&olby...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "Prolo\9e&it ka\9edých",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "rámcù",-1,129,43,36,9
+    LTEXT           "Souèasný formát:",-1,3,56,73,9
+    LTEXT           "Zbývající místo",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "Budi\9e",IDOK,170,42,50,14
+    PUSHBUTTON      "Zru\9ait",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Da.rc b/reactos/dll/win32/avifil32/avifile_Da.rc
new file mode 100644 (file)
index 0000000..669e918
--- /dev/null
+++ b/reactos/dll/win32/avifil32/avifile_Da.rc
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008 Jens Albretsen
+ *
+ * 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_DANISH, SUBLANG_DEFAULT
+
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Komprimerings indstillinger"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Vælg en stream:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
+                    WS_TABSTOP
+    PUSHBUTTON      "I&ndstillinger...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave hver",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "billeder",-1,129,43,36,9
+    LTEXT           "Nuværende format:",-1,3,56,53,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Annuller",IDCANCEL,170,61,50,14
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_WAVESTREAMFORMAT "Lydkurve: %s"
+  IDS_WAVEFILETYPE     "Lydkurve"
+  IDS_ALLMULTIMEDIA    "Alle multimedia filer"
+  IDS_ALLFILES         "Alle files (*.*)@*.*"
+  IDS_VIDEO            "video"
+  IDS_AUDIO            "audio"
+  IDS_AVISTREAMFORMAT  "%s %s #%d"
+  IDS_AVIFILETYPE      "Wine AVI-default-filehandler"
+  IDS_UNCOMPRESSED      "ukomprimeret"
+}

diff --git a/reactos/dll/win32/avifil32/avifile_De.rc b/reactos/dll/win32/avifil32/avifile_De.rc
index 7539af2..9e3e5f2 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_De.rc
+++ b/reactos/dll/win32/avifil32/avifile_De.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Komprimierungsoptionen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Wählen Sie die Eingangsdaten aus:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Wählen Sie die Eingangsdaten aus:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Optionen...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave alle",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "Einzelbilder",-1,104,43,36,9
-    LTEXT           "Akuelles Format:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Abbrechen",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Optionen...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave alle",IDC_INTERLEAVE,3,42,75,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "Einzelbilder",-1,119,43,36,9
+    LTEXT           "Aktuelles Format:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_En.rc b/reactos/dll/win32/avifil32/avifile_En.rc
index 2fc5b45..0947cbd 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_En.rc
+++ b/reactos/dll/win32/avifil32/avifile_En.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Compress options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Choose a stream:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Choose a stream:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Options...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave every",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           "Current format:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Cancel",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Options...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave every",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "frames",-1,129,43,36,9
+    LTEXT           "Current format:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Es.rc b/reactos/dll/win32/avifil32/avifile_Es.rc
index ee3e73a..45d7003 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Es.rc
+++ b/reactos/dll/win32/avifil32/avifile_Es.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Opciones de compresión"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Elija un stream:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Elija un stream:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opciones...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave cada",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "cuadros",-1,104,43,36,9
-    LTEXT           "Formato actual:",-1,3,56,53,9
-    LTEXT           "Espacio en alquiler",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "Aceptar",IDOK,145,42,45,14
-    PUSHBUTTON      "Cancelar",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Opciones...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave cada",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "cuadros",-1,129,43,36,9
+    LTEXT           "Formato actual:",-1,3,56,73,9
+    LTEXT           "Espacio en alquiler",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "Aceptar",IDOK,170,42,50,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Fr.rc b/reactos/dll/win32/avifil32/avifile_Fr.rc
index ceb751b..6a38721 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Fr.rc
+++ b/reactos/dll/win32/avifil32/avifile_Fr.rc
@@ -22,22 +22,22 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Options de compression"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Sélectionnez un flux :",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Sélectionnez un flux :",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Options...",IDC_OPTIONS,145,17,45,14
-    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           "Cet espace est à louer",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Annuler",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Options...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Imbriquer à chaque",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "images",-1,129,43,36,9
+    LTEXT           "Format actuel:",-1,3,56,73,9
+    LTEXT           "Cet espace est à louer",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Annuler",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Hu.rc b/reactos/dll/win32/avifil32/avifile_Hu.rc
index 8eb9825..e9bdce9 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Hu.rc
+++ b/reactos/dll/win32/avifil32/avifile_Hu.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tömörítési beállítások"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Válassuon folyamot:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Válassuon folyamot:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opciók...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Beékel minden",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "képkockát",-1,104,43,36,9
-    LTEXT           "Jelenlegi formátum:",-1,3,56,53,9
-    LTEXT           "Ez hely kölcsönzésre",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Mégse",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Opciók...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Beékel minden",IDC_INTERLEAVE,3,42,75,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "képkockát",-1,119,43,36,9
+    LTEXT           "Jelenlegi formátum:",-1,3,56,73,9
+    LTEXT           "Ez hely kölcsönzésre",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Mégse",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_It.rc b/reactos/dll/win32/avifil32/avifile_It.rc
index 4d333b9..6f06ec5 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_It.rc
+++ b/reactos/dll/win32/avifil32/avifile_It.rc
@@ -19,22 +19,22 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Opzioni di compressione"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Scegliere un flusso:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL |
+    LTEXT           "&Scegliere un flusso:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opzioni...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interfoliazione ogni",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "fotogrammi",-1,104,43,36,9
-    LTEXT           "Formato attuale:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Annulla",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Opzioni...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interfoliazione ogni",IDC_INTERLEAVE,3,42,75,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "fotogrammi",-1,119,43,36,9
+    LTEXT           "Formato attuale:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Annulla",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Ja.rc b/reactos/dll/win32/avifil32/avifile_Ja.rc
index 38fc247..37a3824 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Ja.rc
+++ b/reactos/dll/win32/avifil32/avifile_Ja.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "\88³\8fk\83I\83v\83V\83\87\83\93"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT           "\83X\83g\83\8a\81[\83\80\82ð\91I\91ð(&C):",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "\83X\83g\83\8a\81[\83\80\82ð\91I\91ð(&C):",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "\83I\83v\83V\83\87\83\93(&O)...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "\83C\83\93\83^\81[\83\8a\81[\83u(&I)",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "\83t\83\8c\81[\83\80",-1,104,43,36,9
-    LTEXT           "\8c»\8dÝ\82Ì\83t\83H\81[\83}\83b\83g:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "\83I\83v\83V\83\87\83\93(&O)...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "\83C\83\93\83^\81[\83\8a\81[\83u(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "\83t\83\8c\81[\83\80",-1,129,43,36,9
+    LTEXT           "\8c»\8dÝ\82Ì\83t\83H\81[\83}\83b\83g:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Ko.rc b/reactos/dll/win32/avifil32/avifile_Ko.rc
index 4bf6004..8fbd407 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Ko.rc
+++ b/reactos/dll/win32/avifil32/avifile_Ko.rc
@@ -19,22 +19,22 @@
 
 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "¾ÐÃà ¿É¼Ç"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "½ºÆ®¸² ¼±ÅÃ(&C):",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "½ºÆ®¸² ¼±ÅÃ(&C):",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "¿É¼Ç(&O)...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "Ç×»ó »óÈ£¹èÄ¡(&I)",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   "È®ÀÎ",IDOK,145,42,45,14
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "¿É¼Ç(&O)...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "Ç×»ó »óÈ£¹èÄ¡(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "ÇÁ·¹ÀÓ",-1,129,43,36,9
+    LTEXT           "ÇöÀç Çü½Ä:",-1,3,56,73,9
+    LTEXT           "ÇÊ¿äÇÑ °ø°£",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "È®ÀÎ",IDOK,170,42,50,14
+    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Nl.rc b/reactos/dll/win32/avifil32/avifile_Nl.rc
index 9d6ce68..b120572 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Nl.rc
+++ b/reactos/dll/win32/avifil32/avifile_Nl.rc
@@ -20,22 +20,22 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Compressie-instellingen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Kies een invoerbestand:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Kies een invoerbestand:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opties...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave alle",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "Losse frames",-1,104,43,36,9
-    LTEXT           "Huidig formaat:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Annuleren",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Opties...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave alle",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "Losse frames",-1,129,43,36,9
+    LTEXT           "Huidig formaat:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Annuleren",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_No.rc b/reactos/dll/win32/avifil32/avifile_No.rc
index 8ead416..8483ab2 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_No.rc
+++ b/reactos/dll/win32/avifil32/avifile_No.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Komprimeringsinnstillinger"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Velg en strøm:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Velg en strøm:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "I&nnstillinger . . .",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "Sett &inn for hver",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "bilde",-1,104,43,36,9
-    LTEXT           "Gjeldende format:",-1,3,56,53,9
-    LTEXT           "Denne plassen er til leie",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Avbryt",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "I&nnstillinger...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "Sett &inn for hver",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "bilde",-1,129,43,36,9
+    LTEXT           "Gjeldende format:",-1,3,56,73,9
+    LTEXT           "Denne plassen er til leie",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Pl.rc b/reactos/dll/win32/avifil32/avifile_Pl.rc
index 7fe0ca2..49abdb0 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Pl.rc
+++ b/reactos/dll/win32/avifil32/avifile_Pl.rc
@@ -19,22 +19,22 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Opcje kompresji"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Wybierz strumieñ:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Wybierz strumieñ:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opcje...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Przeplot co",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    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           "Zarezerwowane miejsce",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "OK",IDOK,145,42,45,14
-    PUSHBUTTON      "Anuluj",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Opcje...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Przeplot co",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "klatek",-1,129,43,36,9
+    LTEXT           "Wybrany format:",-1,2,56,73,9
+    LTEXT           "Zarezerwowane miejsce",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Anuluj",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Pt.rc b/reactos/dll/win32/avifil32/avifile_Pt.rc
index 7e5d1c5..37bb941 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Pt.rc
+++ b/reactos/dll/win32/avifil32/avifile_Pt.rc
@@ -19,42 +19,42 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 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 | 
+    LTEXT           "&Escolha a stream:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Opções...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave every",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           "Formato atual:",-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
+    PUSHBUTTON      "&Opções...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave every",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "frames",-1,129,43,36,9
+    LTEXT           "Formato atual:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,170,61,50,14
 END
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 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 |
+    LTEXT           "&Escolha a stream:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,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
+    PUSHBUTTON      "&Opções...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interlaçar a todos os",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "molduras",-1,129,43,36,9
+    LTEXT           "Formato actual:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,170,61,50,14
 END
 
 

diff --git a/reactos/dll/win32/avifil32/avifile_Ru.rc b/reactos/dll/win32/avifil32/avifile_Ru.rc
index 88f313c..fa8206d 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Ru.rc
+++ b/reactos/dll/win32/avifil32/avifile_Ru.rc
@@ -20,22 +20,22 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 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 | 
+    LTEXT           "&Âûáåðèòå ïîòîê:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,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
+    PUSHBUTTON      "&Îïöèè...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Ïðîñëàèâàòü êàæäûå",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "ôðåéìà",-1,129,43,36,9
+    LTEXT           "Òåêóùèé ôîðìàò:",-1,3,56,73,9
+    LTEXT           "Ýòî ìåñòî ñäà¸òñÿ â àðåíäó",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Îòìåíà",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Si.rc b/reactos/dll/win32/avifil32/avifile_Si.rc
index 1b5d7dc..5ed3d13 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Si.rc
+++ b/reactos/dll/win32/avifil32/avifile_Si.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Rok Mandeljc <rok.mandeljc@gimb.org>
+ * Copyright 2003, 2008 Rok Mandeljc
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,35 +16,39 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Mo\9enosti za stiskanje"
+CAPTION "Možnosti stiskanja"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Izbira toka:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "&Izbran tok:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Mo\9enosti ...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Preplet vsake",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
-    EDITTEXT        IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "slike",-1,104,43,36,9
-    LTEXT           "Trenutna oblika zapisa:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "V redu",IDOK,145,42,45,14
-    PUSHBUTTON      "Preklièi",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Možnosti...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Prepletanje vsake",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "slike",-1,129,43,36,9
+    LTEXT           "Trenutna oblika zapisa:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "V redu",IDOK,170,42,50,14
+    PUSHBUTTON      "Prekliči",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE
 {
   IDS_WAVESTREAMFORMAT "Waveform: %s"
   IDS_WAVEFILETYPE     "Waveform"
-  IDS_ALLMULTIMEDIA    "Vse veèpredstavnostne datoteke"
+  IDS_ALLMULTIMEDIA    "Vse večpredstavnostne datoteke"
   IDS_ALLFILES         "Vse datoteke (*.*)@*.*"
   IDS_VIDEO            "video"
   IDS_AUDIO            "avdio"
   IDS_AVISTREAMFORMAT  "%s %s #%d"
-  IDS_AVIFILETYPE      "Privzeti program za obravnavo AVI datotek"
+  IDS_AVIFILETYPE      "Wine privzeti-upravljalec-AVI-datotek"
   IDS_UNCOMPRESSED      "nestisnjeno"
 }
+
+#pragma code_page(default)

diff --git a/reactos/dll/win32/avifil32/avifile_Sv.rc b/reactos/dll/win32/avifil32/avifile_Sv.rc
index 3517edd..f65e4d2 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Sv.rc
+++ b/reactos/dll/win32/avifil32/avifile_Sv.rc
@@ -16,24 +16,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 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 |
+    LTEXT           "&Välj en ström:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,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
+    PUSHBUTTON      "A&lternativ...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interfoliera varje",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "frames",-1,129,43,36,9
+    LTEXT           "Aktuellt format:",-1,3,56,73,9
+    LTEXT           "Detta utrymme uthyres",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
+    PUSHBUTTON      "Avbryt",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/avifile_Tr.rc b/reactos/dll/win32/avifil32/avifile_Tr.rc
index b9caa67..451802f 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_Tr.rc
+++ b/reactos/dll/win32/avifil32/avifile_Tr.rc
@@ -18,22 +18,22 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 196, 82
+IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sýkýþtýrma seçenekleri"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Bir akýþ se&çin:",-1,2,5,114,10
-    COMBOBOX        IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Bir akýþ se&çin:",-1,2,5,154,10
+    COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Seçenekler...",IDC_OPTIONS,145,17,45,14
-    AUTOCHECKBOX    "&Interleave every",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           "Geçerli biçim:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
-    DEFPUSHBUTTON   "Tamam",IDOK,145,42,45,14
-    PUSHBUTTON      "Ýptal",IDCANCEL,145,61,45,14
+    PUSHBUTTON      "&Seçenekler...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interleave every",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
+    LTEXT           "frames",-1,129,43,36,9
+    LTEXT           "Geçerli biçim:",-1,3,56,73,9
+    LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "Tamam",IDOK,170,42,50,14
+    PUSHBUTTON      "Ýptal",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/reactos/dll/win32/avifil32/rsrc.rc b/reactos/dll/win32/avifil32/rsrc.rc
index 5b823f1..3dfdad8 100644 (file)
--- a/reactos/dll/win32/avifil32/rsrc.rc
+++ b/reactos/dll/win32/avifil32/rsrc.rc
@@ -39,6 +39,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  * in one of the specific files.
  */
 #include "avifile_Cs.rc"
+#include "avifile_Da.rc"
 #include "avifile_De.rc"
 #include "avifile_En.rc"
 #include "avifile_Es.rc"

diff --git a/reactos/dll/win32/cabinet/fdi.c b/reactos/dll/win32/cabinet/fdi.c
index 468a68d..454776a 100644 (file)
--- a/reactos/dll/win32/cabinet/fdi.c
+++ b/reactos/dll/win32/cabinet/fdi.c
@@ -121,7 +121,7 @@ typedef struct {
 
 typedef struct fdi_cds_fwd {
   void *hfdi;                      /* the hfdi we are using                 */
-  int filehf, cabhf;               /* file handle we are using              */
+  INT_PTR filehf, cabhf;           /* file handle we are using              */
   struct fdi_folder *current;      /* current folder we're extracting from  */
   cab_ULONG offset;                /* uncompressed offset within folder     */
   cab_UBYTE *outpos;               /* (high level) start of data to use up  */
@@ -160,21 +160,21 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) {
   if (model->syms[0].cumfreq > 3800) {
     if (--model->shiftsleft) {
       for (i = model->entries - 1; i >= 0; i--) {
-    /* -1, not -2; the 0 entry saves this */
-    model->syms[i].cumfreq >>= 1;
-    if (model->syms[i].cumfreq <= model->syms[i+1].cumfreq) {
-      model->syms[i].cumfreq = model->syms[i+1].cumfreq + 1;
-    }
+        /* -1, not -2; the 0 entry saves this */
+        model->syms[i].cumfreq >>= 1;
+        if (model->syms[i].cumfreq <= model->syms[i+1].cumfreq) {
+          model->syms[i].cumfreq = model->syms[i+1].cumfreq + 1;
+        }
       }
     }
     else {
       model->shiftsleft = 50;
       for (i = 0; i < model->entries ; i++) {
-    /* no -1, want to include the 0 entry */
-    /* this converts cumfreqs into frequencies, then shifts right */
-    model->syms[i].cumfreq -= model->syms[i+1].cumfreq;
-    model->syms[i].cumfreq++; /* avoid losing things entirely */
-    model->syms[i].cumfreq >>= 1;
+        /* no -1, want to include the 0 entry */
+        /* this converts cumfreqs into frequencies, then shifts right */
+        model->syms[i].cumfreq -= model->syms[i+1].cumfreq;
+        model->syms[i].cumfreq++; /* avoid losing things entirely */
+        model->syms[i].cumfreq >>= 1;
       }
 
       /* now sort by frequencies, decreasing order -- this must be an
@@ -182,22 +182,22 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) {
        * characteristics
        */
       for (i = 0; i < model->entries - 1; i++) {
-    for (j = i + 1; j < model->entries; j++) {
-      if (model->syms[i].cumfreq < model->syms[j].cumfreq) {
-        temp = model->syms[i];
-        model->syms[i] = model->syms[j];
-        model->syms[j] = temp;
-      }
-    }
+        for (j = i + 1; j < model->entries; j++) {
+          if (model->syms[i].cumfreq < model->syms[j].cumfreq) {
+            temp = model->syms[i];
+            model->syms[i] = model->syms[j];
+            model->syms[j] = temp;
+          }
+        }
       }
-    
+
       /* then convert frequencies back to cumfreq */
       for (i = model->entries - 1; i >= 0; i--) {
-    model->syms[i].cumfreq += model->syms[i+1].cumfreq;
+        model->syms[i].cumfreq += model->syms[i+1].cumfreq;
       }
       /* then update the other part of the table */
       for (i = 0; i < model->entries; i++) {
-    model->tabloc[model->syms[i].sym] = i;
+        model->tabloc[model->syms[i].sym] = i;
       }
     }
   }
@@ -882,7 +882,7 @@ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) {
   memcpy(CAB(lzx_position_base), base, sizeof(base));
 
   /* calculate required position slots */
-       if (window == 20) posn_slots = 42;
+  if (window == 20) posn_slots = 42;
   else if (window == 21) posn_slots = 50;
   else posn_slots = window << 1;
 
@@ -1034,7 +1034,8 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state)
         w += l[h++];            /* add bits already decoded */
 
         /* compute minimum size table less than or equal to *m bits */
-        z = (z = g - w) > (cab_ULONG)*m ? *m : z;        /* upper limit */
+        if ((z = g - w) > (cab_ULONG)*m)    /* upper limit */
+          z = *m;
         if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
         {                       /* too few codes for k-w bit table */
           f -= a + 1;           /* deduct codes from patterns left */
@@ -1177,7 +1178,10 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph
       ZIPDUMPBITS(e)
       do
       {
-        n -= (e = (e = ZIPWSIZE - ((d &= ZIPWSIZE-1) > w ? d : w)) > n ?n:e);
+        d &= ZIPWSIZE - 1;
+        e = ZIPWSIZE - max(d, w);
+        e = min(e, n);
+        n -= e;
         do
         {
           CAB(outbuf)[w++] = CAB(outbuf)[d++];
@@ -2047,7 +2051,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
       /* outlen=0 means this block was the last contiguous part
          of a split block, continued in the next cabinet */
       if (outlen == 0) {
-        int pathlen, filenamelen, idx, i, cabhf;
+        int pathlen, filenamelen, idx, i;
+        INT_PTR cabhf;
         char fullpath[MAX_PATH], userpath[256];
         FDINOTIFICATION fdin;
         FDICABINETINFO fdici;
@@ -2428,7 +2433,8 @@ BOOL __cdecl FDICopy(
 { 
   FDICABINETINFO    fdici;
   FDINOTIFICATION   fdin;
-  int               cabhf, filehf = 0, idx;
+  INT_PTR           cabhf, filehf = 0;
+  int               idx;
   unsigned int      i;
   char              fullpath[MAX_PATH];
   size_t            pathlen, filenamelen;