ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Assorted spelling fixes.

This commit is contained in:
Francois Gouget 2015-08-07 15:40:50 +02:00 committed by Alexandre Julliard
parent cad391f0f6
commit f8a7d6ed74
19 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/avifil32/icmstream.c
View File

@ -771,11 +771,11 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
if (This->lKeyFrameEvery != 0) { if (This->lKeyFrameEvery != 0) {
if (This->lCurrent == This->sInfo.dwStart) { if (This->lCurrent == This->sInfo.dwStart) {
if (idxFlags & AVIIF_KEYFRAME) { if (idxFlags & AVIIF_KEYFRAME) {
/* for keyframes allow to consume all unused bytes */ /* allow keyframes to consume all unused bytes */
dwRequest = This->dwBytesPerFrame + This->dwUnusedBytes; dwRequest = This->dwBytesPerFrame + This->dwUnusedBytes;
This->dwUnusedBytes = 0; This->dwUnusedBytes = 0;
} else { } else {
/* for non-keyframes only allow something of the unused bytes to be consumed */ /* for non-keyframes only allow some of the unused bytes to be consumed */
DWORD tmp1 = 0; DWORD tmp1 = 0;
DWORD tmp2; DWORD tmp2;
@ -797,8 +797,8 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
dwRequest = MAX_FRAMESIZE; dwRequest = MAX_FRAMESIZE;
} }
/* must we check for framesize to gain requested /* must we check for frame size to gain the requested
* datarate or could we trust codec? */ * data rate or can we trust the codec? */
doSizeCheck = (dwRequest != 0 && ((This->dwICMFlags & (VIDCF_CRUNCH|VIDCF_QUALITY)) == 0)); doSizeCheck = (dwRequest != 0 && ((This->dwICMFlags & (VIDCF_CRUNCH|VIDCF_QUALITY)) == 0));
dwMaxQual = dwCurQual = This->sInfo.dwQuality; dwMaxQual = dwCurQual = This->sInfo.dwQuality;

6
dlls/comctl32/listview.c
View File

@ -63,9 +63,9 @@
* -- if list is sorted by item text LISTVIEW_InsertItemT could use * -- if list is sorted by item text LISTVIEW_InsertItemT could use
* binary search to calculate item index (e.g. DPA_Search()). * binary search to calculate item index (e.g. DPA_Search()).
* This requires sorted state to be reliably tracked in item modifiers. * This requires sorted state to be reliably tracked in item modifiers.
* -- we should keep an ordered array of coordinates in iconic mode * -- we should keep an ordered array of coordinates in iconic mode.
* this would allow to frame items (iterator_frameditems), * This would allow framing items (iterator_frameditems),
* and find nearest item (LVFI_NEARESTXY) a lot more efficiently * and finding the nearest item (LVFI_NEARESTXY) a lot more efficiently.
* *
* Flags * Flags
* -- LVIF_COLUMNS * -- LVIF_COLUMNS

2
dlls/comctl32/rebar.c
View File

@ -2294,7 +2294,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, UINT uIndex, LPREBARBANDINFOW lprb
if (lprbbi->fMask & RBBIM_CHILDSIZE) { if (lprbbi->fMask & RBBIM_CHILDSIZE) {
lprbbi->cxMinChild = lpBand->cxMinChild; lprbbi->cxMinChild = lpBand->cxMinChild;
lprbbi->cyMinChild = lpBand->cyMinChild; lprbbi->cyMinChild = lpBand->cyMinChild;
/* to make tests pass we follow Windows behaviour and allow to read these fields only /* to make tests pass we follow Windows' behaviour and allow reading these fields only
* for RBBS_VARIABLEHEIGHTS bands */ * for RBBS_VARIABLEHEIGHTS bands */
if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) {
lprbbi->cyChild = lpBand->cyChild; lprbbi->cyChild = lpBand->cyChild;

6
dlls/d2d1/brush.c
View File

@ -721,7 +721,7 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
} }
static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTEND_MODE mode) static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode)
{ {
switch (mode) switch (mode)
{ {
@ -853,8 +853,8 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_tar
sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT;
else else
sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR;
sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x);
sampler_desc.AddressV = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y);
sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP;
sampler_desc.MipLODBias = 0.0f; sampler_desc.MipLODBias = 0.0f;
sampler_desc.MaxAnisotropy = 0; sampler_desc.MaxAnisotropy = 0;

2
dlls/d3d8/device.c
View File

@ -1188,7 +1188,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface,
if (ds_desc.multisample_type != rt_desc.multisample_type if (ds_desc.multisample_type != rt_desc.multisample_type
|| ds_desc.multisample_quality != rt_desc.multisample_quality) || ds_desc.multisample_quality != rt_desc.multisample_quality)
{ {
WARN("Multisample settings do not match, returing D3DERR_INVALIDCALL\n"); WARN("Multisample settings do not match, returning D3DERR_INVALIDCALL\n");
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;

30
dlls/d3drm/tests/d3drm.c
View File

@ -2047,7 +2047,7 @@ static void test_create_device_from_clipper1(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
surface_desc.dwWidth, surface_desc.dwHeight); surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
@ -2069,7 +2069,7 @@ static void test_create_device_from_clipper1(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
desc.dwWidth, desc.dwHeight); desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -2230,7 +2230,7 @@ static void test_create_device_from_clipper2(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
surface_desc.dwWidth, surface_desc.dwHeight); surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
@ -2252,7 +2252,7 @@ static void test_create_device_from_clipper2(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
desc.dwWidth, desc.dwHeight); desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -2418,7 +2418,7 @@ static void test_create_device_from_clipper3(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
surface_desc.dwWidth, surface_desc.dwHeight); surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
@ -2440,7 +2440,7 @@ static void test_create_device_from_clipper3(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
desc.dwWidth, desc.dwHeight); desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -2596,7 +2596,7 @@ static void test_create_device_from_surface1(void)
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -2778,7 +2778,7 @@ static void test_create_device_from_surface2(void)
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -2964,7 +2964,7 @@ static void test_create_device_from_surface3(void)
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -3250,7 +3250,7 @@ static void test_create_device_from_d3d1(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
@ -3265,7 +3265,7 @@ static void test_create_device_from_d3d1(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -3440,7 +3440,7 @@ static void test_create_device_from_d3d2(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
@ -3455,7 +3455,7 @@ static void test_create_device_from_d3d2(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
@ -3565,7 +3565,7 @@ static void test_create_device_from_d3d3(void)
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
"Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
@ -3580,7 +3580,7 @@ static void test_create_device_from_d3d3(void)
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;

2
dlls/dbghelp/cpu_i386.c
View File

@ -261,7 +261,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO
} }
} }
else else
/* FIXME: this will allow to work when we're not attached to a live target, /* FIXME: this will allow it to work when we're not attached to a live target,
* but the 16 <=> 32 switch facility won't be available. * but the 16 <=> 32 switch facility won't be available.
*/ */
curr_switch = 0; curr_switch = 0;

2
dlls/dbghelp/dbghelp.c
View File

@ -272,7 +272,7 @@ static BOOL check_live_target(struct process* pcs)
* The initialisation of a dbghelp's context. * The initialisation of a dbghelp's context.
* Note that hProcess doesn't need to be a valid process handle (except * Note that hProcess doesn't need to be a valid process handle (except
* when fInvadeProcess is TRUE). * when fInvadeProcess is TRUE).
* Since, we're also allow to load ELF (pure) libraries and Wine ELF libraries * Since we also allow loading ELF (pure) libraries and Wine ELF libraries
* containing PE (and NE) module(s), here's how we handle it: * containing PE (and NE) module(s), here's how we handle it:
* - we load every module (ELF, NE, PE) passed in SymLoadModule * - we load every module (ELF, NE, PE) passed in SymLoadModule
* - in fInvadeProcess (in SymInitialize) is TRUE, we set up what is called ELF * - in fInvadeProcess (in SymInitialize) is TRUE, we set up what is called ELF

4
dlls/gameux/tests/gamestatistics.c
View File

@ -196,13 +196,13 @@ static void test_gamestatisticsmgr( void )
/* test trying to create interface IGameStatistics using GetGameStatistics method */ /* test trying to create interface IGameStatistics using GetGameStatistics method */
/* this should fail, cause statistics doesn't yet exists */ /* this should fail, because statistics don't exist yet */
gs = (void *)0xdeadbeef; gs = (void *)0xdeadbeef;
hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr);
ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs);
/* now, allow to create */ /* now, allow them to be created */
hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);
ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr); ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr);
ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n");

2
dlls/gdi32/bitmap.c
View File

@ -194,7 +194,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
/* Windows ignores the provided bm.bmWidthBytes */ /* Windows ignores the provided bm.bmWidthBytes */
bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel );
/* XP doesn't allow to create bitmaps larger than 128 Mb */ /* XP doesn't allow creating bitmaps larger than 128 MB */
if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes)
{ {
SetLastError( ERROR_NOT_ENOUGH_MEMORY ); SetLastError( ERROR_NOT_ENOUGH_MEMORY );

2
dlls/kernel32/editline.c
View File

@ -233,7 +233,7 @@ static BOOL WCEL_Grow(WCEL_Context* ctx, size_t len)
{ {
if (!WCEL_IsSingleLine(ctx, len) && !ctx->can_wrap) if (!WCEL_IsSingleLine(ctx, len) && !ctx->can_wrap)
{ {
FIXME("Mode doesn't allow to wrap. However, we should allow to overwrite current string\n"); FIXME("Mode doesn't allow wrapping. However, we should allow overwriting the current string\n");
return FALSE; return FALSE;
} }

6
dlls/kernel32/tests/loader.c
View File

@ -1561,7 +1561,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret);
} }
/* win7 doesn't allow to create a thread during process shutdown, /* win7 doesn't allow creating a thread during process shutdown but
* earlier Windows versions allow it. * earlier Windows versions allow it.
*/ */
noop_thread_started = 0; noop_thread_started = 0;
@ -1690,8 +1690,8 @@ todo_wine
trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param);
ret = pRtlDllShutdownInProgress(); ret = pRtlDllShutdownInProgress();
/* win7 doesn't allow to create a thread during process shutdown, /* win7 doesn't allow creating a thread during process shutdown but
* earlier Windows versions allow it, and DLL_THREAD_DETACH is * earlier Windows versions allow it. In that case DLL_THREAD_DETACH is
* sent on thread exit, but DLL_THREAD_ATTACH is never received. * sent on thread exit, but DLL_THREAD_ATTACH is never received.
*/ */
if (noop_thread_started) if (noop_thread_started)

2
dlls/localui/localui.c
View File

@ -615,7 +615,7 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort
* Failure: FALSE * Failure: FALSE
* *
* NOTES * NOTES
* Native localui does not allow to delete a COM / LPT - Port (ERROR_NOT_SUPPORTED) * Native localui does not allow deleting a COM/LPT port (ERROR_NOT_SUPPORTED)
* *
*/ */
static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName)

4
dlls/mpr/tests/mpr.c
View File

@ -199,10 +199,10 @@ static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param)
ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type);
buf = (char*)pce->abResource; buf = (char*)pce->abResource;
ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource);
buf += pce->cbResource; buf += pce->cbResource;
ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password);
m_callback_reached = 1; m_callback_reached = 1;
return TRUE; return TRUE;

2
dlls/msvcrt/mbcs.c
View File

@ -1080,7 +1080,7 @@ int CDECL _mbscat_s_l( unsigned char *dst, MSVCRT_size_t size,
for(j=0; src[j] && i+j<size; j++) for(j=0; src[j] && i+j<size; j++)
dst[i+j] = src[j]; dst[i+j] = src[j];
if(i+j == size) { if(i+j == size) {
MSVCRT_INVALID_PMT("dst buffer is to small", MSVCRT_ERANGE); MSVCRT_INVALID_PMT("dst buffer is too small", MSVCRT_ERANGE);
dst[0] = 0; dst[0] = 0;
return MSVCRT_ERANGE; return MSVCRT_ERANGE;
} }

4
dlls/msxml3/domdoc.c
View File

@ -1965,7 +1965,7 @@ static HRESULT WINAPI domdoc_createNode(
} }
xml_name = xmlchar_from_wchar(name); xml_name = xmlchar_from_wchar(name);
/* prevent empty href to be allocated */ /* prevent empty href from being allocated */
href = namespaceURI ? xmlchar_from_wchar(namespaceURI) : NULL; href = namespaceURI ? xmlchar_from_wchar(namespaceURI) : NULL;
switch(node_type) switch(node_type)
@ -1978,7 +1978,7 @@ static HRESULT WINAPI domdoc_createNode(
xmlnode = xmlNewDocNode(get_doc(This), NULL, local ? local : xml_name, NULL); xmlnode = xmlNewDocNode(get_doc(This), NULL, local ? local : xml_name, NULL);
/* allow to create default namespace xmlns= */ /* allow creating the default namespace xmlns= */
if (local || (href && *href)) if (local || (href && *href))
{ {
xmlNsPtr ns = xmlNewNs(xmlnode, href, prefix); xmlNsPtr ns = xmlNewNs(xmlnode, href, prefix);

2
dlls/ntdll/virtual.c
View File

@ -1783,7 +1783,7 @@ SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_
BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift);
SIZE_T block_size; SIZE_T block_size;
/* If the page is not writeable then check for write watches /* If the page is not writable then check for write watches
* before giving up. This can be done without raising a real * before giving up. This can be done without raising a real
* exception. Similar to virtual_handle_fault. */ * exception. Similar to virtual_handle_fault. */
if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE))

4
dlls/ole32/storage32.c
View File

@ -876,7 +876,7 @@ static HRESULT removeFromTree(
* IEnumSTATSTGImpl definitions. * IEnumSTATSTGImpl definitions.
* *
* Definition of the implementation structure for the IEnumSTATSTGImpl interface. * Definition of the implementation structure for the IEnumSTATSTGImpl interface.
* This class allows iterating through the content of a storage and to find * This class allows iterating through the content of a storage and finding
* specific items inside it. * specific items inside it.
*/ */
struct IEnumSTATSTGImpl struct IEnumSTATSTGImpl
@ -2518,7 +2518,7 @@ static HRESULT deleteStreamContents(
* Strategy: This implementation is built this way for simplicity not for speed. * Strategy: This implementation is built this way for simplicity not for speed.
* I always delete the topmost element of the enumeration and adjust * I always delete the topmost element of the enumeration and adjust
* the deleted element pointer all the time. This takes longer to * the deleted element pointer all the time. This takes longer to
* do but allow to reinvoke DestroyElement whenever we encounter a * do but allows reinvoking DestroyElement whenever we encounter a
* storage object. The optimisation resides in the usage of another * storage object. The optimisation resides in the usage of another
* enumeration strategy that would give all the leaves of a storage * enumeration strategy that would give all the leaves of a storage
* first. (postfix order) * first. (postfix order)

2
dlls/riched20/tests/richole.c
View File

@ -3034,7 +3034,7 @@ static void test_SetFont(void)
EXPECT_REF(range2, 2); EXPECT_REF(range2, 2);
EXPECT_REF(range, 2); EXPECT_REF(range, 2);
/* originaly range 0-4 is non-italic */ /* originally range 0-4 is non-italic */
value = tomTrue; value = tomTrue;
hr = ITextFont_GetItalic(font, &value); hr = ITextFont_GetItalic(font, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);