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

Tag wine-0.9.58 : Alexandre Julliard : Release 0.9.58
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: refs/tags/wine-0.9.58 Tag: a513195c1de134d5bc732927f40a7b208cc36718 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a513195c1de134d5bc732927f40a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 16:41:33 2008 +0100 Release 0.9.58

1 0

Herve Chanal : notepad: Add a nicer icon.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 46b121c77eb09ef912f7c505e859fbd204d7b122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b121c77eb09ef912f7c505e… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Fri Mar 21 16:04:59 2008 +0100 notepad: Add a nicer icon. --- programs/notepad/Makefile.in | 2 + programs/notepad/notepad.ico | Bin 2238 -> 15086 bytes programs/notepad/notepad.svg | 421 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 423 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46b121c77eb09ef912f7c…

1 0

Roderick Colenbrander : ddraw: Use a correct resource type and a valid format.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 41310080a593e14b08d04dfb13adc5a46e84a1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=41310080a593e14b08d04dfb1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 14:53:54 2008 +0100 ddraw: Use a correct resource type and a valid format. --- dlls/ddraw/direct3d.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index a89dcb4..00c9d68 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1131,6 +1131,7 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface); HRESULT hr; int i; + WINED3DDISPLAYMODE d3ddm; /* Order matters. Specifically, BattleZone II (full version) expects the * 16-bit depth formats to be listed before the 24 and 32 ones. */ @@ -1145,6 +1146,11 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, TRACE("(%p)->(%s,%p,%p): Relay\n", iface, debugstr_guid(refiidDevice), Callback, Context); + if(IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &d3ddm ) != WINED3D_OK) { + ERR("Unable to retrieve a default display mode for quering the z-buffer formats!\n"); + return DDERR_INVALIDPARAMS; + } + if(!Callback) return DDERR_INVALIDPARAMS; @@ -1154,9 +1160,9 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, hr = IWineD3D_CheckDeviceFormat(This->wineD3D, 0 /* Adapter */, 0 /* DeviceType */, - 0 /* AdapterFormat */, + d3ddm.Format /* AdapterFormat */, WINED3DUSAGE_DEPTHSTENCIL /* Usage */, - 0 /* ResourceType */, + WINED3DRTYPE_SURFACE /* ResourceType */, FormatList[i]); if(hr == D3D_OK) {

1 0

Roderick Colenbrander : wined3d: Check pixel formats of the same pixel type .
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 51a8162330fb299b619f1029babf01241857906e URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a8162330fb299b619f1029b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 14:52:15 2008 +0100 wined3d: Check pixel formats of the same pixel type. --- dlls/wined3d/directx.c | 48 +++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd861a6..2cc7b03 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1614,24 +1614,44 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const WineD3D_Pixe if(!cfg) return FALSE; - if(!getColorBits(Format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) { - ERR("Unable to check compatibility for Format=%s\n", debug_d3dformat(Format)); - return FALSE; - } + if(cfg->iPixelType == WGL_TYPE_RGBA_ARB) { /* Integer RGBA formats */ + if(!getColorBits(Format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) { + ERR("Unable to check compatibility for Format=%s\n", debug_d3dformat(Format)); + return FALSE; + } - if(cfg->redSize < redSize) - return FALSE; + if(cfg->redSize < redSize) + return FALSE; - if(cfg->greenSize < greenSize) - return FALSE; + if(cfg->greenSize < greenSize) + return FALSE; - if(cfg->blueSize < blueSize) - return FALSE; + if(cfg->blueSize < blueSize) + return FALSE; - if(cfg->alphaSize < alphaSize) + if(cfg->alphaSize < alphaSize) + return FALSE; + + return TRUE; + } else if(cfg->iPixelType == WGL_TYPE_RGBA_FLOAT_ARB) { /* Float RGBA formats; TODO: WGL_NV_float_buffer */ + if(Format == WINED3DFMT_R16F) + return (cfg->redSize == 16 && cfg->greenSize == 0 && cfg->blueSize == 0 && cfg->alphaSize == 0); + if(Format == WINED3DFMT_G16R16F) + return (cfg->redSize == 16 && cfg->greenSize == 16 && cfg->blueSize == 0 && cfg->alphaSize == 0); + if(Format == WINED3DFMT_A16B16G16R16F) + return (cfg->redSize == 16 && cfg->greenSize == 16 && cfg->blueSize == 16 && cfg->alphaSize == 16); + if(Format == WINED3DFMT_R32F) + return (cfg->redSize == 32 && cfg->greenSize == 0 && cfg->blueSize == 0 && cfg->alphaSize == 0); + if(Format == WINED3DFMT_G32R32F) + return (cfg->redSize == 32 && cfg->greenSize == 32 && cfg->blueSize == 0 && cfg->alphaSize == 0); + if(Format == WINED3DFMT_A32B32G32R32F) + return (cfg->redSize == 32 && cfg->greenSize == 32 && cfg->blueSize == 32 && cfg->alphaSize == 32); + } else { + /* Probably a color index mode */ return FALSE; + } - return TRUE; + return FALSE; } static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_PixelFormat *cfg, WINED3DFORMAT Format) { @@ -3882,6 +3902,7 @@ BOOL InitAdapters(void) { PUSH1(WGL_DEPTH_BITS_ARB) PUSH1(WGL_STENCIL_BITS_ARB) PUSH1(WGL_DRAW_TO_WINDOW_ARB) + PUSH1(WGL_PIXEL_TYPE_ARB) for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -3898,6 +3919,7 @@ BOOL InitAdapters(void) { cfgs->depthSize = values[4]; cfgs->stencilSize = values[5]; cfgs->windowDrawable = values[6]; + cfgs->iPixelType = values[7]; cfgs->pbufferDrawable = FALSE; /* Check for pbuffer support when it is around as wglGetPixelFormatAttribiv fails for unknown @@ -3909,7 +3931,7 @@ attributes. */ cfgs->pbufferDrawable = value; } - TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); + TRACE("iPixelFormat=%d, iPixelType=%#x, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); cfgs++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6b0cfb8..8da308e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -636,6 +636,7 @@ extern const WINED3DLIGHT WINED3D_default_light; typedef struct WineD3D_PixelFormat { int iPixelFormat; /* WGL pixel format */ + int iPixelType; /* WGL pixel type e.g. WGL_TYPE_RGBA_ARB, WGL_TYPE_RGBA_FLOAT_ARB or WGL_TYPE_COLORINDEX_ARB */ int redSize, greenSize, blueSize, alphaSize; int depthSize, stencilSize; BOOL windowDrawable;

1 0

Jacek Caban : wine.inf: Register jscript.dll.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: f460cbf9aff6a74e6def11fd294b0c236ae63e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f460cbf9aff6a74e6def11fd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 13:02:10 2008 +0100 wine.inf: Register jscript.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 9afc4fe..625c8ba 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2188,6 +2188,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,infosoft.dll,1 11,,inseng.dll,1 11,,itss.dll,1 +11,,jscript.dll,1 11,,mlang.dll,1 11,,mshtml.dll,1 11,,msi.dll,1

1 0

Jacek Caban : jscript: Added IActiveScriptParseProcedure2 declaration.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 96219452722091018a2d3c8fc469d01fe652841f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96219452722091018a2d3c8fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 13:02:30 2008 +0100 jscript: Added IActiveScriptParseProcedure2 declaration. --- include/activscp.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index fe7497f..6775f8a 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -343,6 +343,15 @@ interface IActiveScriptParseProcedure : IUnknown } [ + object, + uuid(71ee5b20-fb04-11d1-b3a8-00a0c911e8b2), + pointer_default(unique) +] +interface IActiveScriptParseProcedure2 : IActiveScriptParseProcedure +{ +} + +[ object, uuid(63CDBCB0-C1B1-11d0-9336-00A0C90DCAA9), pointer_default(unique)

1 0

Jacek Caban : jscript: Added IActiveScriptParseProcedure2 stub implementation.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: a0d8cbc6ef6b0ada17bd3e1001f0b0b336c348e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d8cbc6ef6b0ada17bd3e100… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 13:02:46 2008 +0100 jscript: Added IActiveScriptParseProcedure2 stub implementation. --- dlls/jscript/jscript.c | 66 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 21ffeff..0251b44 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -24,16 +24,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { - const IActiveScriptVtbl *lpIActiveScriptVtbl; - const IActiveScriptParseVtbl *lpIActiveScriptParseVtbl; - const IActiveScriptPropertyVtbl *lpIActiveScriptPropertyVtbl; + const IActiveScriptVtbl *lpIActiveScriptVtbl; + const IActiveScriptParseVtbl *lpIActiveScriptParseVtbl; + const IActiveScriptParseProcedure2Vtbl *lpIActiveScriptParseProcedure2Vtbl; + const IActiveScriptPropertyVtbl *lpIActiveScriptPropertyVtbl; LONG ref; } JScript; -#define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) -#define ASPARSE(x) ((IActiveScriptParse*) &(x)->lpIActiveScriptParseVtbl) -#define ACTSCPPROP(x) ((IActiveScriptProperty*) &(x)->lpIActiveScriptPropertyVtbl) +#define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) +#define ASPARSE(x) ((IActiveScriptParse*) &(x)->lpIActiveScriptParseVtbl) +#define ASPARSEPROC(x) ((IActiveScriptParseProcedure2*) &(x)->lpIActiveScriptParseProcedure2Vtbl) +#define ACTSCPPROP(x) ((IActiveScriptProperty*) &(x)->lpIActiveScriptPropertyVtbl) #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) @@ -52,6 +54,12 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = ASPARSE(This); + }else if(IsEqualGUID(riid, &IID_IActiveScriptParseProcedure)) { + TRACE("(%p)->(IID_IActiveScriptParseProcedure %p)\n", This, ppv); + *ppv = ASPARSEPROC(This); + }else if(IsEqualGUID(riid, &IID_IActiveScriptParseProcedure2)) { + TRACE("(%p)->(IID_IActiveScriptParseProcedure2 %p)\n", This, ppv); + *ppv = ASPARSEPROC(This); }else if(IsEqualGUID(riid, &IID_IActiveScriptProperty)) { TRACE("(%p)->(IID_IActiveScriptProperty %p)\n", This, ppv); *ppv = ACTSCPPROP(This); @@ -274,6 +282,45 @@ static const IActiveScriptParseVtbl JScriptParseVtbl = { JScriptParse_ParseScriptText }; +#define ASPARSEPROC_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParse, iface) + +static HRESULT WINAPI JScriptParseProcedure_QueryInterface(IActiveScriptParseProcedure2 *iface, REFIID riid, void **ppv) +{ + JScript *This = ASPARSEPROC_THIS(iface); + return IActiveScript_QueryInterface(ACTSCRIPT(This), riid, ppv); +} + +static ULONG WINAPI JScriptParseProcedure_AddRef(IActiveScriptParseProcedure2 *iface) +{ + JScript *This = ASPARSEPROC_THIS(iface); + return IActiveScript_AddRef(ACTSCRIPT(This)); +} + +static ULONG WINAPI JScriptParseProcedure_Release(IActiveScriptParseProcedure2 *iface) +{ + JScript *This = ASPARSEPROC_THIS(iface); + return IActiveScript_Release(ACTSCRIPT(This)); +} + +static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, + LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, + DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) +{ + JScript *This = ASPARSEPROC_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +#undef ASPARSEPROC_THIS + +static const IActiveScriptParseProcedure2Vtbl JScriptParseProcedureVtbl = { + JScriptParseProcedure_QueryInterface, + JScriptParseProcedure_AddRef, + JScriptParseProcedure_Release, + JScriptParseProcedure_ParseProcedureText, +}; + #define ACTSCPPROP_THIS(iface) DEFINE_THIS(JScript, IActiveScriptProperty, iface) static HRESULT WINAPI JScriptProperty_QueryInterface(IActiveScriptProperty *iface, REFIID riid, void **ppv) @@ -330,9 +377,10 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret = heap_alloc(sizeof(*ret)); - ret->lpIActiveScriptVtbl = &JScriptVtbl; - ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; - ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; + ret->lpIActiveScriptVtbl = &JScriptVtbl; + ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; + ret->lpIActiveScriptParseProcedure2Vtbl = &JScriptParseProcedureVtbl; + ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; ret->ref = 1; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv);

1 0

Jacek Caban : jscript: Added IObjectSafety stub implementation.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: cd0213bcb90f0315e676c8f1c81b61988558615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0213bcb90f0315e676c8f1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 13:03:07 2008 +0100 jscript: Added IObjectSafety stub implementation. --- dlls/jscript/jscript.c | 53 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript_main.c | 1 + 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 0251b44..79b55c8 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -18,6 +18,7 @@ #include "jscript.h" #include "activscp.h" +#include "objsafe.h" #include "wine/debug.h" @@ -28,6 +29,7 @@ typedef struct { const IActiveScriptParseVtbl *lpIActiveScriptParseVtbl; const IActiveScriptParseProcedure2Vtbl *lpIActiveScriptParseProcedure2Vtbl; const IActiveScriptPropertyVtbl *lpIActiveScriptPropertyVtbl; + const IObjectSafetyVtbl *lpIObjectSafetyVtbl; LONG ref; } JScript; @@ -36,6 +38,7 @@ typedef struct { #define ASPARSE(x) ((IActiveScriptParse*) &(x)->lpIActiveScriptParseVtbl) #define ASPARSEPROC(x) ((IActiveScriptParseProcedure2*) &(x)->lpIActiveScriptParseProcedure2Vtbl) #define ACTSCPPROP(x) ((IActiveScriptProperty*) &(x)->lpIActiveScriptPropertyVtbl) +#define OBJSAFETY(x) ((IObjectSafety*) &(x)->lpIObjectSafetyVtbl) #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) @@ -63,6 +66,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScriptProperty)) { TRACE("(%p)->(IID_IActiveScriptProperty %p)\n", This, ppv); *ppv = ACTSCPPROP(This); + }else if(IsEqualGUID(riid, &IID_IObjectSafety)) { + TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); + *ppv = OBJSAFETY(This); } if(*ppv) { @@ -367,6 +373,52 @@ static const IActiveScriptPropertyVtbl JScriptPropertyVtbl = { JScriptProperty_SetProperty }; +#define OBJSAFETY_THIS(iface) DEFINE_THIS(JScript, IObjectSafety, iface) + +static HRESULT WINAPI JScriptSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + JScript *This = OBJSAFETY_THIS(iface); + return IActiveScript_QueryInterface(ACTSCRIPT(This), riid, ppv); +} + +static ULONG WINAPI JScriptSafety_AddRef(IObjectSafety *iface) +{ + JScript *This = OBJSAFETY_THIS(iface); + return IActiveScript_AddRef(ACTSCRIPT(This)); +} + +static ULONG WINAPI JScriptSafety_Release(IObjectSafety *iface) +{ + JScript *This = OBJSAFETY_THIS(iface); + return IActiveScript_Release(ACTSCRIPT(This)); +} + +static HRESULT WINAPI JScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + JScript *This = OBJSAFETY_THIS(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + JScript *This = OBJSAFETY_THIS(iface); + FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + return S_OK; +} + +#undef OBJSAFETY_THIS + +static const IObjectSafetyVtbl JScriptSafetyVtbl = { + JScriptSafety_QueryInterface, + JScriptSafety_AddRef, + JScriptSafety_Release, + JScriptSafety_GetInterfaceSafetyOptions, + JScriptSafety_SetInterfaceSafetyOptions +}; + HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -381,6 +433,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; ret->lpIActiveScriptParseProcedure2Vtbl = &JScriptParseProcedureVtbl; ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; + ret->lpIObjectSafetyVtbl = &JScriptSafetyVtbl; ret->ref = 1; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv); diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 7bb771c..f4c4bf1 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -24,6 +24,7 @@ #include "advpub.h" #include "activscp.h" #include "activaut.h" +#include "objsafe.h" #include "wine/debug.h"

1 0

Philip Nilsson : d3dx9/tests: Test the D3DXVec*Array functions.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: b67290b99aeecc0e4dd33b0f5a0cde063ef56351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67290b99aeecc0e4dd33b0f5… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Fri Mar 21 11:04:46 2008 +0100 d3dx9/tests: Test the D3DXVec*Array functions. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_36/tests/Makefile.in | 13 +++ dlls/d3dx9_36/tests/math.c | 177 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 205 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b67290b99aeecc0e4dd33…

1 0

Philip Nilsson : d3dx9: Implement the D3DXVec*Array functions.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 0457333f55c015e0c972c9338b0a8c94d7b32359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0457333f55c015e0c972c9338… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Fri Mar 21 00:33:45 2008 +0100 d3dx9: Implement the D3DXVec*Array functions. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 18 ++-- dlls/d3dx9_36/math.c | 195 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9math.h | 9 ++ 4 files changed, 215 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0457333f55c015e0c972c…

1 0