mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-01 09:21:14 +00:00
Assorted spelling fixes.
This commit is contained in:
parent
b2656633a6
commit
1ccf944900
19 changed files with 28 additions and 28 deletions
|
@ -185,7 +185,7 @@ void WINAPI AVIFileInit(void) {
|
||||||
*/
|
*/
|
||||||
void WINAPI AVIFileExit(void) {
|
void WINAPI AVIFileExit(void) {
|
||||||
/* need to free ole32.dll if we are the last exit call */
|
/* need to free ole32.dll if we are the last exit call */
|
||||||
/* OleUnitialize() */
|
/* OleUninitialize() */
|
||||||
FIXME("(): stub!\n");
|
FIXME("(): stub!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1960,16 +1960,16 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
|
||||||
lpBand->hcx = 0;
|
lpBand->hcx = 0;
|
||||||
lpBand->hcy = 0;
|
lpBand->hcy = 0;
|
||||||
|
|
||||||
/* Data comming in from users into the cx... and cy... fields */
|
/* Data coming in from users into the cx... and cy... fields */
|
||||||
/* may be bad, just garbage, because the user never clears */
|
/* may be bad, just garbage, because the user never clears */
|
||||||
/* the fields. RB_{SET|INSERT}BAND{A|W} just passes the data */
|
/* the fields. RB_{SET|INSERT}BAND{A|W} just passes the data */
|
||||||
/* along if the fields exist in the input area. Here we must */
|
/* along if the fields exist in the input area. Here we must */
|
||||||
/* determine if the data is valid. I have no idea how MS does */
|
/* determine if the data is valid. I have no idea how MS does */
|
||||||
/* the validation, but it does because the RB_GETBANDINFO */
|
/* the validation, but it does because the RB_GETBANDINFO */
|
||||||
/* returns a 0 when I know the sample program passed in an */
|
/* returns a 0 when I know the sample program passed in an */
|
||||||
/* address. Here I will use the algorithim that if the value */
|
/* address. Here I will use the algorithm that if the value */
|
||||||
/* is greater than 65535 then it is bad and replace it with */
|
/* is greater than 65535 then it is bad and replace it with */
|
||||||
/* a zero. Feel free to improve the algorithim. - GA 12/2000 */
|
/* a zero. Feel free to improve the algorithm. - GA 12/2000 */
|
||||||
if (lpBand->cxMinChild > 65535) lpBand->cxMinChild = 0;
|
if (lpBand->cxMinChild > 65535) lpBand->cxMinChild = 0;
|
||||||
if (lpBand->cyMinChild > 65535) lpBand->cyMinChild = 0;
|
if (lpBand->cyMinChild > 65535) lpBand->cyMinChild = 0;
|
||||||
if (lpBand->cx > 65535) lpBand->cx = 0;
|
if (lpBand->cx > 65535) lpBand->cx = 0;
|
||||||
|
|
|
@ -145,7 +145,7 @@ static void addReadDelItem(HWND hdex, HDITEMA *phdiCreate, int maskRead, HDITEMA
|
||||||
ZeroMemory(phdiRead, sizeof(HDITEMA));
|
ZeroMemory(phdiRead, sizeof(HDITEMA));
|
||||||
phdiRead->mask = maskRead;
|
phdiRead->mask = maskRead;
|
||||||
ok(SendMessage(hdex, HDM_GETITEMA, (WPARAM)0, (LPARAM)phdiRead)!=0, "Getting item data failed\n");
|
ok(SendMessage(hdex, HDM_GETITEMA, (WPARAM)0, (LPARAM)phdiRead)!=0, "Getting item data failed\n");
|
||||||
ok(SendMessage(hdex, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0)!=0, "Deleteing item failed\n");
|
ok(SendMessage(hdex, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0)!=0, "Deleting item failed\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static HWND create_header_control (void)
|
static HWND create_header_control (void)
|
||||||
|
|
|
@ -153,7 +153,7 @@ end_of_thread:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* DP messageing stuff */
|
/* DP messaging stuff */
|
||||||
static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This,
|
static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This,
|
||||||
LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList,
|
LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList,
|
||||||
WORD wReplyCommandId );
|
WORD wReplyCommandId );
|
||||||
|
|
|
@ -127,7 +127,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco,
|
||||||
IDirectSoundCapture_Release(dsc);
|
IDirectSoundCapture_Release(dsc);
|
||||||
|
|
||||||
if (initialized == FALSE) {
|
if (initialized == FALSE) {
|
||||||
/* try unitialized object */
|
/* try uninitialized object */
|
||||||
rc=IDirectSoundCapture_GetCaps(dsco,0);
|
rc=IDirectSoundCapture_GetCaps(dsco,0);
|
||||||
ok(rc==DSERR_UNINITIALIZED||rc==E_INVALIDARG,
|
ok(rc==DSERR_UNINITIALIZED||rc==E_INVALIDARG,
|
||||||
"IDirectSoundCapture_GetCaps(NULL) should have returned "
|
"IDirectSoundCapture_GetCaps(NULL) should have returned "
|
||||||
|
|
|
@ -67,7 +67,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
|
||||||
IDirectSound8_Release(ds8);
|
IDirectSound8_Release(ds8);
|
||||||
|
|
||||||
if (initialized == FALSE) {
|
if (initialized == FALSE) {
|
||||||
/* try unitialized object */
|
/* try uninitialized object */
|
||||||
rc=IDirectSound_GetCaps(dso,0);
|
rc=IDirectSound_GetCaps(dso,0);
|
||||||
ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps(NULL) "
|
ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps(NULL) "
|
||||||
"should have returned DSERR_UNINITIALIZED, returned: %s\n",
|
"should have returned DSERR_UNINITIALIZED, returned: %s\n",
|
||||||
|
|
|
@ -77,7 +77,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
|
||||||
IDirectSound8_Release(ds8);
|
IDirectSound8_Release(ds8);
|
||||||
|
|
||||||
if (initialized == FALSE) {
|
if (initialized == FALSE) {
|
||||||
/* try unitialized object */
|
/* try uninitialized object */
|
||||||
rc=IDirectSound8_GetCaps(dso,0);
|
rc=IDirectSound8_GetCaps(dso,0);
|
||||||
ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps(NULL) "
|
ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps(NULL) "
|
||||||
"should have returned DSERR_UNINITIALIZED, returned: %s\n",
|
"should have returned DSERR_UNINITIALIZED, returned: %s\n",
|
||||||
|
|
|
@ -3788,7 +3788,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
|
||||||
{
|
{
|
||||||
UINT rc;
|
UINT rc;
|
||||||
|
|
||||||
/* turn off scheduleing */
|
/* turn off scheduling */
|
||||||
package->script->CurrentlyScripting= FALSE;
|
package->script->CurrentlyScripting= FALSE;
|
||||||
|
|
||||||
/* first do the same as an InstallExecute */
|
/* first do the same as an InstallExecute */
|
||||||
|
|
|
@ -243,7 +243,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute)
|
||||||
case 1: /* DLL file stored in a Binary table stream */
|
case 1: /* DLL file stored in a Binary table stream */
|
||||||
rc = HANDLE_CustomType1(package,source,target,type,action);
|
rc = HANDLE_CustomType1(package,source,target,type,action);
|
||||||
break;
|
break;
|
||||||
case 2: /* EXE file stored in a Binary table strem */
|
case 2: /* EXE file stored in a Binary table stream */
|
||||||
rc = HANDLE_CustomType2(package,source,target,type,action);
|
rc = HANDLE_CustomType2(package,source,target,type,action);
|
||||||
break;
|
break;
|
||||||
case 18: /*EXE file installed with package */
|
case 18: /*EXE file installed with package */
|
||||||
|
@ -511,7 +511,7 @@ static DWORD WINAPI DllThread(LPVOID info)
|
||||||
rc = ACTION_CallDllFunction(stuff);
|
rc = ACTION_CallDllFunction(stuff);
|
||||||
|
|
||||||
TRACE("MSI Thread (%x) finished (rc %i)\n",GetCurrentThreadId(), rc);
|
TRACE("MSI Thread (%x) finished (rc %i)\n",GetCurrentThreadId(), rc);
|
||||||
/* clse all handles for this thread */
|
/* close all handles for this thread */
|
||||||
MsiCloseAllHandles();
|
MsiCloseAllHandles();
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -470,7 +470,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb)
|
||||||
/* (WS) The field szDriver should be initialized because the driver
|
/* (WS) The field szDriver should be initialized because the driver
|
||||||
* is not obliged and often will not do it. Some applications, like
|
* is not obliged and often will not do it. Some applications, like
|
||||||
* VirtualDub, rely on this field and will occasionally crash if it
|
* VirtualDub, rely on this field and will occasionally crash if it
|
||||||
* goes unitialized.
|
* goes uninitialized.
|
||||||
*/
|
*/
|
||||||
if (cb >= sizeof(ICINFO)) picinfo->szDriver[0] = '\0';
|
if (cb >= sizeof(ICINFO)) picinfo->szDriver[0] = '\0';
|
||||||
|
|
||||||
|
|
|
@ -188,7 +188,7 @@ static NTSTATUS RtlpAllocateSomeHandles(RTL_HANDLE_TABLE * HandleTable)
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
* A valid handle must have the bit set as indicated in the code below
|
* A valid handle must have the bit set as indicated in the code below
|
||||||
* otherwise subsquent RtlIsValidHandle() calls will fail.
|
* otherwise subsequent RtlIsValidHandle() calls will fail.
|
||||||
*
|
*
|
||||||
* static inline void RtlpMakeHandleAllocated(RTL_HANDLE * Handle)
|
* static inline void RtlpMakeHandleAllocated(RTL_HANDLE * Handle)
|
||||||
* {
|
* {
|
||||||
|
|
|
@ -808,7 +808,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface)
|
||||||
|
|
||||||
ref = InterlockedDecrement(&This->ref);
|
ref = InterlockedDecrement(&This->ref);
|
||||||
|
|
||||||
/* unitialize rot structure if there's no more reference to it*/
|
/* uninitialize rot structure if there's no more reference to it*/
|
||||||
if (ref == 0)
|
if (ref == 0)
|
||||||
{
|
{
|
||||||
ULONG i;
|
ULONG i;
|
||||||
|
|
|
@ -120,7 +120,7 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
|
||||||
mf16 = (METAFILEPICT16 *)GlobalLock16(hmf16);
|
mf16 = (METAFILEPICT16 *)GlobalLock16(hmf16);
|
||||||
mf16->mm = MM_ANISOTROPIC;
|
mf16->mm = MM_ANISOTROPIC;
|
||||||
mf16->xExt = 20; /* FIXME: bogus */
|
mf16->xExt = 20; /* FIXME: bogus */
|
||||||
mf16->yExt = 20; /* dito */
|
mf16->yExt = 20; /* ditto */
|
||||||
mfSize = GetMetaFileBitsEx(hmf, 0, 0);
|
mfSize = GetMetaFileBitsEx(hmf, 0, 0);
|
||||||
mf16->hMF = GlobalAlloc16(GMEM_MOVEABLE, mfSize);
|
mf16->hMF = GlobalAlloc16(GMEM_MOVEABLE, mfSize);
|
||||||
if(mf16->hMF)
|
if(mf16->hMF)
|
||||||
|
|
|
@ -206,7 +206,7 @@ static void UXTHEME_LoadTheme(void)
|
||||||
}
|
}
|
||||||
if(!bThemeActive) {
|
if(!bThemeActive) {
|
||||||
MSSTYLES_SetActiveTheme(NULL, FALSE);
|
MSSTYLES_SetActiveTheme(NULL, FALSE);
|
||||||
TRACE("Themeing not active\n");
|
TRACE("Theming not active\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1699,7 +1699,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic
|
||||||
*******************/
|
*******************/
|
||||||
|
|
||||||
/* Put the correct figures in the presentation parameters */
|
/* Put the correct figures in the presentation parameters */
|
||||||
TRACE("Coppying accross presentaion paraneters\n");
|
TRACE("Copying across presentation parameters\n");
|
||||||
object->presentParms.BackBufferWidth = *(pPresentationParameters->BackBufferWidth);
|
object->presentParms.BackBufferWidth = *(pPresentationParameters->BackBufferWidth);
|
||||||
object->presentParms.BackBufferHeight = *(pPresentationParameters->BackBufferHeight);
|
object->presentParms.BackBufferHeight = *(pPresentationParameters->BackBufferHeight);
|
||||||
object->presentParms.BackBufferFormat = *(pPresentationParameters->BackBufferFormat);
|
object->presentParms.BackBufferFormat = *(pPresentationParameters->BackBufferFormat);
|
||||||
|
@ -5452,7 +5452,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface,
|
||||||
* buffer and loading the VBO
|
* buffer and loading the VBO
|
||||||
*/
|
*/
|
||||||
if(SrcImpl->vbo) {
|
if(SrcImpl->vbo) {
|
||||||
TRACE("Releaseing the source vbo, it won't be needed\n");
|
TRACE("Releasing the source vbo, it won't be needed\n");
|
||||||
|
|
||||||
if(!SrcImpl->resource.allocatedMemory) {
|
if(!SrcImpl->resource.allocatedMemory) {
|
||||||
/* Rescue the data from the buffer */
|
/* Rescue the data from the buffer */
|
||||||
|
@ -6761,7 +6761,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
|
||||||
WINED3DFMT_DXT5 == destFormat) {
|
WINED3DFMT_DXT5 == destFormat) {
|
||||||
if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) {
|
if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) {
|
||||||
if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) {
|
if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) {
|
||||||
/* FIXME: The easy way to do this is lock the destination, and copy the bits accross */
|
/* FIXME: The easy way to do this is to lock the destination, and copy the bits across */
|
||||||
FIXME("Updating part of a compressed texture is not supported at the moment\n");
|
FIXME("Updating part of a compressed texture is not supported at the moment\n");
|
||||||
} if (destFormat != srcFormat) {
|
} if (destFormat != srcFormat) {
|
||||||
FIXME("Updating mixed format compressed texture is not curretly support\n");
|
FIXME("Updating mixed format compressed texture is not curretly support\n");
|
||||||
|
|
|
@ -74,7 +74,7 @@ IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *p
|
||||||
|
|
||||||
/*Create a structure for storing global data in*/
|
/*Create a structure for storing global data in*/
|
||||||
if(wineD3DGlobalStatistics == NULL){
|
if(wineD3DGlobalStatistics == NULL){
|
||||||
TRACE("Createing global statistics store\n");
|
TRACE("Creating global statistics store\n");
|
||||||
wineD3DGlobalStatistics = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wineD3DGlobalStatistics));
|
wineD3DGlobalStatistics = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wineD3DGlobalStatistics));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -829,7 +829,7 @@ static void convert_888_to_0888_asis(int width, int height,
|
||||||
for (y=0; y<height; y++) {
|
for (y=0; y<height; y++) {
|
||||||
srcpixel=srcbits;
|
srcpixel=srcbits;
|
||||||
dstpixel=dstbits;
|
dstpixel=dstbits;
|
||||||
/* advance w1 pixels to make srcpixel 32 bit alignd */
|
/* advance w1 pixels to make srcpixel 32 bit aligned */
|
||||||
srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3);
|
srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3);
|
||||||
srcpixel += w1;
|
srcpixel += w1;
|
||||||
dstpixel += w1;
|
dstpixel += w1;
|
||||||
|
@ -894,7 +894,7 @@ static void convert_888_to_0888_reverse(int width, int height,
|
||||||
for (y=0; y<height; y++) {
|
for (y=0; y<height; y++) {
|
||||||
srcpixel=srcbits;
|
srcpixel=srcbits;
|
||||||
dstpixel=dstbits;
|
dstpixel=dstbits;
|
||||||
/* advance w1 pixels to make srcpixel 32 bit alignd */
|
/* advance w1 pixels to make srcpixel 32 bit aligned */
|
||||||
srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3);
|
srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3);
|
||||||
srcpixel += w1;
|
srcpixel += w1;
|
||||||
dstpixel += w1;
|
dstpixel += w1;
|
||||||
|
|
|
@ -1146,7 +1146,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev,
|
||||||
|
|
||||||
/* At the moment we only support the pixelformat corresponding to the main
|
/* At the moment we only support the pixelformat corresponding to the main
|
||||||
* x11drv visual which got created at x11drv initialization. More formats
|
* x11drv visual which got created at x11drv initialization. More formats
|
||||||
* can be supported if there was a way to recreate x11 windows in x11drv
|
* could be supported if there was a way to recreate x11 windows in x11drv
|
||||||
*/
|
*/
|
||||||
if(iPixelFormat != 1) {
|
if(iPixelFormat != 1) {
|
||||||
TRACE("Invalid iPixelFormat: %d\n", iPixelFormat);
|
TRACE("Invalid iPixelFormat: %d\n", iPixelFormat);
|
||||||
|
@ -1212,7 +1212,7 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev)
|
||||||
Wine_GLContext *ret;
|
Wine_GLContext *ret;
|
||||||
GLXFBConfig* cfgs_fmt = NULL;
|
GLXFBConfig* cfgs_fmt = NULL;
|
||||||
GLXFBConfig cur_cfg;
|
GLXFBConfig cur_cfg;
|
||||||
int hdcPF = 1; /* We can only use the Wine's main visual which has an index of 1 */
|
int hdcPF = 1; /* We can only use Wine's main visual which has an index of 1 */
|
||||||
int tmp = 0;
|
int tmp = 0;
|
||||||
int fmt_index = 0;
|
int fmt_index = 0;
|
||||||
int nCfgs_fmt = 0;
|
int nCfgs_fmt = 0;
|
||||||
|
@ -1230,7 +1230,7 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev)
|
||||||
/* First, get the visual in use by the X11DRV */
|
/* First, get the visual in use by the X11DRV */
|
||||||
if (!gdi_display) return 0;
|
if (!gdi_display) return 0;
|
||||||
|
|
||||||
/* We can only render using the iPixelFormat (1) of Wine's Main visual, we need to get the correspondig GLX format.
|
/* We can only render using the iPixelFormat (1) of Wine's Main visual, we need to get the corresponding GLX format.
|
||||||
* If this fails something is very wrong on the system. */
|
* If this fails something is very wrong on the system. */
|
||||||
if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &fmt_index, &tmp)) {
|
if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &fmt_index, &tmp)) {
|
||||||
ERR("Cannot get FB Config for main iPixelFormat 1, expect problems!\n");
|
ERR("Cannot get FB Config for main iPixelFormat 1, expect problems!\n");
|
||||||
|
@ -2469,7 +2469,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf
|
||||||
SetLastError(ERROR_INVALID_HANDLE);
|
SetLastError(ERROR_INVALID_HANDLE);
|
||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
}
|
}
|
||||||
/* Disable WGL_ARB_render_texture support untill it is implemented properly
|
/* Disable WGL_ARB_render_texture support until it is implemented properly
|
||||||
* using pbuffers or FBOs */
|
* using pbuffers or FBOs */
|
||||||
#if 0
|
#if 0
|
||||||
if (!use_render_texture_ati && 1 == use_render_texture_emulation) {
|
if (!use_render_texture_ati && 1 == use_render_texture_emulation) {
|
||||||
|
|
|
@ -657,7 +657,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Stop(PIDSCDRIVERBUFFER iface)
|
||||||
if (!This->is_capturing)
|
if (!This->is_capturing)
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
|
|
||||||
/* no more captureing */
|
/* no more capturing */
|
||||||
WInDev[This->drv->wDevID].ossdev->bInputEnabled = FALSE;
|
WInDev[This->drv->wDevID].ossdev->bInputEnabled = FALSE;
|
||||||
enable = getEnables(WInDev[This->drv->wDevID].ossdev);
|
enable = getEnables(WInDev[This->drv->wDevID].ossdev);
|
||||||
if (ioctl(WInDev[This->drv->wDevID].ossdev->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0) {
|
if (ioctl(WInDev[This->drv->wDevID].ossdev->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0) {
|
||||||
|
|
Loading…
Reference in a new issue