January 2008 - Wine-commits

Paul Vriens : msi/tests: Only use functions if they are implemented.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 46f1330e02a2b038c85b9537f878084ba72def4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f1330e02a2b038c85b9537f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 24 11:56:21 2008 +0100 msi/tests: Only use functions if they are implemented. --- dlls/msi/tests/source.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 07e6742..7407f5b 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -41,9 +41,17 @@ static void init_functionpointers(void) HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pMsiSourceListGetInfoA = (void*)GetProcAddress(hmsi, "MsiSourceListGetInfoA"); - pMsiSourceListAddSourceExA = (void*)GetProcAddress(hmsi, "MsiSourceListAddSourceExA"); - pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); +#define GET_PROC(dll, func) \ + p ## func = (void *)GetProcAddress(dll, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(hmsi, MsiSourceListAddSourceExA) + GET_PROC(hmsi, MsiSourceListGetInfoA) + + GET_PROC(hadvapi32, ConvertSidToStringSidA) + +#undef GET_PROC } /* copied from dlls/msi/registry.c */ @@ -125,6 +133,12 @@ static void test_MsiSourceListGetInfo(void) HKEY userkey, hkey; DWORD size; + if (!pMsiSourceListGetInfoA) + { + skip("Skipping MsiSourceListGetInfoA tests\n"); + return; + } + create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid); @@ -348,7 +362,7 @@ static void test_MsiSourceListAddSourceEx(void) if (!pMsiSourceListAddSourceExA) { - skip("Skipping MsiSourceListAddSourceEx tests\n"); + skip("Skipping MsiSourceListAddSourceExA tests\n"); return; }

1 0

Dan Hipschman : oleaut32: Use the symbolic name for TYPEFLAG_FDISPATCHABLE.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: d0820c1840f7a7bcf367c325c118ed85a4109546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0820c1840f7a7bcf367c325c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jan 23 16:56:02 2008 -0800 oleaut32: Use the symbolic name for TYPEFLAG_FDISPATCHABLE. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7464b0c..00c79ce 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1225,7 +1225,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U This->typeinfo->flags = uTypeFlags; - if (uTypeFlags & 0x1000) { + if (uTypeFlags & TYPEFLAG_FDISPATCHABLE) { MSFT_GuidEntry foo; int guidoffset; int fileoffset;

1 0

Alexander Nicolaysen Sørnes : uninstaller: Disable Uninstall button when no items selected.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 6898c9e51bda0aa4f8757ecbb68a0540b352e879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6898c9e51bda0aa4f8757ecbb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 24 00:28:17 2008 +0100 uninstaller: Disable Uninstall button when no items selected. --- programs/uninstaller/main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 72d62f0..d731de4 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -286,6 +286,10 @@ static void UninstallProgram(void) list_need_update = 1; } +static void UpdateButtons(HWND hDlg, HWND hList) +{ + EnableWindow(GetDlgItem(hDlg, IDC_UNINSTALL), SendMessageW(hList, LB_GETSELCOUNT, 0, 0) > 0); +} static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -299,6 +303,7 @@ static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l GetTextMetricsW(hdc, &tm); UpdateList(hList); ReleaseDC(hwnd, hdc); + UpdateButtons(hwnd, hList); break; case WM_COMMAND: switch(LOWORD(wParam)) @@ -316,6 +321,7 @@ static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l } else sFilter = NULL; UpdateList(hList); + UpdateButtons(hwnd, hList); } break; } @@ -326,6 +332,7 @@ static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l { UninstallProgram(); UpdateList(hList); + UpdateButtons(hwnd, hList); } break; } @@ -344,6 +351,7 @@ static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l wine_dbgstr_w(entries[sel].descr)); oldsel = sel; } + UpdateButtons(hwnd, hList); break; case IDC_ABOUT: MessageBoxW(0, sAbout, sAboutTitle, MB_OK);

1 0

Alexander Nicolaysen Sørnes : uninstaller: Fix Norwegian Bokmå l resource.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 77200fd802b9e5a2d7a5c9138ba3d0983a876bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77200fd802b9e5a2d7a5c9138… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 24 00:32:04 2008 +0100 uninstaller: Fix Norwegian Bokmål resource. --- programs/uninstaller/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/No.rc b/programs/uninstaller/No.rc index cc48098..a88196f 100644 --- a/programs/uninstaller/No.rc +++ b/programs/uninstaller/No.rc @@ -31,7 +31,7 @@ BEGIN LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "A&vinstaller",IDC_UNINSTALL,270,48,50,14 PUSHBUTTON "&Om",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "R&ediger",IDC_EXIT,270,81,50,14 + PUSHBUTTON "&Lukk",IDC_EXIT,270,81,50,14 END

1 0

Andrew Talbot : wined3d: Remove unneeded casts.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 35c3bfe25cc38b8cdd6961d594698d0194cf9c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c3bfe25cc38b8cdd6961d59… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:40:05 2008 +0000 wined3d: Remove unneeded casts. --- dlls/wined3d/texture.c | 2 +- dlls/wined3d/vertexbuffer.c | 8 ++++---- dlls/wined3d/volumetexture.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb16700..fe37e55 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -287,7 +287,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface if (Level < This->baseTexture.levels) { *ppSurfaceLevel = This->surfaces[Level]; - IWineD3DSurface_AddRef((IWineD3DSurface*) This->surfaces[Level]); + IWineD3DSurface_AddRef(This->surfaces[Level]); hr = WINED3D_OK; TRACE("(%p) : returning %p for level %d\n", This, *ppSurfaceLevel, Level); } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 2472066..1093add 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -228,11 +228,11 @@ static inline BOOL process_converted_attribute(IWineD3DVertexBufferImpl *This, data = (((DWORD_PTR) attrib->lpData) + offset) % This->stride; attrib_size = WINED3D_ATR_SIZE(type) * WINED3D_ATR_TYPESIZE(type); for(i = 0; i < attrib_size; i++) { - if(This->conv_map[(DWORD_PTR) data + i] != conv_type) { - TRACE("Byte %ld in vertex changed\n", i + (DWORD_PTR) data); - TRACE("It was type %d, is %d now\n", This->conv_map[(DWORD_PTR) data + i], conv_type); + if(This->conv_map[data + i] != conv_type) { + TRACE("Byte %ld in vertex changed\n", i + data); + TRACE("It was type %d, is %d now\n", This->conv_map[data + i], conv_type); ret = TRUE; - This->conv_map[(DWORD_PTR) data + i] = conv_type; + This->conv_map[data + i] = conv_type; } } return ret; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 61c2626..9cddb4f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -251,7 +251,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; if (Level < This->baseTexture.levels) { TRACE("(%p) Level (%d)\n", This, Level); - return IWineD3DVolume_GetDesc((IWineD3DVolume *) This->volumes[Level], pDesc); + return IWineD3DVolume_GetDesc(This->volumes[Level], pDesc); } else { FIXME("(%p) Level (%d)\n", This, Level); } @@ -260,8 +260,8 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, UINT Level, IWineD3DVolume** ppVolumeLevel) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; if (Level < This->baseTexture.levels) { - *ppVolumeLevel = (IWineD3DVolume *)This->volumes[Level]; - IWineD3DVolume_AddRef((IWineD3DVolume *) *ppVolumeLevel); + *ppVolumeLevel = This->volumes[Level]; + IWineD3DVolume_AddRef(*ppVolumeLevel); TRACE("(%p) -> level(%d) returning volume@%p\n", This, Level, *ppVolumeLevel); } else { FIXME("(%p) Level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); @@ -275,7 +275,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *i IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; if (Level < This->baseTexture.levels) { - hr = IWineD3DVolume_LockBox((IWineD3DVolume *)This->volumes[Level], pLockedVolume, pBox, Flags); + hr = IWineD3DVolume_LockBox(This->volumes[Level], pLockedVolume, pBox, Flags); TRACE("(%p) Level (%d) success(%u)\n", This, Level, hr); } else { @@ -290,7 +290,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_UnlockBox(IWineD3DVolumeTexture IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; if (Level < This->baseTexture.levels) { - hr = IWineD3DVolume_UnlockBox((IWineD3DVolume*) This->volumes[Level]); + hr = IWineD3DVolume_UnlockBox(This->volumes[Level]); TRACE("(%p) -> level(%d) success(%u)\n", This, Level, hr); } else { @@ -304,7 +304,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; This->baseTexture.dirty = TRUE; TRACE("(%p) : dirtyfication of volume Level (0)\n", This); - return IWineD3DVolume_AddDirtyBox((IWineD3DVolume *) This->volumes[0], pDirtyBox); + return IWineD3DVolume_AddDirtyBox(This->volumes[0], pDirtyBox); } const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl =

1 0

Andrew Talbot : wined3d: Remove unneeded casts.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 18047e77e55e1d27bce67b6852d7216704d97242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18047e77e55e1d27bce67b685… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:40:02 2008 +0000 wined3d: Remove unneeded casts. --- dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/surface_base.c | 10 +++++----- dlls/wined3d/surface_gdi.c | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f6aed08..cfb47ca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -386,7 +386,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, ref + 1); if (ref == 0) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; renderbuffer_entry_t *entry, *entry2; TRACE("(%p) : cleaning up\n", This); @@ -724,7 +724,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } top = mem + pitch * local_rect.top; - bottom = ((BYTE *) mem) + pitch * ( local_rect.bottom - local_rect.top - 1); + bottom = mem + pitch * ( local_rect.bottom - local_rect.top - 1); for(i = 0; i < (local_rect.bottom - local_rect.top) / 2; i++) { memcpy(row, top + off, len); memcpy(top + off, bottom + off, len); @@ -759,7 +759,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v for(y = local_rect.top; y < local_rect.bottom; y++) { for(x = local_rect.left; x < local_rect.right; x++) { /* start lines pixels */ - BYTE *blue = (BYTE *) ((BYTE *) mem) + y * pitch + x * (sizeof(BYTE) * 3); + BYTE *blue = mem + y * pitch + x * (sizeof(BYTE) * 3); BYTE *green = blue + 1; BYTE *red = green + 1; @@ -994,7 +994,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm GLint prev_rasterpos[4]; GLint skipBytes = 0; UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ - IWineD3DDeviceImpl *myDevice = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; + IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; IWineD3DSwapChainImpl *swapchain; /* Activate the correct context for the render target */ @@ -1655,7 +1655,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN unsigned char *Dest; for(y = 0; y < height; y++) { Source = (short *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { long color = (*Source++); /* B */ Dest[0] = 0xff; @@ -1693,7 +1693,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN unsigned char *Dest; for(y = 0; y < height; y++) { Source = (DWORD *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { long color = (*Source++); /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ @@ -1719,7 +1719,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN */ for(y = 0; y < height; y++) { Source = (WORD *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { short color = (*Source++); unsigned char l = ((color >> 10) & 0xfc); @@ -1772,7 +1772,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN */ for(y = 0; y < height; y++) { Source = (DWORD *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { long color = (*Source++); /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ @@ -1789,7 +1789,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN */ for(y = 0; y < height; y++) { Source = (DWORD *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { long color = (*Source++); /* B */ Dest[0] = ((color >> 16) & 0xff); /* L */ @@ -1808,8 +1808,8 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN unsigned char *Source; unsigned char *Dest; for(y = 0; y < height; y++) { - Source = (unsigned char *) (src + y * pitch); - Dest = (unsigned char *) (dst + y * outpitch); + Source = src + y * pitch; + Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { unsigned char color = (*Source++); /* A */ Dest[1] = (color & 0xf0) << 0; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f57b9f4..8a6f546 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -651,7 +651,7 @@ static HRESULT case 2: COLORFILL_ROW(WORD) case 3: { - BYTE *d = (BYTE *) buf; + BYTE *d = buf; for (x = 0; x < width; x++,d+=3) { d[0] = (color ) & 0xFF; @@ -1427,8 +1427,8 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, /* Since slock was originally copied from this surface's description, we can just reuse it */ assert(This->resource.allocatedMemory != NULL); - sbuf = (BYTE *)This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; - dbuf = (BYTE *)This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; + sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; + dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; sEntry = getFormatDescEntry(Src->resource.format, NULL, NULL); dEntry = sEntry; } @@ -1514,8 +1514,8 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, { BYTE *d, *s; DWORD tmp; - s = (BYTE *) sbuf; - d = (BYTE *) dbuf; + s = sbuf; + d = dbuf; for (y = 0; y < h; y++) { for (x = 0; x < w * 3; x += 3) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 92adcc6..30c922a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -140,7 +140,7 @@ ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) { ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, ref + 1); if (ref == 0) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("(%p) : cleaning up\n", This); if(This->Flags & SFLAG_DIBSECTION) { @@ -254,7 +254,7 @@ static HRESULT WINAPI IWineGDISurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; + IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice; TRACE("(%p)\n", This); if (!(This->Flags & SFLAG_LOCKED)) @@ -492,7 +492,7 @@ const char* filename) table[i][2] = This->palette->palents[i].peBlue; } for (y = 0; y < This->pow2Height; y++) { - unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); + unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); for (x = 0; x < This->pow2Width; x++) { unsigned char color = *src; src += 1; @@ -514,7 +514,7 @@ const char* filename) alpha_shift = get_shift(formatEntry->alphaMask); for (y = 0; y < This->pow2Height; y++) { - unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); + unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); for (x = 0; x < This->pow2Width; x++) { unsigned int color; unsigned int comp;

1 0

Andrew Talbot : wined3d: Remove unneeded casts.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: b3a58a2486a38fa7acb27e777ecfa142e066caae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a58a2486a38fa7acb27e777… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:39:59 2008 +0000 wined3d: Remove unneeded casts. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/state.c | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 234c23a..5d4d536 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -669,7 +669,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa const DWORD *pIdxBufL = NULL; LONG vx_index; int i; - IWineD3DStateBlockImpl *stateblock = (IWineD3DStateBlockImpl *) This->stateBlock; + IWineD3DStateBlockImpl *stateblock = This->stateBlock; BYTE *ptr; if (idxSize != 0) { diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 372b834..4486a9e 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -147,7 +147,7 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, U TRACE("(%p) : offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags); InterlockedIncrement(&This->lockcount); - *ppbData = (BYTE *)This->resource.allocatedMemory + OffsetToLock; + *ppbData = This->resource.allocatedMemory + OffsetToLock; if(Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) || This->vbo == 0) { return WINED3D_OK; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index d97799c..6548c97 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -169,8 +169,8 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetParent(IWineD3DPalette *iface, IUn IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; TRACE("(%p)->(%p)\n", This, Parent); - *Parent = (IUnknown *) This->parent; - IUnknown_AddRef( (IUnknown *) This->parent); + *Parent = This->parent; + IUnknown_AddRef(This->parent); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 49a8222..bcb1559 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1105,7 +1105,7 @@ static void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi /* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)stateblock->wineD3DDevice; + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; GLenum Parm = 0; WineDirect3DStridedData *diffuse = &device->strided_streams.u.s.diffuse; BOOL isDiffuseSupplied; @@ -2029,7 +2029,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W } generated = (stateblock->textureState[texUnit][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != WINED3DTSS_TCI_PASSTHRU; - set_texture_matrix((float *)&stateblock->transforms[WINED3DTS_TEXTURE0 + texUnit].u.m[0][0], + set_texture_matrix(&stateblock->transforms[WINED3DTS_TEXTURE0 + texUnit].u.m[0][0], stateblock->textureState[texUnit][WINED3DTSS_TEXTURETRANSFORMFLAGS], generated, context->last_was_rhw, @@ -2417,7 +2417,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } } - IWineD3DBaseTexture_PreLoad((IWineD3DBaseTexture *) stateblock->textures[sampler]); + IWineD3DBaseTexture_PreLoad(stateblock->textures[sampler]); IWineD3DBaseTexture_ApplyStateChanges(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler]); if (GL_SUPPORT(EXT_TEXTURE_LOD_BIAS)) { @@ -2586,12 +2586,12 @@ static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } else { /* In the general case, the view matrix is the identity matrix */ if (stateblock->wineD3DDevice->view_ident) { - glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); + glLoadMatrixf(&stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); checkGLcall("glLoadMatrixf"); } else { - glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + glLoadMatrixf(&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); checkGLcall("glLoadMatrixf"); - glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); + glMultMatrixf(&stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); checkGLcall("glMultMatrixf"); } } @@ -2607,7 +2607,7 @@ static void clipplane(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo /* Clip Plane settings are affected by the model view in OpenGL, the View transform in direct3d */ glMatrixMode(GL_MODELVIEW); glPushMatrix(); - glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + glLoadMatrixf(&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); TRACE("Clipplane [%f,%f,%f,%f]\n", stateblock->clipplane[index][0], @@ -2727,7 +2727,7 @@ static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glMatrixMode(GL_MODELVIEW); checkGLcall("glMatrixMode(GL_MODELVIEW)"); - glLoadMatrixf((float *)(float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + glLoadMatrixf(&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); checkGLcall("glLoadMatrixf(...)"); /* Reset lights. TODO: Call light apply func */ @@ -2871,7 +2871,7 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock } checkGLcall("glScalef"); - glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); + glMultMatrixf(&stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf"); } } @@ -3669,7 +3669,7 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex /* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/ glMatrixMode(GL_MODELVIEW); glPushMatrix(); - glLoadMatrixf((float *)&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + glLoadMatrixf(&stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); /* Diffuse: */ colRGBA[0] = lightInfo->OriginalParms.Diffuse.r;

1 0

Andrew Talbot : wined3d: Remove unneeded casts.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: ebcedd0350f247881d04927e29fb3ee03b1fecb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcedd0350f247881d04927e2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:39:56 2008 +0000 wined3d: Remove unneeded casts. --- dlls/wined3d/device.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5a7303..d8e530b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1050,7 +1050,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa HRESULT hr; /* Create the volume */ hr = D3DCB_CreateVolume(This->parent, parent, tmpW, tmpH, tmpD, Format, Pool, Usage, - (IWineD3DVolume **)&object->volumes[i], pSharedHandle); + &object->volumes[i], pSharedHandle); if(FAILED(hr)) { ERR("Creating a volume for the volume texture failed(%08x)\n", hr); @@ -1490,7 +1490,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->presentParms = *pPresentationParameters; TRACE("calling rendertarget CB\n"); - hr = D3DCB_CreateRenderTarget((IUnknown *) This->parent, + hr = D3DCB_CreateRenderTarget(This->parent, parent, object->presentParms.BackBufferWidth, object->presentParms.BackBufferHeight, @@ -1572,7 +1572,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic for(i = 0; i < object->presentParms.BackBufferCount; i++) { TRACE("calling rendertarget CB\n"); - hr = D3DCB_CreateRenderTarget((IUnknown *) This->parent, + hr = D3DCB_CreateRenderTarget(This->parent, parent, object->presentParms.BackBufferWidth, object->presentParms.BackBufferHeight, @@ -1607,7 +1607,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (pPresentationParameters->EnableAutoDepthStencil && hr == WINED3D_OK) { TRACE("Creating depth stencil buffer\n"); if (This->auto_depth_stencil_buffer == NULL ) { - hr = D3DCB_CreateDepthStencil((IUnknown *) This->parent, + hr = D3DCB_CreateDepthStencil(This->parent, parent, object->presentParms.BackBufferWidth, object->presentParms.BackBufferHeight, @@ -2054,7 +2054,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); - hr=D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain); + hr=D3DCB_CreateAdditionalSwapChain(This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain); if (FAILED(hr) || !swapchain) { WARN("Failed to create implicit swapchain\n"); goto err_out; @@ -2613,7 +2613,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface FIXME("Unhandled transform state!!\n"); } - multiply_matrix(&temp, mat, (const WINED3DMATRIX *) pMatrix); + multiply_matrix(&temp, mat, pMatrix); /* Apply change via set transform - will reapply to eg. lights this way */ return IWineD3DDeviceImpl_SetTransform(iface, State, &temp); @@ -4564,7 +4564,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U HRESULT hr; if(iSwapChain > 0) { - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); + hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); if (hr == WINED3D_OK) { hr = IWineD3DSwapChain_GetDisplayMode(swapChain, pMode); IWineD3DSwapChain_Release(swapChain); @@ -4789,7 +4789,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, for(i = 0 ; i < swapchains ; i ++) { - IWineD3DDeviceImpl_GetSwapChain(iface, i , (IWineD3DSwapChain **)&swapChain); + IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain); TRACE("presentinng chain %d, %p\n", i, swapChain); IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); IWineD3DSwapChain_Release(swapChain); @@ -5339,7 +5339,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, I static HRESULT WINAPI IWineD3DDeviceImpl_GetFrontBufferData(IWineD3DDevice *iface,UINT iSwapChain, IWineD3DSurface *pDestSurface) { IWineD3DSwapChain *swapChain; HRESULT hr; - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); + hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); if(hr == WINED3D_OK) { hr = IWineD3DSwapChain_GetFrontBufferData(swapChain, pDestSurface); IWineD3DSwapChain_Release(swapChain); @@ -5448,7 +5448,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface TRACE("(%p) : SwapChain %d returning %p\n", This, iSwapChain, pRasterStatus); - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); + hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); if(hr == WINED3D_OK){ hr = IWineD3DSwapChain_GetRasterStatus(swapChain, pRasterStatus); IWineD3DSwapChain_Release(swapChain);

1 0

Alexandre Julliard : user32: Moved the bulk of CreateWindow and SetWindowPos from the driver back into user32 .
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: d6f6745c9c08b85b658c9b0f2ef929910dd1d90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f6745c9c08b85b658c9b0f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 11:23:09 2008 +0100 user32: Moved the bulk of CreateWindow and SetWindowPos from the driver back into user32. --- dlls/user32/driver.c | 20 ++++--- dlls/user32/user_private.h | 4 +- dlls/user32/win.c | 93 ++++++++++++++++++++++++++++++++-- dlls/user32/winpos.c | 57 ++++++++++++++++++++- dlls/winex11.drv/window.c | 101 +------------------------------------ dlls/winex11.drv/winex11.drv.spec | 4 +- dlls/winex11.drv/winpos.c | 77 ++++------------------------ dlls/winex11.drv/x11drv.h | 2 - include/win.h | 3 + 9 files changed, 174 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6f6745c9c08b85b658c9…

1 0

Marcus Meissner : wininet: Check if buffer has overflowed potentially.
by Alexandre Julliard 24 Jan '08

24 Jan '08

Module: wine Branch: master Commit: 45fbfbcef43d465d9f970ee954e3ea7297df9dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fbfbcef43d465d9f970ee95… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 23 22:26:58 2008 +0100 wininet: Check if buffer has overflowed potentially. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec2df72..457a65f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -999,7 +999,7 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"test1")==0, "incorrect string was returned(%s)\n",buffer); ok(len == 5, "Invalid length (exp. 5, got %d)\n", len); - ok(buffer[len] == 0, "Buffer not NULL-terminated\n"); /* len show only 5 characters but the buffer is NULL-terminated*/ + ok((len < sizeof(buffer)) && (buffer[len] == 0), "Buffer not NULL-terminated\n"); /* len show only 5 characters but the buffer is NULL-terminated*/ len = sizeof(buffer); strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS,

1 0