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

Eric Pouech : richedit: Fixed typo in bitmap scaling (for OLE objects).
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 513fcfe48ffc959fe9c1ed0cb675572fc2480c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=513fcfe48ffc959fe9c1ed0cb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:20 2008 +0100 richedit: Fixed typo in bitmap scaling (for OLE objects). --- dlls/riched20/richole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1509d4e..3d5e42f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -682,9 +682,9 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, } else { - sz.cy = MulDiv(dibsect.dsBm.bmWidth, + sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->editor->nZoomNumerator, c->editor->nZoomDenominator); - sz.cx = MulDiv(dibsect.dsBm.bmHeight, + sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy,

1 0

Eric Pouech : richedit: Fix reading paragraph left & first indentation attributes.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: cb4a41b8061a5303ea54439217aeeb3ded8bbbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4a41b8061a5303ea5443921… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:03 2008 +0100 richedit: Fix reading paragraph left & first indentation attributes. --- dlls/riched20/editor.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ce8473d..99e2059 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -471,14 +471,16 @@ static void ME_RTFParAttrHook(RTF_Info *info) } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += info->rtfParam + fmt.dxOffset; + fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + fmt.dxStartIndent += info->rtfParam; fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: + /* we assume rtfLeftIndent is always specified before rtfFirstIndent */ ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = -fmt.dxOffset + info->rtfParam; + fmt.dwMask |= PFM_STARTINDENT; + fmt.dxStartIndent = info->rtfParam; + fmt.dxOffset = 0; break; case rtfRightIndent: fmt.dwMask = PFM_RIGHTINDENT;

1 0

Eric Pouech : richedit: Added support for reading DI bitmaps in RTF streams .
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: f628a1c2454eb558f99f8f5c769058d3938240b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f628a1c2454eb558f99f8f5c7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:45:52 2008 +0100 richedit: Added support for reading DI bitmaps in RTF streams. --- dlls/riched20/editor.c | 61 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a803773..ce8473d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -691,7 +691,8 @@ static void ME_RTFTblAttrHook(RTF_Info *info) } } -static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE h, const SIZEL* sz) +static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, + const SIZEL* sz) { LPOLEOBJECT lpObject = NULL; LPSTORAGE lpStorage = NULL; @@ -704,11 +705,20 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE h, const SIZEL* s BOOL ret = FALSE; DWORD conn; - stgm.tymed = TYMED_ENHMF; - stgm.u.hEnhMetaFile = h; + if (hemf) + { + stgm.tymed = TYMED_ENHMF; + stgm.u.hEnhMetaFile = hemf; + fm.cfFormat = CF_ENHMETAFILE; + } + else if (hbmp) + { + stgm.tymed = TYMED_GDI; + stgm.u.hBitmap = hbmp; + fm.cfFormat = CF_BITMAP; + } stgm.pUnkForRelease = NULL; - fm.cfFormat = CF_ENHMETAFILE; fm.ptd = NULL; fm.dwAspect = DVASPECT_CONTENT; fm.lindex = -1; @@ -768,6 +778,8 @@ static void ME_RTFReadPictGroup(RTF_Info *info) BYTE val; METAFILEPICT mfp; HENHMETAFILE hemf; + HBITMAP hbmp; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_dib} gfx = gfx_unknown; RTFGetToken (info); if (info->rtfClass == rtfEOF) @@ -777,6 +789,12 @@ static void ME_RTFReadPictGroup(RTF_Info *info) if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) { mfp.mm = info->rtfParam; + gfx = gfx_enhmetafile; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) + { + if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); + gfx = gfx_dib; } else { @@ -799,9 +817,13 @@ static void ME_RTFReadPictGroup(RTF_Info *info) goto skip_group; } else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) - mfp.xExt = info->rtfParam; + { + if (gfx == gfx_enhmetafile) mfp.xExt = info->rtfParam; + } else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) - mfp.yExt = info->rtfParam; + { + if (gfx == gfx_enhmetafile) mfp.yExt = info->rtfParam; + } else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) sz.cx = info->rtfParam; else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) @@ -837,8 +859,31 @@ static void ME_RTFReadPictGroup(RTF_Info *info) } if (flip) FIXME("wrong hex string\n"); - if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) - ME_RTFInsertOleObject(info, hemf, &sz); + switch (gfx) + { + case gfx_enhmetafile: + if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) + ME_RTFInsertOleObject(info, hemf, NULL, &sz); + break; + case gfx_dib: + { + BITMAPINFO* bi = (BITMAPINFO*)buffer; + HDC hdc = GetDC(0); + unsigned nc = bi->bmiHeader.biClrUsed; + + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + if ((hbmp = CreateDIBitmap(hdc, &bi->bmiHeader, + CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), + bi, DIB_RGB_COLORS))) + ME_RTFInsertOleObject(info, NULL, hbmp, &sz); + ReleaseDC(0, hdc); + } + break; + default: + break; + } HeapFree(GetProcessHeap(), 0, buffer); RTFRouteToken (info); /* feed "}" back to router */ return;

1 0

Eric Pouech : richedit: When handling \pard in RTF stream, really resets all paragraph styles.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 68ccc4aec6a1aec194361837ddbf05cc72d673d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ccc4aec6a1aec194361837d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:10 2008 +0100 richedit: When handling \pard in RTF stream, really resets all paragraph styles. --- dlls/riched20/editor.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99e2059..9288ea2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -452,10 +452,15 @@ static void ME_RTFParAttrHook(RTF_Info *info) switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */ - fmt.dwMask = PFM_ALIGNMENT | PFM_TABSTOPS | PFM_OFFSET | PFM_STARTINDENT; + fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | + PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT; + /* TODO: numbering, shading */ fmt.wAlignment = PFA_LEFT; fmt.cTabCount = 0; - fmt.dxOffset = fmt.dxStartIndent = 0; + fmt.dxOffset = fmt.dxStartIndent = fmt.dxRightIndent = 0; + fmt.wBorderWidth = fmt.wBorders = 0; + fmt.bLineSpacingRule = 0; + fmt.dySpaceBefore = fmt.dySpaceAfter = 0; RTFFlushOutputBuffer(info); ME_GetParagraph(info->editor->pCursors[0].pRun)->member.para.bTable = FALSE; break;

1 0

Eric Pouech : richedit: Prevent division by zero when 0-width border is used.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 9b2e552bf48f50d128459165ebe44cd094a9344e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2e552bf48f50d128459165e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:45:31 2008 +0100 richedit: Prevent division by zero when 0-width border is used. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8687644..91d5ec0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -290,7 +290,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { - /* none */ {0, 0, PS_SOLID, FALSE}, + /* none */ {0, 1, PS_SOLID, FALSE}, /* 3/4 */ {3, 4, PS_SOLID, FALSE}, /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, /* 2 1/4 */ {9, 4, PS_SOLID, FALSE},

1 0

Eric Pouech : richedit: Properly set the border width while parsing RTF stream.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 9f5fa9ea45c24602a59607c28f37a6f2335001ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5fa9ea45c24602a59607c28… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:45:39 2008 +0100 richedit: Properly set the border width while parsing RTF stream. --- dlls/riched20/editor.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 84f7572..a803773 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -641,8 +641,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) case rtfBorderWidth: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; - fmt.wBorders |= ((info->rtfParam / 15) & 7) << 8; + fmt.wBorderWidth |= ((info->rtfParam / 15) & 7) << 8; break; case rtfBorderSpace: ME_GetSelectionParaFormat(info->editor, &fmt);

1 0

Jacek Caban : jscript: Added JScript stub implementation.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 0750bfbb1d5f9c470b5554e35c9c324f9bbe7015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0750bfbb1d5f9c470b5554e35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 16 21:10:13 2008 +0100 jscript: Added JScript stub implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript.c | 219 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 46 +++++++++ dlls/jscript/jscript_main.c | 20 +---- 4 files changed, 268 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 7f528bf..04cc952 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = kernel32 RC_SRCS = rsrc.rc C_SRCS = \ + jscript.c \ jscript_main.c @MAKE_DLL_RULES@ diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c new file mode 100644 index 0000000..948b340 --- /dev/null +++ b/dlls/jscript/jscript.c @@ -0,0 +1,219 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" +#include "activscp.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + const IActiveScriptVtbl *lpIActiveScriptVtbl; + + LONG ref; +} JScript; + +#define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) + +#define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) + +static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) +{ + JScript *This = ACTSCRIPT_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = ACTSCRIPT(This); + }else if(IsEqualGUID(riid, &IID_IActiveScript)) { + TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); + *ppv = ACTSCRIPT(This); + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI JScript_AddRef(IActiveScript *iface) +{ + JScript *This = ACTSCRIPT_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI JScript_Release(IActiveScript *iface) +{ + JScript *This = ACTSCRIPT_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", iface, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, + IActiveScriptSite *pass) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pass); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, + void **ppvObject) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->(%d)\n", This, ss); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pssState); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_Close(IActiveScript *iface) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, + LPCOLESTR pstrName, DWORD dwFlags) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTypeLib, + DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR pstrItemName, + IDispatch **ppdisp) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetCurrentScriptThreadID(IActiveScript *iface, + SCRIPTTHREADID *pstridThread) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetScriptThreadID(IActiveScript *iface, + DWORD dwWin32ThreadId, SCRIPTTHREADID *pstidThread) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_GetScriptThreadState(IActiveScript *iface, + SCRIPTTHREADID stidThread, SCRIPTTHREADSTATE *pstsState) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_InterruptScriptThread(IActiveScript *iface, + SCRIPTTHREADID stidThread, const EXCEPINFO *pexcepinfo, DWORD dwFlags) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScript_Clone(IActiveScript *iface, IActiveScript **ppscript) +{ + JScript *This = ACTSCRIPT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +#undef ACTSCRIPT_THIS + +static const IActiveScriptVtbl JScriptVtbl = { + JScript_QueryInterface, + JScript_AddRef, + JScript_Release, + JScript_SetScriptSite, + JScript_GetScriptSite, + JScript_SetScriptState, + JScript_GetScriptState, + JScript_Close, + JScript_AddNamedItem, + JScript_AddTypeLib, + JScript_GetScriptDispatch, + JScript_GetCurrentScriptThreadID, + JScript_GetScriptThreadID, + JScript_GetScriptThreadState, + JScript_InterruptScriptThread, + JScript_Clone +}; + +HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + JScript *ret; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + ret = heap_alloc(sizeof(*ret)); + + ret->lpIActiveScriptVtbl = &JScriptVtbl; + ret->ref = 1; + + hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv); + IActiveScript_Release(ACTSCRIPT(ret)); + return hres; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h new file mode 100644 index 0000000..6a7ec76 --- /dev/null +++ b/dlls/jscript/jscript.h @@ -0,0 +1,46 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 3cb9d9b..7bb771c 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -16,21 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> +#include "initguid.h" -#define COBJMACROS +#include "jscript.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winreg.h" #include "advpub.h" - -#include "initguid.h" -#include "ole2.h" #include "activscp.h" #include "activaut.h" @@ -47,13 +38,6 @@ static const CLSID CLSID_JScriptEncode = static HINSTANCE jscript_hinstance; -HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, - REFIID riid, void **ppv) -{ - FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - return E_NOTIMPL; -} - static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL;

1 0

Jacek Caban : jscript: Added JScript class factory.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 85b024d5f71195b815d51ab990fdde02f6b66bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b024d5f71195b815d51ab99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 16 21:09:51 2008 +0100 jscript: Added JScript class factory. --- dlls/jscript/Makefile.in | 1 - dlls/jscript/jscript_main.c | 63 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index f314abb..7f528bf 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll IMPORTS = kernel32 -EXTRALIBS = -luuid RC_SRCS = rsrc.rc diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index dea26ca..3cb9d9b 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -27,10 +27,10 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "ole2.h" #include "advpub.h" #include "initguid.h" +#include "ole2.h" #include "activscp.h" #include "activaut.h" @@ -47,6 +47,62 @@ static const CLSID CLSID_JScriptEncode = static HINSTANCE jscript_hinstance; +HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl JScriptFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + JScriptFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory JScriptFactory = { &JScriptFactoryVtbl }; + /****************************************************************** * DllMain (jscript.@) */ @@ -72,6 +128,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_JScript, rclsid)) { + TRACE("(CLSID_JScript %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&JScriptFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Jacek Caban : wininet: Don' t use query and hash part of URL to generate cache file name.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: e8be5eaba7b32bde6aadb3f55084317265c8291f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8be5eaba7b32bde6aadb3f55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 16 21:10:24 2008 +0100 wininet: Don't use query and hash part of URL to generate cache file name. --- dlls/wininet/urlcache.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 70aac95..c5e37d8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2124,6 +2124,10 @@ BOOL WINAPI CreateUrlCacheEntryW( lpszUrlPart++; break; } + else if(*lpszUrlPart == '?' || *lpszUrlPart == '#') + { + lpszUrlEnd = lpszUrlPart; + } } if (!lstrcmpW(lpszUrlPart, szWWW)) {

1 0

Roderick Colenbrander : wined3d: Check the render target capabilities of a resource type.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: d44c2956512117f8f03f77b38d35fb0503418962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44c2956512117f8f03f77b38… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 16 16:37:38 2008 +0000 wined3d: Check the render target capabilities of a resource type. --- dlls/wined3d/directx.c | 147 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 110 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89ee91b..97989ba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1845,6 +1845,73 @@ WINED3DFORMAT DepthStencilFormat) return FALSE; } +/* Check the render target capabilities of a format */ +static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORMAT CheckFormat) +{ + UINT Adapter = 0; + + /* Filter out non-RT formats */ + switch(CheckFormat) + { + /* Don't offer 8bit, windows doesn't either although we could emulate it */ + case WINED3DFMT_A8P8: + case WINED3DFMT_P8: + + /* No DXTC render targets */ + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + return FALSE; + default: + break; + } + + if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { + WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + int it; + short AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; + short CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; + + getColorBits(AdapterFormat, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); + getColorBits(CheckFormat, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); + + /* In backbuffer mode the front and backbuffer share the same WGL pixelformat. + * The format must match in RGB, alpha is allowed to be different. (Only the backbuffer can have alpha) */ + if(!((AdapterRed == CheckRed) && (AdapterGreen == CheckGreen) && (AdapterBlue == CheckBlue))) { + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + + /* Check if there is a WGL pixel format matching the requirements, the format should also be window + * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (cfgs[it].windowDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], CheckFormat)) { + TRACE_(d3d_caps)("iPixelFormat=%d is compatible with CheckFormat=%s\n", cfgs[it].iPixelFormat, debug_d3dformat(CheckFormat)); + return TRUE; + } + } + } else if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { + /* We can propably use this function in FBO mode too on some drivers to get some basic indication of the capabilities. */ + WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + int it; + + /* Check if there is a WGL pixel format matching the requirements, the pixel format should also be usable with pbuffers */ + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (cfgs[it].pbufferDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], CheckFormat)) { + TRACE_(d3d_caps)("iPixelFormat=%d is compatible with CheckFormat=%s\n", cfgs[it].iPixelFormat, debug_d3dformat(CheckFormat)); + return TRUE; + } + } + } else if(wined3d_settings.offscreen_rendering_mode == ORM_FBO){ + /* For now return TRUE for FBOs until we have some proper checks. + * Note that this function will only be called when the format is around for texturing. */ + return TRUE; + } + return FALSE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2095,6 +2162,15 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt /* No usage checks were requested, so return because we know that the format is supported */ if(!Usage) return WINED3D_OK; + + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } } } else if(RType == WINED3DRTYPE_SURFACE) { @@ -2111,7 +2187,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED] - No depthstencil support\n"); return WINED3DERR_NOTAVAILABLE; } - } + } + + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(RType == WINED3DRTYPE_TEXTURE) { /* Texture allows: * - D3DUSAGE_AUTOGENMIPMAP @@ -2130,6 +2215,14 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(!Usage) return WINED3D_OK; + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2215,43 +2308,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if(Usage & WINED3DUSAGE_RENDERTARGET) { - switch (CheckFormat) { - case WINED3DFMT_R8G8B8: - case WINED3DFMT_A8R8G8B8: - case WINED3DFMT_X8R8G8B8: - case WINED3DFMT_R5G6B5: - case WINED3DFMT_X1R5G5B5: - case WINED3DFMT_A1R5G5B5: - case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_R3G3B2: - case WINED3DFMT_X4R4G4B4: - case WINED3DFMT_A8B8G8R8: - case WINED3DFMT_X8B8G8R8: - case WINED3DFMT_P8: - case WINED3DFMT_G16R16: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - case WINED3DFMT_R16F: - case WINED3DFMT_A16B16G16R16F: - if (!GL_SUPPORT(ARB_HALF_FLOAT_PIXEL) || !GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - case WINED3DFMT_A32B32G32R32F: - if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } else if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { + if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { if(GL_SUPPORT(NV_REGISTER_COMBINERS) && GL_SUPPORT(NV_TEXTURE_SHADER2)) { switch (CheckFormat) { case WINED3DFMT_V8U8: @@ -3672,6 +3729,7 @@ BOOL InitAdapters(void) { PUSH1(WGL_ALPHA_BITS_ARB) PUSH1(WGL_DEPTH_BITS_ARB) PUSH1(WGL_STENCIL_BITS_ARB) + PUSH1(WGL_DRAW_TO_WINDOW_ARB) for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -3687,8 +3745,19 @@ BOOL InitAdapters(void) { cfgs->alphaSize = values[3]; cfgs->depthSize = values[4]; cfgs->stencilSize = values[5]; + cfgs->windowDrawable = values[6]; + + cfgs->pbufferDrawable = FALSE; + /* Check for pbuffer support when it is around as wglGetPixelFormatAttribiv fails for unknown +attributes. */ + if(GL_SUPPORT(WGL_ARB_PBUFFER)) { + int attrib = WGL_DRAW_TO_PBUFFER_ARB; + int value; + if(GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, 1, &attrib, &value))) + cfgs->pbufferDrawable = value; + } - TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize); + 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); cfgs++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a3efde9..6b0cfb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -638,6 +638,8 @@ typedef struct WineD3D_PixelFormat int iPixelFormat; /* WGL pixel format */ int redSize, greenSize, blueSize, alphaSize; int depthSize, stencilSize; + BOOL windowDrawable; + BOOL pbufferDrawable; } WineD3D_PixelFormat; /* The adapter structure */

1 0