December 2007 - Wine-Commits

Alistair Leslie-Hughes : msxml: Register missing components.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: b2add094adf5957cb617fbdaef3fea44dfa61924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2add094adf5957cb617fbdae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 11 09:02:36 2007 +1100 msxml: Register missing components. --- dlls/msxml3/factory.c | 4 ++++ dlls/msxml3/regsvr.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 67ed747..a973b04 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -158,6 +158,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = (IClassFactory*) &xmldoccf.lpVtbl; } + else if( IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ) + { + cf = (IClassFactory*) &domdoccf.lpVtbl; + } if ( !cf ) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 9a0d938..3a0c6bd 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -496,6 +496,23 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.FreeThreadedXMLDOM", "1.0" }, + { &CLSID_DOMFreeThreadedDocument, + "Free threaded XML DOM Document", + NULL, + "msxml3.dll", + "Both", + "Microsoft.FreeThreadedXMLDOM", + NULL + }, + { &CLSID_FreeThreadedDOMDocument, + "Free Threaded XML DOM Document", + NULL, + "msxml3.dll", + "Both", + "Microsoft.FreeThreadedXMLDOM.1.0", + "1.0" + }, + { &CLSID_XMLHTTPRequest, "XML HTTP Request", NULL,

1 0

Michael Stefaniuc : usp10: Rename the wrappers around HeapAlloc() &Co to use the standard names.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: 8f1b74a8464b388b5c23028680303a80aa5d8cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1b74a8464b388b5c2302868… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 23:53:07 2007 +0100 usp10: Rename the wrappers around HeapAlloc() &Co to use the standard names. --- dlls/usp10/usp10.c | 82 ++++++++++++++++++++++++++-------------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5d77829..2c3b9cc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -173,24 +173,24 @@ typedef struct { SIZE* sz; } StringAnalysis; -static inline void *usp_alloc(SIZE_T size) +static inline void *heap_alloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *usp_zero_alloc(SIZE_T size) +static inline void *heap_alloc_zero(SIZE_T size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *usp_zero_realloc(LPVOID mem, SIZE_T size) +static inline void *heap_realloc_zero(LPVOID mem, SIZE_T size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline void usp_free(LPVOID mem) +static inline BOOL heap_free(LPVOID mem) { - HeapFree(GetProcessHeap(), 0, mem); + return HeapFree(GetProcessHeap(), 0, mem); } static HDC get_cache_hdc(SCRIPT_CACHE *psc) @@ -230,10 +230,10 @@ static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) ScriptCache *sc; if (!hdc) return E_PENDING; - if (!(sc = usp_zero_alloc(sizeof(ScriptCache)))) return E_OUTOFMEMORY; + if (!(sc = heap_alloc_zero(sizeof(ScriptCache)))) return E_OUTOFMEMORY; if ((ret = init_script_cache(hdc, sc))) { - usp_free(sc); + heap_free(sc); return ret; } *psc = sc; @@ -292,7 +292,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) if (psc) { - usp_free(*psc); + heap_free(*psc); *psc = NULL; } return S_OK; @@ -610,8 +610,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (cString < 1 || !pString) return E_INVALIDARG; if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - if (!(analysis = usp_zero_alloc(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = usp_zero_alloc(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; + if (!(analysis = heap_alloc_zero(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; + if (!(analysis->pItem = heap_alloc_zero(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; /* FIXME: handle clipping */ analysis->clip_len = cString; @@ -624,7 +624,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_ITEM *tmp; num_items *= 2; - if (!(tmp = usp_zero_realloc(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) + if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; analysis->pItem = tmp; @@ -633,12 +633,12 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } if (hr) goto error; - if ((analysis->logattrs = usp_alloc(sizeof(SCRIPT_LOGATTR) * cString))) + if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); else goto error; - if (!(analysis->glyphs = usp_zero_alloc(sizeof(StringGlyphs) * analysis->numItems))) + if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) goto error; for (i = 0; i < analysis->numItems; i++) @@ -646,12 +646,12 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = usp_zero_alloc(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = usp_zero_alloc(sizeof(WORD) * cChar); - int *piAdvance = usp_zero_alloc(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = usp_zero_alloc(sizeof(SCRIPT_VISATTR) * cChar); - GOFFSET *pGoffset = usp_zero_alloc(sizeof(GOFFSET) * numGlyphs); - ABC *abc = usp_zero_alloc(sizeof(ABC)); + WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); + WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); + int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); + SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * cChar); + GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); + ABC *abc = heap_alloc_zero(sizeof(ABC)); int numGlyphsReturned; /* FIXME: non unicode strings */ @@ -675,11 +675,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, return S_OK; error: - usp_free(analysis->glyphs); - usp_free(analysis->logattrs); - usp_free(analysis->pItem); - usp_free(analysis->sc); - usp_free(analysis); + heap_free(analysis->glyphs); + heap_free(analysis->logattrs); + heap_free(analysis->pItem); + heap_free(analysis->sc); + heap_free(analysis); return hr; } @@ -731,7 +731,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, { cnt += analysis->glyphs[item].numGlyphs; } - if (!(glyphs = usp_alloc(sizeof(WCHAR) * cnt))) return E_OUTOFMEMORY; + if (!(glyphs = heap_alloc(sizeof(WCHAR) * cnt))) return E_OUTOFMEMORY; /* * ScriptStringOut only processes glyphs hence set ETO_GLYPH_INDEX @@ -767,7 +767,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, /* * Free the output buffer and script cache */ - usp_free(glyphs); + heap_free(glyphs); return hr; } @@ -894,20 +894,20 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) for (i = 0; i < analysis->numItems; i++) { - usp_free(analysis->glyphs[i].glyphs); - usp_free(analysis->glyphs[i].pwLogClust); - usp_free(analysis->glyphs[i].piAdvance); - usp_free(analysis->glyphs[i].psva); - usp_free(analysis->glyphs[i].pGoffset); - usp_free(analysis->glyphs[i].abc); + heap_free(analysis->glyphs[i].glyphs); + heap_free(analysis->glyphs[i].pwLogClust); + heap_free(analysis->glyphs[i].piAdvance); + heap_free(analysis->glyphs[i].psva); + heap_free(analysis->glyphs[i].pGoffset); + heap_free(analysis->glyphs[i].abc); } - usp_free(analysis->glyphs); - usp_free(analysis->pItem); - usp_free(analysis->logattrs); - usp_free(analysis->sz); - usp_free(analysis->sc); - usp_free(analysis); + heap_free(analysis->glyphs); + heap_free(analysis->pItem); + heap_free(analysis->logattrs); + heap_free(analysis->sz); + heap_free(analysis->sc); + heap_free(analysis); if (invalid) return E_INVALIDARG; return S_OK; @@ -1321,7 +1321,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, * has been converted to glyphs and we still need to translate back to the original chars * to get the correct ABC widths. */ - if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; if (pABC) memset(pABC, 0, sizeof(ABC)); @@ -1357,7 +1357,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); - usp_free(lpABC); + heap_free(lpABC); unselect_cached_font(psc, hfont); return S_OK; } @@ -1615,7 +1615,7 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) if (!analysis->sz) { - if (!(analysis->sz = usp_alloc(sizeof(SIZE)))) return NULL; + if (!(analysis->sz = heap_alloc(sizeof(SIZE)))) return NULL; analysis->sz->cy = analysis->sc->height; analysis->sz->cx = 0;

1 0

Andrew Riedi : user32: Test the initial state of the cursor.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: 00b55015245a4f5f6ef6811fdd26837c59f2ba62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b55015245a4f5f6ef6811fd… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Mon Dec 10 23:24:54 2007 -0800 user32: Test the initial state of the cursor. --- dlls/user32/tests/cursoricon.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d7d5fa6..781282c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -238,6 +238,23 @@ static void test_CopyImage_Bitmap(int depth) HeapFree(GetProcessHeap(), 0, info); } +static void test_initial_cursor(void) +{ + HCURSOR cursor, cursor2; + DWORD error; + + cursor = GetCursor(); + + /* Check what handle GetCursor() returns if a cursor is not set yet. */ + SetLastError(0xdeadbeef); + cursor2 = LoadCursor(NULL, IDC_WAIT); + todo_wine { + ok(cursor == cursor2, "cursor (%p) is not IDC_WAIT (%p).\n", cursor, cursor2); + } + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); +} + static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_bpp, int line) { ICONINFO info; @@ -460,6 +477,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_initial_cursor(); test_CreateIcon(); test_DestroyCursor(); }

1 0

Lei Zhang : quartz: Add IFilterGraph2 interface and stubs.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: cff265950a9c9e3e684ff99747800987851426de URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff265950a9c9e3e684ff9974… Author: Lei Zhang <thestig(a)google.com> Date: Mon Dec 10 23:40:19 2007 -0800 quartz: Add IFilterGraph2 interface and stubs. --- dlls/quartz/filtergraph.c | 185 +++++++++++++++++++++++---------------- dlls/quartz/tests/filtergraph.c | 9 +- 2 files changed, 116 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cff265950a9c9e3e684ff…

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak in test.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: 93b64766716f2073fa7e87c37a09bffcbaaed4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b64766716f2073fa7e87c37… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 11 16:06:00 2007 +1100 msxml3: Fix memory leak in test. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d7afb19..41208f2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -575,7 +575,7 @@ static void test_domnode( void ) ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ - str = SysAllocString( szNonExistentFile ); + str = NULL; r = IXMLDOMElement_get_nodeName( element, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n");

1 0

Jacek Caban : shdocvw: Added client site's IOleCommandTarget tests.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: 69805b12456f8c62d0906365f7c08b0bcc1b9601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69805b12456f8c62d0906365f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 01:40:17 2007 +0100 shdocvw: Added client site's IOleCommandTarget tests. --- dlls/shdocvw/tests/webbrowser.c | 154 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index dacd6fd..9908df8 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -21,6 +21,7 @@ #include <wine/test.h> #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -31,6 +32,7 @@ #include "idispids.h" #include "olectl.h" #include "mshtmdid.h" +#include "shlguid.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -38,17 +40,16 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define CHECK_EXPECT(func) \ +#define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ - expect_ ## func = FALSE; \ called_ ## func = TRUE; \ }while(0) -#define CHECK_EXPECT2(func) \ +#define CHECK_EXPECT(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ }while(0) #define CHECK_CALLED(func) \ @@ -81,19 +82,139 @@ DEFINE_EXPECT(GetOptionKeyPath); DEFINE_EXPECT(GetOverridesKeyPath); DEFINE_EXPECT(SetStatusText); DEFINE_EXPECT(UpdateUI); +DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_0); +DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); +DEFINE_EXPECT(Exec_SETPROGRESSMAX); +DEFINE_EXPECT(Exec_SETPROGRESSPOS); +DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); static const WCHAR wszItem[] = {'i','t','e','m',0}; static HWND container_hwnd, shell_embedding_hwnd; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static HRESULT QueryInterface(REFIID,void**); +static HRESULT WINAPI OleCommandTarget_QueryInterface(IOleCommandTarget *iface, + REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI OleCommandTarget_AddRef(IOleCommandTarget *iface) +{ + return 2; +} + +static ULONG WINAPI OleCommandTarget_Release(IOleCommandTarget *iface) +{ + return 1; +} + +static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + ok(!pguidCmdGroup, "pguidCmdGroup != MULL\n"); + ok(cCmds == 1, "cCmds=%d, expected 1\n", cCmds); + ok(!pCmdText, "pCmdText != NULL\n"); + + switch(prgCmds[0].cmdID) { + case OLECMDID_SETPROGRESSTEXT: + CHECK_EXPECT(QueryStatus_SETPROGRESSTEXT); + prgCmds[0].cmdf = OLECMDF_ENABLED; + return S_OK; + default: + ok(0, "unexpected command %d\n", prgCmds[0].cmdID); + } + + return E_FAIL; +} + +static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + if(!pguidCmdGroup) { + switch(nCmdID) { + case OLECMDID_SETPROGRESSMAX: + CHECK_EXPECT(Exec_SETPROGRESSMAX); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + if(pvaIn) + ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d, expected VT_I4\n", V_VT(pvaIn)); + ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); + return S_OK; + case OLECMDID_SETPROGRESSPOS: + CHECK_EXPECT(Exec_SETPROGRESSPOS); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + if(pvaIn) + ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d, expected VT_I4\n", V_VT(pvaIn)); + ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); + return S_OK; + case OLECMDID_SETDOWNLOADSTATE: + ok(!nCmdexecopt, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d\n", V_VT(pvaIn)); + switch(V_I4(pvaIn)) { + case 0: + CHECK_EXPECT(Exec_SETDOWNLOADSTATE_0); + break; + case 1: + CHECK_EXPECT2(Exec_SETDOWNLOADSTATE_1); + break; + default: + ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + } + return S_OK; + default: + ok(0, "unexpected nsCmdID %d\n", nCmdID); + } + }else if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { + switch(nCmdID) { + case 24: + return E_FAIL; /* TODO */ + default: + ok(0, "unexpected nCmdID %d\n", nCmdID); + } + }else { + ok(0, "unepected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + } + + return E_FAIL; +} + +static IOleCommandTargetVtbl OleCommandTargetVtbl = { + OleCommandTarget_QueryInterface, + OleCommandTarget_AddRef, + OleCommandTarget_Release, + OleCommandTarget_QueryStatus, + OleCommandTarget_Exec +}; + +static IOleCommandTarget OleCommandTarget = { &OleCommandTargetVtbl }; + static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_ITargetContainer, riid)) return E_NOINTERFACE; /* TODO */ - if(IsEqualGUID(&IID_IOleCommandTarget, riid)) - return E_NOINTERFACE; /* TODO */ + + if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { + *ppv = &OleCommandTarget; + return S_OK; + } ok(0, "unexpected call\n"); return E_NOINTERFACE; @@ -646,6 +767,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface IUnknown *pcmdtReserved, IDispatch *pdicpReserved) { ok(0, "unexpected call %d %p %p %p\n", dwID, ppt, pcmdtReserved, pdicpReserved); + trace("%x\n", dwID); return S_FALSE; } @@ -927,6 +1049,8 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client) SET_EXPECT(Site_GetWindow); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Invoke_AMBIENT_SILENT); + }else { + SET_EXPECT(Exec_SETDOWNLOADSTATE_0); } hres = IOleObject_SetClientSite(oleobj, client); @@ -937,7 +1061,9 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client) CHECK_CALLED(Site_GetWindow); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Invoke_AMBIENT_SILENT); - } + }else { + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + } hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); @@ -1381,6 +1507,7 @@ static void test_Navigate2(IUnknown *unk) V_BSTR(&url) = SysAllocString(wszAboutBlank); SET_EXPECT(Invoke_AMBIENT_USERMODE); + SET_EXPECT(Exec_SETDOWNLOADSTATE_1); SET_EXPECT(EnableModeless_FALSE); SET_EXPECT(GetHostInfo); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); @@ -1388,6 +1515,10 @@ static void test_Navigate2(IUnknown *unk) SET_EXPECT(Invoke_AMBIENT_PALETTE); SET_EXPECT(GetOptionKeyPath); SET_EXPECT(GetOverridesKeyPath); + SET_EXPECT(QueryStatus_SETPROGRESSTEXT); + SET_EXPECT(Exec_SETPROGRESSMAX); + SET_EXPECT(Exec_SETPROGRESSPOS); + SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(SetStatusText); SET_EXPECT(EnableModeless_TRUE); @@ -1395,6 +1526,7 @@ static void test_Navigate2(IUnknown *unk) ok(hres == S_OK, "Navigate2 failed: %08x\n", hres); CHECK_CALLED(Invoke_AMBIENT_USERMODE); + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(GetHostInfo); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); @@ -1402,6 +1534,12 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_PALETTE); CHECK_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverridesKeyPath); + todo_wine { + CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); + CHECK_CALLED(Exec_SETPROGRESSMAX); + CHECK_CALLED(Exec_SETPROGRESSPOS); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + } CHECK_CALLED(SetStatusText); CHECK_CALLED(EnableModeless_TRUE);

1 0

Alistair Leslie-Hughes : shlwapi: Fix memory leak in test.
by Alexandre Julliard Dec. 11, 2007

Dec. 11, 2007

Module: wine Branch: master Commit: 6dd046a61d242f3b5f7863bbc56257a634a2d782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd046a61d242f3b5f7863bbc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 11 15:37:42 2007 +1100 shlwapi: Fix memory leak in test. --- dlls/shlwapi/tests/string.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 895d767..b90dcc6 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -483,6 +483,7 @@ static void test_StrDupA(void) */ lpszStr = StrDupA(NULL); ok(lpszStr == NULL || *lpszStr == '\0', "NULL string returned %p\n", lpszStr); + LocalFree((HLOCAL)lpszStr); } static void test_StrFormatByteSize64A(void)

1 0

Jeremy Newman : improve the prev/next links on the news archive
by Jeremy Newman Dec. 11, 2007

Dec. 11, 2007

Module: website Branch: master Commit: 321f17b3f5ef274ef88ed5522dd3637d18489a00 URL: http://source.winehq.org/git/website.git/?a=commit;h=321f17b3f5ef274ef88ed5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 11 09:53:23 2007 -0600 improve the prev/next links on the news archive --- site | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/site b/site index 8294174..32a6bb8 100644 --- a/site +++ b/site @@ -160,7 +160,9 @@ function view_news ($where) $amax = 25; // where are we in news list - $x = $_GET['x']; + $x = 0; + if ($_GET['x']) + $x = $_GET['x']; // get list of news items $news = get_files($config->news_xml_path, "xml"); @@ -201,20 +203,24 @@ function view_news ($where) // prev/next links if ($where == 'archive') { + $pages = floor(($total / $amax)); + $prev_link = ""; + $next_link = ""; + // add back to first page link when not first page + if ($x != 0) + $prev_link .= $html->ahref("[First Page]","?news=archive;x=0", 'class="menuItem"')." "; // display prev link if ($x > 0) - { - $prev = ($total) - $c; - $prev_link = $html->ahref("<< Previous News","?news=archive;x=".$prev,"class=menuItem"); - } + $prev_link .= $html->ahref("<< Previous Page","?news=archive;x=".($x - $amax), 'class="menuItem"'); // display next link if (($x + $amax) < $total) { - $next = $x + $amax; - $next_link .= $html->ahref("More News >>","?news=archive;x=".$next,"class=menuItem"); - } + $next_link .= $html->ahref("Next Page >>","?news=archive;x=".($x + $amax) , 'class="menuItem"'); + // add jump to last page link + $next_link .= " ".$html->ahref("[Last Page]","?news=archive;x=".($pages * $amax) , 'class="menuItem"'); + } // add prev/next links - $news_body .= $html->p($html->div($prev_link.'   '.$next_link, 'align=center')); + $news_body .= $html->p($html->div($prev_link.'   '.$next_link, 'align="center"')); } // return the finished body

1 0

Jeremy Newman : override php setting for input var delimiter
by Jeremy Newman Dec. 11, 2007

Dec. 11, 2007

Module: website Branch: master Commit: b6ed075556112f1f565e77507012f544a75ce298 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6ed075556112f1f565e77… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 11 09:52:58 2007 -0600 override php setting for input var delimiter --- .htaccess | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess index 119fdf8..b79e7b0 100644 --- a/.htaccess +++ b/.htaccess @@ -10,6 +10,10 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Tell PHP how we want to handle global vars php_value register_globals 0 +# We want to use ";" as variable seperator (more XML compliant) +php_value arg_separator.output ";" +php_value arg_separator.input ";&" + # force the php to accept PATH_INFO <Files ~ (site)$> AcceptPathInfo On

1 0

Jeremy Newman : adding RSS news link
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: f58cce7836b2f8666b4bf26ebc9674e1ee630a0b URL: http://source.winehq.org/git/website.git/?a=commit;h=f58cce7836b2f8666b4bf2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 15:04:35 2007 -0600 adding RSS news link --- images/feed.gif | Bin 0 -> 652 bytes include/themes/winehq/home_page.template | 5 ++++- winehq_styles.css | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/images/feed.gif b/images/feed.gif new file mode 100644 index 0000000..b0e4adf Binary files /dev/null and b/images/feed.gif differ diff --git a/include/themes/winehq/home_page.template b/include/themes/winehq/home_page.template index f38562f..58bb25e 100644 --- a/include/themes/winehq/home_page.template +++ b/include/themes/winehq/home_page.template @@ -1,8 +1,11 @@ <table width="100%" border="0" cellpadding="0" cellspacing="0"> -<tr valign=top align=left> +<tr valign="top" align="left"> <td width="70%"> {$about_box} {$news_box} + <ul class="rss"> + <li><a href="{$root}/?rss=1">WineHQ News RSS Feed</a></li> + </ul> </td> <td width="30%"> {$latest_box} diff --git a/winehq_styles.css b/winehq_styles.css index f9e024f..5cf3bcc 100644 --- a/winehq_styles.css +++ b/winehq_styles.css @@ -90,6 +90,22 @@ p.indent { padding-left: 1em; padding-right: 1em;} .rowtitle { background-color: black; color: white; font-weight: bold; } .commandWidth { width: 500px; padding: 5px; } +/* RSS Feed Links */ +ul.rss { + list-style: none; + padding: 0 0 0 2px; + margin: 0; +} +ul.rss li { + background: url("./images/feed.gif") no-repeat 0 1px; + padding: 0px 0 0px 0px; + height: 18px; +} +ul.rss li a { + font-size: 10px; + padding: 0 0 0 18px; +} + /* Generic Buttons */ .button { background-color: #A50D0D; color: #ffffff; font-family: Sans-Serif; font-size: 12px; padding: 0; } .searchInput { background-color: #FFFFFF; color: #000000; font-family: Sans-Serif; font-size: 12px; padding: 0; }

1 0