wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Jacek Caban : jscript: Fixed SetScriptSite called before InitNew handling.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 89327655807842586589c185664360de221de940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89327655807842586589c1856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 01:03:03 2008 +0100 jscript: Fixed SetScriptSite called before InitNew handling. --- dlls/jscript/jscript.c | 42 ++++++++++++++++++--------------- dlls/jscript/tests/jscript.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 081f468..938b64e 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -36,6 +36,7 @@ typedef struct { DWORD safeopt; script_ctx_t *ctx; LONG thread_id; + LCID lcid; IActiveScriptSite *site; @@ -127,6 +128,26 @@ static void exec_queued_code(JScript *This) clear_script_queue(This); } +static HRESULT set_ctx_site(JScript *This) +{ + HRESULT hres; + + This->ctx->lcid = This->lcid; + + if(!This->ctx->script_disp) { + hres = create_dispex(This->ctx, NULL, NULL, &This->ctx->script_disp); + if(FAILED(hres)) + return hres; + } + + hres = init_global(This->ctx); + if(FAILED(hres)) + return hres; + + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; +} + #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) @@ -211,22 +232,6 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(This->site) return E_UNEXPECTED; - if(!This->ctx) { - hres = IActiveScriptParse_InitNew(ASPARSE(This)); - if(FAILED(hres)) - return hres; - } - - if(!This->ctx->script_disp) { - hres = create_dispex(This->ctx, NULL, NULL, &This->ctx->script_disp); - if(FAILED(hres)) - return hres; - } - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; @@ -237,8 +242,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(hres == S_OK) This->ctx->lcid = lcid; - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; + return This->ctx ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -517,7 +521,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; } - return S_OK; + return This->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface, diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index b0c532f..35818cc 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -339,11 +339,64 @@ static void test_jscript(void) ok(!ref, "ref = %d\n", ref); } +static void test_jscript2(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IUnknown *unk; + ULONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&script); + ok(hres == S_OK, "Could not get IActiveScript: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + SET_EXPECT(GetLCID); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScriptParse_InitNew(parse); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScriptParse_InitNew(parse); + ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + test_script_dispatch(script, FALSE); + + IActiveScriptParse_Release(parse); + IActiveScript_Release(script); + + ref = IUnknown_Release(unk); + ok(!ref, "ref = %d\n", ref); +} + START_TEST(jscript) { CoInitialize(NULL); test_jscript(); + test_jscript2(); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Remove no longer used interfaces.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: d9f097adf9618de5e9a20b43a84c5ed25ee67136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f097adf9618de5e9a20b43a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 4 20:18:43 2008 +0100 mshtml: Remove no longer used interfaces. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/nsembed.c | 38 ---------- dlls/mshtml/nsiface.idl | 162 +----------------------------------------- 3 files changed, 2 insertions(+), 200 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 888669f..6c6ab33 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -524,8 +524,6 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); -nsIMutableArray *create_nsarray(void); -nsIWritableVariant *create_nsvariant(void); void nsnode_to_nsstring(nsIDOMNode*,nsAString*); void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1734541..2cddbdf 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -604,44 +604,6 @@ nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) return (nsIInputStream*)ret; } -nsIMutableArray *create_nsarray(void) -{ - nsIMutableArray *ret; - nsresult nsres; - - if(!pCompMgr) - return NULL; - - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, - NS_ARRAY_CONTRACTID, NULL, &IID_nsIMutableArray, - (void**)&ret); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIArray: %08x\n", nsres); - return NULL; - } - - return ret; -} - -nsIWritableVariant *create_nsvariant(void) -{ - nsIWritableVariant *ret; - nsresult nsres; - - if(!pCompMgr) - return NULL; - - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, - NS_VARIANT_CONTRACTID, NULL, &IID_nsIWritableVariant, - (void**)&ret); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIWritableVariant: %08x\n", nsres); - return NULL; - } - - return ret; -} - nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 21f8cd7..5953143 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -242,142 +242,6 @@ interface nsISimpleEnumerator : nsISupports [ object, - uuid(114744d9-c369-456e-b55a-52fe52880d2d), - local - /* NOT_FROZEN */ -] -interface nsIArray : nsISupports -{ - nsresult GetLength(PRUint32 *aLength); - nsresult QueryElementAt(PRUint32 index, const nsIID *uuid, void **result); - nsresult IndexOf(PRUint32 startIndex, nsISupports *element, PRUint32 *_retval); - nsresult Enumerate(nsISimpleEnumerator **_retval); -} - -[ - object, - uuid(af059da0-c85b-40ec-af07-ae4bfdc192cc), - local - /* NOT_FROZEN */ -] -interface nsIMutableArray : nsIArray -{ - nsresult AppendElement(nsISupports *element, PRBool weak); - nsresult RemoveElementAt(PRUint32 index); - nsresult InsertElementAt(nsISupports *element, PRUint32 index, PRBool weak); - nsresult Clear(); -} - -[ - object, - uuid(4d12e540-83d7-11d5-90ed-0010a4e73d9a), - local - /* NOT_FROZEN */ -] -interface nsIVariant : nsISupports -{ - enum nsDataType { - TYPE_INT8, - TYPE_INT16, - TYPE_INT32, - TYPE_INT64, - TYPE_UINT8, - TYPE_UINT16, - TYPE_UINT32, - TYPE_UINT64, - TYPE_FLOAT, - TYPE_DOUBLE, - TYPE_BOOL, - TYPE_CHAR, - TYPE_WCHAR, - TYPE_VOID, - TYPE_ID, - TYPE_DOMSTRING, - TYPE_CHAR_STR, - TYPE_WCHAR_STR, - TYPE_INTERFACE, - TYPE_INTERFACE_IS, - TYPE_ARRAY, - TYPE_STRING_SIZE_IS, - TYPE_WSTRING_SIZE_IS, - TYPE_UTF8STRING, - TYPE_CSTRING, - TYPE_ASTRING, - TYPE_AMPTY_ARRAY, - TYPE_EMPTY - }; - - nsresult GetDataType(PRUint16 *aDataType); - nsresult GetAsInt8(PRUint8 *_retval); - nsresult GetAsInt16(PRInt16 *_retval); - nsresult GetAsInt32(PRInt32 *_retval); - nsresult GetAsInt64(PRInt64 *_retval); - nsresult GetAsUint8(PRUint8 *_retval); - nsresult GetAsUint16(PRUint16 *_retval); - nsresult GetAsUint32(PRUint32 *_retval); - nsresult GetAsUint64(PRUint64 *_retval); - nsresult GetAsFloat(float *_retval); - nsresult GetAsDouble(double *_retval); - nsresult GetAsBool(PRBool *_retval); - nsresult GetAsChar(char *_retval); - nsresult GetAsWChar(PRUnichar *_retval); - nsresult GetAsID(nsID *retval); - nsresult GetAsAString(nsAString *_retval); - nsresult GetAsDOMString(nsAString *_retval); - nsresult GetAsACString(nsACString *_retval); - nsresult GetAsAUTF8String(nsACString *_retval); - nsresult GetAsString(char **_retval); - nsresult GetAsWString(PRUnichar **_retval); - nsresult GetAsISupports(nsISupports **_retval); - nsresult GetAsInterface(nsIID * *iid, void **iface); - nsresult GetAsArray(PRUint16 *type, nsIID *iid, PRUint32 *count, void **ptr); - nsresult GetAsStringWithSize(PRUint32 *size, char **str); - nsresult GetAsWStringWithSize(PRUint32 *size, PRUnichar **str); -} - -[ - object, - uuid(5586a590-8c82-11d5-90f3-0010a4e73d9a), - local - /* NOT_FROZEN */ -] -interface nsIWritableVariant : nsIVariant -{ - nsresult GetWritable(PRBool *aWritable); - nsresult SetWritable(PRBool aWritable); - nsresult SetAsInt8(PRUint8 aValue); - nsresult SetAsInt16(PRInt16 aValue); - nsresult SetAsInt32(PRInt32 aValue); - nsresult SetAsInt64(PRInt64 aValue); - nsresult SetAsUint8(PRUint8 aValue); - nsresult SetAsUint16(PRUint16 aValue); - nsresult SetAsUint32(PRUint32 aValue); - nsresult SetAsUint64(PRUint64 aValue); - nsresult SetAsFloat(float aValue); - nsresult SetAsDouble(double aValue); - nsresult SetAsBool(PRBool aValue); - nsresult SetAsChar(char aValue); - nsresult SetAsWChar(PRUnichar aValue); - nsresult SetAsID(const nsID *aValue); - nsresult SetAsAString(const nsAString *aValue); - nsresult SetAsDOMString(const nsAString *aValue); - nsresult SetAsACString(const nsACString *aValue); - nsresult SetAsAUTF8String(const nsACString *aValue); - nsresult SetAsString(const char *aValue); - nsresult SetAsWString(const PRUnichar *aValue); - nsresult SetAsISupports(nsISupports *aValue); - nsresult SetAsInterface(const nsIID *iid, void *iface); - nsresult SetAsArray(PRUint16 type, const nsIID *iid, PRUint32 count, void *ptr); - nsresult SetAsStringWithSize(PRUint32 size, const char *str); - nsresult SetAsWStringWithSize(PRUint32 size, const PRUnichar *str); - nsresult SetAsVoid(); - nsresult SetAsEmpty(); - nsresult SetAsEmptyArray(); - nsresult SetFromVariant(nsIVariant *aValue); -} - -[ - object, uuid(fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a), local /* FROZEN */ @@ -2352,32 +2216,9 @@ interface nsIContentSerializer : nsISupports [ object, - uuid(68b97c56-2289-48ac-a9e1-72c30fd3dba2), - local -] -interface nsIScriptContainer : nsISupports -{ - typedef void *JSObject; - - nsresult GetContext(void **aContext); - nsresult GetGlobalObject(void **aGlobalObject); - nsresult CompileScript(const PRUnichar *aText, PRInt32 aTextLength, void *aScopeObject, - nsIPrincipal *aPrincipal, const char *aURL, PRUint32 aLineNo, PRUint32 aVersion, void **_retval); - nsresult ExecuteScript(void *aScriptObject, void *aScopeObject, nsAString *aRetVal, PRBool *aIsUndefined); - nsresult CompileFunction(void *aTarget, const nsACString *aName, PRUint32 aArgCount, - const char **aArgArray, const nsAString *aBody, const char *aURL, PRInt32 aLineNo, - PRBool aShared, void* *_retval); - nsresult CallFunction(nsISupports *aTarget, void *aScope, void *aHandler, nsIArray *argv, - nsIVariant **_retval); - nsresult BindEventHandler(nsISupports *aTarget, void *aScope, nsIAtom *aName, void *aHandler); - nsresult HoldScriptObject(void *aObject); - nsresult DropScriptObject(void *aObject); -} - -[ - object, uuid(D4882FFB-E927-408b-96BE-D4391B456FA9), local + /* NOT_FROZEN */ ] interface nsIEditor : nsISupports { @@ -2461,6 +2302,7 @@ interface nsIEditor : nsISupports object, uuid(afc36593-5787-4420-93d9-b2c0ccbf0cad), local + /* NOT_FROZEN */ ] interface nsIHTMLEditor : nsISupports {

1 0

Aric Stewart : comctl32: Add implementation of LVS_EX_ONECLICKACTIVATE.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: e46a87599660f2bc92676df3dba6b27eb24bf8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46a87599660f2bc92676df3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 4 12:11:57 2008 -0600 comctl32: Add implementation of LVS_EX_ONECLICKACTIVATE. --- dlls/comctl32/listview.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 47d79d6..ce1e1b4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -95,10 +95,8 @@ * -- LVS_EX_INFOTIP * -- LVS_EX_LABELTIP * -- LVS_EX_MULTIWORKAREAS - * -- LVS_EX_ONECLICKACTIVATE * -- LVS_EX_REGIONAL * -- LVS_EX_SIMPLESELECT - * -- LVS_EX_TRACKSELECT * -- LVS_EX_TWOCLICKACTIVATE * -- LVS_EX_UNDERLINECOLD * -- LVS_EX_UNDERLINEHOT @@ -3270,6 +3268,13 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } +static inline BOOL LISTVIEW_isHotTracking(const LISTVIEW_INFO *infoPtr) +{ + return ((infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) || + (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) || + (infoPtr->dwLvExStyle & LVS_EX_TWOCLICKACTIVATE)); +} + /*** * DESCRIPTION: * Called when the mouse is being actively tracked and has hovered for a specified @@ -3290,7 +3295,7 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte */ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { - if (infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) + if (LISTVIEW_isHotTracking(infoPtr)) { LVITEMW item; POINT pt; @@ -3364,7 +3369,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ - if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { + if (LISTVIEW_isHotTracking(infoPtr)) { /* fill in the trackinfo struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -8694,6 +8699,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN LISTVIEW_SetSelection(infoPtr, nItem); } } + + if (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) + if(lvHitTestInfo.iItem != -1) notify_itemactivate(infoPtr,&lvHitTestInfo); } else { @@ -9235,7 +9243,7 @@ static BOOL LISTVIEW_SetCursor(const LISTVIEW_INFO *infoPtr, HWND hwnd, UINT nHi { LVHITTESTINFO lvHitTestInfo; - if(!(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT)) return FALSE; + if(!(LISTVIEW_isHotTracking(infoPtr))) return FALSE; if(!infoPtr->hHotCursor) return FALSE;

1 0

Paul Vriens : shell32/tests: Fix a test failure on NT4.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: ec2258169cfca4aac63fe15d0f0564b40096dce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2258169cfca4aac63fe15d0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 5 08:20:34 2008 +0100 shell32/tests: Fix a test failure on NT4. --- dlls/shell32/tests/shelllink.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7657fe0..7206df3 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -650,7 +650,9 @@ static void test_datalink(void) r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl ); - ok( r == S_OK || r == E_NOINTERFACE, "CoCreateInstance failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* Win9x */ + "CoCreateInstance failed (0x%08x)\n", r); if (!sl) { skip("no shelllink\n"); @@ -658,11 +660,14 @@ static void test_datalink(void) } r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); - ok(r == S_OK, "IShellLinkW_QueryInterface failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "IShellLinkW_QueryInterface failed (0x%08x)\n", r); if (!dl) { skip("no datalink interface\n"); + IShellLinkW_Release( sl ); return; }

1 0

Paul Vriens : shlwapi/tests: Fix a failure on Win9x and NT4.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: d64f8a887fc90874476d76b61f06a694f441a49f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64f8a887fc90874476d76b61… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 19:21:50 2008 +0100 shlwapi/tests: Fix a failure on Win9x and NT4. --- dlls/shlwapi/tests/assoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 3e4d8d4..3799ecc 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -130,7 +130,9 @@ static void test_getstring_basic(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); - expect_hr(S_FALSE, hr); + ok(hr == S_FALSE || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ + "Unexpected result : %08x\n", hr); if (hr != S_FALSE) { HeapFree(GetProcessHeap(), 0, executableName);

1 0

Paul Vriens : ddraw/tests: Fix a test on W2K3.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: fbdb78c88805d08ef3dcc22fa59886e833f2516f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdb78c88805d08ef3dcc22fa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 19:05:06 2008 +0100 ddraw/tests: Fix a test on W2K3. --- dlls/ddraw/tests/overlay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 8dd8805..d1edc1d 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -170,7 +170,8 @@ static void offscreen_test(void) { ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + ok(hr == DD_OK || broken(hr == E_NOTIMPL), + "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); /* Try to overlay the primary with a non-overlay surface */ hr = IDirectDrawSurface7_UpdateOverlay(offscreen, NULL, primary, NULL, DDOVER_SHOW, NULL);

1 0

Alexandre Julliard : kernel32/tests: Add a few more tests, fix some failures on Windows.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 503269a4db5f6de5a22fa519efb6d66345c39efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=503269a4db5f6de5a22fa519e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 16:13:41 2008 +0100 kernel32/tests: Add a few more tests, fix some failures on Windows. --- dlls/kernel32/tests/virtual.c | 103 ++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503269a4db5f6de5a22fa…

1 0

Alexandre Julliard : kernel32/tests: Fix a couple of failures on Windows.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: fdf2e7a3389601b38e7a7b28ae9cc9ee294fcc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf2e7a3389601b38e7a7b28a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 16:13:30 2008 +0100 kernel32/tests: Fix a couple of failures on Windows. --- dlls/kernel32/tests/heap.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 271a221..c196c23 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -75,7 +75,8 @@ START_TEST(heap) /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024); ok( mem != NULL, "failed for size 512K\n" ); - ok( (ULONG_PTR)mem % 16 == 0, "512K block not 16-byte aligned\n" ); + ok( (ULONG_PTR)mem % 16 == 0 || broken((ULONG_PTR)mem % 16) /* win9x */, + "512K block not 16-byte aligned\n" ); HeapFree(GetProcessHeap(), 0, mem); /* Global*() functions */ @@ -191,10 +192,11 @@ START_TEST(heap) /* invalid free */ SetLastError(MAGIC_DEAD); mem = GlobalFree(gbl); - ok(mem == gbl, "Expected gbl, got %p\n", mem); - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); + if (mem == gbl) + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); gbl = GlobalAlloc(GMEM_DDESHARE, 100);

1 0

Paul Vriens : shlwapi/tests: Fix some failures on XP and W2K3.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 6fd4c628022c73bf86f091fd33ab4fb8e07cf379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd4c628022c73bf86f091fd3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 4 13:49:02 2008 +0100 shlwapi/tests: Fix some failures on XP and W2K3. --- dlls/shlwapi/tests/assoc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index d1c15aa..3e4d8d4 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -219,6 +219,10 @@ static void test_getstring_no_extra(void) } hr = pAssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, buf, &len); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP and W2K3 */ + "Unexpected result : %08x\n", hr); + hr = pAssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, "foo", buf, &len); expect_hr(S_OK, hr); ok(strstr(buf, action) != NULL, "got '%s' (Expected result to include 'notepad.exe')\n", buf);

1 0

Hans Leidekker : inetcomm: CreateIMAPTransport, CreatePOP3Transport and CreateSMTPTransport are implemented.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: f0399605868fb8fd24c4c74ea6a31250e01d613c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0399605868fb8fd24c4c74ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 11:35:18 2008 +0100 inetcomm: CreateIMAPTransport, CreatePOP3Transport and CreateSMTPTransport are implemented. --- dlls/inetcomm/inetcomm.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 86669c8..0c90b4d 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -1,10 +1,10 @@ @ stub CreateIMAPTransport2 -@ stub CreateIMAPTransport +@ stdcall CreateIMAPTransport(ptr) @ stub CreateNNTPTransport -@ stub CreatePOP3Transport +@ stdcall CreatePOP3Transport(ptr) @ stub CreateRASTransport @ stub CreateRangeList -@ stub CreateSMTPTransport +@ stdcall CreateSMTPTransport(ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2008