forked from Mirrors/wine-wine
Misc spelling fixes.
parent
303bff281c
commit
f6caf1be81
|
@ -423,7 +423,7 @@ static void test_enum_value(void)
|
||||||
ok( val_count == 2 || val_count == 3, "val_count set to %d\n", val_count );
|
ok( val_count == 2 || val_count == 3, "val_count set to %d\n", val_count );
|
||||||
ok( data_count == 7, "data_count set to %d instead of 7\n", data_count );
|
ok( data_count == 7, "data_count set to %d instead of 7\n", data_count );
|
||||||
ok( type == REG_SZ, "type %d is not REG_SZ\n", type );
|
ok( type == REG_SZ, "type %d is not REG_SZ\n", type );
|
||||||
/* v5.1.2600.0 (XP Home and Proffesional) does not touch value or data in this case */
|
/* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */
|
||||||
ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ),
|
ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ),
|
||||||
"value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value );
|
"value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value );
|
||||||
ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ),
|
ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ),
|
||||||
|
|
|
@ -514,7 +514,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The following defintions were copied from dlls/cabinet/cabinet.h */
|
/* The following definitions were copied from dlls/cabinet/cabinet.h */
|
||||||
|
|
||||||
/* SESSION Operation */
|
/* SESSION Operation */
|
||||||
#define EXTRACT_FILLFILELIST 0x00000001
|
#define EXTRACT_FILLFILELIST 0x00000001
|
||||||
|
|
|
@ -210,7 +210,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path)
|
||||||
* substitution table, and executes the INF.
|
* substitution table, and executes the INF.
|
||||||
*
|
*
|
||||||
* PARAMS
|
* PARAMS
|
||||||
* hm [I] Module that contains the REGINST resouce.
|
* hm [I] Module that contains the REGINST resource.
|
||||||
* pszSection [I] The INF section to execute.
|
* pszSection [I] The INF section to execute.
|
||||||
* pstTable [I] Table of string substitutions.
|
* pstTable [I] Table of string substitutions.
|
||||||
*
|
*
|
||||||
|
|
|
@ -623,7 +623,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
|
||||||
if (This->paf->hmmio != NULL)
|
if (This->paf->hmmio != NULL)
|
||||||
return AVIERR_ERROR; /* No reuse of this object for another file! */
|
return AVIERR_ERROR; /* No reuse of this object for another file! */
|
||||||
|
|
||||||
/* remeber mode and name */
|
/* remember mode and name */
|
||||||
This->paf->uMode = dwMode;
|
This->paf->uMode = dwMode;
|
||||||
|
|
||||||
len = lstrlenW(pszFileName) + 1;
|
len = lstrlenW(pszFileName) + 1;
|
||||||
|
@ -951,7 +951,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
|
||||||
if (This->lpFormat == NULL) {
|
if (This->lpFormat == NULL) {
|
||||||
/* initial format */
|
/* initial format */
|
||||||
if (This->paf->dwMoviChunkPos != 0)
|
if (This->paf->dwMoviChunkPos != 0)
|
||||||
return AVIERR_ERROR; /* user has used API in wrong sequnece! */
|
return AVIERR_ERROR; /* user has used API in wrong sequence! */
|
||||||
|
|
||||||
This->lpFormat = HeapAlloc(GetProcessHeap(), 0, formatsize);
|
This->lpFormat = HeapAlloc(GetProcessHeap(), 0, formatsize);
|
||||||
if (This->lpFormat == NULL)
|
if (This->lpFormat == NULL)
|
||||||
|
@ -1413,7 +1413,7 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* first frame is alwasy a keyframe */
|
/* first frame is always a keyframe */
|
||||||
if (This->lLastFrame == -1)
|
if (This->lLastFrame == -1)
|
||||||
flags |= AVIIF_KEYFRAME;
|
flags |= AVIIF_KEYFRAME;
|
||||||
|
|
||||||
|
@ -2226,7 +2226,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
|
||||||
|
|
||||||
/* ... some optional additional extra chunk for this stream ... */
|
/* ... some optional additional extra chunk for this stream ... */
|
||||||
if (pStream->extra.lp != NULL && pStream->extra.cb > 0) {
|
if (pStream->extra.lp != NULL && pStream->extra.cb > 0) {
|
||||||
/* the chunk header(s) are already in the strucuture */
|
/* the chunk header(s) are already in the structure */
|
||||||
if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb)
|
if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb)
|
||||||
return AVIERR_FILEWRITE;
|
return AVIERR_FILEWRITE;
|
||||||
}
|
}
|
||||||
|
@ -2332,7 +2332,7 @@ static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This)
|
||||||
return AVIERR_FILEWRITE;
|
return AVIERR_FILEWRITE;
|
||||||
|
|
||||||
if (This->fInfo.dwFlags & AVIFILEINFO_ISINTERLEAVED) {
|
if (This->fInfo.dwFlags & AVIFILEINFO_ISINTERLEAVED) {
|
||||||
/* is interleaved -- write block of coresponding frames */
|
/* is interleaved -- write block of corresponding frames */
|
||||||
LONG lInitialFrames = 0;
|
LONG lInitialFrames = 0;
|
||||||
LONG stepsize;
|
LONG stepsize;
|
||||||
LONG i;
|
LONG i;
|
||||||
|
|
|
@ -424,7 +424,7 @@ static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart,
|
||||||
if (plStart == NULL || plLength == NULL || *plStart < 0)
|
if (plStart == NULL || plLength == NULL || *plStart < 0)
|
||||||
return AVIERR_BADPARAM;
|
return AVIERR_BADPARAM;
|
||||||
|
|
||||||
/* if asked for cutted part copy it before deleting */
|
/* if asked for cut part copy it before deleting */
|
||||||
if (ppResult != NULL) {
|
if (ppResult != NULL) {
|
||||||
hr = IAVIEditStream_Copy(iface, plStart, plLength, ppResult);
|
hr = IAVIEditStream_Copy(iface, plStart, plLength, ppResult);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
|
@ -620,7 +620,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
|
||||||
AVIFILE_ReadFrame(This, This->pStreams[0].pStream,
|
AVIFILE_ReadFrame(This, This->pStreams[0].pStream,
|
||||||
This->pStreams[0].dwStart);
|
This->pStreams[0].dwStart);
|
||||||
|
|
||||||
/* Check if we could convert the source streams to the disired format... */
|
/* Check if we could convert the source streams to the desired format... */
|
||||||
if (pEdit != NULL) {
|
if (pEdit != NULL) {
|
||||||
if (FAILED(AVIFILE_FindStreamInTable(pEdit, lStart, &pStream,
|
if (FAILED(AVIFILE_FindStreamInTable(pEdit, lStart, &pStream,
|
||||||
&startPos, &streamNr, TRUE)))
|
&startPos, &streamNr, TRUE)))
|
||||||
|
|
|
@ -558,7 +558,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos,
|
||||||
if (ICCompressBegin(This->hic, lpbi, This->lpbiOutput) != S_OK)
|
if (ICCompressBegin(This->hic, lpbi, This->lpbiOutput) != S_OK)
|
||||||
return AVIERR_COMPRESSOR;
|
return AVIERR_COMPRESSOR;
|
||||||
|
|
||||||
/* check if we need to restart decompresion also */
|
/* check if we need to restart decompression also */
|
||||||
if (This->lKeyFrameEvery != 1 &&
|
if (This->lKeyFrameEvery != 1 &&
|
||||||
(This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) {
|
(This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) {
|
||||||
ICDecompressEnd(This->hic);
|
ICDecompressEnd(This->hic);
|
||||||
|
|
|
@ -574,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
|
||||||
if (This->hmmio != NULL)
|
if (This->hmmio != NULL)
|
||||||
return AVIERR_ERROR; /* No reuse of this object for another file! */
|
return AVIERR_ERROR; /* No reuse of this object for another file! */
|
||||||
|
|
||||||
/* remeber mode and name */
|
/* remember mode and name */
|
||||||
This->uMode = dwMode;
|
This->uMode = dwMode;
|
||||||
|
|
||||||
len = lstrlenW(pszFileName) + 1;
|
len = lstrlenW(pszFileName) + 1;
|
||||||
|
|
|
@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
|
||||||
#define CANCEL_MSG_LINE 2
|
#define CANCEL_MSG_LINE 2
|
||||||
|
|
||||||
/* Note: to avoid a deadlock we don't want to send messages to the dialog
|
/* Note: to avoid a deadlock we don't want to send messages to the dialog
|
||||||
* with the critical section held. Instead we only mark what fields shoud be
|
* with the critical section held. Instead we only mark what fields should be
|
||||||
* updated and the dialog proc does the update */
|
* updated and the dialog proc does the update */
|
||||||
#define UPDATE_PROGRESS 0x1
|
#define UPDATE_PROGRESS 0x1
|
||||||
#define UPDATE_TITLE 0x2
|
#define UPDATE_TITLE 0x2
|
||||||
|
|
|
@ -75,7 +75,7 @@ typedef struct {
|
||||||
cab_UBYTE versionMajor; /* 1 */
|
cab_UBYTE versionMajor; /* 1 */
|
||||||
cab_UWORD cFolders; /* number of CFFOLDER entries in the cabinet*/
|
cab_UWORD cFolders; /* number of CFFOLDER entries in the cabinet*/
|
||||||
cab_UWORD cFiles; /* number of CFFILE entries in the cabinet*/
|
cab_UWORD cFiles; /* number of CFFILE entries in the cabinet*/
|
||||||
cab_UWORD flags; /* 1=prev cab, 2=next cabinet, 4=reserved setions*/
|
cab_UWORD flags; /* 1=prev cab, 2=next cabinet, 4=reserved sections*/
|
||||||
cab_UWORD setID; /* identification number of all cabinets in a set*/
|
cab_UWORD setID; /* identification number of all cabinets in a set*/
|
||||||
cab_UWORD iCabinet; /* number of the cabinet in a set */
|
cab_UWORD iCabinet; /* number of the cabinet in a set */
|
||||||
/* additional area if "flags" were set*/
|
/* additional area if "flags" were set*/
|
||||||
|
@ -525,7 +525,7 @@ static BOOL fci_flushfolder_copy_cfdata(HFCI hfci, char* buffer, UINT cbReserveC
|
||||||
split_block=TRUE; /* In this case split_block is abused to store */
|
split_block=TRUE; /* In this case split_block is abused to store */
|
||||||
/* the complete data block into the next cabinet and not into the */
|
/* the complete data block into the next cabinet and not into the */
|
||||||
/* current one. Originally split_block is the indicator that a */
|
/* current one. Originally split_block is the indicator that a */
|
||||||
/* data block has been splitted across different cabinets. */
|
/* data block has been split across different cabinets. */
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* read CFDATA from p_fci_internal->handleCFDATA1 to cfdata*/
|
/* read CFDATA from p_fci_internal->handleCFDATA1 to cfdata*/
|
||||||
|
@ -615,13 +615,13 @@ static BOOL fci_flushfolder_copy_cfdata(HFCI hfci, char* buffer, UINT cbReserveC
|
||||||
strlen(p_fci_internal->pccab->szDisk)+1;
|
strlen(p_fci_internal->pccab->szDisk)+1;
|
||||||
|
|
||||||
savedUncomp = pcfdata->cbUncomp;
|
savedUncomp = pcfdata->cbUncomp;
|
||||||
pcfdata->cbUncomp = 0; /* on splitted blocks of data this is zero */
|
pcfdata->cbUncomp = 0; /* on split blocks of data this is zero */
|
||||||
|
|
||||||
/* if split_block==TRUE then the above while loop won't */
|
/* if split_block==TRUE then the above while loop won't */
|
||||||
/* be executed again */
|
/* be executed again */
|
||||||
split_block=TRUE; /* split_block is the indicator that */
|
split_block=TRUE; /* split_block is the indicator that */
|
||||||
/* a data block has been splitted across */
|
/* a data block has been split across */
|
||||||
/* diffentent cabinets.*/
|
/* different cabinets.*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This should never happen !!! */
|
/* This should never happen !!! */
|
||||||
|
@ -799,7 +799,7 @@ static BOOL fci_flushfolder_copy_cfdata(HFCI hfci, char* buffer, UINT cbReserveC
|
||||||
|
|
||||||
/* report status with pfnfcis about copied size of folder */
|
/* report status with pfnfcis about copied size of folder */
|
||||||
if( (*pfnfcis)(statusFolder,
|
if( (*pfnfcis)(statusFolder,
|
||||||
p_fci_internal->statusFolderCopied,/*cfdata.cbData(+revious ones)*/
|
p_fci_internal->statusFolderCopied,/*cfdata.cbData(+previous ones)*/
|
||||||
p_fci_internal->statusFolderTotal, /* total folder size */
|
p_fci_internal->statusFolderTotal, /* total folder size */
|
||||||
p_fci_internal->pv) == -1) {
|
p_fci_internal->pv) == -1) {
|
||||||
fci_set_error( FCIERR_USER_ABORT, 0, TRUE );
|
fci_set_error( FCIERR_USER_ABORT, 0, TRUE );
|
||||||
|
@ -1649,7 +1649,7 @@ static BOOL fci_flush_cabinet(
|
||||||
cfheader.cFolders=p_fci_internal->cFolders;
|
cfheader.cFolders=p_fci_internal->cFolders;
|
||||||
/* number of CFFILE entries in the cabinet */
|
/* number of CFFILE entries in the cabinet */
|
||||||
cfheader.cFiles=p_fci_internal->cFiles;
|
cfheader.cFiles=p_fci_internal->cFiles;
|
||||||
cfheader.flags=0; /* 1=prev cab, 2=next cabinet, 4=reserved setions */
|
cfheader.flags=0; /* 1=prev cab, 2=next cabinet, 4=reserved sections */
|
||||||
|
|
||||||
if( p_fci_internal->fPrevCab ) {
|
if( p_fci_internal->fPrevCab ) {
|
||||||
cfheader.flags = cfheadPREV_CABINET;
|
cfheader.flags = cfheadPREV_CABINET;
|
||||||
|
@ -1904,7 +1904,7 @@ static BOOL fci_flush_cabinet(
|
||||||
/* add optional reserved area */
|
/* add optional reserved area */
|
||||||
|
|
||||||
/* This allocation and freeing at each CFFolder block is a bit */
|
/* This allocation and freeing at each CFFolder block is a bit */
|
||||||
/* inefficent, but it's harder to forget about freeing the buffer :-). */
|
/* inefficient, but it's harder to forget about freeing the buffer :-). */
|
||||||
/* Reserved areas are used seldom besides that... */
|
/* Reserved areas are used seldom besides that... */
|
||||||
if (cbReserveCFFolder!=0) {
|
if (cbReserveCFFolder!=0) {
|
||||||
if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFFolder))) {
|
if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFFolder))) {
|
||||||
|
@ -2713,7 +2713,7 @@ BOOL __cdecl FCIAddFile(
|
||||||
*
|
*
|
||||||
* FCIFlushFolder completes the CFFolder structure under construction.
|
* FCIFlushFolder completes the CFFolder structure under construction.
|
||||||
*
|
*
|
||||||
* All further data which is added by FCIAddFile will be associateed to
|
* All further data which is added by FCIAddFile will be associated to
|
||||||
* the next CFFolder structure.
|
* the next CFFolder structure.
|
||||||
*
|
*
|
||||||
* FCIFlushFolder will be called by FCIAddFile automatically if the
|
* FCIFlushFolder will be called by FCIAddFile automatically if the
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define MEDIA_SIZE 999999999
|
#define MEDIA_SIZE 999999999
|
||||||
#define FOLDER_THRESHOLD 900000
|
#define FOLDER_THRESHOLD 900000
|
||||||
|
|
||||||
/* The following defintions were copied from dlls/cabinet/cabinet.h
|
/* The following definitions were copied from dlls/cabinet/cabinet.h
|
||||||
* because they are undocumented in windows.
|
* because they are undocumented in windows.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue