Commit 96c337f0 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Assorted spelling fixes.

parent 7d55f09e
...@@ -1401,15 +1401,15 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark ...@@ -1401,15 +1401,15 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark
/*********************************************************************** /***********************************************************************
* COMCTL32_EnsureBitmapSize [internal] * COMCTL32_EnsureBitmapSize [internal]
* *
* If needed enlarge the bitmap so that the width is at least cxMinWidth * If needed, enlarge the bitmap so that the width is at least cxMinWidth and
* the height is at least cyMinHeight. If the bitmap already have these * the height is at least cyMinHeight. If the bitmap already has these
* dimensions nothing changes. * dimensions nothing changes.
* *
* PARAMS * PARAMS
* hBitmap [I/O] Bitmap to modify. The handle may change * hBitmap [I/O] Bitmap to modify. The handle may change
* cxMinWidth [I] If the width of the bitmap is smaller then it will * cxMinWidth [I] If the width of the bitmap is smaller, then it will
* be enlarged to this value * be enlarged to this value
* cyMinHeight [I] If the height of the bitmap is smaller then it will * cyMinHeight [I] If the height of the bitmap is smaller, then it will
* be enlarged to this value * be enlarged to this value
* cyBackground [I] The color with which the new area will be filled * cyBackground [I] The color with which the new area will be filled
* *
......
...@@ -764,7 +764,7 @@ static void test_sizes(void) ...@@ -764,7 +764,7 @@ static void test_sizes(void)
SetWindowLong(hToolbar, GWL_STYLE, style | CCS_VERT); SetWindowLong(hToolbar, GWL_STYLE, style | CCS_VERT);
SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); SendMessage(hToolbar, TB_AUTOSIZE, 0, 0);
check_sizes_todo(0x3c); check_sizes_todo(0x3c);
/* with a TBSTYLE_WRAPABLE a wrapping will occure on the separator */ /* with a TBSTYLE_WRAPABLE a wrapping will occur on the separator */
SetWindowLong(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE | CCS_VERT); SetWindowLong(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE | CCS_VERT);
SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); SendMessage(hToolbar, TB_AUTOSIZE, 0, 0);
check_sizes_todo(0x7c); check_sizes_todo(0x7c);
......
...@@ -456,7 +456,7 @@ BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll, ...@@ -456,7 +456,7 @@ BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll,
/****************************************************************** /******************************************************************
* symt_get_info * symt_get_info
* *
* Retrieves inforamtion about a symt (either symbol or type) * Retrieves information about a symt (either symbol or type)
*/ */
BOOL symt_get_info(const struct symt* type, IMAGEHLP_SYMBOL_TYPE_INFO req, BOOL symt_get_info(const struct symt* type, IMAGEHLP_SYMBOL_TYPE_INFO req,
void* pInfo) void* pInfo)
......
...@@ -970,7 +970,7 @@ START_TEST(localmon) ...@@ -970,7 +970,7 @@ START_TEST(localmon)
pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor");
if (!pInitializePrintMonitor) { if (!pInitializePrintMonitor) {
/* The Monitor for "Local Ports" was in a seperate dll before w2k */ /* The Monitor for "Local Ports" was in a separate dll before w2k */
hlocalmon = LoadLibraryA("localmon.dll"); hlocalmon = LoadLibraryA("localmon.dll");
if (hlocalmon) { if (hlocalmon) {
pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor"); pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor");
...@@ -978,7 +978,7 @@ START_TEST(localmon) ...@@ -978,7 +978,7 @@ START_TEST(localmon)
} }
if (!pInitializePrintMonitor) return; if (!pInitializePrintMonitor) return;
/* Native localmon.dll / localspl.dll need a vaild Port-Entry in: /* Native localmon.dll / localspl.dll need a valid Port-Entry in:
a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports
b) up to w2k: Section "Ports" in win.ini b) up to w2k: Section "Ports" in win.ini
or InitializePrintMonitor fails. */ or InitializePrintMonitor fails. */
......
...@@ -249,7 +249,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) ...@@ -249,7 +249,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms)
wma->dwSet |= 2; wma->dwSet |= 2;
break; break;
default: default:
WARN("Unknown audio chanel %u\n", lpParms->dwAudio); WARN("Unknown audio channel %u\n", lpParms->dwAudio);
break; break;
} }
} }
...@@ -283,7 +283,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) ...@@ -283,7 +283,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms)
wma->dwSet &= ~2; wma->dwSet &= ~2;
break; break;
default: default:
WARN("Unknown audio chanel %u\n", lpParms->dwAudio); WARN("Unknown audio channel %u\n", lpParms->dwAudio);
break; break;
} }
} }
......
...@@ -90,7 +90,7 @@ static void test_SQLInstallDriverManager(void) ...@@ -90,7 +90,7 @@ static void test_SQLInstallDriverManager(void)
ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN,
"Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n");
/* Length smaller then MAX_PATH */ /* Length smaller than MAX_PATH */
bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL);
sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL);
todo_wine { todo_wine {
......
...@@ -1519,7 +1519,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ...@@ -1519,7 +1519,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
editor->nUndoLimit = min(wParam, STACK_SIZE_MAX); editor->nUndoLimit = min(wParam, STACK_SIZE_MAX);
/* Setting a max stack size keeps wine from getting killed /* Setting a max stack size keeps wine from getting killed
for hogging memory. Windows allocates all this memory at once, so for hogging memory. Windows allocates all this memory at once, so
no program would realistically set a value above our maxiumum. */ no program would realistically set a value above our maximum. */
return editor->nUndoLimit; return editor->nUndoLimit;
} }
case EM_CANUNDO: case EM_CANUNDO:
......
...@@ -1133,7 +1133,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) ...@@ -1133,7 +1133,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg)
ExitThread(rc); ExitThread(rc);
} }
/* ShellExecute won't succesfully send DDE commands to console applications after starting them, /* ShellExecute won't successfully send DDE commands to console applications after starting them,
* so we run a DDE server in this application, deny the first connection request to make * so we run a DDE server in this application, deny the first connection request to make
* ShellExecute start the application, and then process the next DDE connection in this application * ShellExecute start the application, and then process the next DDE connection in this application
* to see the execute command that is sent. */ * to see the execute command that is sent. */
...@@ -1274,7 +1274,7 @@ static dde_default_app_tests_t dde_default_app_tests[] = ...@@ -1274,7 +1274,7 @@ static dde_default_app_tests_t dde_default_app_tests[] =
{"%s\\test2", "test2", 0x0, 33}, {"%s\\test2", "test2", 0x0, 33},
{"%s\\test2 param", "test2", 0x0, 33}, {"%s\\test2 param", "test2", 0x0, 33},
/* Test an unquoted non-existent filename */ /* Test an unquoted nonexistent filename */
{"%s\\notexist.exe", "", 0x0, 5}, {"%s\\notexist.exe", "", 0x0, 5},
{"%s\\notexist.exe param", "", 0x0, 5}, {"%s\\notexist.exe param", "", 0x0, 5},
......
...@@ -212,7 +212,7 @@ static void test_SHQUeryValueEx(void) ...@@ -212,7 +212,7 @@ static void test_SHQUeryValueEx(void)
/* /*
* string grows during expanding * string grows during expanding
* dwSize is smaller then the size of the unexpanded string * dwSize is smaller than the size of the unexpanded string
*/ */
strcpy(buf, sEmptyBuffer); strcpy(buf, sEmptyBuffer);
dwSize = 6; dwSize = 6;
...@@ -225,8 +225,9 @@ static void test_SHQUeryValueEx(void) ...@@ -225,8 +225,9 @@ static void test_SHQUeryValueEx(void)
/* /*
* string grows during expanding * string grows during expanding
* dwSize is larger then the size of the unexpanded string but smaller than the part before the backslash * dwSize is larger than the size of the unexpanded string, but
* if the unexpanded string fits into the buffer it can get cut when expanded * smaller than the part before the backslash. If the unexpanded
* string fits into the buffer, it can get cut when expanded.
*/ */
strcpy(buf, sEmptyBuffer); strcpy(buf, sEmptyBuffer);
dwSize = strlen(sEnvvar2) - 2; dwSize = strlen(sEnvvar2) - 2;
...@@ -245,8 +246,9 @@ static void test_SHQUeryValueEx(void) ...@@ -245,8 +246,9 @@ static void test_SHQUeryValueEx(void)
/* /*
* string grows during expanding * string grows during expanding
* dwSize is larger then the size of the part before the backslash but smaller then the expanded string * dwSize is larger than the size of the part before the backslash,
* if the unexpanded string fits into the buffer it can get cut when expanded * but smaller than the expanded string. If the unexpanded string fits
* into the buffer, it can get cut when expanded.
*/ */
strcpy(buf, sEmptyBuffer); strcpy(buf, sEmptyBuffer);
dwSize = nExpLen2 - 4; dwSize = nExpLen2 - 4;
......
...@@ -498,7 +498,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) ...@@ -498,7 +498,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
* *
* This extra buffer is used for ANSI to Unicode conversions in W-Calls. * This extra buffer is used for ANSI to Unicode conversions in W-Calls.
* info->wLength should be the same as len. Currently it isn't but that * info->wLength should be the same as len. Currently it isn't but that
* doesn't seem to be a problem (len is bigger then info->wLength). * doesn't seem to be a problem (len is bigger than info->wLength).
*/ */
len = (len - sizeof(VS_FIXEDFILEINFO)) * 4; len = (len - sizeof(VS_FIXEDFILEINFO)) * 4;
} }
......
...@@ -317,7 +317,7 @@ static void test_32bit_win(void) ...@@ -317,7 +317,7 @@ static void test_32bit_win(void)
ok( !memcmp(pVersionInfoA, pVersionInfoW, retvalA), "Both structs should be the same, they aren't\n"); ok( !memcmp(pVersionInfoA, pVersionInfoW, retvalA), "Both structs should be the same, they aren't\n");
} }
/* The structs on Windows are bigger then just the struct for the basic information. The total struct /* The structs on Windows are bigger than just the struct for the basic information. The total struct
* contains also an empty part, which is used for converted strings. The converted strings are a result * contains also an empty part, which is used for converted strings. The converted strings are a result
* of calling VerQueryValueA on a 32bit resource and calling VerQueryValueW on a 16bit resource. * of calling VerQueryValueA on a 32bit resource and calling VerQueryValueW on a 16bit resource.
* The first WORD of the structure (wLength) shows the size of the base struct. The total struct size depends * The first WORD of the structure (wLength) shows the size of the base struct. The total struct size depends
......
...@@ -4480,8 +4480,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun ...@@ -4480,8 +4480,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun
LEAVE_GL(); LEAVE_GL();
/* Dirtify the target surface for now. If the surface is locked regularily, and an up to date sysmem copy exists, /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists,
* it is most likely more efficient to perform a clear on the sysmem copy too isntead of downloading it * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it
*/ */
if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) {
target->Flags |= SFLAG_INTEXTURE; target->Flags |= SFLAG_INTEXTURE;
......
...@@ -411,7 +411,7 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine ...@@ -411,7 +411,7 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine
return; return;
} }
/* TODO: Keep track of previously enabled clipplanes to avoid unneccessary resetting /* TODO: Keep track of previously enabled clipplanes to avoid unnecessary resetting
* of already set values * of already set values
*/ */
......
...@@ -2067,7 +2067,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ...@@ -2067,7 +2067,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch
GLuint tmpTexture = 0; GLuint tmpTexture = 0;
DWORD color; DWORD color;
/*FIXME: /*FIXME:
Textures my not be stored in ->allocatedgMemory and a GlTexture Textures may not be stored in ->allocatedgMemory and a GlTexture
so we should lock the surface before saving a snapshot, or at least check that so we should lock the surface before saving a snapshot, or at least check that
*/ */
/* TODO: Compressed texture images can be obtained from the GL in uncompressed form /* TODO: Compressed texture images can be obtained from the GL in uncompressed form
...@@ -2081,7 +2081,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ...@@ -2081,7 +2081,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch
/* Setup the width and height to be the internal texture width and height. */ /* Setup the width and height to be the internal texture width and height. */
width = This->pow2Width; width = This->pow2Width;
height = This->pow2Height; height = This->pow2Height;
/* check to see if were a 'virtual' texture e.g. were not a pbuffer of texture were a back buffer*/ /* check to see if we're a 'virtual' texture, e.g. we're not a pbuffer of texture, we're a back buffer*/
IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapChain); IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapChain);
if (This->Flags & SFLAG_INDRAWABLE && !(This->Flags & SFLAG_INTEXTURE)) { if (This->Flags & SFLAG_INDRAWABLE && !(This->Flags & SFLAG_INTEXTURE)) {
...@@ -2147,7 +2147,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ...@@ -2147,7 +2147,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch
ERR("opening of %s failed with: %s\n", filename, strerror(errno)); ERR("opening of %s failed with: %s\n", filename, strerror(errno));
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel*/ /* Save the data out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel */
TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format)); TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format));
/* TGA header */ /* TGA header */
fputc(0,f); fputc(0,f);
...@@ -2170,7 +2170,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ...@@ -2170,7 +2170,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch
fputc(0x20,f); fputc(0x20,f);
fputc(0x28,f); fputc(0x28,f);
/* raw data */ /* raw data */
/* if the data is upside down if we've fetched it from a back buffer, so it needs flipping again to make it the correct way up*/ /* if the data is upside down if we've fetched it from a back buffer, so it needs flipping again to make it the correct way up */
if(swapChain) if(swapChain)
textureRow = allocatedMemory + (width * (height - 1) *4); textureRow = allocatedMemory + (width * (height - 1) *4);
else else
...@@ -2293,7 +2293,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM ...@@ -2293,7 +2293,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM
HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
/* Render targets depend on their hdc, and we can't create a hdc on a user pointer */ /* Render targets depend on their hdc, and we can't create an hdc on a user pointer */
if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) {
ERR("Not supported on render targets\n"); ERR("Not supported on render targets\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
......
...@@ -446,10 +446,10 @@ static BOOL INT10_FillModeInformation( struct _ModeInfoBlock *mib, WORD mode ) ...@@ -446,10 +446,10 @@ static BOOL INT10_FillModeInformation( struct _ModeInfoBlock *mib, WORD mode )
* 32,34,36 - BYTE: red/green/blue field position * 32,34,36 - BYTE: red/green/blue field position
* Bit position of the least significant bit of red/green/blue color * Bit position of the least significant bit of red/green/blue color
* component. * component.
* Both should be only used when memory model is direct color or YUV but * Both should be only used when the memory model is direct color or YUV
* "Imperium Romanum" uses this fields even when memory model is planar. * but "Imperium Romanum" uses this field even when the memory model is
* So always fill this fields when we have a depth bigger then 8, otherwise * planar. So always fill this field when we have a depth bigger than 8,
* set them to zero. * otherwise set them to zero.
*/ */
switch (ptr->Depth) { switch (ptr->Depth) {
case 24: case 24:
......
...@@ -1589,7 +1589,7 @@ DECLARE_INTERFACE_(IWineD3DClipper,IUnknown) ...@@ -1589,7 +1589,7 @@ DECLARE_INTERFACE_(IWineD3DClipper,IUnknown)
#define IWineD3DClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b) #define IWineD3DClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b)
#endif #endif
/* DDraw Clippers are not created from DDraw objects, they have a seperate creation function */ /* DDraw Clippers are not created from DDraw objects, they have a separate creation function */
IWineD3DClipper* WINAPI WineDirect3DCreateClipper(IUnknown *parent); IWineD3DClipper* WINAPI WineDirect3DCreateClipper(IUnknown *parent);
#if 0 /* FIXME: During porting in from d3d8 - the following will be used */ #if 0 /* FIXME: During porting in from d3d8 - the following will be used */
......
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