April 2013 - Wine-Commits - list.winehq.org

André Hentschel : winegcc: Add support for Multiarch Architecture Specifiers.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: c11da76dc588cfdcb2328c92dce5188304935ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11da76dc588cfdcb2328c92d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 21 16:59:47 2013 +0200 winegcc: Add support for Multiarch Architecture Specifiers. --- tools/winegcc/winegcc.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1469b8a..4b0d3e8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -361,7 +361,7 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; @@ -380,6 +380,18 @@ static char *get_lib_dir( struct options *opts ) strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } + switch(opts->target_cpu) + { + case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; + case CPU_x86_64: strcpy( p, "/x86_64-linux-gnu" ); break; + case CPU_ARM: strcpy( p, "/arm-linux-gnueabi" ); break; + case CPU_ARM64: strcpy( p, "/aarch64-linux-gnu" ); break; + case CPU_POWERPC: strcpy( p, "/powerpc-linux-gnu" ); break; + default: + assert(0); + } + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; free( buffer ); continue;

1 0

Jacek Caban : jscript: Run some SunSpider benchmarks in interactive mode.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 6d8359fcc5760d8131632a702f8bad432618e6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8359fcc5760d8131632a702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 15:03:35 2013 +0200 jscript: Run some SunSpider benchmarks in interactive mode. --- dlls/jscript/tests/rsrc.rc | 9 + dlls/jscript/tests/run.c | 71 +- dlls/jscript/tests/sunspider-regexp-dna.js | 1712 ++++++++++++++++++++ dlls/jscript/tests/sunspider-string-base64.js | 135 ++ .../tests/sunspider-string-validate-input.js | 89 + 5 files changed, 2014 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d8359fcc5760d8131632…

1 0

Stefan Leichter : msvcr80: Add some 64-bit only exports.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 47c6310e464ed82d66ec586ef883f28d479e34d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c6310e464ed82d66ec586ef… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 21 23:02:38 2013 +0200 msvcr80: Add some 64-bit only exports. --- dlls/msvcr80/msvcr80.spec | 50 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 006204a..860383a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -151,14 +151,20 @@ @ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame +@ stub -arch=win64 _GetImageBase +@ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths @ cdecl _Gettnames() msvcrt._Gettnames @ extern _HUGE msvcrt._HUGE @ stub _IsExceptionObjectToBeDestroyed -@ stub _NLG_Dispatch2 -@ stub _NLG_Return -@ stub _NLG_Return2 +@ stub -arch=i386 _NLG_Dispatch2 +@ stub -arch=arm,win64 __NLG_Dispatch2 +@ stub -arch=i386 _NLG_Return +@ stub -arch=i386 _NLG_Return2 +@ stub -arch=arm,win64 __NLG_Return2 +@ stub -arch=win64 _SetImageBase +@ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcrt._Strftime @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ stub __AdjustPointer @@ -210,8 +216,10 @@ @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias -@ stub ___fls_getvalue(a)4 -@ stub ___fls_setvalue(a)8 +@ stub -arch=i386 ___fls_getvalue(a)4 +@ stub -arch=x86_64 __fls_getvalue +@ stub -arch=i386 ___fls_setvalue(a)8 +@ stub -arch=x86_64 __fls_setvalue @ cdecl __fpecode() msvcrt.__fpecode @ stub __free_locale @ stub __get_app_type @@ -372,6 +380,7 @@ @ cdecl _chdir(str) msvcrt._chdir @ cdecl _chdrive(long) msvcrt._chdrive @ cdecl _chgsign(double) msvcrt._chgsign +@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcrt._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize @@ -385,6 +394,7 @@ @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign(double double) msvcrt._copysign +@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcrt._copysignf @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l @ stub _cprintf_p @@ -395,7 +405,8 @@ @ cdecl _cputws(wstr) msvcrt._cputws @ cdecl _creat(str long) msvcrt._creat @ cdecl _create_locale(long str) msvcrt._create_locale -@ stub _crt_debugger_hook +@ stub -arch=i386 _crt_debugger_hook +@ stub -arch=arm,win64 __crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l @ varargs _cscanf_s(str) msvcrt._cscanf_s @@ -469,10 +480,12 @@ @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite(double) msvcrt._finite +@ cdecl -arch=arm,x86_64 _finitef(float) msvcrt._finitef @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall @ extern _fmode msvcrt._fmode @ cdecl _fpclass(double) msvcrt._fpclass +# stub -arch=x86_64 _fpclassf @ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt @ cdecl _fpreset() msvcrt._fpreset @ stub _fprintf_l @@ -662,6 +675,7 @@ @ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail @ stub _ismbstrail_l @ cdecl _isnan(double) msvcrt._isnan +@ cdecl -arch=arm,x86_64 _isnanf(float) msvcrt._isnanf @ cdecl _isprint_l(long ptr) msvcrt._isprint_l @ stub _ispunct_l @ cdecl _isspace_l(long ptr) msvcrt._isspace_l @@ -703,6 +717,7 @@ @ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb(double) msvcrt._logb +@ cdecl -arch=arm,x86_64 _logbf(float) msvcrt._logbf @ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex @ cdecl _lrotl(long long) msvcrt._lrotl @ cdecl _lrotr(long long) msvcrt._lrotr @@ -865,6 +880,7 @@ @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize @ cdecl _nextafter(double double) msvcrt._nextafter +@ cdecl -arch=arm,x86_64 _nextafterf(float float) msvcrt._nextafterf @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle @@ -908,6 +924,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb(double long) msvcrt._scalb +@ cdecl -arch=arm,x86_64 _scalbf(float long) msvcrt._scalbf @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l @ varargs _scprintf(str) msvcrt._scprintf @@ -939,6 +956,7 @@ @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 +@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) msvcrt._setjmpex @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp @ cdecl _setmode(long long) msvcrt._setmode @@ -1281,11 +1299,15 @@ @ cdecl abort() msvcrt.abort @ cdecl abs(long) msvcrt.abs @ cdecl acos(double) msvcrt.acos +@ cdecl -arch=arm,x86_64 acosf(float) msvcrt.acosf @ cdecl asctime(ptr) msvcrt.asctime @ cdecl asctime_s(ptr long ptr) msvcrt.asctime_s @ cdecl asin(double) msvcrt.asin +@ cdecl -arch=arm,x86_64 asinf(float) msvcrt.asinf @ cdecl atan(double) msvcrt.atan +@ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atan2(double double) msvcrt.atan2 +@ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof @ cdecl atoi(str) msvcrt.atoi @@ -1295,14 +1317,18 @@ @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil +@ cdecl -arch=arm,x86_64 ceilf(float) msvcrt.ceilf @ cdecl clearerr(ptr) msvcrt.clearerr @ stub clearerr_s @ cdecl clock() msvcrt.clock @ cdecl cos(double) msvcrt.cos +@ cdecl -arch=arm,x86_64 cosf(float) msvcrt.cosf @ cdecl cosh(double) msvcrt.cosh +@ cdecl -arch=arm,x86_64 coshf(float) msvcrt.coshf @ cdecl -ret64 div(long long) msvcrt.div @ cdecl exit(long) msvcrt.exit @ cdecl exp(double) msvcrt.exp +@ cdecl -arch=arm,x86_64 expf(float) msvcrt.expf @ cdecl fabs(double) msvcrt.fabs @ cdecl fclose(ptr) msvcrt.fclose @ cdecl feof(ptr) msvcrt.feof @@ -1314,7 +1340,9 @@ @ cdecl fgetwc(ptr) msvcrt.fgetwc @ cdecl fgetws(ptr long ptr) msvcrt.fgetws @ cdecl floor(double) msvcrt.floor +@ cdecl -arch=arm,x86_64 floorf(float) msvcrt.floorf @ cdecl fmod(double double) msvcrt.fmod +@ cdecl -arch=arm,x86_64 fmodf(float float) msvcrt.fmodf @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @@ -1378,7 +1406,9 @@ @ cdecl ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv @ cdecl log(double) msvcrt.log +@ cdecl -arch=arm,x86_64 logf(float) msvcrt.logf @ cdecl log10(double) msvcrt.log10 +@ cdecl -arch=arm,x86_64 log10f(float) msvcrt.log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen @@ -1397,8 +1427,10 @@ @ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s @ cdecl memset(ptr long long) msvcrt.memset @ cdecl modf(double ptr) msvcrt.modf +@ cdecl -arch=arm,x86_64 modff(float ptr) msvcrt.modff @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow +@ cdecl -arch=arm,x86_64 powf(float float) msvcrt.powf @ varargs printf(str) msvcrt.printf @ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @@ -1418,14 +1450,18 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal @ cdecl sin(double) msvcrt.sin +@ cdecl -arch=arm,x86_64 sinf(float) msvcrt.sinf @ cdecl sinh(double) msvcrt.sinh +@ cdecl -arch=arm,x86_64 sinhf(float) msvcrt.sinhf @ varargs sprintf(ptr str) msvcrt.sprintf @ varargs sprintf_s(ptr long str) msvcrt.sprintf_s @ cdecl sqrt(double) msvcrt.sqrt +@ cdecl -arch=arm,x86_64 sqrtf(float) msvcrt.sqrtf @ cdecl srand(long) msvcrt.srand @ varargs sscanf(str str) msvcrt.sscanf @ varargs sscanf_s(str str) msvcrt.sscanf_s @@ -1462,7 +1498,9 @@ @ varargs swscanf_s(wstr wstr) msvcrt.swscanf_s @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan +@ cdecl -arch=arm,x86_64 tanf(float) msvcrt.tanf @ cdecl tanh(double) msvcrt.tanh +@ cdecl -arch=arm,x86_64 tanhf(float) msvcrt.tanhf @ cdecl tmpfile() msvcrt.tmpfile @ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER3.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 68c4f61dc5d9a6abb8471ed748821e40323ecb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c4f61dc5d9a6abb8471ed74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:34 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER3. --- dlls/d3drm/d3drm.c | 9 +++------ dlls/d3drm/meshbuilder.c | 9 +++------ dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3e9e777..ff7ea71 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -929,14 +929,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3 *iface, IDirect3D return Direct3DRMMesh_create(mesh); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, - LPDIRECT3DRMMESHBUILDER3* ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4678593..40e23de 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1750,13 +1750,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMMESHBUILDER3 MeshBuilder, - DWORD flags) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface, + IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p,%u): stub\n", This, MeshBuilder, flags); + FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1317777..be85098 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -528,7 +528,7 @@ static void test_MeshBuilder3(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRM3 *d3drm3; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + IDirect3DRMMeshBuilder3 *pMeshBuilder3; D3DRMLOADMEMORY info; int val; DWORD val1; diff --git a/include/d3drm.h b/include/d3drm.h index d4d21eb..f1e5c4e 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5179002..71244a1 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2861,7 +2861,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS_ D3DVALUE crease, DWORD flags) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3, DWORD flags) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER2.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 5c442f8dc84da57af02ee9954ee3495c35df8f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c442f8dc84da57af02ee9954… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:33 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER2. --- dlls/d3drm/d3drm.c | 9 +++------ include/d3drm.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index eba40c8..3e9e777 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -533,14 +533,11 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2 *iface, IDirect3D return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, - LPDIRECT3DRMMESHBUILDER2 * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, IDirect3DRMMeshBuilder2 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/include/d3drm.h b/include/d3drm.h index 1f62756..d4d21eb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER2 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: ec1c18b65cb5ee721f28f3dbae6b2df7820759fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1c18b65cb5ee721f28f3dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:32 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER. --- dlls/d3drm/d3drm.c | 8 +++----- dlls/d3drm/meshbuilder.c | 8 +++----- dlls/d3drm/tests/d3drm.c | 10 +++++----- include/d3drm.h | 2 +- include/d3drmobj.h | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4402cec..eba40c8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDirect3DRMMeshBuilder **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c0e2f86..4678593 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESHBUILDER pMeshBuilder) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMMeshBuilder *mesh_builder) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pMeshBuilder); + FIXME("iface %p, mesh_builder %p stub!\n", iface, mesh_builder); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7c52738..1317777 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -226,7 +226,7 @@ static void test_MeshBuilder(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *pMeshBuilder; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -675,7 +675,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; LPDIRECT3DRMFRAMEARRAY pArray; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual_tmp; LPDIRECT3DRMVISUALARRAY pVisualArray; @@ -907,9 +907,9 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); /* Create Visual */ - hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); - visual1 = (IDirect3DRMVisual *)pMeshBuilder; + visual1 = (IDirect3DRMVisual *)mesh_builder; /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); @@ -935,7 +935,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 3); - IDirect3DRMMeshBuilder_Release(pMeshBuilder); + IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); diff --git a/include/d3drm.h b/include/d3drm.h index f57a854..1f62756 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 70fb2e9..5179002 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, @@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_STR-> DBTYPE_WSTR.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 9d4284cc0dce54074814619a6b8c057a5b17e0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4284cc0dce54074814619a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 23 13:46:10 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_STR->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 6 ++++++ dlls/oledb32/tests/convert.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 8525c6c..f2c4c29 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1108,6 +1108,12 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { switch (src_type) { + case DBTYPE_STR: + if(src_len) + *dst_len = (*src_len + 1) * sizeof(WCHAR); + else + *dst_len = (strlen(src) + 1) * sizeof(WCHAR); + break; case DBTYPE_WSTR: if(src_len) *dst_len = (*src_len) + sizeof(WCHAR); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index d1f6c4e..51dc0f6 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2484,6 +2484,7 @@ static void test_getconversionsize(void) HRESULT hr; BSTR str; static WCHAR strW[] = {'t','e','s','t',0}; + static char strTest[] = "test"; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2530,6 +2531,23 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 22, "%ld\n", dst_len); + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, NULL, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10 || broken(dst_len == 12), "%ld\n", dst_len); + + dst_len = 0; + src_len = 2; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 6, "%ld\n", dst_len); + + dst_len = 0; + src_len = 20; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 42, "%ld\n", dst_len); + IDataConvert_Release(convert); }

1 0

Jacek Caban : wrc: Allow '/' and '\' in identifiers.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 0da8be91ef67284de63b90001d62adf7776d27bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da8be91ef67284de63b90001… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 14:13:58 2013 +0200 wrc: Allow '/' and '\' in identifiers. --- tools/wrc/parser.l | 10 +--------- tools/wrc/parser.y | 5 ++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index cf16ccc..8c50a8a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -404,14 +404,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } - /* - * The next two rules scan identifiers and filenames. - * This is achieved by using the priority ruling - * of the scanner where a '.' is valid in a filename - * and *only* in a filename. In this case, the second - * rule will be reduced because it is longer. - */ -[A-Za-z_0-9.]+ { +[A-Za-z_0-9./\\]+ { struct keyword *tok = iskeyword(yytext); if(tok) @@ -430,7 +423,6 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) return tIDENT; } } -[A-Za-z_0-9./\\]+ parser_lval.str = make_string(yytext); return tFILENAME; /* * Wide string scanning diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 4cc37ac..ad5fb98 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -268,7 +268,7 @@ static int rsrcid_to_token(int lookahead); %token tNL %token <num> tNUMBER tLNUMBER -%token <str> tSTRING tIDENT tFILENAME +%token <str> tSTRING tIDENT %token <raw> tRAWDATA %token tACCELERATORS tBITMAP tCURSOR tDIALOG tDIALOGEX tMENU tMENUEX tMESSAGETABLE %token tRCDATA tVERSIONINFO tSTRINGTABLE tFONT tFONTDIR tICON tHTML @@ -647,8 +647,7 @@ resource_definition ; -filename: tFILENAME { $$ = make_filename($1); } - | tIDENT { $$ = make_filename($1); } +filename: tIDENT { $$ = make_filename($1); } | tSTRING { $$ = make_filename($1); } ;

1 0

Henri Verbeet : wined3d: Disable occlusion query support if the implementation has 0 counter bits.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 6fe9e0f033ae072fe5fd6e2b6a09ad9a0bb21783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe9e0f033ae072fe5fd6e2b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:31 2013 +0200 wined3d: Disable occlusion query support if the implementation has 0 counter bits. --- dlls/wined3d/directx.c | 9 +++++++++ dlls/wined3d/wined3d_gl.h | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68016e0..392c7eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,6 +2809,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) * we never render to sRGB surfaces). */ gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; } + if (gl_info->supported[ARB_OCCLUSION_QUERY]) + { + GLint counter_bits; + + GL_EXTCALL(glGetQueryivARB(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB, &counter_bits)); + TRACE("Occlusion query counter has %d bits.\n", counter_bits); + if (!counter_bits) + gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f68fdc7..9c4af05 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -251,8 +251,10 @@ enum wined3d_gl_extension USE_GL_FUNC(glDeleteQueriesARB) \ USE_GL_FUNC(glEndQueryARB) \ USE_GL_FUNC(glGenQueriesARB) \ + USE_GL_FUNC(glGetQueryivARB) \ USE_GL_FUNC(glGetQueryObjectivARB) \ USE_GL_FUNC(glGetQueryObjectuivARB) \ + USE_GL_FUNC(glIsQueryARB) \ /* GL_ARB_point_parameters */ \ USE_GL_FUNC(glPointParameterfARB) \ USE_GL_FUNC(glPointParameterfvARB) \

1 0

Alexandre Julliard : gdi32: Replace some macros by inline functions in the region code.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: a34c6f436d4bd271dfa88d7740226b1fc7d3c6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34c6f436d4bd271dfa88d774… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 21:40:05 2013 +0200 gdi32: Replace some macros by inline functions in the region code. --- dlls/gdi32/region.c | 189 ++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 98 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index caa4ff6..12f106b 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -118,15 +118,12 @@ static const struct gdi_obj_funcs region_funcs = REGION_DeleteObject /* pDeleteObject */ }; -/* 1 if two RECTs overlap. - * 0 if two RECTs do not overlap. - */ -#define EXTENTCHECK(r1, r2) \ - ((r1)->right > (r2)->left && \ - (r1)->left < (r2)->right && \ - (r1)->bottom > (r2)->top && \ - (r1)->top < (r2)->bottom) - +/* Check if two RECTs overlap. */ +static inline BOOL overlapping( const RECT *r1, const RECT *r2 ) +{ + return (r1->right > r2->left && r1->left < r2->right && + r1->bottom > r2->top && r1->top < r2->bottom); +} static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom ) { @@ -146,18 +143,16 @@ static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom return TRUE; } -#define EMPTY_REGION(pReg) do { \ - (pReg)->numRects = 0; \ - (pReg)->extents.left = (pReg)->extents.top = 0; \ - (pReg)->extents.right = (pReg)->extents.bottom = 0; \ - } while(0) - -#define INRECT(r, x, y) \ - ( ( ((r).right > x)) && \ - ( ((r).left <= x)) && \ - ( ((r).bottom > y)) && \ - ( ((r).top <= y)) ) +static inline void empty_region( WINEREGION *reg ) +{ + reg->numRects = 0; + reg->extents.left = reg->extents.top = reg->extents.right = reg->extents.bottom = 0; +} +static inline BOOL is_in_rect( const RECT *rect, int x, int y ) +{ + return (rect->right > x && rect->left <= x && rect->bottom > y && rect->top <= y); +} /* * number of points to buffer before sending them off @@ -194,6 +189,22 @@ typedef struct _POINTBLOCK { /* + * This structure contains all of the information needed + * to run the bresenham algorithm. + * The variables may be hardcoded into the declarations + * instead of using this structure to make use of + * register declarations. + */ +struct bres_info +{ + INT minor_axis; /* minor axis */ + INT d; /* decision variable */ + INT m, m1; /* slope and slope+1 */ + INT incr1, incr2; /* error increments */ +}; + + +/* * In scan converting polygons, we want to choose those pixels * which are inside the polygon. Thus, we add .5 to the starting * x coordinate for both left and right edges. Now we choose the @@ -212,76 +223,58 @@ typedef struct _POINTBLOCK { * If it is moving to the left, then we don't want it to flip until * we traverse an entire pixel. */ -#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \ - int dx; /* local storage */ \ -\ - /* \ - * if the edge is horizontal, then it is ignored \ - * and assumed not to be processed. Otherwise, do this stuff. \ - */ \ - if ((dy) != 0) { \ - xStart = (x1); \ - dx = (x2) - xStart; \ - if (dx < 0) { \ - m = dx / (dy); \ - m1 = m - 1; \ - incr1 = -2 * dx + 2 * (dy) * m1; \ - incr2 = -2 * dx + 2 * (dy) * m; \ - d = 2 * m * (dy) - 2 * dx - 2 * (dy); \ - } else { \ - m = dx / (dy); \ - m1 = m + 1; \ - incr1 = 2 * dx - 2 * (dy) * m1; \ - incr2 = 2 * dx - 2 * (dy) * m; \ - d = -2 * m * (dy) + 2 * dx; \ - } \ - } \ -} - -#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \ - if (m1 > 0) { \ - if (d > 0) { \ - minval += m1; \ - d += incr1; \ - } \ - else { \ - minval += m; \ - d += incr2; \ - } \ - } else {\ - if (d >= 0) { \ - minval += m1; \ - d += incr1; \ - } \ - else { \ - minval += m; \ - d += incr2; \ - } \ - } \ -} - -/* - * This structure contains all of the information needed - * to run the bresenham algorithm. - * The variables may be hardcoded into the declarations - * instead of using this structure to make use of - * register declarations. - */ -typedef struct { - INT minor_axis; /* minor axis */ - INT d; /* decision variable */ - INT m, m1; /* slope and slope+1 */ - INT incr1, incr2; /* error increments */ -} BRESINFO; - +static inline void bres_init_polygon( int dy, int x1, int x2, struct bres_info *bres ) +{ + int dx; -#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \ - BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ - bres.m, bres.m1, bres.incr1, bres.incr2) + /* + * if the edge is horizontal, then it is ignored + * and assumed not to be processed. Otherwise, do this stuff. + */ + if (!dy) return; -#define BRESINCRPGONSTRUCT(bres) \ - BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2) + bres->minor_axis = x1; + dx = x2 - x1; + if (dx < 0) + { + bres->m = dx / dy; + bres->m1 = bres->m - 1; + bres->incr1 = -2 * dx + 2 * dy * bres->m1; + bres->incr2 = -2 * dx + 2 * dy * bres->m; + bres->d = 2 * bres->m * dy - 2 * dx - 2 * dy; + } + else + { + bres->m = dx / (dy); + bres->m1 = bres->m + 1; + bres->incr1 = 2 * dx - 2 * dy * bres->m1; + bres->incr2 = 2 * dx - 2 * dy * bres->m; + bres->d = -2 * bres->m * dy + 2 * dx; + } +} +static inline void bres_incr_polygon( struct bres_info *bres ) +{ + if (bres->m1 > 0) { + if (bres->d > 0) { + bres->minor_axis += bres->m1; + bres->d += bres->incr1; + } + else { + bres->minor_axis += bres->m; + bres->d += bres->incr2; + } + } else { + if (bres->d >= 0) { + bres->minor_axis += bres->m1; + bres->d += bres->incr1; + } + else { + bres->minor_axis += bres->m; + bres->d += bres->incr2; + } + } +} /* @@ -338,7 +331,7 @@ typedef struct { typedef struct _EdgeTableEntry { INT ymax; /* ycoord at which we exit this edge. */ - BRESINFO bres; /* Bresenham info to run the edge */ + struct bres_info bres; /* Bresenham info to run the edge */ struct _EdgeTableEntry *next; /* next in the list */ struct _EdgeTableEntry *back; /* for insertion sort */ struct _EdgeTableEntry *nextWETE; /* for winding num rule */ @@ -395,7 +388,7 @@ typedef struct _ScanLineListBlock { pAET->back = pPrevAET; \ } \ else { \ - BRESINCRPGONSTRUCT(pAET->bres); \ + bres_incr_polygon(&pAET->bres); \ pPrevAET = pAET; \ pAET = pAET->next; \ } \ @@ -417,7 +410,7 @@ typedef struct _ScanLineListBlock { pAET->back = pPrevAET; \ } \ else { \ - BRESINCRPGONSTRUCT(pAET->bres); \ + bres_incr_polygon(&pAET->bres); \ pPrevAET = pAET; \ pAET = pAET->next; \ } \ @@ -477,7 +470,7 @@ static BOOL init_region( WINEREGION *pReg, INT n ) { if (!(pReg->rects = HeapAlloc(GetProcessHeap(), 0, n * sizeof( RECT )))) return FALSE; pReg->size = n; - EMPTY_REGION(pReg); + empty_region(pReg); return TRUE; } @@ -713,7 +706,7 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top, obj->numRects = 1; } else - EMPTY_REGION(obj); + empty_region(obj); GDI_ReleaseObj( hrgn ); return TRUE; @@ -1080,9 +1073,9 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) { int i; - if (obj->numRects > 0 && INRECT(obj->extents, x, y)) + if (obj->numRects > 0 && is_in_rect(&obj->extents, x, y)) for (i = 0; i < obj->numRects; i++) - if (INRECT (obj->rects[i], x, y)) + if (is_in_rect(&obj->rects[i], x, y)) { ret = TRUE; break; @@ -1122,7 +1115,7 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) RECT *pCurRect, *pRectEnd; /* this is (just) a useful optimization */ - if ((obj->numRects > 0) && EXTENTCHECK(&obj->extents, &rc)) + if ((obj->numRects > 0) && overlapping(&obj->extents, &rc)) { for (pCurRect = obj->rects, pRectEnd = pCurRect + obj->numRects; pCurRect < pRectEnd; pCurRect++) @@ -1973,7 +1966,7 @@ static BOOL REGION_IntersectRegion(WINEREGION *newReg, WINEREGION *reg1, { /* check for trivial reject */ if ( (!(reg1->numRects)) || (!(reg2->numRects)) || - (!EXTENTCHECK(&reg1->extents, &reg2->extents))) + (!overlapping(&reg1->extents, &reg2->extents))) newReg->numRects = 0; else if (!REGION_RegionOp (newReg, reg1, reg2, REGION_IntersectO, NULL, NULL)) return FALSE; @@ -2296,7 +2289,7 @@ static BOOL REGION_SubtractRegion(WINEREGION *regD, WINEREGION *regM, WINEREGION { /* check for trivial reject */ if ( (!(regM->numRects)) || (!(regS->numRects)) || - (!EXTENTCHECK(&regM->extents, &regS->extents)) ) + (!overlapping(&regM->extents, &regS->extents)) ) return REGION_CopyRegion(regD, regM); if (!REGION_RegionOp (regD, regM, regS, REGION_SubtractO, REGION_SubtractNonO1, NULL)) @@ -2510,7 +2503,7 @@ static void REGION_CreateETandAET(const INT *Count, INT nbpolygons, * initialize integer edge algorithm */ dy = bottom->y - top->y; - BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres); + bres_init_polygon(dy, top->x, bottom->x, &pETEs->bres); REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock);

1 0