diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 22c79391df0..639ef6fb20d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -343,7 +343,7 @@ typedef struct tagLISTVIEW_INFO #define LV_FL_DT_FLAGS (DT_TOP | DT_NOPREFIX | DT_EDITCONTROL | DT_CENTER | DT_WORDBREAK | DT_NOCLIP) #define LV_SL_DT_FLAGS (DT_TOP | DT_EDITCONTROL | DT_SINGLELINE | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS) -/* The time in milisecods to reset the search in the list */ +/* The time in milliseconds to reset the search in the list */ #define KEY_DELAY 450 /* Dump the LISTVIEW_INFO structure to the debug channel */ diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ddf8ae950c7..27a1399a7de 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3640,7 +3640,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (iLength >= 1023) { - ERR("Insuficient space to retrieve new item label\n"); + ERR("Insufficient space to retrieve new item label\n"); } tvdi.item.pszText = tmpText; diff --git a/dlls/kernel/tests/alloc.c b/dlls/kernel/tests/alloc.c index ff7b0ed2849..506daceacad 100644 --- a/dlls/kernel/tests/alloc.c +++ b/dlls/kernel/tests/alloc.c @@ -56,7 +56,7 @@ static void test_Heap(void) UINT error,i; DWORD dwSize; -/* Retreive the page size for this system */ +/* Retrieve the page size for this system */ sysInfo.dwPageSize=0; GetSystemInfo(&sysInfo); ok(sysInfo.dwPageSize>0,"GetSystemInfo should return a valid page size"); @@ -391,12 +391,12 @@ static void test_Virtual(void) UCHAR *mem1; UINT error,i; -/* Retreive the page size for this system */ +/* Retrieve the page size for this system */ sysInfo.dwPageSize=0; GetSystemInfo(&sysInfo); ok(sysInfo.dwPageSize>0,"GetSystemInfo should return a valid page size"); -/* Chhose a reasonable allocation size */ +/* Choose a reasonable allocation size */ memchunk=10*sysInfo.dwPageSize; /* Check that a normal alloc works */ diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index bd2eeba4202..e26b73a55b6 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -165,10 +165,10 @@ LRESULT WINAPI SHCoCreateInstance( dwSize = sizeof(sDllPath); SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); - /* if a special registry key is set we loading a shell extension without help of OLE32 */ + /* if a special registry key is set, we load a shell extension without help of OLE32 */ bLoadWithoutCOM = (ERROR_SUCCESS == SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)); - /* if the com object is inside shell32 omit use of ole32 */ + /* if the com object is inside shell32, omit use of ole32 */ bLoadFromShell32 = (0==lstrcmpiW( PathFindFileNameW(sDllPath), sShell32)); RegCloseKey (hKey); diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index eb2a73c120a..68a7b17c00f 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -623,7 +623,7 @@ LONG WINAPI SHRegEnumUSKeyA( return RegEnumKeyExA(dokey, dwIndex, pszName, pcchValueNameLen, 0, 0, 0, 0); } - FIXME("no support for SHREGNUM_BOTH\n"); + FIXME("no support for SHREGENUM_BOTH\n"); return ERROR_INVALID_FUNCTION; } @@ -656,7 +656,7 @@ LONG WINAPI SHRegEnumUSKeyW( return RegEnumKeyExW(dokey, dwIndex, pszName, pcchValueNameLen, 0, 0, 0, 0); } - FIXME("no support for SHREGNUM_BOTH\n"); + FIXME("no support for SHREGENUM_BOTH\n"); return ERROR_INVALID_FUNCTION; } @@ -1483,7 +1483,7 @@ LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey, * * RETURNS * Success: ERROR_SUCCESS. Output parameters are updated. - * Failure: An error code from RegEnumValueExA. + * Failure: An error code from RegEnumValueA. */ LONG WINAPI SHEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpszValue, LPDWORD pwLen, LPDWORD pwType, diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 4c2ea91bf00..32a1219c3c7 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -481,7 +481,7 @@ LONG ALSA_WaveInit(void) #undef X } - if ( snd_pcm_hw_params_get_channels_min(hw_params) > 1) FIXME("-"); + if ( snd_pcm_hw_params_get_channels_min(hw_params) > 1) FIXME("-\n"); wwo->caps.wChannels = (snd_pcm_hw_params_get_channels_max(hw_params) >= 2) ? 2 : 1; if (snd_pcm_hw_params_get_channels_min(hw_params) <= 2 && 2 <= snd_pcm_hw_params_get_channels_max(hw_params)) wwo->caps.dwSupport |= WAVECAPS_LRVOLUME; diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 06f57ac6f99..9443431abc8 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -873,13 +873,13 @@ inline static void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) /* Do something if internal table state != X state for keycode */ if (((pKeyStateTable[vkey] & 0x80)!=0) != state) { - TRACE("Adjusting state for vkey %#.2x. State before %#.2x \n", + TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", vkey, pKeyStateTable[vkey]); /* Fake key being pressed inside wine */ send_keyboard_input( vkey, 0, state? 0 : KEYEVENTF_KEYUP, time ); - TRACE("State after %#.2x \n",pKeyStateTable[vkey]); + TRACE("State after %#.2x\n",pKeyStateTable[vkey]); } } @@ -951,12 +951,12 @@ void X11DRV_KeyEvent( HWND hwnd, XKeyEvent *event ) TRACE_(key)("state = %X\n", event->state); - /* If XKB extensions is used, the state mask for AltGr will used the group + /* If XKB extensions are used, the state mask for AltGr will use the group index instead of the modifier mask. The group index is set in bits 13-14 of the state field in the XKeyEvent structure. So if AltGr is - pressed, look if the group index is diferent than 0. From XKB - extension documentation, the group index should for AltGr should - be 2 (event->state = 0x2000). It's probably better to not assume a + pressed, look if the group index is different than 0. From XKB + extension documentation, the group index for AltGr should be 2 + (event->state = 0x2000). It's probably better to not assume a predefined group index and find it dynamically Ref: X Keyboard Extension: Library specification (section 14.1.1 and 17.1.1) */ @@ -997,7 +997,7 @@ void X11DRV_KeyEvent( HWND hwnd, XKeyEvent *event ) /* Adjust the NUMLOCK state if it has been changed outside wine */ if (!(pKeyStateTable[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask)) { - TRACE("Adjusting NumLock state. \n"); + TRACE("Adjusting NumLock state.\n"); KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyPress, event_time ); KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyRelease, event_time ); } @@ -1365,7 +1365,7 @@ WORD X11DRV_VkKeyScan(CHAR cChar) keycode = TSXKeysymToKeycode(display, keysym | 0xFE00); } - TRACE("VkKeyScan '%c'(%#lx, %lu): got keycode %#.2x\n", + TRACE("'%c'(%#lx, %lu): got keycode %#.2x\n", cChar,keysym,keysym,keycode); if (keycode) @@ -1402,7 +1402,7 @@ UINT X11DRV_MapVirtualKey(UINT wCode, UINT wMapType) #define returnMVK(value) { TRACE("returning 0x%x.\n",value); return value; } - TRACE("MapVirtualKey wCode=0x%x wMapType=%d ... \n", wCode,wMapType); + TRACE("wCode=0x%x wMapType=%d ...\n", wCode,wMapType); switch(wMapType) { case 0: { /* vkey-code to scan-code */ /* let's do vkey -> keycode -> scan */ @@ -1799,7 +1799,7 @@ INT X11DRV_ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, } /* more areas where X returns characters but Windows does not - CTRL + number or CTRL + symbol*/ + CTRL + number or CTRL + symbol */ if (e.state & ControlMask) { if (((keysym>=33) && (keysym < 'A')) ||