marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dlls: Assorted spelling fixes.

oldstable
Frédéric Delanoy 2011-07-30 12:03:08 +02:00 committed by Alexandre Julliard
parent 65d1760452
commit f932abf326
46 changed files with 104 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/avifil32/api.c
View File

@ -1024,8 +1024,8 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
/*
* 1. iterate over HKEY_CLASSES_ROOT\\AVIFile\\Extensions and collect
* extensions and CLSID's
* 2. iterate over collected CLSID's and copy its description and its
* extensions and CLSIDs
* 2. iterate over collected CLSIDs and copy its description and its
* extensions to szFilter if it fits
*
* First filter is named "All multimedia files" and its filter is a

2
dlls/avifil32/getframe.c
View File

@ -215,7 +215,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
if (FAILED(AVIStreamSampleSize(This->pStream, lNext, &readBytes)))
return NULL; /* bad thing, but bad things will happen */
if (readBytes <= 0) {
ERR(": IAVIStream::REad doesn't return needed bytes!\n");
ERR(": IAVIStream::Read doesn't return needed bytes!\n");
return NULL;
}

6
dlls/cabinet/fdi.c
View File

@ -48,7 +48,7 @@
* Test unit(s).
*
* The fdintNEXT_CABINET callbacks are probably not working quite as they should.
* There are several FIXME's in the source describing some of the deficiencies in
* There are several FIXMEs in the source describing some of the deficiencies in
* some detail. Additionally, we do not do a very good job of returning the right
* error codes to this callback.
*
@ -2731,7 +2731,7 @@ BOOL __cdecl FDICopy(
TRACE("Resetting folder for file %s.\n", debugstr_a(file->filename));
/* free stuff for the old decompresser */
/* free stuff for the old decompressor */
switch (ct2) {
case cffoldCOMPTYPE_LZX:
if (LZX(window)) {
@ -2752,7 +2752,7 @@ BOOL __cdecl FDICopy(
CAB(offset) = 0;
CAB(outlen) = 0;
/* initialize the new decompresser */
/* initialize the new decompressor */
switch (ct1) {
case cffoldCOMPTYPE_NONE:
CAB(decompress) = NONEfdi_decomp;

2
dlls/comctl32/comboex.c
View File

@ -97,7 +97,7 @@ typedef struct
* Special flag set in DRAWITEMSTRUCT itemState field. It is set by
* the ComboEx version of the Combo Window Proc so that when the
* WM_DRAWITEM message is then passed to ComboEx, we know that this
* particular WM_DRAWITEM message is for listbox only items. Any messasges
* particular WM_DRAWITEM message is for listbox only items. Any message
* without this flag is then for the Edit control field.
*
* We really cannot use the ODS_COMBOBOXEDIT flag because MSDN states that

10
dlls/comctl32/commctrl.c
View File

@ -192,7 +192,7 @@ static BOOL create_manifest( BOOL install )
* PARAMS
* hinstDLL [I] handle to the 'dlls' instance
* fdwReason [I]
* lpvReserved [I] reserverd, must be NULL
* lpvReserved [I] reserved, must be NULL
*
* RETURNS
* Success: TRUE
@ -701,7 +701,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
*
* NOTES
* This function is just a dummy - all the controls are registered at
* the DLL's initialization. See InitCommonContolsEx for details.
* the DLL initialization time. See InitCommonContolsEx for details.
*/
VOID WINAPI
@ -1088,7 +1088,7 @@ VOID WINAPI InitMUILanguage (LANGID uiLang)
* PARAMS
* hWnd [in] handle to window subclass.
* pfnSubclass [in] Pointer to new window procedure.
* uIDSubclass [in] Unique identifier of sublass together with pfnSubclass.
* uIDSubclass [in] Unique identifier of subclass together with pfnSubclass.
* dwRef [in] Reference data to pass to window procedure.
*
* RETURNS
@ -1177,7 +1177,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
* PARAMS
* hWnd [in] Handle to window which were subclassing
* pfnSubclass [in] Pointer to the subclass procedure
* uID [in] Unique indentifier of the subclassing procedure
* uID [in] Unique identifier of the subclassing procedure
* pdwRef [out] Pointer to the reference data
*
* RETURNS
@ -1320,7 +1320,7 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam
/***********************************************************************
* DefSubclassProc [COMCTL32.413]
*
* Calls the next window procedure (ie. the one before this subclass)
* Calls the next window procedure (i.e. the one before this subclass)
*
* PARAMS
* hWnd [in] The window that we're subclassing

8
dlls/comctl32/listview.c
View File

@ -1296,7 +1296,7 @@ static RANGE iterator_range(const ITERATOR *i)
}
/***
* Releases resources associated with this ierator.
* Releases resources associated with this iterator.
*/
static inline void iterator_destroy(const ITERATOR *i)
{
@ -4938,7 +4938,7 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc)
LineTo (hdc, rcItem.right, infoPtr->rcList.bottom);
}
/* draw the horizontial lines for the rows */
/* draw the horizontal lines for the rows */
itemheight = LISTVIEW_CalculateItemHeight(infoPtr);
rcItem.left = infoPtr->rcList.left;
rcItem.right = infoPtr->rcList.right;
@ -5543,7 +5543,7 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn)
}
}
/* if we found our subitem, zapp it */
/* if we found our subitem, zap it */
if (nSubItem > 0)
{
/* free string */
@ -8418,7 +8418,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM
ImageList_Destroy(infoPtr->himlState);
}
himl = LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl);
/* checkbox list replaces prevous custom list or... */
/* checkbox list replaces previous custom list or... */
if(((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) &&
!(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) ||
/* ...previous was checkbox list */

16
dlls/comctl32/monthcal.c
View File

@ -68,7 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal);
to the next/prev month */
#define MC_TODAYUPDATEDELAY 120000 /* time between today check for update (2 min) */
#define MC_PREVNEXTMONTHTIMER 1 /* Timer ID's */
#define MC_PREVNEXTMONTHTIMER 1 /* Timer IDs */
#define MC_TODAYUPDATETIMER 2
#define countof(arr) (sizeof(arr)/sizeof(arr[0]))
@ -199,7 +199,7 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr)
}
/* returns the number of days in any given month, checking for leap days */
/* january is 1, december is 12 */
/* January is 1, December is 12 */
int MONTHCAL_MonthLength(int month, int year)
{
const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
@ -286,7 +286,7 @@ static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to)
* 0 : first == second
* 1 : first > second
*
* Note that no date validation performed, alreadt validated values expected.
* Note that no date validation performed, already validated values expected.
*/
static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second)
{
@ -331,7 +331,7 @@ static LONG MONTHCAL_CompareDate(const SYSTEMTIME *first, const SYSTEMTIME *seco
*
* RETURN VALUE
*
* TRUE - date whithin largest and configured range
* TRUE - date within largest and configured range
* FALSE - date is outside largest or configured range
*/
static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr,
@ -532,7 +532,7 @@ static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date)
}
/* From a given point, calculate the row (weekpos), column(daypos)
and day in the calendar. day== 0 mean the last day of tha last month
and day in the calendar. day== 0 mean the last day of the last month
*/
static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y,
int *daypos, int *weekpos)
@ -820,7 +820,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con
The week containing Jan 1 is the first week of year
LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany):
First week of year must contain 4 days of the new year
LOCALE_IFIRSTWEEKOFYEAR == 1 (what contries?)
LOCALE_IFIRSTWEEKOFYEAR == 1 (what countries?)
The first week of the year must contain only days of the new year
*/
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTWEEKOFYEAR, buf, countof(buf));
@ -840,7 +840,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con
if (date->wMonth == 1)
{
/* calculate all those exceptions for january */
/* calculate all those exceptions for January */
st.wDay = st.wMonth = 1;
weeknum1 = MONTHCAL_CalculateDayOfWeek(&st, FALSE);
if ((infoPtr->firstDay - weeknum1) % 7 > mindays)
@ -1228,7 +1228,7 @@ MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr)
* RETURN VALUE:
* Low word contains previous first day,
* high word indicates was first day forced with this message before or is
* locale difined (TRUE - was forced, FALSE - wasn't).
* locale defined (TRUE - was forced, FALSE - wasn't).
*
* FIXME: this needs to be implemented properly in MONTHCAL_Refresh()
* FIXME: we need more error checking here

14
dlls/comctl32/toolbar.c
View File

@ -325,7 +325,7 @@ TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr)
* TOOLBAR_CheckStyle
*
* This function validates that the styles set are implemented and
* issues FIXME's warning of possible problems. In a perfect world this
* issues FIXMEs warning of possible problems. In a perfect world this
* function should be null.
*/
static void
@ -1467,7 +1467,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
*
* +--------------------------------------------------------+ ^
* | ^ ^ | |
* | | pad.cy / 2 | centred | |
* | | pad.cy / 2 | centered | |
* | pad.cx/2 + cxedge +--------------+ +------------+ | | DEFPAD_CY +
* |<----------------->| nBitmapWidth | | Text | | | max(nBitmapHeight, szText.cy)
* | |<------------>| | | | |
@ -1483,7 +1483,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
*
* +-----------------------------------+ ^
* | ^ | |
* | | centred | | LISTPAD_CY +
* | | centered | | LISTPAD_CY +
* | +------------+ | | szText.cy
* | | Text | | |
* | | | | |
@ -1521,13 +1521,13 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
* | | pad.cy / 2 | | nBitmapHeight +
* | - | | szText.cy +
* | +------------+ | | DEFPAD_CY + 1
* | centred | Bitmap | | |
* | centered | Bitmap | | |
* |<----------------->| | | |
* | +------------+ | |
* | ^ | |
* | 1 | | |
* | - | |
* | centred +---------------+ | |
* | centered +---------------+ | |
* |<--------------->| Text | | |
* | +---------------+ | |
* +-----------------------------------+ -
@ -1540,7 +1540,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
* | ^ | |
* | | 2 + pad.cy / 2 | |
* | - | | szText.cy +
* | centred +-----------------+ | | pad.cy + 2
* | centered +-----------------+ | | pad.cy + 2
* |<--------------->| Text | | |
* | +-----------------+ | |
* | | |
@ -4378,7 +4378,7 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam)
/*
* The documentation also does not mention that if 0 is supplied for
* either size, the system changes it to the default of 24 wide and
* 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02
* 22 high. Demonstrated in ControlSpy Toolbar. GLA 3/02
*/
if (cx == 0) cx = 24;
if (cy == 0) cy = 22;

2
dlls/comdlg32/filedlg.c
View File

@ -1511,7 +1511,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
/* Initialise the file name edit control */
handledPath = FALSE;
TRACE("Before manipilation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir));
TRACE("Before manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir));
if(fodInfos->filename)
{

2
dlls/comdlg32/filedlg31.c
View File

@ -441,7 +441,7 @@ static LRESULT FD31_FileListSelect( const FD31_DATA *lfs )
if (lRet == LB_ERR)
return TRUE;
/* set the edit control to the choosen file */
/* set the edit control to the chosen file */
if ((pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
{
SendDlgItemMessageW(hWnd, lst1, LB_GETTEXT, lRet,

2
dlls/comdlg32/filedlgbrowser.h
View File

@ -95,7 +95,7 @@ typedef struct
} FileOpenDlgInfos;
/***********************************************************************
* Control ID's
* Control IDs
*/
#define IDS_ABOUTBOX 101
#define IDS_DOCUMENTFOLDERS 102

2
dlls/comdlg32/finddlg.c
View File

@ -183,7 +183,7 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA
pdata = (COMDLG32_FR_Data *)lParam;
if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
{
ERR("Could not Set prop; invent a gracefull exit?...\n");
ERR("Could not Set prop; invent a graceful exit?...\n");
DestroyWindow(hDlgWnd);
return FALSE;
}

2
dlls/comdlg32/printdlg.c
View File

@ -2586,7 +2586,7 @@ static inline WORD get_devname_offset(const DEVNAMES *dn, devnames_name which)
case devnames_device_name: return dn->wDeviceOffset;
case devnames_output_name: return dn->wOutputOffset;
}
ERR("Souldn't be here\n");
ERR("Shouldn't be here\n");
return 0;
}

4
dlls/commdlg.dll16/filedlg.c
View File

@ -63,7 +63,7 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L
* FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
*
* BUGS
* unknown, there are some FIXME's left.
* unknown, there are some FIXMEs left.
*/
BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/
{
@ -116,7 +116,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w
* FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
*
* BUGS
* unknown. There are some FIXME's left.
* unknown. There are some FIXMEs left.
*/
BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/
{

2
dlls/commdlg.dll16/finddlg.c
View File

@ -174,7 +174,7 @@ static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam,
SetWindowLongPtrW(hWnd, DWLP_USER, lParam);
*lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
/*
* FIXME : If the initial FindWhat string is empty, we should disable the FinNext /
* FIXME : If the initial FindWhat string is empty, we should disable the FindNext /
* Replace / ReplaceAll buttons. Only after typing some text, the buttons should be
* enabled.
*/

2
dlls/credui/credui_main.c
View File

@ -260,7 +260,7 @@ static void CredDialogShowIncorrectPasswordBalloon(HWND hwndDlg, struct cred_dia
SendMessageW(params->hwndBalloonTip, TTM_SETTITLEW, TTI_ERROR, (LPARAM)wszTitle);
GetWindowRect(GetDlgItem(hwndDlg, IDC_PASSWORD), &rcPassword);
/* centred vertically and in the right side of the password edit control */
/* centered vertically and in the right side of the password edit control */
x = rcPassword.right - 12;
y = (rcPassword.top + rcPassword.bottom) / 2;
SendMessageW(params->hwndBalloonTip, TTM_TRACKPOSITION, 0, MAKELONG(x, y));

2
dlls/crypt32/oid.c
View File

@ -591,7 +591,7 @@ BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet,
* CryptRegisterOIDFunction (CRYPT32.@)
*
* Register the DLL and the functions it uses to cover the combination
* of encoding type, functionname and OID.
* of encoding type, function name and OID.
*
* PARAMS
* dwEncodingType [I] Encoding type to be used.

2
dlls/crypt32/serialize.c
View File

@ -167,7 +167,7 @@ BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext,
/* Looks for the property with ID propID in the buffer buf. Returns a pointer
* to its header if a valid header is found, NULL if not. Valid means the
* length of thte property won't overrun buf, and the unknown field is 1.
* length of the property won't overrun buf, and the unknown field is 1.
*/
static const WINE_CERT_PROP_HEADER *CRYPT_findPropID(const BYTE *buf,
DWORD size, DWORD propID)

2
dlls/cryptnet/cryptnet_main.c
View File

@ -571,7 +571,7 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject,
return ret;
}
/* Parses the URL, and sets components's lpszHostName and lpszUrlPath members
/* Parses the URL, and sets components' lpszHostName and lpszUrlPath members
* to NULL-terminated copies of those portions of the URL (to be freed with
* CryptMemFree.)
*/

2
dlls/d3d10/effect.c
View File

@ -539,7 +539,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con
/*
* Not sure if this calculation is 100% correct, but a test
* show's that these values work.
* shows that these values work.
*/
t->elementtype->size_unpacked = t->size_packed / t->element_count;
TRACE("\tUnpacked size: %#x.\n", t->elementtype->size_unpacked);

2
dlls/d3d8/device.c
View File

@ -3146,7 +3146,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct
device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls));
if (!device->decls)
{
ERR("Failed to allocate FVF vertex delcaration map memory.\n");
ERR("Failed to allocate FVF vertex declaration map memory.\n");
hr = E_OUTOFMEMORY;
goto err;
}

2
dlls/d3d8/vertexdeclaration.c
View File

@ -193,7 +193,7 @@ size_t parse_token(const DWORD* pToken)
default:
TRACE(" 0x%08x UNKNOWN\n", token);
/* argg error */
/* arg error */
}
return tokenlen;

3
dlls/d3dcompiler_43/asmparser.c
View File

@ -528,8 +528,7 @@ static void asmparser_instr(struct asm_parser *This, DWORD opcode,
}
TRACE_(parsed_shader)("\n");
/* Check for instructions with different syntaxes in different shader versio
ns */
/* Check for instructions with different syntaxes in different shader versions */
switch(opcode) {
case BWRITERSIO_SINCOS:
/* The syntax changes between vs 2 and the other shader versions */

2
dlls/d3dxof/parsing.c
View File

@ -1385,7 +1385,7 @@ _exit:
if (buf->pxo->nb_childs > MAX_CHILDS)
{
FIXME("Too many childs %d\n", buf->pxo->nb_childs);
FIXME("Too many children %d\n", buf->pxo->nb_childs);
return FALSE;
}

2
dlls/dbghelp/dbghelp_private.h
View File

@ -485,7 +485,7 @@ struct cpu
/* dwarf dedicated information */
unsigned (*map_dwarf_register)(unsigned regno);
/* context related maniputation */
/* context related manipulation */
void* (*fetch_context_reg)(CONTEXT* context, unsigned regno, unsigned* size);
const char* (*fetch_regname)(unsigned regno);
};

2
dlls/dbghelp/dwarf.c
View File

@ -1664,7 +1664,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm,
}
else
{
/* variable has been optimiezd away... report anyway */
/* variable has been optimized away... report anyway */
loc.kind = loc_error;
loc.reg = loc_err_no_location;
if (subpgm->func)

6
dlls/dbghelp/elf_module.c
View File

@ -763,7 +763,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h
* we are adding new symbols, but as we're parsing a symbol table
* (hopefully without duplicate symbols) we delay rebuilding the sorted
* module table until we're done with the symbol table
* Otherwise, as we intertwine symbols's add and lookup, performance
* Otherwise, as we intertwine symbols' add and lookup, performance
* is rather bad
*/
module->sortlist_valid = TRUE;
@ -1285,7 +1285,7 @@ static BOOL elf_load_file_from_dll_path(HANDLE hProcess,
/******************************************************************
* elf_search_auxv
*
* locate some a value from the debuggee auxillary vector
* locate some a value from the debuggee auxiliary vector
*/
static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned long* val)
{
@ -1307,7 +1307,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l
return FALSE;
}
/* walk through envp[] */
/* envp[] strings are located after the auxillary vector, so protect the walk */
/* envp[] strings are located after the auxiliary vector, so protect the walk */
str_max = (void*)(DWORD_PTR)~0L;
while (ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) &&
(addr = (void*)((DWORD_PTR)addr + sizeof(str))) != NULL && str != NULL)

2
dlls/dbghelp/msc.c
View File

@ -1398,7 +1398,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B
{
/* now locate function (if any) */
addr = func_addr0 + ltb->offsets[k] - start[j].start;
/* unfortunetaly, we can have several functions in the same block, if there's no
/* unfortunately, we can have several functions in the same block, if there's no
* gap between them... find the new function if needed
*/
if (!func || addr >= func->address + func->size)

2
dlls/dbghelp/pe_module.c
View File

@ -88,7 +88,7 @@ const char* pe_map_section(struct image_section_map* ism)
return IMAGE_NO_MAP;
}
/* FIXME: that's rather drastic, but that will do for now
* that's ok if the full file map exists, but we could be less agressive otherwise and
* that's ok if the full file map exists, but we could be less aggressive otherwise and
* only map the relevant section
*/
if ((mapping = pe_map_full(ism->fmap, &nth)))

2
dlls/ddeml.dll16/ddeml.c
View File

@ -155,7 +155,7 @@ static HDDEDATA CALLBACK WDML_InvokeCallback16(DWORD pfn16, UINT uType, UINT uFm
* a 32bit callback. This thunk also stores (in the code!) the 16bit
* address of the 16bit callback, and passes it back to
* WDML_InvokeCallback16.
* The code below is mainly to create the thunks themselved
* The code below is mainly to create the thunks themselves
*/
#include "pshpack1.h"
static struct ddeml_thunk

4
dlls/ddraw/ddraw.c
View File

@ -215,7 +215,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid,
}
else if(This->ImplType != SURFACE_OPENGL && DefaultSurfaceType == SURFACE_UNKNOWN)
{
ERR("(%p) The App is requesting a D3D device, but a non-OpenGL surface type was choosen. Prepare for trouble!\n", This);
ERR("(%p) The App is requesting a D3D device, but a non-OpenGL surface type was chosen. Prepare for trouble!\n", This);
ERR(" (%p) You may want to contact wine-devel for help\n", This);
/* Should I assert(0) here??? */
}
@ -2734,7 +2734,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD
DDRAW_dump_surface_desc(pDDSD);
}
/* Select the surface type, if it wasn't choosen yet */
/* Select the surface type, if it wasn't chosen yet */
if(ImplType == SURFACE_UNKNOWN)
{
/* Use GL Surfaces if a D3DDEVICE Surface is requested */

2
dlls/ddraw/vertexbuffer.c
View File

@ -47,7 +47,7 @@ static inline IDirect3DVertexBufferImpl *impl_from_IDirect3DVertexBuffer7(IDirec
* For a link to QueryInterface rules, see IDirectDraw7::QueryInterface
*
* Params
* riid: Queryied Interface id
* riid: Queried Interface id
* obj: Address to return the interface pointer
*
* Returns:

2
dlls/dinput/device.c
View File

@ -431,7 +431,7 @@ static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *forma
* instance id.
*/
((asked_format->rgodf[j].dwType & DIDFT_INSTANCEMASK) == DIDFT_ANYINSTANCE) ||
(DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentionned in no DX docs, but it works fine - tested on WinXP */
(DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentioned in no DX docs, but it works fine - tested on WinXP */
(DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(format->wine_df->rgodf[i].dwType)))
&&
( /* Then if the asked type matches the one Wine provides */

6
dlls/dinput/joystick_linuxinput.c
View File

@ -427,7 +427,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig
newDevice->ff_state = FF_STATUS_STOPPED;
#endif
/* There is no way in linux to query force feedback autocenter status.
Instead, track it with ff_autocenter, and assume it's initialy
Instead, track it with ff_autocenter, and assume it's initially
enabled. */
newDevice->ff_autocenter = 1;
newDevice->ff_gain = 0xFFFF;
@ -716,8 +716,8 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
/* Enable autocenter. */
event.type = EV_FF;
event.code = FF_AUTOCENTER;
/* TODO: Read autocenter strengh before disabling it, and use it here
* instead of 0xFFFF (maximum strengh).
/* TODO: Read autocenter strength before disabling it, and use it here
* instead of 0xFFFF (maximum strength).
*/
event.value = 0xFFFF;
if (write(This->joyfd, &event, sizeof(event)) == -1)

2
dlls/dinput/joystick_osx.c
View File

@ -398,7 +398,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8])
int usagePage = IOHIDElementGetUsagePage( tIOHIDElementRef );
if (usagePage != kHIDPage_Button)
{
/* avoid strange elements found on the 360 controler */
/* avoid strange elements found on the 360 controller */
continue;
}

4
dlls/dinput/mouse.c
View File

@ -749,7 +749,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo(
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
WARN(" dinput3 not supporte yet...\n");
WARN(" dinput3 not supported yet...\n");
return DI_OK;
}
@ -764,7 +764,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, L
TRACE("(this=%p,%p)\n", This, pdidi);
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {
WARN(" dinput3 not supporte yet...\n");
WARN(" dinput3 not supported yet...\n");
return DI_OK;
}

2
dlls/dispex/usrmarshal.c
View File

@ -1,5 +1,5 @@
/*
* Misc marshaling routinues
* Misc marshaling routines
*
* Copyright 2010 Huw Davies
*

14
dlls/dmband/band.c
View File

@ -282,7 +282,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (L
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -302,7 +302,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (L
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -439,7 +439,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -508,7 +508,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = ListSize[1];
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -517,7 +517,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -582,7 +582,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREA
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -609,7 +609,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREA
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

10
dlls/dmband/bandtrack.c
View File

@ -401,7 +401,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = StreamSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -410,7 +410,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -421,7 +421,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -484,7 +484,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSIS
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -511,7 +511,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSIS
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

2
dlls/dmband/dmutils.c
View File

@ -290,7 +290,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

8
dlls/dmcompos/chordmap.c
View File

@ -272,7 +272,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescripto
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -292,7 +292,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescripto
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -453,7 +453,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_Load (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -473,7 +473,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_Load (LPPERSISTSTR
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

8
dlls/dmime/audiopath.c
View File

@ -383,7 +383,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -403,7 +403,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -563,7 +563,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -583,7 +583,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

2
dlls/dmime/dmutils.c
View File

@ -186,7 +186,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
break;
}
default: {
TRACE(": unknown chunk (irrevelant & skipping)\n");
TRACE(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

8
dlls/dmime/graph.c
View File

@ -348,7 +348,7 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -368,7 +368,7 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -527,7 +527,7 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_Load (LPPERSISTSTREAM
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -547,7 +547,7 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_Load (LPPERSISTSTREAM
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = chunkSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

16
dlls/dmime/segment.c
View File

@ -674,7 +674,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -692,7 +692,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -712,7 +712,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -971,7 +971,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST
break;
}
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -1015,7 +1015,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = StreamSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -1024,7 +1024,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -1124,7 +1124,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -1152,7 +1152,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;

6
dlls/dmime/segtriggertrack.c
View File

@ -326,7 +326,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -380,7 +380,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegmentsList (LPP
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@ -440,7 +440,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (LPP
break;
}
default: {
TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;