diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls index fb09800f324..b7452ec1d4e 100644 --- a/dlls/kernel32/nls/rmc.nls +++ b/dlls/kernel32/nls/rmc.nls @@ -20,7 +20,7 @@ */ /* -- Windows Vista (at least the NLS informations about it on www.microsoft.com) +- Windows Vista (at least the NLS information about it on www.microsoft.com) has the wrong short date format dd/MM/yyyy e.g. 01/08/1996 instead of the correct d-M-yyyy e.g 1-8-1996. This file uses the right short date format as seen on http://www.liarumantscha.ch/ and in the glibc-morelocales.patch for diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 11d6169a242..e35051754c6 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -141,7 +141,7 @@ static void test_QueryInterface(void) ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08x\n", hres); ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - /* Orignial ref and QueryInterface ref both have to be released */ + /* Original ref and QueryInterface ref both have to be released */ IFont_Release(font); IFont_Release(font); } diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d942f7d9288..b20ed6cd695 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1060,7 +1060,7 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); - /* Doesn't recognise hex format humbers at all! */ + /* Doesn't recognise hex format numbers at all! */ CONVERT("0x0", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 59b4d96166c..2d0e7ba0c04 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5580,7 +5580,7 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, /*********************************************************************** * DispCallFunc (OLEAUT32.@) * - * Invokes a function of the specifed calling convention, passing the + * Invokes a function of the specified calling convention, passing the * specified arguments and returns the result. * * PARAMS diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d69faa485e4..42f2644b295 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -277,7 +277,7 @@ static void test_enumstations(void) { SetLastError(0xbabefeed); ret = EnumWindowStationsA(NULL, 0); - ok(!ret, "EnumWindowStationsA returned succesfully!\n"); + ok(!ret, "EnumWindowStationsA returned successfully!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); } @@ -323,7 +323,7 @@ static void test_enumdesktops(void) { SetLastError(0xbabefeed); ret = EnumDesktopsA(GetProcessWindowStation(), NULL, 0); - ok(!ret, "EnumDesktopsA returned succesfully!\n"); + ok(!ret, "EnumDesktopsA returned successfully!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); } diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8d2c70f874..701d48527ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1990,12 +1990,12 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values * for output parameters. D3D in theory does not do that either, but some applications depend on a * proper initialization of the secondary color, and programs using the fixed function pipeline without - * a replacement shader depend on the texcoord.w beeing set properly. + * a replacement shader depend on the texcoord.w being set properly. * * GL_NV_vertex_program defines that all output values are initialized to {0.0, 0.0, 0.0, 1.0}. This * assetion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So * skip this if NV_vertex_program is supported. Otherwise, initialize the secondary color. For the tex- - * coords, we have a flag in the opengl caps. Many cards do not require the texcoord beeing set, and + * coords, we have a flag in the opengl caps. Many cards do not require the texcoord being set, and * this can eat a number of instructions, so skip it unless this cap is set as well */ if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd6f8922207..3c12ff6b2a4 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -240,12 +240,12 @@ static GLuint find_tmpreg(struct texture_stage_op op[MAX_TEXTURES]) { if(lowest_read == -1) return GL_NONE; if(lowest_write >= lowest_read) { - FIXME("Temp register read before beeing written\n"); + FIXME("Temp register read before being written\n"); } if(lowest_write == -1) { /* This needs a test. Maybe we are supposed to return 0.0/0.0/0.0/0.0, or fail drawprim, or whatever */ - FIXME("Temp register read without beeing written\n"); + FIXME("Temp register read without being written\n"); return GL_REG_1_ATI; } else if(lowest_write >= 1) { /* If we're writing to the temp reg at earliest in stage 1, we can use register 1 for the temp result. diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 76ab604a0d7..25bd80012c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5555,7 +5555,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { /* What happens in such situation isn't documented; Native seems to silently abort on such conditions. Return Invalid Call. */ - ERR("(%p) : (%u) Non-existent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); return WINED3DERR_INVALIDCALL; } for (j = 0; j < 256; ++j) { @@ -5574,7 +5574,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevi /* Native appears to silently abort on attempt to make an uninitialized palette current and render. (tested with reference rasterizer). Return Invalid Call. */ if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { - ERR("(%p) : (%u) Non-existent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); return WINED3DERR_INVALIDCALL; } /*TODO: stateblocks */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cbbb0439500..4a9bbedc55f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -983,7 +983,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } if(gl_info->supported[ATI_FRAGMENT_SHADER]) { /* Disable NV_register_combiners and fragment shader if this is supported. - * generally the NV extensions are prefered over the ATI one, and this + * generally the NV extensions are preferred over the ATI ones, and this * extension is disabled if register_combiners and texture_shader2 are both * supported. So we reach this place only if we have incomplete NV dxlevel 8 * fragment processing support @@ -1972,7 +1972,7 @@ static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORM } } } else if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { - /* We can propably use this function in FBO mode too on some drivers to get some basic indication of the capabilities. */ + /* We can probably use this function in FBO mode too on some drivers to get some basic indication of the capabilities. */ WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; int it; diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 69fe7264a40..1a46753b286 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -1067,7 +1067,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) break; case 0x0200: /* get real mode interrupt vector */ - TRACE( "get realmode interupt vector (0x%02x)\n", + TRACE( "get realmode interrupt vector (0x%02x)\n", BL_reg(context) ); { FARPROC16 proc = DOSVM_GetRMHandler( BL_reg(context) ); diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index aa9088a8e71..a7ec4fdd9c6 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -663,7 +663,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) continue; len = read(midiSeqFD, buffer, sizeof(buffer)); - TRACE("Reveived %d bytes\n", len); + TRACE("Received %d bytes\n", len); if (len < 0) continue; if ((len % 4) != 0) { diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 21e806a7ec4..3748f219465 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -187,7 +187,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { param[0] = '\0'; i++; } else { - s++; /* Skip delimter */ + s++; /* Skip delimiter */ } p = param; } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 17b385d884f..564ce452303 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -243,7 +243,7 @@ void WCMD_copy (void) { * * Create a directory. * - * this works recursivly. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if + * this works recursively. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if * they do not already exist. */ @@ -452,7 +452,7 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { } /* Now check result, keeping a running boolean about whether it - matches all parsed attribues so far */ + matches all parsed attributes so far */ if (attribute && !negate) { stillOK = stillOK; } else if (!attribute && negate) { @@ -1823,7 +1823,7 @@ void WCMD_setshow_default (WCHAR *command) { } *pos = 0x00; - /* Search for approprate directory */ + /* Search for appropriate directory */ WINE_TRACE("Looking for directory '%s'\n", wine_dbgstr_w(string)); hff = FindFirstFile (string, &fd); while (hff != INVALID_HANDLE_VALUE) { @@ -2277,7 +2277,7 @@ void WCMD_more (WCHAR *command) { /* Wine implements pipes via temporary files, and hence stdin is effectively reading from the file. This means the prompts for - more are satistied by the next line from the input (file). To + more are satisfied by the next line from the input (file). To avoid this, ensure stdin is to the console */ HANDLE hstdin = GetStdHandle(STD_INPUT_HANDLE); HANDLE hConIn = CreateFile(conInW, GENERIC_READ | GENERIC_WRITE, diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 483e496ab5d..10d0e67e16b 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -925,7 +925,7 @@ void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { /* In case of error, return empty string */ *owner = 0x00; - /* Find out how much space we need for the owner security descritpor */ + /* Find out how much space we need for the owner security descriptor */ GetFileSecurity(filename, OWNER_SECURITY_INFORMATION, 0, 0, &sizeNeeded); rc = GetLastError(); diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index d5de817eb4d..f326906498f 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -283,7 +283,7 @@ VOID DIALOG_FileNew(VOID) { static const WCHAR empty_strW[] = { 0 }; - /* Close any files and promt to save changes */ + /* Close any files and prompt to save changes */ if (DoCloseFile()) { SetWindowText(Globals.hEdit, empty_strW); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index aec0a22be6f..fb844879d0a 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -107,7 +107,7 @@ DWORD get_dpi(void) * * NOTEPAD_SaveSettingToRegistry * - * Save settring to registry HKCU\Software\Microsoft\Notepad. + * Save setting to registry HKCU\Software\Microsoft\Notepad. */ static VOID NOTEPAD_SaveSettingToRegistry(void) { diff --git a/programs/services/services.c b/programs/services/services.c index 0177076dad1..01e80cc6442 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -124,10 +124,10 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); WINE_TRACE("Service account name = %s\n", wine_dbgstr_w(entry->config.lpServiceStartName) ); WINE_TRACE("Display name = %s\n", wine_dbgstr_w(entry->config.lpDisplayName) ); - WINE_TRACE("Service dependancies : %s\n", entry->dependOnServices[0] ? "" : "(none)"); + WINE_TRACE("Service dependencies : %s\n", entry->dependOnServices[0] ? "" : "(none)"); for (wptr = entry->dependOnServices; *wptr; wptr += strlenW(wptr) + 1) WINE_TRACE(" * %s\n", wine_dbgstr_w(wptr)); - WINE_TRACE("Group dependancies : %s\n", entry->dependOnGroups[0] ? "" : "(none)"); + WINE_TRACE("Group dependencies : %s\n", entry->dependOnGroups[0] ? "" : "(none)"); for (wptr = entry->dependOnGroups; *wptr; wptr += strlenW(wptr) + 1) WINE_TRACE(" * %s\n", wine_dbgstr_w(wptr)); diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index c421ecdc147..b36a1f16709 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -141,7 +141,7 @@ extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ -/* Foward declarations of functions included in this code module: */ +/* Forward declarations of functions included in this code module: */ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr); void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight); diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index aa0a1614901..92dd97087f5 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -95,7 +95,7 @@ enum dllmode BUILTIN, NATIVE, DISABLE, - UNKNOWN /* Special value indicating an erronous DLL override mode */ + UNKNOWN /* Special value indicating an erroneous DLL override mode */ }; struct dll @@ -411,7 +411,7 @@ static void on_add_combo_change(HWND dialog) int sel, len; SendDlgItemMessage(dialog, IDC_DLLCOMBO, WM_GETTEXT, sizeof(buffer), (LPARAM) buffer); - /* if lib was chosen from combobox, we reveive an empty buffer, check manually */ + /* if lib was chosen from combobox, we receive an empty buffer, check manually */ sel=SendDlgItemMessage(dialog, IDC_DLLCOMBO, CB_GETCURSEL, 0, 0); len=SendDlgItemMessage(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index db3e0cd1dd0..8ce79d1d939 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -27,7 +27,7 @@ struct backend_cpu * address manipulation * ------------------------------------------------------------------------------ */ /* Linearizes an address. Only CPUs with segmented address model need this. - * Otherwise, implementation is straigthforward (be_cpu_linearize will do) + * Otherwise, implementation is straightforward (be_cpu_linearize will do) */ void* (*linearize)(HANDLE hThread, const ADDRESS64*); /* Fills in an ADDRESS64 structure from a segment & an offset. CPUs without @@ -76,9 +76,9 @@ struct backend_cpu * it's INT3 (0xCC) */ unsigned (*is_break_insn)(const void*); - /* Check whether instruciton at 'addr' is a function call */ + /* Check whether instruction at 'addr' is a function call */ unsigned (*is_function_call)(const void* insn, ADDRESS64* callee); - /* Ask for dissasembling one instruction. If display is true, assembly code + /* Ask for disassembling one instruction. If display is true, assembly code * will be printed. In all cases, 'addr' is advanced at next instruction */ void (*disasm_one_insn)(ADDRESS64* addr, int display); diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index a4eb2514032..c3bf155e9b0 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -218,7 +218,7 @@ static void be_i386_print_context(HANDLE hThread, const CONTEXT* ctx, int all_re if (ctx->EFlags & 0x00000040) *pt-- = 'Z'; /* Zero Flag */ if (ctx->EFlags & 0x00000080) *pt-- = 'S'; /* Sign Flag */ if (ctx->EFlags & 0x00000100) *pt-- = 'T'; /* Trap/Trace Flag */ - if (ctx->EFlags & 0x00000200) *pt-- = 'I'; /* Interupt Enable Flag */ + if (ctx->EFlags & 0x00000200) *pt-- = 'I'; /* Interrupt Enable Flag */ if (ctx->EFlags & 0x00000400) *pt-- = 'D'; /* Direction Indicator */ if (ctx->EFlags & 0x00000800) *pt-- = 'O'; /* Overflow flags */ if (ctx->EFlags & 0x00001000) *pt-- = '1'; /* I/O Privilege Level */ diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 24522ebbf01..48b2e739dbb 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -216,7 +216,7 @@ static unsigned dbg_save_internal_vars(void) for (i = 0; i < DBG_IV_LAST; i++) { - /* FIXME: type should be infered from basic type -if any- of intvar */ + /* FIXME: type should be inferred from basic type -if any- of intvar */ if (dbg_internal_vars[i].pval == &dbg_internal_vars[i].val) RegSetValueEx(hkey, dbg_internal_vars[i].name, 0, REG_DWORD, (const void*)dbg_internal_vars[i].pval, diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 6a1e8bff364..aeb839708ac 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -794,7 +794,7 @@ cleanup: /* ========================================================================= * Routine copied from cmd.exe md command - - * This works recursivly. so creating dir1\dir2\dir3 will create dir1 and + * This works recursively. so creating dir1\dir2\dir3 will create dir1 and * dir2 if they do not already exist. * ========================================================================= */ static BOOL XCOPY_CreateDirectory(const WCHAR* path) diff --git a/server/atom.c b/server/atom.c index 8094188c85a..f941c5124a7 100644 --- a/server/atom.c +++ b/server/atom.c @@ -65,7 +65,7 @@ struct atom_table int count; /* count of atom handles */ int last; /* last handle in-use */ struct atom_entry **handles; /* atom handles */ - int entries_count; /* humber of hash entries */ + int entries_count; /* number of hash entries */ struct atom_entry **entries; /* hash table entries */ }; diff --git a/server/change.c b/server/change.c index 22666213504..2c690e0c4b3 100644 --- a/server/change.c +++ b/server/change.c @@ -56,7 +56,7 @@ #define DN_CREATE 0x00000004 /* File created */ #define DN_DELETE 0x00000008 /* File removed */ #define DN_RENAME 0x00000010 /* File renamed */ -#define DN_ATTRIB 0x00000020 /* File changed attibutes */ +#define DN_ATTRIB 0x00000020 /* File changed attributes */ #define DN_MULTISHOT 0x80000000 /* Don't remove notifier */ #endif #endif diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 7281ed9d0b6..e4317d5989a 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -418,7 +418,7 @@ static void put_raw_data(res_t *res, raw_data_t *raw, int offset) /* ***************************************************************************** * Function : put_res_header - * Syntax : intput_res_header(res_t *res, int type, name_id_t *ntype, + * Syntax : input_res_header(res_t *res, int type, name_id_t *ntype, * name_id_t *name, DWORD memopt, lvc_t *lvc) * * Input :