January 2008 - Wine-commits

Gerald Pfeifer : msi: Simplify condition in TABLE_fetch_stream().
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: f7fea9e9f0fde7c1e8928580f7a5bbb6501ccf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fea9e9f0fde7c1e8928580f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 12:21:52 2008 +0100 msi: Simplify condition in TABLE_fetch_stream(). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e5ad1af..42845d9 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1206,7 +1206,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return r; /* check the column value is in range */ - if (ival < 0 || ival > tv->num_cols || ival == col) + if (ival > tv->num_cols || ival == col) { ERR("bad column ref (%u) for stream\n", ival); return ERROR_FUNCTION_FAILED;

1 0

Gerald Pfeifer : d3d9/tests: Simplify condition in test_vshader_input().
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: a77249ad140153f0ae023a07e99fd59e76405e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77249ad140153f0ae023a07e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 12:36:36 2008 +0100 d3d9/tests: Simplify condition in test_vshader_input(). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2700e73..4fae64b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5142,7 +5142,7 @@ void test_vshader_input(IDirect3DDevice9 *device) r = (color & 0x00ff0000) >> 16; g = (color & 0x0000ff00) >> 8; b = (color & 0x000000ff) >> 0; - ok(r >= 0xfe && r <= 0xff && g >= 0xfe && g <= 0xff && b >= 0x00 && b <= 0x01, + ok(r >= 0xfe && r <= 0xff && g >= 0xfe && g <= 0xff && b <= 0x01, "Input test: Quad 4(color-float) returned color 0x%08x, expected 0x00FFFF00\n", color); IDirect3DVertexShader9_Release(texcoord_color_shader);

1 0

Gerald Pfeifer : wined3d: Remove four noop checks.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 02afd70fbb9e9bf2aa6666e9bc2d20fc1ebec638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02afd70fbb9e9bf2aa6666e9b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 13:21:11 2008 +0100 wined3d: Remove four noop checks. --- dlls/wined3d/cubetexture.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index e2d9099..e99ab38 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -273,7 +273,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeText IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; HRESULT hr = WINED3DERR_INVALIDCALL; - if (Level < This->baseTexture.levels && FaceType >= WINED3DCUBEMAP_FACE_POSITIVE_X && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { + if (Level < This->baseTexture.levels && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { *ppCubeMapSurface = This->surfaces[FaceType][Level]; IWineD3DSurface_AddRef(*ppCubeMapSurface); @@ -292,7 +292,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_LockRect(IWineD3DCubeTexture *ifac HRESULT hr = WINED3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels && FaceType >= WINED3DCUBEMAP_FACE_POSITIVE_X && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { + if (Level < This->baseTexture.levels && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_LockRect(This->surfaces[FaceType][Level], pLockedRect, pRect, Flags); } @@ -309,7 +309,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_UnlockRect(IWineD3DCubeTexture *if HRESULT hr = WINED3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels && FaceType >= WINED3DCUBEMAP_FACE_POSITIVE_X && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { + if (Level < This->baseTexture.levels && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_UnlockRect(This->surfaces[FaceType][Level]); } @@ -326,7 +326,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; This->baseTexture.dirty = TRUE; TRACE("(%p) : dirtyfication of faceType(%d) Level (0)\n", This, FaceType); - if (FaceType >= WINED3DCUBEMAP_FACE_POSITIVE_X && FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { + if (FaceType <= WINED3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_AddDirtyRect(This->surfaces[FaceType][0], pDirtyRect); } else { WARN("(%p) overflow FaceType(%d)\n", This, FaceType);

1 0

Gerald Pfeifer : winspool: Adjust the typo of a loop variable in test_EnumForms().
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 216a1b3767941104223c6cb43b658675d15923f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216a1b3767941104223c6cb43… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 14:06:47 2008 +0100 winspool: Adjust the typo of a loop variable in test_EnumForms(). Simplify a test in test_GetPrinterDriver(). --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 96020ef..cd93f16 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -768,7 +768,7 @@ static void test_EnumForms(LPSTR pName) DWORD pcbNeeded; DWORD pcReturned; DWORD level; - INT i; + UINT i; const char *formtype; static const char * const formtypes[] = { "FORM_USER", "FORM_BUILTIN", "FORM_PRINTER", "FORM_flag_unknown" }; #define FORMTYPE_MAX 2 @@ -2115,7 +2115,7 @@ static void test_GetPrinterDriver(void) /* MSDN is wrong: The Drivers on the win9x-CD's have cVersion=0x0400 NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k and above(Usermode): 3 */ - ok((di_2->cVersion >= 0 && di_2->cVersion <= 3) || + ok( (di_2->cVersion <= 3) || (di_2->cVersion == 0x0400), "di_2->cVersion = %d\n", di_2->cVersion); ok(di_2->pName != NULL, "not expected NULL ptr\n"); ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n");

1 0

Andrew Talbot : dsound: Remove unneeded casts.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 2cf2807052ccbe00e0de803693aa84f6616cd2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2807052ccbe00e0de80369… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 31 21:38:23 2007 +0000 dsound: Remove unneeded casts. --- dlls/dsound/capture.c | 6 +++--- dlls/dsound/dsound.c | 6 +++--- dlls/dsound/mixer.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9de2ecd..0c74ef9 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -376,7 +376,7 @@ DirectSoundCaptureEnumerateW( wDesc, sizeof(wDesc)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); - if (lpDSEnumCallback((LPGUID)&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE) + if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE) return DS_OK; } } @@ -418,7 +418,7 @@ DSOUND_capture_callback( DWORD dw2 ) { DirectSoundCaptureDevice * This = (DirectSoundCaptureDevice*)dwUser; - IDirectSoundCaptureBufferImpl * Moi = (IDirectSoundCaptureBufferImpl*) This->capture_buffer; + IDirectSoundCaptureBufferImpl * Moi = This->capture_buffer; TRACE("(%p,%08x(%s),%08x,%08x,%08x) entering at %d\n",hwi,msg, msg == MM_WIM_OPEN ? "MM_WIM_OPEN" : msg == MM_WIM_CLOSE ? "MM_WIM_CLOSE" : msg == MM_WIM_DATA ? "MM_WIM_DATA" : "UNKNOWN",dwUser,dw1,dw2,GetTickCount()); @@ -1388,7 +1388,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( HRESULT err = DS_OK; LPBYTE newbuf; DWORD buflen; - IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)*ppobj; + IDirectSoundCaptureBufferImpl *This = *ppobj; This->ref = 1; This->device = device; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7b0779a..cd0861a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1560,7 +1560,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( if (device->hwbuf) device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; - hres = PrimaryBufferImpl_Create(device, (PrimaryBufferImpl**)&(device->primary), &(device->dsbd)); + hres = PrimaryBufferImpl_Create(device, &(device->primary), &(device->dsbd)); if (device->primary) { IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); @@ -1628,12 +1628,12 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } - hres = IDirectSoundBufferImpl_Create(device, (IDirectSoundBufferImpl**)&dsb, dsbd); + hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); if (dsb) { hres = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl**)ppdsb); if (*ppdsb) { dsb->secondary = (SecondaryBufferImpl*)*ppdsb; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)*ppdsb); + IDirectSoundBuffer_AddRef(*ppdsb); } else WARN("SecondaryBufferImpl_Create failed\n"); } else diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7c570bc..0e76adf 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -445,11 +445,11 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, DWORD writepos, /* 8-bit WAV is unsigned, but we need to operate */ /* on signed data for this to work properly */ for (i = 0; i < len; i+=2) { - *(bpc++) = (((INT)(*(mem++) - 128) * vLeft) >> 16) + 128; - *(bpc++) = (((INT)(*(mem++) - 128) * vRight) >> 16) + 128; + *(bpc++) = (((*(mem++) - 128) * vLeft) >> 16) + 128; + *(bpc++) = (((*(mem++) - 128) * vRight) >> 16) + 128; } if (len % 2 == 1 && nChannels == 1) - *(bpc++) = (((INT)(*(mem++) - 128) * vLeft) >> 16) + 128; + *(bpc++) = (((*(mem++) - 128) * vLeft) >> 16) + 128; break; case 16: /* 16-bit WAV is signed -- much better */

1 0

Jacek Caban : mshtml: Added PutProperty implementation.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 7514283d7399d620401ccdbfbf04532a9d71199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7514283d7399d620401ccdbfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 31 01:32:48 2007 +0100 mshtml: Added PutProperty implementation. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/mshtml_private.h | 18 ++++++++++++++++++ dlls/mshtml/navigate.c | 14 ++++++++++++-- dlls/mshtml/persist.c | 21 +++++++++++++++++++-- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eb4abe0..4ce0381 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -185,6 +185,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) if(This->window) IHTMLWindow2_Release(HTMLWINDOW2(This->window)); + heap_free(This->mime); detach_selection(This); detach_ranges(This); release_nodes(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2180184..c981348 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -23,6 +23,7 @@ #include "hlink.h" #include "wine/list.h" +#include "wine/unicode.h" #ifdef INIT_GUID #include "initguid.h" @@ -155,6 +156,7 @@ struct HTMLDocument { BOOL has_key_path; BOOL container_locked; BOOL focus; + LPWSTR mime; DWORD update; @@ -561,6 +563,22 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + + HINSTANCE get_shdoclc(void); extern HINSTANCE hInst; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b1b5609..3dd8e53 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -212,8 +212,8 @@ static HRESULT read_stream_data(BSCallback *This, IStream *stream) break; if(!This->readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { - This->nschannel->charset = heap_alloc(sizeof(UTF16_STR)); - memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); + This->nschannel->charset = heap_alloc(sizeof(UTF16_STR)); + memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); } if(!This->readed) { @@ -887,6 +887,16 @@ void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) if(callback) { IBindStatusCallback_AddRef(STATUSCLB(callback)); callback->doc = doc; + + if(doc->mime) { + DWORD len; + + heap_free(callback->nschannel->content); + + len = WideCharToMultiByte(CP_ACP, 0, doc->mime, -1, NULL, 0, NULL, NULL); + callback->nschannel->content = heap_alloc(len); + WideCharToMultiByte(CP_ACP, 0, doc->mime, -1, callback->nschannel->content, -1, NULL, NULL); + } } } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2f3d5cc..033ce7e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -502,8 +502,24 @@ static ULONG WINAPI MonikerProp_Release(IMonikerProp *iface) static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPERTY mkp, LPCWSTR val) { HTMLDocument *This = MONPROP_THIS(iface); - FIXME("(%p)->(%d %s)\n", This, mkp, debugstr_w(val)); - return E_NOTIMPL; + + TRACE("(%p)->(%d %s)\n", This, mkp, debugstr_w(val)); + + switch(mkp) { + case MIMETYPEPROP: + heap_free(This->mime); + This->mime = heap_strdupW(val); + break; + + case CLASSIDPROP: + break; + + default: + FIXME("mkp %d\n", mkp); + return E_NOTIMPL; + } + + return S_OK; } static const IMonikerPropVtbl MonikerPropVtbl = { @@ -743,4 +759,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->bscallback = NULL; This->mon = NULL; This->url = NULL; + This->mime = NULL; }

1 0

Andrew Talbot : dbghelp: Remove unneeded casts.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 159672d01c1c6f0eae56ac8cab4990b8f5bf8de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159672d01c1c6f0eae56ac8ca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 31 21:28:09 2007 +0000 dbghelp: Remove unneeded casts. --- dlls/dbghelp/minidump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 949545f..2a16a98 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -386,7 +386,7 @@ static void dump_exception_info(struct dump_context* dc, mdExcpt.ExceptionRecord.NumberParameters = prec->NumberParameters; mdExcpt.ExceptionRecord.__unusedAlignment = 0; for (i = 0; i < mdExcpt.ExceptionRecord.NumberParameters; i++) - mdExcpt.ExceptionRecord.ExceptionInformation[i] = (DWORD_PTR)prec->ExceptionInformation[i]; + mdExcpt.ExceptionRecord.ExceptionInformation[i] = prec->ExceptionInformation[i]; mdExcpt.ThreadContext.DataSize = sizeof(*pctx); mdExcpt.ThreadContext.Rva = dc->rva + sizeof(mdExcpt); @@ -657,7 +657,7 @@ static void dump_memory_info(struct dump_context* dc, DWORD* size) { len = min(dc->mem[i].size - pos, sizeof(tmp)); if (ReadProcessMemory(dc->hProcess, - (void*)(ULONG)(dc->mem[i].base + pos), + (void*)(dc->mem[i].base + pos), tmp, len, NULL)) WriteFile(dc->hFile, tmp, len, &written, NULL); }

1 0

Andrew Talbot : ddraw: Remove unneeded casts.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: f074c0e162b8fac52238895ad54e8f9b65c79628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f074c0e162b8fac52238895ad… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 31 21:37:46 2007 +0000 ddraw: Remove unneeded casts. --- dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/viewport.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fa471ef..135d6e9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1350,8 +1350,8 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - This->Handles[(DWORD) *D3DMatHandle - 1].ptr = Matrix; - This->Handles[(DWORD) *D3DMatHandle - 1].type = DDrawHandle_Matrix; + This->Handles[*D3DMatHandle - 1].ptr = Matrix; + This->Handles[*D3DMatHandle - 1].type = DDrawHandle_Matrix; TRACE(" returning matrix handle %d\n", *D3DMatHandle); LeaveCriticalSection(&ddraw_cs); @@ -1382,7 +1382,7 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface, D3DMATRIX *D3DMatrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x,%p)\n", This, (DWORD) D3DMatHandle, D3DMatrix); + TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix); if( (!D3DMatHandle) || (!D3DMatrix) ) return DDERR_INVALIDPARAMS; @@ -1451,7 +1451,7 @@ IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface, D3DMATRIX *D3DMatrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x,%p)\n", This, (DWORD) D3DMatHandle, D3DMatrix); + TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix); if(!D3DMatrix) return DDERR_INVALIDPARAMS; @@ -1499,7 +1499,7 @@ IDirect3DDeviceImpl_1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x)\n", This, (DWORD) D3DMatHandle); + TRACE("(%p)->(%08x)\n", This, D3DMatHandle); if(!D3DMatHandle) return DDERR_INVALIDPARAMS; @@ -4589,7 +4589,7 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); HRESULT hr; - TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, (DWORD) Color, Z, Stencil); + TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, Color, Z, Stencil); /* Note; D3DRECT is compatible with WINED3DRECT */ EnterCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e5fb45b..302555d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -515,7 +515,7 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE hMat) { ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); - TRACE("(%p)->(%d)\n", This, (DWORD) hMat); + TRACE("(%p)->(%d)\n", This, hMat); EnterCriticalSection(&ddraw_cs); if(hMat && hMat > This->ddraw->d3ddevice->numHandles)

1 0

Andrew Talbot : dplayx: Remove unneeded casts.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: a5195512c922ddbc47948e2559eda900ea7d2a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5195512c922ddbc47948e255… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 31 21:38:06 2007 +0000 dplayx: Remove unneeded casts. --- dlls/dplayx/dplayx_global.c | 14 +++++++------- dlls/dplayx/dplobby.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 9ad9b3e..60ddd89 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -679,7 +679,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpy( (LPSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionNameA ); dest->lpSessionDesc->u1.lpszSessionNameA = (LPSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += - strlen( (LPSTR)dest->lpSessionDesc->u1.lpszSessionNameA ) + 1; + strlen( dest->lpSessionDesc->u1.lpszSessionNameA ) + 1; } if( src->lpSessionDesc->u2.lpszPasswordA ) @@ -687,7 +687,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpy( (LPSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPasswordA ); dest->lpSessionDesc->u2.lpszPasswordA = (LPSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += - strlen( (LPSTR)dest->lpSessionDesc->u2.lpszPasswordA ) + 1; + strlen( dest->lpSessionDesc->u2.lpszPasswordA ) + 1; } } @@ -703,7 +703,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpy( (LPSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortNameA ); dest->lpPlayerName->u1.lpszShortNameA = (LPSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += - strlen( (LPSTR)dest->lpPlayerName->u1.lpszShortNameA ) + 1; + strlen( dest->lpPlayerName->u1.lpszShortNameA ) + 1; } if( src->lpPlayerName->u2.lpszLongNameA ) @@ -801,7 +801,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( (LPWSTR)dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); + ( strlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); } if( src->lpSessionDesc->u2.lpszPassword ) @@ -809,7 +809,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword ); dest->lpSessionDesc->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( (LPWSTR)dest->lpSessionDesc->u2.lpszPassword ) + 1 ); + ( strlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 ); } } @@ -825,7 +825,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName ); dest->lpPlayerName->u1.lpszShortName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( (LPWSTR)dest->lpPlayerName->u1.lpszShortName ) + 1 ); + ( strlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); } if( src->lpPlayerName->u2.lpszLongName ) @@ -833,7 +833,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName ); dest->lpPlayerName->u2.lpszLongName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( (LPWSTR)dest->lpPlayerName->u2.lpszLongName ) + 1 ); + ( strlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 ); } } diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 98e4f33..f12025e 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1335,7 +1335,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_RunApplication HANDLE hReceiveEvent ) { IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; - FIXME( "(%p)->(0x%08x,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, (void *)hReceiveEvent ); + FIXME( "(%p)->(0x%08x,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); return DPERR_OUTOFMEMORY; }

1 0