May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : mscms: Constify some variables.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 9312f0f974de36bc4bf6e7dcd6e9ae104872d9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9312f0f974de36bc4bf6e7dcd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 28 18:11:29 2007 +0100 mscms: Constify some variables. --- dlls/mscms/handle.c | 2 +- dlls/mscms/icc.c | 16 ++++++++-------- dlls/mscms/mscms_priv.h | 14 +++++++------- dlls/mscms/profile.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index 0ee2c95..fe474f3 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -153,7 +153,7 @@ cmsHPROFILE MSCMS_hprofile2cmsprofile( HPROFILE profile ) return cmsprofile; } -HPROFILE MSCMS_iccprofile2hprofile( icProfile *iccprofile ) +HPROFILE MSCMS_iccprofile2hprofile( const icProfile *iccprofile ) { HPROFILE profile = NULL; DWORD_PTR i; diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index e5d0ba8..ffdd3e5 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -40,7 +40,7 @@ static inline void MSCMS_adjust_endianess32( ULONG *ptr ) #endif } -void MSCMS_get_profile_header( icProfile *iccprofile, PROFILEHEADER *header ) +void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ) { unsigned int i; @@ -51,7 +51,7 @@ void MSCMS_get_profile_header( icProfile *iccprofile, PROFILEHEADER *header ) MSCMS_adjust_endianess32( (ULONG *)header + i ); } -void MSCMS_set_profile_header( icProfile *iccprofile, PROFILEHEADER *header ) +void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ) { unsigned int i; icHeader *iccheader = (icHeader *)iccprofile; @@ -63,7 +63,7 @@ void MSCMS_set_profile_header( icProfile *iccprofile, PROFILEHEADER *header ) MSCMS_adjust_endianess32( (ULONG *)iccheader + i ); } -DWORD MSCMS_get_tag_count( icProfile *iccprofile ) +DWORD MSCMS_get_tag_count( const icProfile *iccprofile ) { ULONG count = iccprofile->count; @@ -84,19 +84,19 @@ void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) MSCMS_adjust_endianess32( (ULONG *)&tag->size ); } -void MSCMS_get_tag_data( icProfile *iccprofile, icTag *tag, DWORD offset, void *buffer ) +void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ) { - memcpy( buffer, (char *)iccprofile + tag->offset + offset, tag->size - offset ); + memcpy( buffer, (const char *)iccprofile + tag->offset + offset, tag->size - offset ); } -void MSCMS_set_tag_data( icProfile *iccprofile, icTag *tag, DWORD offset, void *buffer ) +void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ) { memcpy( (char *)iccprofile + tag->offset + offset, buffer, tag->size - offset ); } -DWORD MSCMS_get_profile_size( icProfile *iccprofile ) +DWORD MSCMS_get_profile_size( const icProfile *iccprofile ) { - DWORD size = ((icHeader *)iccprofile)->size; + DWORD size = ((const icHeader *)iccprofile)->size; MSCMS_adjust_endianess32( (ULONG *)&size ); return size; diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 9bde1c8..fd89ba2 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -69,7 +69,7 @@ extern DWORD MSCMS_hprofile2access( HPROFILE ); extern HPROFILE MSCMS_handle2hprofile( HANDLE file ); extern HPROFILE MSCMS_cmsprofile2hprofile( cmsHPROFILE cmsprofile ); -extern HPROFILE MSCMS_iccprofile2hprofile( icProfile *iccprofile ); +extern HPROFILE MSCMS_iccprofile2hprofile( const icProfile *iccprofile ); extern HANDLE MSCMS_hprofile2handle( HPROFILE profile ); extern cmsHPROFILE MSCMS_hprofile2cmsprofile( HPROFILE profile ); extern icProfile *MSCMS_hprofile2iccprofile( HPROFILE profile ); @@ -82,12 +82,12 @@ extern cmsHTRANSFORM MSCMS_htransform2cmstransform( HTRANSFORM transform ); extern HTRANSFORM MSCMS_create_htransform_handle( cmsHTRANSFORM cmstransform ); extern void MSCMS_destroy_htransform_handle( HTRANSFORM transform ); -extern DWORD MSCMS_get_tag_count( icProfile *iccprofile ); +extern DWORD MSCMS_get_tag_count( const icProfile *iccprofile ); extern void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ); -extern void MSCMS_get_tag_data( icProfile *iccprofile, icTag *tag, DWORD offset, void *buffer ); -extern void MSCMS_set_tag_data( icProfile *iccprofile, icTag *tag, DWORD offset, void *buffer ); -extern void MSCMS_get_profile_header( icProfile *iccprofile, PROFILEHEADER *header ); -extern void MSCMS_set_profile_header( icProfile *iccprofile, PROFILEHEADER *header ); -extern DWORD MSCMS_get_profile_size( icProfile *iccprofile ); +extern void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ); +extern void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ); +extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ); +extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ); +extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ); #endif /* HAVE_LCMS */ diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0ada3e8..8c9d73c 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -471,7 +471,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi return TRUE; } -static BOOL MSCMS_header_from_file( LPWSTR file, PPROFILEHEADER header ) +static BOOL MSCMS_header_from_file( LPCWSTR file, PPROFILEHEADER header ) { BOOL ret; PROFILE profile;

1 0

Andrew Talbot : msdmo: Constify some variables.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: a7e82e68eab5794f0bd4bbc26007e9f167defd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e82e68eab5794f0bd4bbc26… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 28 18:11:33 2007 +0100 msdmo: Constify some variables. --- dlls/msdmo/dmoreg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index bba159a..74aa1b4 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -102,7 +102,7 @@ static LPWSTR GUIDToString(LPWSTR lpwstr, REFGUID lpcguid) return lpwstr; } -static BOOL IsMediaTypeEqual(DMO_PARTIAL_MEDIATYPE* mt1, DMO_PARTIAL_MEDIATYPE* mt2) +static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL_MEDIATYPE* mt2) { return (IsEqualCLSID(&mt1->type, &mt2->type) ||

1 0

Evan Stade : gdiplus: Added stub implementation of gdiplus.dll.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: bed761c9e72febb3b2d681fd4e540e149af9e71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed761c9e72febb3b2d681fd4… Author: Evan Stade <estade(a)evanstade.smo.corp.google.com> Date: Fri May 25 10:21:44 2007 -0700 gdiplus: Added stub implementation of gdiplus.dll. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/gdiplus/Makefile.in | 14 + dlls/gdiplus/gdiplus.c | 45 ++++ dlls/gdiplus/gdiplus.spec | 609 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 680 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed761c9e72febb3b2d68…

1 0

Dmitry Timoshkov : oleaut32: Add support for loading and drawing metafiles.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 8bf41d88c8be5fecb6f97700914070ed13077975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf41d88c8be5fecb6f977009… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 28 16:22:46 2007 +0900 oleaut32: Add support for loading and drawing metafiles. --- dlls/oleaut32/olepicture.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6485c7d..3eb6e3e 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -674,7 +674,16 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, break; case PICTYPE_METAFILE: + PlayMetaFile(hdc, This->desc.u.wmf.hmeta); + break; + case PICTYPE_ENHMETAFILE: + { + RECT rc = { x, y, cx, cy }; + PlayEnhMetaFile(hdc, This->desc.u.emf.hemf, &rc); + break; + } + default: FIXME("type %d not implemented\n", This->desc.picType); return E_NOTIMPL; @@ -795,6 +804,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, switch (This->desc.picType) { case PICTYPE_BITMAP: if (This->hbmMask) *pdwAttr = PICTURE_TRANSPARENT; break; /* not 'truly' scalable, see MSDN. */ case PICTYPE_ICON: *pdwAttr = PICTURE_TRANSPARENT;break; + case PICTYPE_ENHMETAFILE: /* fall through */ case PICTYPE_METAFILE: *pdwAttr = PICTURE_TRANSPARENT|PICTURE_SCALABLE;break; default:FIXME("Unknown pictype %d\n",This->desc.picType);break; } @@ -1385,6 +1395,43 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } } +static HRESULT OLEPictureImpl_LoadMetafile(OLEPictureImpl *This, + const BYTE *data, ULONG size) +{ + HMETAFILE hmf; + HENHMETAFILE hemf; + + /* SetMetaFileBitsEx performs data check on its own */ + hmf = SetMetaFileBitsEx(size, data); + if (hmf) + { + This->desc.picType = PICTYPE_METAFILE; + This->desc.u.wmf.hmeta = hmf; + This->desc.u.wmf.xExt = 0; + This->desc.u.wmf.yExt = 0; + + This->origWidth = 0; + This->origHeight = 0; + This->himetricWidth = 0; + This->himetricHeight = 0; + + return S_OK; + } + + hemf = SetEnhMetaFileBits(size, data); + if (!hemf) return E_FAIL; + + This->desc.picType = PICTYPE_ENHMETAFILE; + This->desc.u.emf.hemf = hemf; + + This->origWidth = 0; + This->origHeight = 0; + This->himetricWidth = 0; + This->himetricHeight = 0; + + return S_OK; +} + /************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * @@ -1393,7 +1440,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x * DWORD magic; * DWORD len; * - * Currently implemented: BITMAP, ICON, JPEG, GIF + * Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF */ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { HRESULT hr = E_FAIL; @@ -1544,6 +1591,11 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { default: { unsigned int i; + + /* let's see if it's a metafile */ + hr = OLEPictureImpl_LoadMetafile(This, xbuf, xread); + if (hr == S_OK) break; + FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); hr=E_FAIL; for (i=0;i<xread+8;i++) {

1 0

Dmitry Timoshkov : gdi32: Perform consistency checks when loading an EMF, add a test case.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 6aa84e0eafe4464c3901fb81a1b55afcad97db99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa84e0eafe4464c3901fb81a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 28 16:21:58 2007 +0900 gdi32: Perform consistency checks when loading an EMF, add a test case. --- dlls/gdi32/enhmetafile.c | 40 +++++++++++++++++------------------ dlls/gdi32/tests/metafile.c | 48 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index c822b28..9e7684b 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -250,9 +250,20 @@ static inline BOOL is_dib_monochrome( const BITMAPINFO* info ) HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) { HENHMETAFILE hmf = 0; - ENHMETAFILEOBJ *metaObj = GDI_AllocObject( sizeof(ENHMETAFILEOBJ), - ENHMETAFILE_MAGIC, - (HGDIOBJ *)&hmf, NULL ); + ENHMETAFILEOBJ *metaObj; + + if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE || + (emh->nBytes & 3)) /* refuse to load unaligned EMF as Windows does */ + { + WARN("Invalid emf header type 0x%08x sig 0x%08x.\n", + emh->iType, emh->dSignature); + SetLastError(ERROR_INVALID_DATA); + return 0; + } + + metaObj = GDI_AllocObject( sizeof(ENHMETAFILEOBJ), + ENHMETAFILE_MAGIC, + (HGDIOBJ *)&hmf, NULL ); if (metaObj) { metaObj->emh = emh; @@ -304,6 +315,7 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) { ENHMETAHEADER *emh; HANDLE hMapping; + HENHMETAFILE hemf; hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); @@ -311,24 +323,10 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) if (!emh) return 0; - if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE) { - WARN("Invalid emf header type 0x%08x sig 0x%08x.\n", - emh->iType, emh->dSignature); - goto err; - } - - /* refuse to load unaligned EMF as Windows does */ - if (emh->nBytes & 3) - { - WARN("Refusing to load unaligned EMF\n"); - goto err; - } - - return EMF_Create_HENHMETAFILE( emh, TRUE ); - -err: - UnmapViewOfFile( emh ); - return 0; + hemf = EMF_Create_HENHMETAFILE( emh, TRUE ); + if (!hemf) + UnmapViewOfFile( emh ); + return hemf; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a1481c3..3cc27d6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1541,7 +1541,7 @@ static void test_gdiis(void) ok(!pGdiIsMetaPrintDC(hmfDC), "ismetaprint on metafile\n"); ok(pGdiIsMetaFileDC(hmfDC), "ismetafile on metafile\n"); ok(!pGdiIsPlayMetafileDC(hmfDC), "isplaymetafile on metafile\n"); - DeleteObject(CloseMetaFile(hmfDC)); + DeleteMetaFile(CloseMetaFile(hmfDC)); /* try with an enhanced metafile */ hdc = GetDC(NULL); @@ -1554,10 +1554,53 @@ static void test_gdiis(void) hemf = CloseEnhMetaFile(hemfDC); ok(hemf != NULL, "failed to close EMF\n"); - DeleteObject(hemf); + DeleteEnhMetaFile(hemf); ReleaseDC(NULL,hdc); } +static void test_SetEnhMetaFileBits(void) +{ + BYTE data[256]; + HENHMETAFILE hemf; + ENHMETAHEADER *emh; + + memset(data, 0xAA, sizeof(data)); + SetLastError(0xdeadbeef); + hemf = SetEnhMetaFileBits(sizeof(data), data); + ok(!hemf, "SetEnhMetaFileBits should fail\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %u\n", GetLastError()); + + emh = (ENHMETAHEADER *)data; + memset(emh, 0, sizeof(*emh)); + + emh->iType = EMR_HEADER; + emh->nSize = sizeof(*emh); + emh->dSignature = ENHMETA_SIGNATURE; + /* emh->nVersion = 0x10000; XP doesn't care about version */ + emh->nBytes = sizeof(*emh); + /* emh->nRecords = 1; XP doesn't care about records */ + emh->nHandles = 1; /* XP refuses to load a EMF if nHandles == 0 */ + + SetLastError(0xdeadbeef); + hemf = SetEnhMetaFileBits(emh->nBytes, data); + ok(hemf != 0, "SetEnhMetaFileBits error %u\n", GetLastError()); + DeleteEnhMetaFile(hemf); + + /* XP refuses to load unaligned EMF */ + emh->nBytes++; + SetLastError(0xdeadbeef); + hemf = SetEnhMetaFileBits(emh->nBytes, data); + ok(!hemf, "SetEnhMetaFileBits should fail\n"); + /* XP doesn't set error in this case */ + + emh->dSignature = 0; + emh->nBytes--; + SetLastError(0xdeadbeef); + hemf = SetEnhMetaFileBits(emh->nBytes, data); + ok(!hemf, "SetEnhMetaFileBits should fail\n"); + /* XP doesn't set error in this case */ +} + START_TEST(metafile) { init_function_pointers(); @@ -1580,4 +1623,5 @@ START_TEST(metafile) test_SetWinMetaFileBits(); test_gdiis(); + test_SetEnhMetaFileBits(); }

1 0

Detlef Riekenberg : ddraw: Do not crash when Clipper is NULL.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: fb0a9291ea927db4ac4510f3e231cf7b9900369f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0a9291ea927db4ac4510f3e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 28 01:02:38 2007 +0200 ddraw: Do not crash when Clipper is NULL. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 62edb21..d3ebc84 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1981,7 +1981,7 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, if(oldClipper) IDirectDrawClipper_Release(ICOM_INTERFACE(oldClipper, IDirectDrawClipper)); - return IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper->wineD3DClipper); + return IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper ? This->clipper->wineD3DClipper : NULL); } /*****************************************************************************

1 0

Andrew Talbot : mpr: Constify some variables.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 0ad8eaa27a35d70908164696e35e091a89402ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad8eaa27a35d70908164696e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 26 23:23:10 2007 +0100 mpr: Constify some variables. --- dlls/mpr/pwcache.c | 2 +- dlls/mpr/wnet.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index bc8e25a..f8d3e32 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -50,7 +50,7 @@ static inline CHAR ctox( CHAR x ) return -1; } -static LPSTR MPR_GetValueName( LPSTR pbResource, WORD cbResource, BYTE nType ) +static LPSTR MPR_GetValueName( LPCSTR pbResource, WORD cbResource, BYTE nType ) { LPSTR name; DWORD i; diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 0abe0e8..9a6a9ef 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -449,7 +449,7 @@ static PWNetEnumerator _createContextEnumerator(DWORD dwScope, DWORD dwType, * failure. */ static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, - LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) + const DWORD *lpcCount, LPVOID lpBuffer, const DWORD *lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; LPSTR strNext; @@ -534,7 +534,7 @@ static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, * failure. */ static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn, - LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) + const DWORD *lpcCount, LPVOID lpBuffer, const DWORD *lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; LPWSTR strNext; @@ -876,7 +876,7 @@ static DWORD _countProviderBytesW(PWNetProvider provider) } static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount, - LPVOID lpBuffer, LPDWORD lpBufferSize) + LPVOID lpBuffer, const DWORD *lpBufferSize) { DWORD ret;

1 0

Andrew Talbot : mciwave: Constify a variable.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 7984532fe207c50afd175875708a91bb193bf180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7984532fe207c50afd1758757… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 26 17:55:33 2007 +0100 mciwave: Constify a variable. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 8d8fde3..d58ca0e 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -241,7 +241,7 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) /************************************************************************** * WAVE_mciReadFmt [internal] */ -static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF) +static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) { MMCKINFO mmckInfo; long r;

1 0

Rob Shearman : wininet: Pass context to InitializeSecurityContext in second parameter.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 7b94871c9f1c93f02f5265c2240ceb3ed1b0d4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b94871c9f1c93f02f5265c22… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat May 26 08:49:12 2007 +0100 wininet: Pass context to InitializeSecurityContext in second parameter. Otherwise, the call will now fail with SEC_E_INVALID_HANDLE. --- dlls/wininet/http.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4febb76..54f6410 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -426,6 +426,7 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo; LPWSTR password = lpwhr->lpHttpSession->lpszPassword; LPWSTR domain_and_username = lpwhr->lpHttpSession->lpszUserName; + BOOL first = FALSE; TRACE("%s\n", debugstr_w(pszAuthValue)); @@ -435,6 +436,7 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue { TimeStamp exp; + first = TRUE; pAuthInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*pAuthInfo)); if (!pAuthInfo) return FALSE; @@ -561,7 +563,8 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue out_desc.cBuffers = 1; out_desc.pBuffers = &out; - sec_status = InitializeSecurityContextW(&pAuthInfo->cred, NULL, NULL, + sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL, + first ? NULL : &pAuthInfo->ctx, NULL, context_req, 0, SECURITY_NETWORK_DREP, in.pvBuffer ? &in_desc : NULL, 0, &pAuthInfo->ctx, &out_desc,

1 0

Detlef Riekenberg : localui/tests: Handle different results from XP.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 0d1de51a157fae33db64772b76c47835459da416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1de51a157fae33db64772b7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 28 00:57:35 2007 +0200 localui/tests: Handle different results from XP. --- dlls/localui/tests/localui.c | 66 +++++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 7965d3c..cb7a1cf 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -137,21 +137,24 @@ static void test_AddPortUI(void) SetLastError(0xdeadbeef); res = pAddPortUI(NULL, NULL, NULL, NULL); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pAddPortUI(NULL, NULL, emptyW, NULL); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pAddPortUI(NULL, NULL, does_not_existW, NULL); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if (winetest_interactive) { SetLastError(0xdeadbeef); @@ -191,24 +194,25 @@ static void test_ConfigurePortUI(void) SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, NULL); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); - + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, emptyW); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, does_not_existW); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); - + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if (winetest_interactive && lpt_present) { SetLastError(0xdeadbeef); @@ -222,9 +226,10 @@ static void test_ConfigurePortUI(void) if (lpt_absent) { SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, lpt_absent); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); } if (winetest_interactive && com_present) { @@ -239,17 +244,20 @@ static void test_ConfigurePortUI(void) if (com_absent) { SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, com_absent); - ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), - "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + } if (winetest_interactive && file_present) { SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, portname_fileW); - ok( !res && (GetLastError() == ERROR_CANCELLED), - "got %d with %u (expected '0' with ERROR_CANCELLED)\n", - res, GetLastError()); + ok( !res && + ((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)), + "got %d with %u (expected '0' with: ERROR_CANCELLED or " + "ERROR_ACCESS_DENIED)\n", res, GetLastError()); } }

1 0