Author: winesync Date: Thu Nov 29 12:38:17 2007 New Revision: 30855
URL: http://svn.reactos.org/svn/reactos?rev=30855&view=rev Log: Autosyncing with Wine HEAD
Added: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc (with props) Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/avifil32_ros.diff trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/regsvr.c trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/avifil32/wavfile.c
Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?re... ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c (original) +++ trunk/reactos/dll/win32/avifil32/api.c Thu Nov 29 12:38:17 2007 @@ -550,7 +550,7 @@ * 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);
@@ -1159,7 +1159,7 @@ break; } } - + memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0])); szFilter += size; szFilter[0] = 0; @@ -1827,7 +1827,7 @@ if (curStream != 0) { lFirstVideo = AVIStreamSampleToSample(pInStreams[curStream], pInStreams[0], - (sInfo.fccType == streamtypeVIDEO ? + (sInfo.fccType == streamtypeVIDEO ? (LONG)dwInterleave : lSampleInc) + sInfo.dwInitialFrames + lCurFrame); } else @@ -1913,7 +1913,7 @@ hres = AVIStreamReadFormat(pInStreams[curStream], sInfo.dwStart, lpBuffer, &lBufferSize); if (FAILED(hres)) - return hres; + goto error; AVIStreamSetFormat(pOutStreams[curStream], sInfo.dwStart, lpBuffer, lBufferSize);
Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil32... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild Thu Nov 29 12:38:17 2007 @@ -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="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>msacm32</library> <library>msvfw32</library>
Modified: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil32... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32_ros.diff (original) +++ trunk/reactos/dll/win32/avifil32/avifil32_ros.diff Thu Nov 29 12:38:17 2007 @@ -63,8 +63,8 @@ =================================================================== --- rsrc.rc (revision 23782) +++ rsrc.rc (working copy) -@@ -54,3 +54,4 @@ - #include "avifile_Ru.rc" +@@ -55,3 +55,4 @@ #include "avifile_Si.rc" + #include "avifile_Sv.rc" #include "avifile_Tr.rc" +#include "avifile_Uk.rc"
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 Thu Nov 29 12:38:17 2007 @@ -1018,14 +1018,15 @@ 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 || + mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK || + mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize || + mmioAscend(This->paf->hmmio, &ck, 0) != S_OK) + { + HeapFree(GetProcessHeap(), 0, lppc); return AVIERR_FILEWRITE; - if (mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK) - return AVIERR_FILEWRITE; - if (mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize) - return AVIERR_FILEWRITE; - 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 @@ 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; } } @@ -2248,7 +2250,7 @@ ck.cksize, NULL, NULL);
if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { - HeapFree(GetProcessHeap(), 0, str); + HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; }
Modified: trunk/reactos/dll/win32/avifil32/avifile_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Cs.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Cs.rc Thu Nov 29 12:38:17 2007 @@ -30,7 +30,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "V&olby...",IDC_OPTIONS,145,17,45,14 AUTOCHECKBOX "Prolo&it kadých",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_De.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_De.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_En.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_En.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Es.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Es.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Fr.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Fr.rc Thu Nov 29 12:38:17 2007 @@ -28,13 +28,13 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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 "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 @@
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 (*.*)@*.*"
Modified: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Hu.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Hu.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ja.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ja.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "Xg[ðIð(&C):",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "IvV(&O)...",IDC_OPTIONS,145,17,45,14 AUTOCHECKBOX "C^[[u(&I)",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc Thu Nov 29 12:38:17 2007 @@ -25,7 +25,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "½ºÆ®¸² ¼±ÅÃ(&C):",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Nl.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Nl.rc Thu Nov 29 12:38:17 2007 @@ -26,7 +26,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_No.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_No.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pl.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pl.rc Thu Nov 29 12:38:17 2007 @@ -25,14 +25,14 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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 "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
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 Thu Nov 29 12:38:17 2007 @@ -25,7 +25,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ru.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ru.rc Thu Nov 29 12:38:17 2007 @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Âûáåðèòå ïîòîê:",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + 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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Si.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Si.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Monosti ...",IDC_OPTIONS,145,17,45,14 AUTOCHECKBOX "&Preplet vsake",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
Added: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Sv.rc (added) +++ trunk/reactos/dll/win32/avifil32/avifile_Sv.rc Thu Nov 29 12:38:17 2007 @@ -1,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<ernativ...",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" +}
Propchange: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/avifil32/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Tr.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Tr.rc Thu Nov 29 12:38:17 2007 @@ -24,7 +24,7 @@ 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 | + COMBOBOX IDC_STREAM,2,18,134,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
Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Uk.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Uk.rc Thu Nov 29 12:38:17 2007 @@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Îáåð³òü ïîò³ê:",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + 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
Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstre... ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c Thu Nov 29 12:38:17 2007 @@ -653,7 +653,7 @@ nLastStream++;
nStreams = nLastStream - streamNr; - } else + } else nStreams = 1; if (This->nStreams + nStreams + 1 > This->nTableSize) { n = This->nStreams + nStreams + 33; @@ -944,7 +944,7 @@ } else n = 0; n += lp->biSize; - + memcpy(format, lp, min((LONG)n, *fmtsize)); hr = ((LONG)n > *fmtsize ? AVIERR_BUFFERTOOSMALL : AVIERR_OK); *fmtsize = n;
Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getframe... ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c Thu Nov 29 12:38:17 2007 @@ -387,7 +387,7 @@
/* only to pass through? */ if (This->lpInFormat->biCompression == BI_RGB && lpBits == NULL) { - if (lpbi == NULL || + if (lpbi == NULL || (lpbi->biCompression == BI_RGB && lpbi->biWidth == This->lpInFormat->biWidth && lpbi->biHeight == This->lpInFormat->biHeight &&
Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstrea... ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c Thu Nov 29 12:38:17 2007 @@ -815,7 +815,7 @@ dwMinQual = ICQUALITY_LOW;
noPrev = TRUE; - if ((icmFlags & ICCOMPRESS_KEYFRAME) == 0 && + if ((icmFlags & ICCOMPRESS_KEYFRAME) == 0 && (This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) noPrev = FALSE;
Modified: trunk/reactos/dll/win32/avifil32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.c... ============================================================================== --- trunk/reactos/dll/win32/avifil32/regsvr.c (original) +++ trunk/reactos/dll/win32/avifil32/regsvr.c Thu Nov 29 12:38:17 2007 @@ -116,9 +116,6 @@ 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 @@ 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 @@ 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; } } @@ -432,70 +433,6 @@
error_close_progid_key: RegCloseKey(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; }
Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc?... ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc Thu Nov 29 12:38:17 2007 @@ -53,5 +53,6 @@ #include "avifile_Pt.rc" #include "avifile_Ru.rc" #include "avifile_Si.rc" +#include "avifile_Sv.rc" #include "avifile_Tr.rc" #include "avifile_Uk.rc"
Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c Thu Nov 29 12:38:17 2007 @@ -915,7 +915,7 @@ if (bytesread != NULL) *bytesread = buffersize; if (samplesread != NULL) - *samplesread = samples; + *samplesread = samples;
return AVIERR_OK; }
-
winesync＠svn.reactos.org