From 1e214eb5d354ffbb64699686913a5eb61998ed78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy@gmail.com>
Date: Thu, 2 Oct 2014 10:30:06 +0200
Subject: [PATCH] Assorted spelling/grammar fixes.

---
 dlls/ddraw/tests/visual.c              | 4 ++--
 dlls/kernel32/environ.c                | 2 +-
 dlls/kernel32/locale.c                 | 2 +-
 dlls/kernel32/tests/locale.c           | 2 +-
 dlls/shlwapi/tests/path.c              | 2 +-
 programs/wineconsole/winecon_private.h | 2 +-
 programs/winhlp32/winhelp.c            | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 097e8be5ee6..038504453e8 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -490,8 +490,8 @@ static void fog_test(IDirect3DDevice7 *device)
         {{ 0.0f,  0.0f, 1.5f}, 0xffff0000, 0xff000000},
     };
     /* Untransformed ones. Give them a different diffuse color to make the
-     * test look nicer. It also makes making sure that they are drawn
-     * correctly easier. */
+     * test look nicer. It also helps making sure that they are drawn
+     * correctly. */
     struct
     {
         struct vec4 position;
diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c
index 18cb44c7def..57b6a1f8397 100644
--- a/dlls/kernel32/environ.c
+++ b/dlls/kernel32/environ.c
@@ -503,7 +503,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf
 }
 
 /***********************************************************************
- *              GetFirmwareEnvironmentVariableA         (KERNEL32.@)
+ *              GetFirmwareEnvironmentVariableW         (KERNEL32.@)
  */
 DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size)
 {
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 1ae32d50458..730574bfe55 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -4324,7 +4324,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid)
 
         ptr = &geoinfodata[n];
         if (geoid == ptr->id)
-            /* we don't need empty entry */
+            /* we don't need empty entries */
             return *ptr->iso2W ? ptr : NULL;
 
         if (ptr->id > geoid)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index aad58b2637d..65172a7f17d 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -3971,7 +3971,7 @@ static void test_EnumSystemGeoID(void)
     ret = pEnumSystemGeoID(GEOCLASS_NATION, 0, test_geoid_enumproc);
     ok(ret, "got %d\n", ret);
 
-    /* only first level is enumerated, not the whole hierarchy */
+    /* only the first level is enumerated, not the whole hierarchy */
     geoidenum_count = 0;
     ret = pEnumSystemGeoID(GEOCLASS_NATION, 39070, test_geoid_enumproc2);
     if (ret == 0)
diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index 1599313c901..1edb31ef585 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -1626,7 +1626,7 @@ static void test_PathIsRelativeW(void)
     LPWSTR path;
 
     if (!pPathIsRelativeW) {
-        win_skip("PathIsRelativeA not available\n");
+        win_skip("PathIsRelativeW not available\n");
         return;
     }
 
diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
index 1daf581fca0..eec4171ab69 100644
--- a/programs/wineconsole/winecon_private.h
+++ b/programs/wineconsole/winecon_private.h
@@ -75,7 +75,7 @@ struct inner_data {
     void                (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight);
     void		(*fnDeleteBackend)(struct inner_data* data);
 
-    void*               private;        /* data part belonging to the chosen backed */
+    void*               private;        /* data part belonging to the chosen backend */
 };
 
 /* from wineconsole.c */
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 195a23f3dac..ee5eecd035b 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -309,7 +309,7 @@ static HLPFILE_WINDOWINFO*     WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile,
     /* Calculate horizontal size and position of a popup window */
     GetWindowRect(parent->hMainWnd, &parent_rect);
     wi.size.cx = (parent_rect.right  - parent_rect.left) / 2;
-    wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */
+    wi.size.cy = 10; /* need a non null value, so that borders are taken into account while computing */
 
     wi.origin.x = (short)LOWORD(mouse);
     wi.origin.y = (short)HIWORD(mouse);