Commit 7649c75b authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Assorted typo and spelling fixes.

parent e5a19a51
...@@ -1362,13 +1362,13 @@ static void failure_test(void) { ...@@ -1362,13 +1362,13 @@ static void failure_test(void) {
/* shader 42: no modifiers with vs dcl sampler instruction */ /* shader 42: no modifiers with vs dcl sampler instruction */
"vs_3_0\n" "vs_3_0\n"
"dcl_2d_pp s0\n", "dcl_2d_pp s0\n",
/* shader 43: can't explicitely declare input registers in ps_2_0 */ /* shader 43: can't explicitly declare input registers in ps_2_0 */
"ps_2_0\n" "ps_2_0\n"
"dcl_texcoord0 t0\n", "dcl_texcoord0 t0\n",
/* shader 44: can't implicitely declare registers in vs */ /* shader 44: can't implicitly declare registers in vs */
"vs_2_0\n" "vs_2_0\n"
"dcl o0\n", "dcl o0\n",
/* shader 45: can't implicitely declare samplers in vs */ /* shader 45: can't implicitly declare samplers in vs */
"vs_3_0\n" "vs_3_0\n"
"dcl s2\n", "dcl s2\n",
/* shader 46: no tx registers in ps_3_0 */ /* shader 46: no tx registers in ps_3_0 */
......
...@@ -238,7 +238,7 @@ static void dump_unwind_info(HANDLE hProcess, ULONG64 base, RUNTIME_FUNCTION *fu ...@@ -238,7 +238,7 @@ static void dump_unwind_info(HANDLE hProcess, ULONG64 base, RUNTIME_FUNCTION *fu
} }
} }
/* highly derivated from dlls/ntdlls/signal_x86_64.c */ /* highly derived from dlls/ntdll/signal_x86_64.c */
static ULONG64 get_int_reg(CONTEXT *context, int reg) static ULONG64 get_int_reg(CONTEXT *context, int reg)
{ {
return *(&context->Rax + reg); return *(&context->Rax + reg);
......
...@@ -345,7 +345,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) ...@@ -345,7 +345,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface)
* DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't
* expect any difference to a normal window for wine) * expect any difference to a normal window for wine)
* DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for * DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for
* rendering (Possible test case: Half-life) * rendering (Possible test case: Half-Life)
* *
* Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE
* *
......
/* /*
* Copyright 2010 Maarten Lankhorst for Codeweavers * Copyright 2010 Maarten Lankhorst for CodeWeavers
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
......
/* /*
* Copyright 2010 Maarten Lankhorst for Codeweavers * Copyright 2010 Maarten Lankhorst for CodeWeavers
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
......
/* /*
* Copyright 2010 Maarten Lankhorst for Codeweavers * Copyright 2010 Maarten Lankhorst for CodeWeavers
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -244,7 +244,7 @@ static void test_audioclient(IAudioClient *ac) ...@@ -244,7 +244,7 @@ static void test_audioclient(IAudioClient *ac)
ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr);
/* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds /* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds
* Since we can only initialize succesfully once skip those tests * Since we can only initialize successfully once skip those tests
*/ */
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL);
ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr);
......
...@@ -96,7 +96,7 @@ static void test_memcpy_s(void) ...@@ -96,7 +96,7 @@ static void test_memcpy_s(void)
ret = pmemcpy_s(data, 10, data, 10); ret = pmemcpy_s(data, 10, data, 10);
ok(ret == 0, "ret = %x\n", ret); ok(ret == 0, "ret = %x\n", ret);
ok(errno == 0xdeadbeef, "errno = %x\n", errno); ok(errno == 0xdeadbeef, "errno = %x\n", errno);
ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n"); ok(!memcmp(dest, data, 5), "data was destroyed during overwriting\n");
errno = 0xdeadbeef; errno = 0xdeadbeef;
dest[0] = 'x'; dest[0] = 'x';
......
...@@ -829,7 +829,7 @@ static void test_OleLoadPicturePath(void) ...@@ -829,7 +829,7 @@ static void test_OleLoadPicturePath(void)
DeleteFileA(temp_file); DeleteFileA(temp_file);
/* Try with a non-existent file. */ /* Try with a nonexistent file. */
hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic);
ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
hres == E_UNEXPECTED || /* NT4/Win95 */ hres == E_UNEXPECTED || /* NT4/Win95 */
...@@ -865,7 +865,7 @@ static void test_OleLoadPicturePath(void) ...@@ -865,7 +865,7 @@ static void test_OleLoadPicturePath(void)
DeleteFileA(temp_file); DeleteFileA(temp_file);
/* Try with a non-existent file. */ /* Try with a nonexistent file. */
hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic);
ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
hres == E_UNEXPECTED || /* NT4/Win95 */ hres == E_UNEXPECTED || /* NT4/Win95 */
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* Stuff tested with: * Stuff tested with:
* - rs405deu.exe (German Acroread 4.05 setup) * - rs405deu.exe (German Acroread 4.05 setup)
* - ie5setup.exe * - ie5setup.exe
* - Netmeeting * - NetMeeting
* *
* FIXME: * FIXME:
* - string handling is... weird ;) (buflen etc.) * - string handling is... weird ;) (buflen etc.)
......
...@@ -727,7 +727,7 @@ static void doChild(const char *arg) ...@@ -727,7 +727,7 @@ static void doChild(const char *arg)
trace("CSIDL_FAVORITES was changed to %s\n", path); trace("CSIDL_FAVORITES was changed to %s\n", path);
ret = CreateDirectoryA(path, NULL); ret = CreateDirectoryA(path, NULL);
ok(!ret, "expected failure with with ERROR_ALREADY_EXISTS\n"); ok(!ret, "expected failure with ERROR_ALREADY_EXISTS\n");
if (!ret) if (!ret)
ok(GetLastError() == ERROR_ALREADY_EXISTS, ok(GetLastError() == ERROR_ALREADY_EXISTS,
"got %d, expected ERROR_ALREADY_EXISTS\n", GetLastError()); "got %d, expected ERROR_ALREADY_EXISTS\n", GetLastError());
......
...@@ -1254,7 +1254,7 @@ static void test_IUri_GetPropertyLength(void) { ...@@ -1254,7 +1254,7 @@ static void test_IUri_GetPropertyLength(void) {
expectedLen = lstrlen(prop.value); expectedLen = lstrlen(prop.value);
/* This won't be neccessary once GetPropertyLength is implemented. */ /* This won't be necessary once GetPropertyLength is implemented. */
receivedLen = -1; receivedLen = -1;
hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0); hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0);
......
...@@ -851,7 +851,7 @@ int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B ...@@ -851,7 +851,7 @@ int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B
return ich; return ich;
} }
/* Applies the reorder in reverse. Taking an already reordered string and returing the original */ /* Applies the reorder in reverse. Taking an already reordered string and returning the original */
int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse)
{ {
int ich = 0; int ich = 0;
......
...@@ -3276,7 +3276,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, ...@@ -3276,7 +3276,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface,
&& dst_surface == dstSwapchain->front_buffer && dst_surface == dstSwapchain->front_buffer
&& src_surface == dstSwapchain->back_buffers[0]) && src_surface == dstSwapchain->back_buffers[0])
{ {
/* Half-life does a Blt from the back buffer to the front buffer, /* Half-Life does a Blt from the back buffer to the front buffer,
* Full surface size, no flags... Use present instead * Full surface size, no flags... Use present instead
* *
* This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer
......
...@@ -230,10 +230,10 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', ...@@ -230,10 +230,10 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',
lpCaps->wZmin = 0; lpCaps->wZmin = 0;
lpCaps->wZmax = (nrOfAxes >= 3) ? 0xFFFF : 0; lpCaps->wZmax = (nrOfAxes >= 3) ? 0xFFFF : 0;
#ifdef BODGE_THE_HAT #ifdef BODGE_THE_HAT
/* HalfLife won't allow you to map an axis event to things like /* Half-Life won't allow you to map an axis event to things like
"next weapon" and "use". Linux reports the hat on my stick as "next weapon" and "use". Linux reports the hat on my stick as
axis U and V. So, IFF BODGE_THE_HAT is defined, lie through our axis U and V. So, IFF BODGE_THE_HAT is defined, lie through our
teeth and say we have 32 buttons, and we will map the axises to teeth and say we have 32 buttons, and we will map the axes to
the high buttons. Really, perhaps this should be a registry entry, the high buttons. Really, perhaps this should be a registry entry,
or even a parameter to the Linux joystick driver (which would completely or even a parameter to the Linux joystick driver (which would completely
remove the need for this.) remove the need for this.)
......
...@@ -51,7 +51,7 @@ static DWORD dwCompStringSize = 0; ...@@ -51,7 +51,7 @@ static DWORD dwCompStringSize = 0;
#define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing) #define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing)
/* this uses all the callbacks to utilize full IME support */ /* this uses all the callbacks to utilize full IME support */
#define STYLE_CALLBACK (XIMPreeditCallbacks | XIMStatusNothing) #define STYLE_CALLBACK (XIMPreeditCallbacks | XIMStatusNothing)
/* inorder to enable deadkey support */ /* in order to enable deadkey support */
#define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing)
static XIMStyle ximStyle = 0; static XIMStyle ximStyle = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment