mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-28 14:03:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Autosyncing with Wine HEAD

Browse Source 
svn path=/trunk/; revision=30855
This commit is contained in:
The Wine Synchronizer 2007-11-29 09:38:17 +00:00
parent 0dd126df47
commit c129bf95ec
27 changed files with 103 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reactos/dll/win32/avifil32/api.c
View File

@ -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);
@ -1159,7 +1159,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
break;
}
}
memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0]));
szFilter += size;
szFilter[0] = 0;
@ -1827,7 +1827,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
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 @@ 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);

9
reactos/dll/win32/avifil32/avifil32.rbuild
View File

@ -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>

4
reactos/dll/win32/avifil32/avifil32_ros.diff
View File

@ -63,8 +63,8 @@ Index: rsrc.rc
===================================================================
--- 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"

18
reactos/dll/win32/avifil32/avifile.c
View File

@ -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)
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)
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;
}
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;
}
}
@ -2248,7 +2250,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
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;
}

2
reactos/dll/win32/avifil32/avifile_Cs.rc
View File

@ -30,7 +30,7 @@ CAPTION "Nastaven
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 každých",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP

2
reactos/dll/win32/avifil32/avifile_De.rc
View File

@ -24,7 +24,7 @@ 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 |
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

2
reactos/dll/win32/avifil32/avifile_En.rc
View File

@ -24,7 +24,7 @@ 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 |
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

2
reactos/dll/win32/avifil32/avifile_Es.rc
View File

@ -24,7 +24,7 @@ CAPTION "Opciones de compresi
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

6
reactos/dll/win32/avifil32/avifile_Fr.rc
View File

@ -28,13 +28,13 @@ 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 |
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 @@ 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 (*.*)@*.*"

2
reactos/dll/win32/avifil32/avifile_Hu.rc
View File

@ -24,7 +24,7 @@ CAPTION "T
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

2
reactos/dll/win32/avifil32/avifile_Ja.rc
View File

@ -24,7 +24,7 @@ CAPTION "
FONT 9, "MS UI Gothic"
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

2
reactos/dll/win32/avifil32/avifile_Ko.rc
View File

@ -25,7 +25,7 @@ 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 |
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

2
reactos/dll/win32/avifil32/avifile_Nl.rc
View File

@ -26,7 +26,7 @@ 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 |
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

2
reactos/dll/win32/avifil32/avifile_No.rc
View File

@ -24,7 +24,7 @@ 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 |
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

4
reactos/dll/win32/avifil32/avifile_Pl.rc
View File

@ -25,14 +25,14 @@ 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 |
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

2
reactos/dll/win32/avifil32/avifile_Pt.rc
View File

@ -25,7 +25,7 @@ CAPTION "Op
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

2
reactos/dll/win32/avifil32/avifile_Ru.rc
View File

@ -26,7 +26,7 @@ CAPTION "
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

2
reactos/dll/win32/avifil32/avifile_Si.rc
View File

@ -24,7 +24,7 @@ CAPTION "Mo
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 "&Možnosti ...",IDC_OPTIONS,145,17,45,14
AUTOCHECKBOX "&Preplet vsake",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP

50
reactos/dll/win32/avifil32/avifile_Sv.rc Normal file
View File

@ -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"
}

2
reactos/dll/win32/avifil32/avifile_Tr.rc
View File

@ -24,7 +24,7 @@ CAPTION "S
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

2
reactos/dll/win32/avifil32/avifile_Uk.rc
View File

@ -14,7 +14,7 @@ CAPTION "
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

4
reactos/dll/win32/avifil32/editstream.c
View File

@ -653,7 +653,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
nLastStream++;
nStreams = nLastStream - streamNr;
} else
} else
nStreams = 1;
if (This->nStreams + nStreams + 1 > This->nTableSize) {
n = This->nStreams + nStreams + 33;
@ -944,7 +944,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
} else
n = 0;
n += lp->biSize;
memcpy(format, lp, min((LONG)n, *fmtsize));
hr = ((LONG)n > *fmtsize ? AVIERR_BUFFERTOOSMALL : AVIERR_OK);
*fmtsize = n;

2
reactos/dll/win32/avifil32/getframe.c
View File

@ -387,7 +387,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
/* 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 &&

2
reactos/dll/win32/avifil32/icmstream.c
View File

@ -815,7 +815,7 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
dwMinQual = ICQUALITY_LOW;
noPrev = TRUE;
if ((icmFlags & ICCOMPRESS_KEYFRAME) == 0 &&
if ((icmFlags & ICCOMPRESS_KEYFRAME) == 0 &&
(This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0)
noPrev = FALSE;

79
reactos/dll/win32/avifil32/regsvr.c
View File

@ -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
*/

1
reactos/dll/win32/avifil32/rsrc.rc
View File

@ -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"

2
reactos/dll/win32/avifil32/wavfile.c
View File

@ -915,7 +915,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
if (bytesread != NULL)
*bytesread = buffersize;
if (samplesread != NULL)
*samplesread = samples;
*samplesread = samples;
return AVIERR_OK;
}