From 1563abe8ec94fd34988f9dfe673aaac7b7a711a2 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Fri, 13 Oct 2000 20:26:52 +0000 Subject: [PATCH] - stupid spelling fixes - some more loadorder array work --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/listview.c | 4 ++-- dlls/shell32/shell32_main.c | 4 ++-- dlls/shell32/shlfolder.c | 2 +- dlls/winmm/wineoss/audio.c | 2 +- loader/loadorder.c | 9 ++++----- memory/registry.c | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c8e49e28a88..53ca01d87ca 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -559,7 +559,7 @@ InitCommonControls (void) * Failure: FALSE * * NOTES - * Only the additinal common controls are registered by this function. + * Only the additional common controls are registered by this function. * The Win95 controls are registered at the DLL's initialization. */ diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 58bd77471ac..54110de91e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -18,7 +18,7 @@ * Comments: * - ImageList_Draw, ImageList_DrawEx and ImageList_GetIcon use * ImageList_DrawIndirect. Since ImageList_DrawIndirect is still - * partially imlemented, the functions mentioned above will be + * partially implemented, the functions mentioned above will be * limited in functionality too. */ diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 91787c98460..67fcfa8dbe3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4679,7 +4679,7 @@ static LRESULT LISTVIEW_GetBkColor(HWND hwnd) * * RETURN: * SUCCESS : TRUE - * FAILURE : FALSE` + * FAILURE : FALSE */ /* static LRESULT LISTVIEW_GetBkImage(HWND hwnd, LPLVBKIMAGE lpBkImage) */ /* { */ @@ -7768,7 +7768,7 @@ static LRESULT LISTVIEW_VScroll(HWND hwnd, INT nScrollCode, SHORT nCurrentPos, * PARAMETER(S): * [I] HWND : window handle * [I] INT : scroll code - * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION + * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION * or SB_THUMBTRACK. * [I] HWND : scrollbar control window handle * diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 058126a0195..5fe61a0ad69 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -323,8 +323,8 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) /************************************************************************* * ExtractIconA [SHELL32.133] * - * fixme - * is the filename is not a file return 1 + * FIXME + * if the filename is not a file return 1 */ HICON WINAPI ExtractIconA( HINSTANCE hInstance, LPCSTR lpszExeFileName, UINT nIconIndex ) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index dad9895ffba..155aa7b2db5 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -612,7 +612,7 @@ static ULONG WINAPI IShellFolder_fnRelease(IShellFolder2 * iface) * ULONG* pdwAttributes //[out] items attributes * * NOTES -* every folder trys to parse only it's own (the leftmost) pidl and creates a +* every folder tries to parse only its own (the leftmost) pidl and creates a * subfolder to evaluate the remaining parts * now we can parse into namespaces implemented by shell extensions * diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 754aa1c1fc5..2b3fe9ca81f 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -162,7 +162,7 @@ LONG OSS_WaveInit(void) ioctl(audio, SNDCTL_DSP_RESET, 0); /* FIXME: some programs compare this string against the content of the registry - * for MM drivers. The name have to match in order the program to work + * for MM drivers. The names have to match in order for the program to work * (e.g. MS win9x mplayer.exe) */ #ifdef EMULATE_SB16 diff --git a/loader/loadorder.c b/loader/loadorder.c index e1fd0682399..9a2526ef335 100644 --- a/loader/loadorder.c +++ b/loader/loadorder.c @@ -37,6 +37,7 @@ static struct tagDllOverride { {"kernel32,gdi32,user32", "builtin"}, {"krnl386,gdi,user", "builtin"}, {"toolhelp", "builtin"}, + {"windebug", "native,builtin"}, {"system,display", "builtin"}, {"w32skrnl,wow32", "builtin"}, {"advapi32,crtdll,ntdll", "builtin,native"}, @@ -49,8 +50,7 @@ static struct tagDllOverride { {"shfolder", "builtin,native"}, {"comctl32,commctrl", "builtin,native"}, /* network */ - {"wsock32,winsock", "builtin"}, - {"ws2_32", "builtin"}, + {"wsock32,ws2_32,winsock", "builtin"}, {"icmp", "builtin"}, /* multimedia */ {"ddraw,dinput,dsound", "builtin,native"}, @@ -61,9 +61,8 @@ static struct tagDllOverride { {"mciavi.drv,mcianim.drv", "native,builtin"}, {"msacm.drv,midimap.drv", "builtin,native"}, {"opengl32", "builtin,native"}, - /* we have to use libglide2x.so instead of glide2x.dll ... */ - {"glide2x", "so,native"}, - {"glide3x", "so,native"}, + /* we have to use libglideXx.so instead of glideXx.dll ... */ + {"glide2x,glide3x", "so,native"}, /* other stuff */ {"mpr,winspool.drv", "builtin,native"}, {"wnaspi32,winaspi", "builtin"}, diff --git a/memory/registry.c b/memory/registry.c index 22c6919a7bc..3b682e5dcda 100644 --- a/memory/registry.c +++ b/memory/registry.c @@ -856,7 +856,7 @@ DWORD WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWOR * RegQueryValueExA [ADVAPI32.157] * * NOTES: - * the documentation is wrong: if the buffer is to small it remains untouched + * the documentation is wrong: if the buffer is too small it remains untouched */ DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )