Francois Gouget : Assorted spelling fixes.

Alexandre Julliard julliard at winehq.org
Tue Aug 11 10:47:21 CDT 2009


Module: wine
Branch: master
Commit: e74efb54872180b23f090f1e1fa78e45fd9cb455
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e74efb54872180b23f090f1e1fa78e45fd9cb455

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Aug 11 09:03:12 2009 +0200

Assorted spelling fixes.

---

 dlls/urlmon/sec_mgr.c             |    2 +-
 dlls/urlmon/tests/sec_mgr.c       |    2 +-
 dlls/user32/tests/menu.c          |    2 +-
 dlls/winealsa.drv/dsoutput.c      |    2 +-
 dlls/wined3d/arb_program_shader.c |    4 ++--
 dlls/wined3d/glsl_shader.c        |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index d54b2bf..9d0e799 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -689,7 +689,7 @@ static LPDWORD build_zonemap_from_reg(void)
     WCHAR name[32];
     HKEY hkey;
     LPDWORD data = NULL;
-    DWORD allocated = 6; /* space for the zonecount and Zone "0" upto Zone "4" */
+    DWORD allocated = 6; /* space for the zonecount and Zone "0" up to Zone "4" */
     DWORD used = 0;
     DWORD res;
     DWORD len;
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index c7774ec..e607259 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -496,7 +496,7 @@ static void test_GetZoneAttributes(void)
     if (FAILED(hr))
         return;
 
-    /* native urlmon has Zone "0" upto Zone "4" since IE4 */
+    /* native urlmon has Zone "0" up to Zone "4" since IE4 */
     for (i = 0; i < 5; i++) {
         memset(buffer, -1, sizeof(buffer));
         hr = IInternetZoneManager_GetZoneAttributes(zonemgr, i, pZA);
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 7ffe29a..a388103 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -3023,7 +3023,7 @@ static void test_menu_maxdepth(void)
         hmenus[i] = CreatePopupMenu();
         if( !hmenus[i]) break;
     }
-    ok( i == NR_MENUS, "could not create more then %d menu's\n", i);
+    ok( i == NR_MENUS, "could not create more than %d menu's\n", i);
     for( i = 1; i < NR_MENUS; i++) {
         ret = AppendMenuA( hmenus[i], MF_POPUP, (UINT_PTR)hmenus[i-1],"test");
         if( !ret) break;
diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index 9c6d7fd..6d0df21 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -400,7 +400,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface,
             ret = snd_pcm_writei(This->pcm, pvAudio1, writelen);
             if (ret == -EPIPE)
             {
-                WARN("Underrun occured\n");
+                WARN("Underrun occurred\n");
                 snd_pcm_prepare(This->pcm);
                 ret = snd_pcm_writei(This->pcm, pvAudio1, writelen);
                 snd_pcm_start(This->pcm);
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index c7eeb8f..991fe69 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -1245,8 +1245,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD
 
     if (flags & TEX_DERIV)
     {
-        if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n");
-        if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivates\n");
+        if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivatives\n");
+        if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivatives\n");
         shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg,
                        dsx, dsy,sampler_idx, tex_type);
     }
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 0f5871e..706b065 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -973,7 +973,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
     /* Declare uniforms for NP2 texcoord fixup:
      * This is NOT done inside the loop that declares the texture samplers since the NP2 fixup code
      * is currently only used for the GeforceFX series and when forcing the ARB_npot extension off.
-     * Modern cards just skip the code anyway, so put it inside a seperate loop. */
+     * Modern cards just skip the code anyway, so put it inside a separate loop. */
     if (pshader && ps_args->np2_fixup) {
 
         struct ps_np2fixup_info* const fixup = ctx_priv->cur_np2fixup_info;




More information about the wine-cvs mailing list