January 2009 - Wine-commits

Michael Stefaniuc : include: Change MUSIC_TIME from long to LONG for Win64 compatibility.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 4bfb33ec733428b17ee12ac731e125af5e979a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfb33ec733428b17ee12ac73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:44:41 2009 +0100 include: Change MUSIC_TIME from long to LONG for Win64 compatibility. Fix also 192 printf format warnings produced by this change. --- dlls/dmband/bandtrack.c | 20 ++++++++++---------- dlls/dmcompos/chordmaptrack.c | 10 +++++----- dlls/dmcompos/composer.c | 2 +- dlls/dmcompos/signposttrack.c | 10 +++++----- dlls/dmime/lyricstrack.c | 10 +++++----- dlls/dmime/markertrack.c | 10 +++++----- dlls/dmime/paramcontroltrack.c | 10 +++++----- dlls/dmime/performance.c | 16 ++++++++-------- dlls/dmime/segment.c | 22 +++++++++++----------- dlls/dmime/segtriggertrack.c | 14 +++++++------- dlls/dmime/seqtrack.c | 10 +++++----- dlls/dmime/sysextrack.c | 10 +++++----- dlls/dmime/tempotrack.c | 12 ++++++------ dlls/dmime/timesigtrack.c | 10 +++++----- dlls/dmime/wavetrack.c | 10 +++++----- dlls/dmscript/scripttrack.c | 10 +++++----- dlls/dmstyle/auditiontrack.c | 10 +++++----- dlls/dmstyle/chordtrack.c | 12 ++++++------ dlls/dmstyle/commandtrack.c | 12 ++++++------ dlls/dmstyle/motiftrack.c | 10 +++++----- dlls/dmstyle/mutetrack.c | 10 +++++----- dlls/dmstyle/styletrack.c | 10 +++++----- dlls/dswave/dswave.c | 14 +++++++------- include/dmplugin.h | 2 +- include/dmusici.h | 2 +- 25 files changed, 134 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bfb33ec733428b17ee12…

1 0

Michael Stefaniuc : include: Use LONG instead of long in dmusici. h for Win64 compatibility.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 9e296ead7ea718f63849e12381f02b22948ea908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e296ead7ea718f63849e1238… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:44:57 2009 +0100 include: Use LONG instead of long in dmusici.h for Win64 compatibility. --- dlls/dmime/audiopath.c | 4 ++-- include/dmusici.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 23d837a..301ace9 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -206,9 +206,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Activate ( return S_OK; } -static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume (LPDIRECTMUSICAUDIOPATH iface, long lVolume, DWORD dwDuration) { +static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume (LPDIRECTMUSICAUDIOPATH iface, LONG lVolume, DWORD dwDuration) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - FIXME("(%p, %li, %d): stub\n", This, lVolume, dwDuration); + FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration); return S_OK; } diff --git a/include/dmusici.h b/include/dmusici.h index 46cbdf3..82a137b 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -707,9 +707,9 @@ struct _DMUS_WAVE_PMSG { DMUS_PMSG_PART REFERENCE_TIME rtStartOffset; REFERENCE_TIME rtDuration; - long lOffset; - long lVolume; - long lPitch; + LONG lOffset; + LONG lVolume; + LONG lPitch; BYTE bFlags; }; @@ -1199,7 +1199,7 @@ DECLARE_INTERFACE_(IDirectMusicAudioPath,IUnknown) /*** IDirectMusicAudioPath methods ***/ STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; STDMETHOD(Activate)(THIS_ BOOL fActivate) PURE; - STDMETHOD(SetVolume)(THIS_ long lVolume, DWORD dwDuration) PURE; + STDMETHOD(SetVolume)(THIS_ LONG lVolume, DWORD dwDuration) PURE; STDMETHOD(ConvertPChannel)(THIS_ DWORD dwPChannelIn, DWORD *pdwPChannelOut) PURE; }; #undef INTERFACE

1 0

Michael Stefaniuc : include: Use LONG instead of long in msacmdrv.h.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 7488d8863fef4978c4b10d0c29e6c640aa66ca95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7488d8863fef4978c4b10d0c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:45:55 2009 +0100 include: Use LONG instead of long in msacmdrv.h. --- include/msacmdrv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/msacmdrv.h b/include/msacmdrv.h index bbb8c8c..46e8ba5 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -38,7 +38,7 @@ */ #define MAKE_ACM_VERSION(mjr, mnr, bld) \ - (((long)(mjr)<<24) | ((long)(mnr)<<16) | ((long)bld)) + (((LONG)(mjr)<<24) | ((LONG)(mnr)<<16) | ((LONG)bld)) #define ACMDRVOPENDESC_SECTIONNAME_CHARS

1 0

Michael Stefaniuc : include: Change to ULONG in dmerror. h for Win64 compatibility.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 3d5de188893888c749ecce9688840e5d227d26fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5de188893888c749ecce968… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:45:33 2009 +0100 include: Change to ULONG in dmerror.h for Win64 compatibility. --- include/dmerror.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dmerror.h b/include/dmerror.h index 9784dc0..8db2510 100644 --- a/include/dmerror.h +++ b/include/dmerror.h @@ -28,7 +28,7 @@ #ifndef MAKE_HRESULT #define MAKE_HRESULT(sev,fac,code) \ - ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) + ((HRESULT) (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) ) #endif #define MAKE_DMHRESULTSUCCESS(code) MAKE_HRESULT(0, FACILITY_DIRECTMUSIC, (DMUS_ERRBASE + (code)))

1 0

Juan Lang : riched20: Add stub IOleClientSite interface.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: cfd1a6317d4f5b6aa8a044f313fc102245341736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd1a6317d4f5b6aa8a044f31… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 9 09:08:35 2009 -0800 riched20: Add stub IOleClientSite interface. --- dlls/riched20/richole.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9eabb04..a5f79c7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -52,6 +52,7 @@ DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); typedef struct ITextSelectionImpl ITextSelectionImpl; +typedef struct IOleClientSiteImpl IOleClientSiteImpl; typedef struct IRichEditOleImpl { const IRichEditOleVtbl *lpRichEditOleVtbl; @@ -60,6 +61,7 @@ typedef struct IRichEditOleImpl { ME_TextEditor *editor; ITextSelectionImpl *txtSel; + IOleClientSiteImpl *clientSite; } IRichEditOleImpl; struct ITextSelectionImpl { @@ -69,6 +71,13 @@ struct ITextSelectionImpl { IRichEditOleImpl *reOle; }; +struct IOleClientSiteImpl { + const IOleClientSiteVtbl *lpVtbl; + LONG ref; + + IRichEditOleImpl *reOle; +}; + static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) { return (IRichEditOleImpl *)((BYTE*)iface - FIELD_OFFSET(IRichEditOleImpl, lpRichEditOleVtbl)); @@ -126,6 +135,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) TRACE ("Destroying %p\n", This); This->txtSel->reOle = NULL; ITextSelection_Release((ITextSelection *) This->txtSel); + IOleClientSite_Release((IOleClientSite *) This->clientSite); heap_free(This); } return ref; @@ -157,12 +167,147 @@ IRichEditOle_fnConvertObject(IRichEditOle *me, LONG iob, } static HRESULT WINAPI +IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) +{ + TRACE("%p %s\n", me, debugstr_guid(riid) ); + + *ppvObj = NULL; + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IOleClientSite)) + *ppvObj = me; + if (*ppvObj) + { + IOleClientSite_AddRef(me); + return S_OK; + } + FIXME("%p: unhandled interface %s\n", me, debugstr_guid(riid) ); + + return E_NOINTERFACE; +} + +static ULONG WINAPI +IOleClientSite_fnAddRef(IOleClientSite *me) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI +IOleClientSite_fnRelease(IOleClientSite *me) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + ULONG ref = InterlockedDecrement(&This->ref); + if (ref == 0) + heap_free(This); + return ref; +} + +static HRESULT WINAPI +IOleClientSite_fnSaveObject(IOleClientSite *me) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + + +static HRESULT WINAPI +IOleClientSite_fnGetMoniker(IOleClientSite *me, DWORD dwAssign, DWORD dwWhichMoniker, + IMoniker **ppmk) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + +static HRESULT WINAPI +IOleClientSite_fnGetContainer(IOleClientSite *me, IOleContainer **ppContainer) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + +static HRESULT WINAPI +IOleClientSite_fnShowObject(IOleClientSite *me) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + +static HRESULT WINAPI +IOleClientSite_fnOnShowWindow(IOleClientSite *me, BOOL fShow) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + +static HRESULT WINAPI +IOleClientSite_fnRequestNewObjectLayout(IOleClientSite *me) +{ + IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("stub %p\n",me); + return E_NOTIMPL; +} + +static const IOleClientSiteVtbl ocst = { + IOleClientSite_fnQueryInterface, + IOleClientSite_fnAddRef, + IOleClientSite_fnRelease, + IOleClientSite_fnSaveObject, + IOleClientSite_fnGetMoniker, + IOleClientSite_fnGetContainer, + IOleClientSite_fnShowObject, + IOleClientSite_fnOnShowWindow, + IOleClientSite_fnRequestNewObjectLayout +}; + +static IOleClientSiteImpl * +CreateOleClientSite(IRichEditOleImpl *reOle) +{ + IOleClientSiteImpl *clientSite = heap_alloc(sizeof *clientSite); + if (!clientSite) + return NULL; + + clientSite->lpVtbl = &ocst; + clientSite->ref = 1; + clientSite->reOle = reOle; + return clientSite; +} + +static HRESULT WINAPI IRichEditOle_fnGetClientSite(IRichEditOle *me, LPOLECLIENTSITE *lplpolesite) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); - return E_NOTIMPL; + + TRACE("%p,%p\n",This, lplpolesite); + + if(!lplpolesite) + return E_INVALIDARG; + *lplpolesite = (IOleClientSite *) This->clientSite; + IOleClientSite_fnAddRef(*lplpolesite); + return S_OK; } static HRESULT WINAPI @@ -1541,6 +1686,13 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) heap_free(reo); return 0; } + reo->clientSite = CreateOleClientSite(reo); + if (!reo->txtSel) + { + ITextSelection_Release((ITextSelection *) reo->txtSel); + heap_free(reo); + return 0; + } TRACE("Created %p\n",reo); *ppObj = (LPVOID) reo;

1 0

Francois Gouget : configure: Check for HAL and GnuTLS even if pkg-config is not present.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 295a0cddeac23a7024795614320d3a8b6e3bc3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295a0cddeac23a70247956143… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 9 20:22:22 2009 +0100 configure: Check for HAL and GnuTLS even if pkg-config is not present. --- configure | 22 ++++++++++++++-------- configure.ac | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 8bbd1fc..65743ff 100755 --- a/configure +++ b/configure @@ -12783,12 +12783,15 @@ fi HALINCL="" -if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false" +if test "x$with_hal" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_hal_cflags" + if test "$PKG_CONFIG" != "false" + then + ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" + ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_hal_cflags" + fi for ac_header in dbus/dbus.h hal/libhal.h @@ -13109,12 +13112,15 @@ esac fi -if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false" +if test "x$with_gnutls" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" - ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" + if test "$PKG_CONFIG" != "false" + then + ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" + ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" + fi if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5 $as_echo_n "checking for gnutls/gnutls.h... " >&6; } diff --git a/configure.ac b/configure.ac index 13530ac..604f331 100644 --- a/configure.ac +++ b/configure.ac @@ -912,12 +912,15 @@ WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"], dnl **** Check for libhal **** AC_SUBST(HALINCL,"") -if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false" +if test "x$with_hal" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_hal_cflags" + if test "$PKG_CONFIG" != "false" + then + ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" + ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_hal_cflags" + fi AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h]) if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" then @@ -931,12 +934,15 @@ WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"], [libhal ${notice_platform}development files not found, no dynamic device support.]) dnl **** Check for libgnutls **** -if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false" +if test "x$with_gnutls" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" - ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" + if test "$PKG_CONFIG" != "false" + then + ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" + ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" + fi AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,

1 0

Andrew Talbot : ddraw: Fix double unlock of critical section.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 1ac07906ae9e06273e100d8fe305e95f02a3735c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac07906ae9e06273e100d8fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 9 22:09:07 2009 +0000 ddraw: Fix double unlock of critical section. --- dlls/ddraw/surface.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f184111..b0b7437 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2333,14 +2333,15 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(IDirectDrawSurface7 *iface, if(hr != WINED3D_OK) { /* No need for a trace here, wined3d does that for us */ - LeaveCriticalSection(&ddraw_cs); switch(hr) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: break; /* Go on */ + case WINED3DERR_INVALIDCALL: + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + default: + break; /* Go on */ } } - } This->surface_desc = *DDSD;

1 0

Michael Stefaniuc : ddrawex: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: cee7954a67a600251543dea7fee70a9b2deec305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee7954a67a600251543dea7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:43:44 2009 +0100 ddrawex: Remove redundant NULL check before HeapFree (Smatch). --- dlls/ddrawex/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 9e8066a..3fabc04 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1551,7 +1551,7 @@ IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, err: if(object && object->parent) IDirectDraw4_Release(object->parent); if(parent) IDirectDraw_Release(parent); - if(object) HeapFree(GetProcessHeap(), 0, object); + HeapFree(GetProcessHeap(), 0, object); *ppDirectDraw = NULL; return hr; }

1 0

Alexandre Julliard : shell32/tests: Fix some uninitialized handle checks for Win64.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 8cd82dda1fe2ca4d663f7f9c53a25ecb90bbfcb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd82dda1fe2ca4d663f7f9c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 18:09:03 2009 +0100 shell32/tests: Fix some uninitialized handle checks for Win64. --- dlls/shell32/tests/appbar.c | 5 +++-- dlls/shell32/tests/shlfileop.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index d11a999..0d0c898 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -358,16 +358,17 @@ static void test_setpos(void) static void test_appbarget(void) { APPBARDATA abd; - HWND hwnd, foregnd; + HWND hwnd, foregnd, unset_hwnd; UINT_PTR ret; memset(&abd, 0xcc, sizeof(abd)); + memset(&unset_hwnd, 0xcc, sizeof(unset_hwnd)); abd.cbSize = sizeof(abd); abd.uEdge = ABE_BOTTOM; hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); - ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); + ok(abd.hWnd == unset_hwnd, "hWnd overwritten %p\n",abd.hWnd); if (!pMonitorFromWindow) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 48e89fa..e6d3287 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -202,11 +202,13 @@ static void test_get_file_info(void) if (pSHGetFileInfoW) { + HANDLE unset_icon; /* Test whether fields of SHFILEINFOW are always cleared */ memset(&shfiw, 0xcf, sizeof(shfiw)); + memset(&unset_icon, 0xcf, sizeof(unset_icon)); rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); - ok(shfiw.hIcon == (HANDLE) 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); + ok(shfiw.hIcon == unset_icon, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n");

1 0

Alexandre Julliard : setupapi/tests: Pass the correct size to SetupDiGetDeviceInterfaceDetailA.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: e1a4d068d1a8cf356f7c1565015a592df5b480cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a4d068d1a8cf356f7c15650… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 23:22:42 2009 +0100 setupapi/tests: Pass the correct size to SetupDiGetDeviceInterfaceDetailA. --- dlls/setupapi/tests/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9a5b1fc..1dfb13d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1088,7 +1088,7 @@ static void testRegisterAndGetDetail(void) detail = HeapAlloc(GetProcessHeap(), 0, dwSize); if (detail) { - detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + detail->cbSize = sizeof(*detail); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL);

1 0