December 2008 - Wine-commits

Alexandre Julliard : ole32: Register interfaces through dlldata. c as far as possible.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 16b5e6b9b5992781e788d7da3afded0e182005ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b5e6b9b5992781e788d7da3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 20:52:09 2008 +0100 ole32: Register interfaces through dlldata.c as far as possible. --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/compobj.c | 11 +++------ dlls/ole32/compobj_private.h | 6 +++- dlls/ole32/ole2.c | 8 +++--- dlls/ole32/regsvr.c | 45 ++++++++--------------------------------- 5 files changed, 22 insertions(+), 50 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index a38c965..f8d7481 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -6,7 +6,7 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 rpcrt4 kernel32 ntdll EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer + -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DREGISTER_PROXY_DLL C_SRCS = \ antimoniker.c \ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a920b9c..d778478 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -63,8 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -HINSTANCE OLE32_hInstance = 0; - #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) /**************************************************************************** @@ -209,14 +207,14 @@ static void COMPOBJ_InitProcess( void ) */ memset(&wclass, 0, sizeof(wclass)); wclass.lpfnWndProc = apartment_wndproc; - wclass.hInstance = OLE32_hInstance; + wclass.hInstance = hProxyDll; wclass.lpszClassName = wszAptWinClass; RegisterClassW(&wclass); } static void COMPOBJ_UninitProcess( void ) { - UnregisterClassW(wszAptWinClass, OLE32_hInstance); + UnregisterClassW(wszAptWinClass, hProxyDll); } static void COM_TlsDestroy(void) @@ -729,7 +727,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) { HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, OLE32_hInstance, NULL); + HWND_MESSAGE, 0, hProxyDll, NULL); if (!hwnd) { ERR("CreateWindow failed with error %d\n", GetLastError()); @@ -3861,7 +3859,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) switch(fdwReason) { case DLL_PROCESS_ATTACH: - OLE32_hInstance = hinstDLL; + hProxyDll = hinstDLL; COMPOBJ_InitProcess(); if (TRACE_ON(ole)) CoRegisterMallocSpy((LPVOID)-1); break; @@ -3872,7 +3870,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); - OLE32_hInstance = 0; break; case DLL_THREAD_DETACH: diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 150c7c7..869cd84 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -303,14 +303,16 @@ static inline GUID COM_CurrentCausalityId(void) # define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) # define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 -extern HINSTANCE OLE32_hInstance; /* FIXME: make static */ - #define CHARS_IN_GUID 39 /* including NULL */ #define WINE_CLSCTX_DONT_HOST 0x80000000 /* from dlldata.c */ +extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; +extern BOOL WINAPI OLE32_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4be2eb8..a2ff9b7 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2119,19 +2119,19 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { if (*trackerInfo->pdwEffect & DROPEFFECT_MOVE) { - SetCursor(LoadCursorA(OLE32_hInstance, MAKEINTRESOURCEA(1))); + SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(1))); } else if (*trackerInfo->pdwEffect & DROPEFFECT_COPY) { - SetCursor(LoadCursorA(OLE32_hInstance, MAKEINTRESOURCEA(2))); + SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(2))); } else if (*trackerInfo->pdwEffect & DROPEFFECT_LINK) { - SetCursor(LoadCursorA(OLE32_hInstance, MAKEINTRESOURCEA(3))); + SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(3))); } else { - SetCursor(LoadCursorA(OLE32_hInstance, MAKEINTRESOURCEA(0))); + SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(0))); } } } diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 07ddde0..2abd636 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -509,69 +509,38 @@ static struct regsvr_coclass const coclass_list[] = { * interface list */ -#define INTERFACE_ENTRY(interface, base, clsid32, clsid16) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), clsid16, clsid32 } -#define BAS_INTERFACE_ENTRY(interface, base) INTERFACE_ENTRY(interface, &IID_##base, &CLSID_PSFactoryBuffer, NULL) -#define STD_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer, NULL) -#define ACTX_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer_actxprxy, NULL) -#define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL, NULL) +#define INTERFACE_ENTRY(interface, base, clsid32) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), NULL, clsid32 } +#define BAS_INTERFACE_ENTRY(interface, base) INTERFACE_ENTRY(interface, &IID_##base, NULL) +#define ACTX_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer_actxprxy) +#define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL) static const struct regsvr_interface interface_list[] = { LCL_INTERFACE_ENTRY(IUnknown), - STD_INTERFACE_ENTRY(IClassFactory), LCL_INTERFACE_ENTRY(IMalloc), LCL_INTERFACE_ENTRY(IMarshal), - STD_INTERFACE_ENTRY(ILockBytes), - STD_INTERFACE_ENTRY(IStorage), - STD_INTERFACE_ENTRY(IStream), - STD_INTERFACE_ENTRY(IEnumSTATSTG), - STD_INTERFACE_ENTRY(IBindCtx), BAS_INTERFACE_ENTRY(IMoniker, IPersistStream), - STD_INTERFACE_ENTRY(IRunningObjectTable), - STD_INTERFACE_ENTRY(IRootStorage), LCL_INTERFACE_ENTRY(IMessageFilter), LCL_INTERFACE_ENTRY(IStdMarshalInfo), LCL_INTERFACE_ENTRY(IExternalConnection), LCL_INTERFACE_ENTRY(IMallocSpy), LCL_INTERFACE_ENTRY(IMultiQI), - STD_INTERFACE_ENTRY(IEnumUnknown), - STD_INTERFACE_ENTRY(IEnumString), - STD_INTERFACE_ENTRY(IEnumMoniker), - STD_INTERFACE_ENTRY(IEnumFORMATETC), - STD_INTERFACE_ENTRY(IEnumOLEVERB), - STD_INTERFACE_ENTRY(IEnumSTATDATA), BAS_INTERFACE_ENTRY(IPersistStream, IPersist), BAS_INTERFACE_ENTRY(IPersistStorage, IPersist), BAS_INTERFACE_ENTRY(IPersistFile, IPersist), - STD_INTERFACE_ENTRY(IPersist), - STD_INTERFACE_ENTRY(IViewObject), - STD_INTERFACE_ENTRY(IDataObject), - STD_INTERFACE_ENTRY(IAdviseSink), LCL_INTERFACE_ENTRY(IDataAdviseHolder), LCL_INTERFACE_ENTRY(IOleAdviseHolder), - STD_INTERFACE_ENTRY(IOleObject), BAS_INTERFACE_ENTRY(IOleInPlaceObject, IOleWindow), - STD_INTERFACE_ENTRY(IOleWindow), BAS_INTERFACE_ENTRY(IOleInPlaceUIWindow, IOleWindow), - STD_INTERFACE_ENTRY(IOleInPlaceFrame), BAS_INTERFACE_ENTRY(IOleInPlaceActiveObject, IOleWindow), - STD_INTERFACE_ENTRY(IOleClientSite), BAS_INTERFACE_ENTRY(IOleInPlaceSite, IOleWindow), - STD_INTERFACE_ENTRY(IParseDisplayName), BAS_INTERFACE_ENTRY(IOleContainer, IParseDisplayName), BAS_INTERFACE_ENTRY(IOleItemContainer, IOleContainer), - STD_INTERFACE_ENTRY(IOleLink), - STD_INTERFACE_ENTRY(IOleCache), LCL_INTERFACE_ENTRY(IDropSource), - STD_INTERFACE_ENTRY(IDropTarget), BAS_INTERFACE_ENTRY(IAdviseSink2, IAdviseSink), - STD_INTERFACE_ENTRY(IRunnableObject), BAS_INTERFACE_ENTRY(IViewObject2, IViewObject), BAS_INTERFACE_ENTRY(IOleCache2, IOleCache), - STD_INTERFACE_ENTRY(IOleCacheControl), - STD_INTERFACE_ENTRY(IRemUnknown), LCL_INTERFACE_ENTRY(IClientSecurity), LCL_INTERFACE_ENTRY(IServerSecurity), - STD_INTERFACE_ENTRY(ISequentialStream), ACTX_INTERFACE_ENTRY(IEnumGUID), ACTX_INTERFACE_ENTRY(IEnumCATEGORYINFO), ACTX_INTERFACE_ENTRY(ICatRegister), @@ -588,7 +557,9 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); - hr = register_coclasses(coclass_list); + hr = OLE32_DllRegisterServer(); + if (SUCCEEDED(hr)) + hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); return hr; @@ -606,5 +577,7 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = OLE32_DllUnregisterServer(); return hr; }

1 0

Austin English : website: redirect the FAQ to the wiki
by Jeremy Newman 02 Dec '08

02 Dec '08

Module: website Branch: master Commit: cebf9174e9797006985c8de847a83a27d2df69d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=cebf9174e9797006985c8d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 2 03:03:33 2008 -0600 website: redirect the FAQ to the wiki Should fix bug 10188. -- -Austin --- .htaccess | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess index 3925d64..77b2f6e 100644 --- a/.htaccess +++ b/.htaccess @@ -61,6 +61,14 @@ RedirectPermanent /cvs/ http://www.winehq.org/site/cvs RedirectPermanent /cvs http://www.winehq.org/site/cvs RedirectPermanent /forums/ http://www.winehq.org/site/forums RedirectPermanent /forums http://www.winehq.org/site/forums +RedirectPermanent /site/docs/wine-faq/ http://wiki.winehq.org/FAQ +RedirectPermanent /site/docs/wine-faq http://wiki.winehq.org/FAQ +RedirectPermanent /site/docs/wine-faq/index/ http://wiki.winehq.org/FAQ +RedirectPermanent /site/docs/wine-faq/index http://wiki.winehq.org/FAQ +RedirectPermanent /site/faq/ http://wiki.winehq.org/FAQ +RedirectPermanent /site/faq http://wiki.winehq.org/FAQ +RedirectPermanent /site/FAQ/ http://wiki.winehq.org/FAQ +RedirectPermanent /site/FAQ http://wiki.winehq.org/FAQ # fix documentation links RedirectMatch ^/(Docs|Docs/)$ http://www.winehq.org/site/documentation

1 0

Andrew Nguyen : jscript: Implement the String.small() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 424a3f3ffe671ce81355cb8334b03f8a9df04ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424a3f3ffe671ce81355cb833… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:37 2008 -0600 jscript: Implement the String.small() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5afbe46..862dfb0 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -866,8 +866,8 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR smalltagW[] = {'S','M','A','L','L',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, smalltagW); } static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d8df87f..4b58e99 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -314,6 +314,15 @@ ok(tmp === "test", "'test'.italics() = " + tmp); tmp = "test".italics(3); ok(tmp === "test", "'test'.italics(3) = " + tmp); +tmp = "".small(); +ok(tmp === "", "''.small() = " + tmp); +tmp = "".small(3); +ok(tmp === "", "''.small(3) = " + tmp); +tmp = "test".small(); +ok(tmp === "test", "'test'.small() = " + tmp); +tmp = "test".small(3); +ok(tmp === "test", "'test'.small(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.strike() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: bbac6de702dd971c248047a9c569bac0f3ae0739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbac6de702dd971c248047a9c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:43 2008 -0600 jscript: Implement the String.strike() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 862dfb0..5e93fa2 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -997,8 +997,8 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_strike(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR striketagW[] = {'S','T','R','I','K','E',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, striketagW); } static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4b58e99..1a0a88d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -323,6 +323,15 @@ ok(tmp === "test", "'test'.small() = " + tmp); tmp = "test".small(3); ok(tmp === "test", "'test'.small(3) = " + tmp); +tmp = "".strike(); +ok(tmp === "<STRIKE></STRIKE>", "''.strike() = " + tmp); +tmp = "".strike(3); +ok(tmp === "<STRIKE></STRIKE>", "''.strike(3) = " + tmp); +tmp = "test".strike(); +ok(tmp === "<STRIKE>test</STRIKE>", "'test'.strike() = " + tmp); +tmp = "test".strike(3); +ok(tmp === "<STRIKE>test</STRIKE>", "'test'.strike(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.italics() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: edba282951c07966273118e261b4b7fdef15efd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edba282951c07966273118e26… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:30 2008 -0600 jscript: Implement the String.italics() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index f99d9ad..5afbe46 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -418,8 +418,8 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR static HRESULT String_italics(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR italicstagW[] = {'I',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, italicstagW); } static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c8e8d2c..d8df87f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -305,6 +305,15 @@ ok(tmp === "<TT>test</TT>", "'test'.fixed() = " + tmp); tmp = "test".fixed(3); ok(tmp === "<TT>test</TT>", "'test'.fixed(3) = " + tmp); +tmp = "".italics(); +ok(tmp === "", "''.italics() = " + tmp); +tmp = "".italics(3); +ok(tmp === "", "''.italics(3) = " + tmp); +tmp = "test".italics(); +ok(tmp === "test", "'test'.italics() = " + tmp); +tmp = "test".italics(3); +ok(tmp === "test", "'test'.italics(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.fixed() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: c80a23c639ded0e196a72f3b8ea46441d4ab24cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80a23c639ded0e196a72f3b8… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:22 2008 -0600 jscript: Implement the String.fixed() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 426436b..f99d9ad 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -329,8 +329,8 @@ static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fixedtagW[] = {'T','T',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fixedtagW); } static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4355d34..c8e8d2c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -296,6 +296,15 @@ ok(tmp === "test", "'test'.bold() = " + tmp); tmp = "test".bold(3); ok(tmp === "test", "'test'.bold(3) = " + tmp); +tmp = "".fixed(); +ok(tmp === "<TT></TT>", "''.fixed() = " + tmp); +tmp = "".fixed(3); +ok(tmp === "<TT></TT>", "''.fixed(3) = " + tmp); +tmp = "test".fixed(); +ok(tmp === "<TT>test</TT>", "'test'.fixed() = " + tmp); +tmp = "test".fixed(3); +ok(tmp === "<TT>test</TT>", "'test'.fixed(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.bold() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 99f376dc4e07f43cdb3ade21dcbb1d80e40c538e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f376dc4e07f43cdb3ade21d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:15 2008 -0600 jscript: Implement the String.bold() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 94f4733..426436b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -174,8 +174,8 @@ static HRESULT String_blink(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR boldtagW[] = {'B',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, boldtagW); } /* ECMA-262 3rd Edition 15.5.4.5 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7668509..4355d34 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,15 @@ ok(tmp === "<BLINK>test</BLINK>", "'test'.blink() = " + tmp); tmp = "test".blink(3); ok(tmp === "<BLINK>test</BLINK>", "'test'.blink(3) = " + tmp); +tmp = "".bold(); +ok(tmp === "", "''.bold() = " + tmp); +tmp = "".bold(3); +ok(tmp === "", "''.bold(3) = " + tmp); +tmp = "test".bold(); +ok(tmp === "test", "'test'.bold() = " + tmp); +tmp = "test".bold(3); +ok(tmp === "test", "'test'.bold(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.blink() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: a8dff20f2ea793eebba186919b9e3c8a384bb593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8dff20f2ea793eebba186919… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:08 2008 -0600 jscript: Implement the String.blink() method. --- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4cfc082..94f4733 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -167,8 +167,8 @@ static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_blink(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR blinktagW[] = {'B','L','I','N','K',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, blinktagW); } static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e0d7025..7668509 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -278,6 +278,15 @@ ok(tmp === "<BIG>test</BIG>", "'test'.big() = " + tmp); tmp = "test".big(3); ok(tmp === "<BIG>test</BIG>", "'test'.big(3) = " + tmp); +tmp = "".blink(); +ok(tmp === "<BLINK></BLINK>", "''.blink() = " + tmp); +tmp = "".blink(3); +ok(tmp === "<BLINK></BLINK>", "''.blink(3) = " + tmp); +tmp = "test".blink(); +ok(tmp === "<BLINK>test</BLINK>", "'test'.blink() = " + tmp); +tmp = "test".blink(3); +ok(tmp === "<BLINK>test</BLINK>", "'test'.blink(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.big() method.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: dd23e5b19c00659f527f4840d4fbc3068a3a9308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd23e5b19c00659f527f4840d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 30 06:40:01 2008 -0600 jscript: Implement the String.big() method. --- dlls/jscript/string.c | 31 +++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5c074e8..4cfc082 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -123,6 +123,33 @@ static HRESULT String_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return String_toString(dispex, lcid, flags, dp, retv, ei, sp); } +static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname) +{ + static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; + StringInstance *string; + BSTR ret; + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + return E_NOTIMPL; + } + + string = (StringInstance*)dispex; + + if(retv) { + ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + 5); + if(!ret) + return E_OUTOFMEMORY; + + sprintfW(ret, tagfmt, tagname, string->str, tagname); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + return S_OK; +} + static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -133,8 +160,8 @@ static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR bigtagW[] = {'B','I','G',0}; + return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, bigtagW); } static HRESULT String_blink(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4f843ec..e0d7025 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -269,6 +269,15 @@ ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "".big(); +ok(tmp === "<BIG></BIG>", "''.big() = " + tmp); +tmp = "".big(3); +ok(tmp === "<BIG></BIG>", "''.big(3) = " + tmp); +tmp = "test".big(); +ok(tmp === "<BIG>test</BIG>", "'test'.big() = " + tmp); +tmp = "test".big(3); +ok(tmp === "<BIG>test</BIG>", "'test'.big(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Maarten Lankhorst : wineoss.drv: Get rid of sizeof in traces.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 1470955cc50c8359f961910cefd312db8361d993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470955cc50c8359f961910ce… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 2 15:01:48 2008 +0100 wineoss.drv: Get rid of sizeof in traces. --- dlls/wineoss.drv/midi.c | 4 ++-- dlls/wineoss.drv/mixer.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index ade1928..15e0396 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1620,8 +1620,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, - lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; } diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 34588f9..8eeb22b 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -787,8 +787,8 @@ static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD fdwInfo) } if (lpMl->cbStruct != sizeof(*lpMl)) { - WARN("invalid parameter: lpMl->cbStruct = %d != %d\n", - lpMl->cbStruct, sizeof(*lpMl)); + WARN("invalid parameter: lpMl->cbStruct = %d\n", + lpMl->cbStruct); return MMSYSERR_INVALPARAM; } @@ -963,14 +963,14 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, } if (lpMlc->cbStruct < sizeof(*lpMlc)) { - WARN("invalid parameter: lpMlc->cbStruct = %d < %d\n", - lpMlc->cbStruct, sizeof(*lpMlc)); + WARN("invalid parameter: lpMlc->cbStruct = %d\n", + lpMlc->cbStruct); return MMSYSERR_INVALPARAM; } if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) { - WARN("invalid parameter: lpMlc->cbmxctrl = %d < %d\n", - lpMlc->cbmxctrl, sizeof(MIXERCONTROLW)); + WARN("invalid parameter: lpMlc->cbmxctrl = %d\n", + lpMlc->cbmxctrl); return MMSYSERR_INVALPARAM; } @@ -1098,8 +1098,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1145,8 +1145,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1167,8 +1167,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1299,8 +1299,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1351,8 +1351,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1395,8 +1395,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }

1 0