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

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

17 Mar '08

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: Fixed typo in bitmap scaling (for OLE objects).
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Added support for end of line inside paragraphs.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 4fb2dfc9f016d4ad5d1e476925eea12b3aceddfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb2dfc9f016d4ad5d1e47692… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:36 2008 +0100 richedit: Added support for end of line inside paragraphs. --- dlls/riched20/editstr.h | 14 ++++++++------ dlls/riched20/wrap.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 92dbab4..7c1fe7f 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -92,11 +92,11 @@ typedef enum { /******************************** run flags *************************/ #define MERF_STYLEFLAGS 0x0FFF /* run contains non-text content, which has its own rules for wrapping, sizing etc */ -#define MERF_GRAPHICS 1 +#define MERF_GRAPHICS 0x001 /* run is a tab (or, in future, any kind of content whose size is dependent on run position) */ -#define MERF_TAB 2 +#define MERF_TAB 0x002 /* run is a cell boundary */ -#define MERF_CELL 4 +#define MERF_CELL 0x004 #define MERF_NONTEXT (MERF_GRAPHICS | MERF_TAB | MERF_CELL) @@ -114,13 +114,15 @@ typedef enum { #define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 +/* forcing the "end of row" run, contains 1 character */ +#define MERF_ENDROW 0x200000 /* run is hidden */ -#define MERF_HIDDEN 0x200000 +#define MERF_HIDDEN 0x400000 /* runs with any of these flags set cannot be joined */ -#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* runs that don't contain real text */ -#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* those flags are kept when the row is split */ #define MERF_SPLITMASK (~(0)) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 1037cec..cd1f325 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -282,6 +282,13 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_InsertRowStart(wc, p); return p; } + /* simply end the current row and move on to next one */ + if (run->nFlags & MERF_ENDROW) + { + p = p->next; + ME_InsertRowStart(wc, p); + return p; + } /* we're not at the end of the row */ /* will current run fit? */ if (wc->pt.x + run->nWidth > wc->nAvailWidth)

1 0

Eric Pouech : richedit: Store shift-enter (keyboard) and \line (rtf) as end of row (and emit \line while saving in RTF).
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: a64c22c8b19767b14e2cb57eefc6df2f7d8c9602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64c22c8b19767b14e2cb57ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:51 2008 +0100 richedit: Store shift-enter (keyboard) and \line (rtf) as end of row (and emit \line while saving in RTF). --- dlls/riched20/caret.c | 15 +++++++++++++++ dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/reader.c | 6 +++++- dlls/riched20/writer.c | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3f0604e..adf90ac 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -411,6 +411,21 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur } +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) +{ + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_DisplayItem *di; + WCHAR space = ' '; + + /* FIXME no no no */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_ENDROW); + ME_SendSelChange(editor); +} + void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor) { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9288ea2..7ad8980 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2960,7 +2960,10 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { ME_Style *style = ME_GetInsertStyle(editor, 0); ME_SaveTempStyle(editor); - ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); + if (wstr == '\r' && (GetKeyState(VK_SHIFT) & 0x8000)) + ME_InsertEndRowFromCursor(editor, 0); + else + ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); ME_CommitUndo(editor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8b97a55..bfcc794 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -186,6 +186,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y); void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style); +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index ebc9745..28930db 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2596,10 +2596,13 @@ static void SpecialChar (RTF_Info *info) } break; } + case rtfLine: + RTFFlushOutputBuffer(info); + ME_InsertEndRowFromCursor(info->editor, 0); + break; case rtfPage: case rtfSect: case rtfRow: - case rtfLine: case rtfPar: RTFPutUnicodeChar (info, '\n'); break; @@ -2648,6 +2651,7 @@ RTFFlushUnicodeOutputBuffer(RTF_Info *info) } } + static void RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) { diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ff3f5ee..30e9c93 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -714,6 +714,10 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC nChars--; if (editor->bEmulateVersion10 && nChars) nChars--; + } else if (p->member.run.nFlags & MERF_ENDROW) { + if (!ME_StreamOutPrint(pStream, "\\line \r\n")) + return FALSE; + nChars--; } else { int nEnd;

1 0

Eric Pouech : richedit: Prevent division by zero when 0-width border is used.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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 17 Mar '08

17 Mar '08

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 class factory.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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 : jscript: Added JScript stub implementation.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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 : wininet: Don' t use query and hash part of URL to generate cache file name.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Move depth/ stencil verification to CheckDepthStencilCapability.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 02f6c9ece8b24d0161c5382e2f4dc6a74876afd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f6c9ece8b24d0161c5382e2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 16 16:02:02 2008 +0000 wined3d: Move depth/stencil verification to CheckDepthStencilCapability. --- dlls/wined3d/directx.c | 99 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 75 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e852d6b..0dcc8f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1806,10 +1806,50 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter return hr; } + #define GLINFO_LOCATION Adapters[Adapter].gl_info +/* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ +static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayFormat, +WINED3DFORMAT DepthStencilFormat) +{ + int it=0; + WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + + /* Only allow depth/stencil formats */ + switch (DepthStencilFormat) { + case WINED3DFMT_D16_LOCKABLE: + case WINED3DFMT_D16: + case WINED3DFMT_D15S1: + case WINED3DFMT_D24X8: + case WINED3DFMT_D24X4S4: + case WINED3DFMT_D24S8: + case WINED3DFMT_D24FS8: + case WINED3DFMT_D32: + case WINED3DFMT_D32F_LOCKABLE: + break; + + default: + return FALSE; + } + + /* Walk through all WGL pixel formats to find a match */ + cfgs = Adapters[Adapter].cfgs; + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], DisplayFormat)) { + if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&cfgs[it], DepthStencilFormat)) { + return TRUE; + } + } + } + + return FALSE; +} + static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + DWORD UsageCaps = 0; + TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%u,%s,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s))\n", This, Adapter, @@ -1842,7 +1882,38 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if(RType == WINED3DRTYPE_VOLUMETEXTURE) { + if(RType == WINED3DRTYPE_SURFACE) { + /* Surface allows: + * - D3DUSAGE_DEPTHSTENCIL + * - D3DUSAGE_NONSECURE (d3d9ex) + * - D3DUSAGE_RENDERTARGET + */ + + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { + if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } else { + TRACE_(d3d_caps)("[FAILED] - No depthstencil support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + } else if(RType == WINED3DRTYPE_TEXTURE) { + /* Texture allows: + * - D3DUSAGE_AUTOGENMIPMAP + * - D3DUSAGE_DEPTHSTENCIL + * - D3DUSAGE_DMAP + * - D3DUSAGE_DYNAMIC + * - D3DUSAGE_NONSECURE (d3d9ex) + * - D3DUSAGE_RENDERTARGET + * - D3DUSAGE_SOFTWAREPROCESSING + * - D3DUSAGE_TEXTAPI (d3d9ex) + */ + + if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) + UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } + } else if(RType == WINED3DRTYPE_VOLUMETEXTURE) { if(!GL_SUPPORT(EXT_TEXTURE3D)) { TRACE_(d3d_caps)("[FAILED] - No volume texture support\n"); return WINED3DERR_NOTAVAILABLE; @@ -1919,29 +1990,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { - switch (CheckFormat) { - /* In theory we could do all formats, just fetch them accordingly should the buffer be locked. - * Windows supports only those 3, and enumerating the other formats confuses applications - */ - case WINED3DFMT_D24S8: - case WINED3DFMT_D24X8: - case WINED3DFMT_D16: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - case WINED3DFMT_D16_LOCKABLE: - case WINED3DFMT_D24FS8: - case WINED3DFMT_D32F_LOCKABLE: - case WINED3DFMT_D24X4S4: - case WINED3DFMT_D15S1: - case WINED3DFMT_D32: - TRACE_(d3d_caps)("[FAILED]. Disabled because not enumerated on windows\n"); - return WINED3DERR_NOTAVAILABLE; - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } else if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(Usage & WINED3DUSAGE_RENDERTARGET) { switch (CheckFormat) { case WINED3DFMT_R8G8B8: case WINED3DFMT_A8R8G8B8: @@ -2190,6 +2239,8 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt break; } + + TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; }

1 0