March 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : setupapi: Check for NULL module to avoid an exception in RtlImageNtHeader.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: c1b411e32180cbd0b0a8c807ca78180dc78c8e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b411e32180cbd0b0a8c807c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 11:52:51 2009 +0100 setupapi: Check for NULL module to avoid an exception in RtlImageNtHeader. This allows creating a wineprefix on 64-bit, where exception handling doesn't quite work yet. --- dlls/setupapi/fakedll.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 68166b7..e6eddf1 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -193,7 +193,7 @@ static BOOL build_fake_dll( HANDLE file, HMODULE module ) memcpy( dos + 1, fakedll_signature, sizeof(fakedll_signature) ); nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); - src_nt = RtlImageNtHeader( module ); + if (module) src_nt = RtlImageNtHeader( module ); /* some fields are copied from the source dll */ #define SET(field,def) nt->field = src_nt ? src_nt->field : def SET( FileHeader.Machine, IMAGE_FILE_MACHINE_I386 );

1 0

Michael Stefaniuc : qedit: Change long to LONG in qedit.idl.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: b14c0056dd2859f2f7a7bd3f6099d86e00c80d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14c0056dd2859f2f7a7bd3f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:42:24 2009 +0100 qedit: Change long to LONG in qedit.idl. --- dlls/qedit/mediadet.c | 22 +++++++++++----------- dlls/qedit/tests/mediadet.c | 4 ++-- include/qedit.idl | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 2cf37f9..d27a638 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -112,7 +112,7 @@ static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) return E_NOTIMPL; } -static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; IEnumPins *pins; @@ -156,7 +156,7 @@ static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) return S_OK; } -static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; TRACE("(%p)\n", This); @@ -209,16 +209,16 @@ static HRESULT SetCurPin(MediaDetImpl *This, long strm) return S_OK; } -static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) +static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; HRESULT hr; - TRACE("(%p)->(%ld)\n", This, newVal); + TRACE("(%p)->(%d)\n", This, newVal); if (This->num_streams == -1) { - long n; + LONG n; hr = MediaDet_get_OutputStreams(iface, &n); if (FAILED(hr)) return hr; @@ -461,21 +461,21 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, double StreamTime, - long *pBufferSize, char *pBuffer, - long Width, long Height) + LONG *pBufferSize, char *pBuffer, + LONG Width, LONG Height) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, - double StreamTime, long Width, - long Height, BSTR Filename) + double StreamTime, LONG Width, + LONG Height, BSTR Filename) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 711281d..d1f53a0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -94,8 +94,8 @@ static void test_mediadet(void) HRESULT hr; IMediaDet *pM = NULL; BSTR filename = NULL; - long nstrms = 0; - long strm; + LONG nstrms = 0; + LONG strm; AM_MEDIA_TYPE mt; double fps; int flags; diff --git a/include/qedit.idl b/include/qedit.idl index 48764c1..ea1e593 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -37,7 +37,7 @@ interface ISampleGrabberCB : IUnknown HRESULT BufferCB( double SampleTime, BYTE * pBuffer, - long BufferLen + LONG BufferLen ); } @@ -66,8 +66,8 @@ interface ISampleGrabber: IUnknown ); HRESULT GetCurrentBuffer( - [in,out] long * pBufferSize, - [out] long * pBuffer + [in,out] LONG * pBufferSize, + [out] LONG * pBuffer ); HRESULT GetCurrentSample( @@ -76,7 +76,7 @@ interface ISampleGrabber: IUnknown HRESULT SetCallback( ISampleGrabberCB * pCallback, - long WhichMethodToCallback + LONG WhichMethodToCallback ); }; @@ -96,15 +96,15 @@ interface IMediaDet : IUnknown ); HRESULT get_OutputStreams( - [out] long *pVal + [out] LONG *pVal ); HRESULT get_CurrentStream( - [out] long *pVal + [out] LONG *pVal ); HRESULT put_CurrentStream( - long newVal + LONG newVal ); HRESULT get_StreamType( @@ -129,16 +129,16 @@ interface IMediaDet : IUnknown HRESULT GetBitmapBits( double StreamTime, - long * pBufferSize, + LONG * pBufferSize, char * pBuffer, - long Width, - long Height + LONG Width, + LONG Height ); HRESULT WriteBitmapBits( double StreamTime, - long Width, - long Height, + LONG Width, + LONG Height, BSTR Filename );

1 0

Michael Stefaniuc : include: Change long to LONG in mshtml.idl.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 6b37e6bbedcc5b77fa97e0e26086803f989af87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b37e6bbedcc5b77fa97e0e26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:43:43 2009 +0100 include: Change long to LONG in mshtml.idl. This is the stuff not yet backed by code in mshtml. --- include/mshtml.idl | 516 ++++++++++++++++++++++++++-------------------------- 1 files changed, 258 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b37e6bbedcc5b77fa97e…

1 0

Michael Stefaniuc : mshtml: Change long to LONG in mshtml.idl (htmlwindow. c part).
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 165f691ca8eb78920c5d9a321a5274d7a1699add URL: http://source.winehq.org/git/wine.git/?a=commit;h=165f691ca8eb78920c5d9a321… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:42:55 2009 +0100 mshtml: Change long to LONG in mshtml.idl (htmlwindow.c part). --- dlls/mshtml/htmlwindow.c | 66 +++++++++++++++++++++--------------------- include/mshtml.idl | 72 +++++++++++++++++++++++----------------------- 2 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=165f691ca8eb78920c5d9…

1 0

Michael Stefaniuc : d3d9/tests: Fix some ok() strings in the fog test.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 8e64efeeec8bc9507654589db36fe35b0753950e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e64efeeec8bc9507654589db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:42:13 2009 +0100 d3d9/tests: Fix some ok() strings in the fog test. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3564de3..f767d97 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1026,21 +1026,21 @@ static void fog_test(IDirect3DDevice9 *device) } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); - ok(color == 0x0000FF00 || color == 0x0000FE00, "Reversed %s fog: z=0.1 has color 0x%08x, expected 0x0000ff00\n", mode, color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Reversed %s fog: z=0.1 has color 0x%08x, expected 0x0000ff00 or 0x0000fe00\n", mode, color); color = getPixelColor(device, 160, 120); r = (color & 0x00ff0000) >> 16; g = (color & 0x0000ff00) >> 8; b = (color & 0x000000ff); ok(r == 0x00 && g >= 0x29 && g <= 0x2d && b >= 0xd2 && b <= 0xd6, - "Reversed %s fog: z=0.7 has color 0x%08x, expected\n", mode, color); + "Reversed %s fog: z=0.7 has color 0x%08x\n", mode, color); color = getPixelColor(device, 480, 120); r = (color & 0x00ff0000) >> 16; g = (color & 0x0000ff00) >> 8; b = (color & 0x000000ff); ok(r == 0x00 && g >= 0xa8 && g <= 0xac && b >= 0x53 && b <= 0x57, - "Reversed %s fog: z=0.4 has color 0x%08x, expected\n", mode, color); + "Reversed %s fog: z=0.4 has color 0x%08x\n", mode, color); color = getPixelColor(device, 480, 360); ok(color == 0x000000ff, "Reversed %s fog: z=0.9 has color 0x%08x, expected 0x000000ff\n", mode, color);

1 0

Michael Stefaniuc : include: Change long to LONG in axextend.idl.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 7ef5f44bb5a71ae5c6dd74f8a2a8de17de97e37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef5f44bb5a71ae5c6dd74f8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:42:38 2009 +0100 include: Change long to LONG in axextend.idl. --- dlls/qcap/capture.h | 4 ++-- dlls/qcap/v4l.c | 20 ++++++++++---------- dlls/qcap/vfwcapture.c | 12 ++++++------ dlls/quartz/filtergraph.c | 4 ++-- include/axextend.idl | 14 +++++++------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 626bc05..42eed57 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -30,8 +30,8 @@ Capture *qcap_driver_init(IPin*,USHORT); HRESULT qcap_driver_destroy(Capture*); HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*); HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**); -HRESULT qcap_driver_get_prop_range(Capture*,long,long*,long*,long*,long*,long*); -HRESULT qcap_driver_get_prop(Capture*,long,long*,long*); +HRESULT qcap_driver_get_prop_range(Capture*,LONG,LONG*,LONG*,LONG*,LONG*,LONG*); +HRESULT qcap_driver_get_prop(Capture*,LONG,LONG*,LONG*); HRESULT qcap_driver_set_prop(Capture*,long,long,long); HRESULT qcap_driver_run(Capture*,FILTER_STATE*); HRESULT qcap_driver_pause(Capture*,FILTER_STATE*); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 7a131cd..0546797 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -324,10 +324,10 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) return S_OK; } -HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { - TRACE("%p -> %ld %p %p %p %p %p\n", capBox, Property, + TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property, pMin, pMax, pSteppingDelta, pDefault, pCapsFlags); switch (Property) @@ -345,7 +345,7 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, *pDefault = capBox->dcolour; break; default: - FIXME("Not implemented %ld\n", Property); + FIXME("Not implemented %d\n", Property); return E_NOTIMPL; } *pMin = 0; @@ -355,9 +355,9 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, return S_OK; } -HRESULT qcap_driver_get_prop( Capture *capBox, long Property, long *lValue, long *Flags ) +HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG *Flags ) { - TRACE("%p -> %ld %p %p\n", capBox, Property, lValue, Flags); + TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags); switch (Property) { @@ -374,7 +374,7 @@ HRESULT qcap_driver_get_prop( Capture *capBox, long Property, long *lValue, long *lValue = capBox->pict.colour; break; default: - FIXME("Not implemented %ld\n", Property); + FIXME("Not implemented %d\n", Property); return E_NOTIMPL; } *Flags = VideoProcAmp_Flags_Manual; @@ -932,13 +932,13 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) FAIL_WITH_ERR; } -HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { FAIL_WITH_ERR; } -HRESULT qcap_driver_get_prop(Capture *capBox, long Property, long *lValue, long *Flags) +HRESULT qcap_driver_get_prop(Capture *capBox, LONG Property, LONG *lValue, LONG *Flags) { FAIL_WITH_ERR; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 07fba25..d851836 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -503,8 +503,8 @@ static ULONG WINAPI AMVideoProcAmp_Release(IAMVideoProcAmp * iface) } static HRESULT WINAPI -AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); @@ -513,8 +513,8 @@ AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, long Property, long *pMin, } static HRESULT WINAPI -AMVideoProcAmp_Set( IAMVideoProcAmp * iface, long Property, long lValue, - long Flags ) +AMVideoProcAmp_Set( IAMVideoProcAmp * iface, LONG Property, LONG lValue, + LONG Flags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); @@ -522,8 +522,8 @@ AMVideoProcAmp_Set( IAMVideoProcAmp * iface, long Property, long lValue, } static HRESULT WINAPI -AMVideoProcAmp_Get( IAMVideoProcAmp * iface, long Property, long *lValue, - long *Flags ) +AMVideoProcAmp_Get( IAMVideoProcAmp * iface, LONG Property, LONG *lValue, + LONG *Flags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ab0d47e..d978f72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5155,12 +5155,12 @@ static ULONG WINAPI MediaEventSink_Release(IMediaEventSink *iface) return Filtergraph_Release(This); } -static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, long EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2) +static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); Event evt; - TRACE("(%p/%p)->(%ld, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); + TRACE("(%p/%p)->(%d, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); /* We need thread safety here, let's use the events queue's one */ EnterCriticalSection(&This->evqueue.msg_crst); diff --git a/include/axextend.idl b/include/axextend.idl index 723def7..bbbf179 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -317,7 +317,7 @@ typedef enum tagQualityMessageType typedef struct tagQuality { QualityMessageType Type; - long Proportion; + LONG Proportion; REFERENCE_TIME Late; REFERENCE_TIME TimeStamp; } Quality; @@ -486,7 +486,7 @@ pointer_default(unique) interface IMediaEventSink : IUnknown { HRESULT Notify( - [in] long EventCode, + [in] LONG EventCode, [in] LONG_PTR EventParam1, [in] LONG_PTR EventParam2 ); @@ -828,11 +828,11 @@ typedef enum tagVideoProcAmpFlags ] interface IAMVideoProcAmp : IUnknown { - HRESULT GetRange( [in] long Property, [out] long *pMin, [out] long *pMax, - [out] long *pSteppingDelta, [out] long *pDefault, - [out] long *pCapsFlags); - HRESULT Set( [in] long Property, [in] long lValue, [in] long Flags); - HRESULT Get( [in] long Property, [out] long *lValue, [out] long *Flags); + HRESULT GetRange( [in] LONG Property, [out] LONG *pMin, [out] LONG *pMax, + [out] LONG *pSteppingDelta, [out] LONG *pDefault, + [out] LONG *pCapsFlags); + HRESULT Set( [in] LONG Property, [in] LONG lValue, [in] LONG Flags); + HRESULT Get( [in] LONG Property, [out] LONG *lValue, [out] LONG *Flags); }

1 0

Christian Costa : d3dxof: Use offsets to reference data instead of pointers so data buffer can be resized .
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: df48d6f578624059dff2e6ea5919c91be7db3e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df48d6f578624059dff2e6ea5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 12 09:06:16 2009 +0100 d3dxof: Use offsets to reference data instead of pointers so data buffer can be resized. --- dlls/d3dxof/d3dxof.c | 5 +++-- dlls/d3dxof/d3dxof_private.h | 6 ++++-- dlls/d3dxof/parsing.c | 31 ++++++++++++++++--------------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6a27cd5..f46a82c 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -686,7 +686,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS } *pcbSize = This->pobj->size; - *ppvData = This->pobj->pdata; + *ppvData = This->pobj->root->pdata + This->pobj->pos_data; return DXFILE_OK; } @@ -1063,7 +1063,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE hr = DXFILEERR_BADALLOC; goto error; } - This->buf.cur_pdata = This->buf.pdata = object->pdata = pdata; + This->buf.pxo->pdata = This->buf.pdata = object->pdata = pdata; + This->buf.cur_pos_data = 0; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 67883ae..9cbd0e2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -66,7 +66,7 @@ typedef struct { typedef struct { char* name; - LPBYTE start; + ULONG start; ULONG size; } xobject_member; @@ -77,12 +77,14 @@ struct _xobject { GUID class_id; GUID type; LPBYTE pdata; + ULONG pos_data; DWORD size; ULONG nb_members; xobject_member members[MAX_MEMBERS]; ULONG nb_childs; ULONG nb_subobjects; struct _xobject * childs[MAX_CHILDS]; + struct _xobject * root; }; typedef struct _xobject xobject; @@ -130,7 +132,7 @@ typedef struct { BOOL token_present; BOOL txt; ULONG cur_subobject; - LPBYTE cur_pdata; + ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; xobject** pxo_globals; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c849e5a..85c66cb 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1009,14 +1009,14 @@ static BOOL parse_object_members_list(parse_buffer * buf) int nb_elems = 1; buf->pxo->members[i].name = pt->members[i].name; - buf->pxo->members[i].start = buf->cur_pdata; + buf->pxo->members[i].start = buf->cur_pos_data; for (k = 0; k < pt->members[i].nb_dims; k++) { if (pt->members[i].dim_fixed[k]) nb_elems *= pt->members[i].dim_value[k]; else - nb_elems *= *(DWORD*)buf->pxo->members[pt->members[i].dim_value[k]].start; + nb_elems *= *(DWORD*)(buf->pxo->root->pdata + buf->pxo->members[pt->members[i].dim_value[k]].start); } TRACE("Elements to consider: %d\n", nb_elems); @@ -1076,20 +1076,20 @@ static BOOL parse_object_members_list(parse_buffer * buf) last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) { FIXME("Buffer too small\n"); return FALSE; } if (pt->members[i].type == TOKEN_WORD) { - *(((WORD*)(buf->cur_pdata))) = (WORD)(*(DWORD*)buf->value); - buf->cur_pdata += 2; + *(((WORD*)(buf->cur_pos_data + buf->pdata))) = (WORD)(*(DWORD*)buf->value); + buf->cur_pos_data += 2; } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->cur_pdata))) = (DWORD)(*(DWORD*)buf->value); - buf->cur_pdata += 4; + *(((DWORD*)(buf->cur_pos_data + buf->pdata))) = (DWORD)(*(DWORD*)buf->value); + buf->cur_pos_data += 4; } else { @@ -1102,15 +1102,15 @@ static BOOL parse_object_members_list(parse_buffer * buf) get_TOKEN(buf); TRACE("%s = %f\n", pt->members[i].name, *(float*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) { FIXME("Buffer too small\n"); return FALSE; } if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->cur_pdata))) = (float)(*(float*)buf->value); - buf->cur_pdata += 4; + *(((float*)(buf->cur_pos_data + buf->pdata))) = (float)(*(float*)buf->value); + buf->cur_pos_data += 4; } else { @@ -1123,7 +1123,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) { FIXME("Buffer too small\n"); return FALSE; @@ -1137,9 +1137,9 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; } strcpy((char*)buf->cur_pstrings, (char*)buf->value); - *(((LPCSTR*)(buf->cur_pdata))) = (char*)buf->cur_pstrings; + *(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; buf->cur_pstrings += len; - buf->cur_pdata += 4; + buf->cur_pos_data += 4; } else { @@ -1173,7 +1173,7 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) if (allow_optional) { - buf->pxo->size = buf->cur_pdata - buf->pxo->pdata; + buf->pxo->size = buf->cur_pos_data - buf->pxo->pos_data; /* Skip trailing semicolon */ while (check_TOKEN(buf) == TOKEN_SEMICOLON) @@ -1242,8 +1242,9 @@ BOOL parse_object(parse_buffer * buf) { int i; - buf->pxo->pdata = buf->cur_pdata; + buf->pxo->pos_data = buf->cur_pos_data; buf->pxo->ptarget = NULL; + buf->pxo->root = buf->pxo_tab; if (get_TOKEN(buf) != TOKEN_NAME) return FALSE;

1 0

Michael Stefaniuc : d3d9/tests: Limit the back buffer to 800x600 in the scissor size test.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: a242d601ccd74a281d801e5121c3f2d3058de7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a242d601ccd74a281d801e512… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:42:05 2009 +0100 d3d9/tests: Limit the back buffer to 800x600 in the scissor size test. --- dlls/d3d9/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4b09316..a0597f5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2111,8 +2111,8 @@ static void test_scissor_size(void) ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ - present_parameters.BackBufferWidth = 1024; - present_parameters.BackBufferHeight = 768; + present_parameters.BackBufferWidth = 800; + present_parameters.BackBufferHeight = 600; hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); @@ -2120,7 +2120,7 @@ static void test_scissor_size(void) hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); - ok(scissorrect.right == 1024 && scissorrect.bottom == 768 && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, 1024, 768); + ok(scissorrect.right == 800 && scissorrect.bottom == 600 && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, 800, 600); if(device_ptr) { ULONG ref;

1 0

Paul Vriens : ddraw/tests: Fix some test failures on W2K/VMware.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: d5e9c3cf9249ae5e4bd27cb6df7384548a028adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e9c3cf9249ae5e4bd27cb6d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 08:17:33 2009 +0100 ddraw/tests: Fix some test failures on W2K/VMware. --- dlls/ddraw/tests/visual.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 9234e59..fa96e5a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2608,6 +2608,14 @@ static void cubemap_test(IDirect3DDevice7 *device) if(SUCCEEDED(hr)) { hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 0 * 6, 4, 0); + if (hr == E_NOTIMPL) + { + /* VMware */ + win_skip("IDirect3DDevice7_DrawPrimitive is not completely implemented, colors won't be tested\n"); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "IDirect3DDevice7_EndScene returned %08x\n", hr); + goto out; + } ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 4 * 6, 4, 0); ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); @@ -2630,6 +2638,8 @@ static void cubemap_test(IDirect3DDevice7 *device) ok(color == 0x00ff00ff, "DDSCAPS2_CUBEMAP_POSITIVEY has color 0x%08x, expected 0x00ff00ff\n", color); color = getPixelColor(device, 480, 120); /* upper right quad - positivez */ ok(color == 0x000000ff, "DDSCAPS2_CUBEMAP_POSITIVEZ has color 0x%08x, expected 0x000000ff\n", color); + +out: hr = IDirect3DDevice7_SetTexture(device, 0, NULL); ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); IDirectDrawSurface7_Release(cubemap);

1 0

Paul Vriens : crypt32/tests: Fix a test failure on Win9x.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: fd77bc5f105dcc528e403683bbe9d3a11b9a2d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd77bc5f105dcc528e403683b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 09:18:21 2009 +0100 crypt32/tests: Fix a test failure on Win9x. --- dlls/crypt32/tests/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 5f74aee..1236153 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2977,12 +2977,14 @@ static void test_msg_control(void) "expected NTE_BAD_SIGNATURE or OSS_DATA_ERROR, got %08x\n", GetLastError()); /* Now that the signature's been checked, can't do the final update */ + SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(!ret && + ok((!ret && (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == NTE_BAD_ALGID || /* Win9x */ - GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ + GetLastError() == CRYPT_E_MSG_ERROR)) || /* Vista */ + broken(ret), /* Win9x */ "expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, " "got %08x\n", GetLastError()); CryptMsgClose(msg);

1 0