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

Aric Stewart : msctf: Add stub for ITfDisplayAttributeMgr.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: e669ffe6e52d6f5193dd3a71c372ca9bfc42a621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e669ffe6e52d6f5193dd3a71c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 18 10:39:00 2010 -0500 msctf: Add stub for ITfDisplayAttributeMgr. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/displayattributemgr.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/regsvr.c | 7 ++ dlls/uuid/uuid.c | 1 + include/msctf.idl | 2 +- 7 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 2e52b09..bb1c35a 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ categorymgr.c \ compartmentmgr.c \ context.c \ + displayattributemgr.c \ documentmgr.c \ inputprocessor.c \ langbarmgr.c \ diff --git a/dlls/msctf/displayattributemgr.c b/dlls/msctf/displayattributemgr.c new file mode 100644 index 0000000..75248cd --- /dev/null +++ b/dlls/msctf/displayattributemgr.c @@ -0,0 +1,139 @@ +/* + * ITfDisplayAttributeMgr implementation + * + * Copyright 2010 CodeWeavers, Aric Stewart + * + * 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 + */ + +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagDisplayAttributeMgr { + const ITfDisplayAttributeMgrVtbl *DisplayAttributeMgrVtbl; + + LONG refCount; + +} DisplayAttributeMgr; + +static void DisplayAttributeMgr_Destructor(DisplayAttributeMgr *This) +{ + TRACE("destroying %p\n", This); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI DisplayAttributeMgr_QueryInterface(ITfDisplayAttributeMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfDisplayAttributeMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI DisplayAttributeMgr_AddRef(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI DisplayAttributeMgr_Release(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + DisplayAttributeMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfDisplayAttributeMgr functions + *****************************************************/ + +static HRESULT WINAPI DisplayAttributeMgr_OnUpdateInfo(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayAttributeMgr_EnumDisplayAttributeInfo(ITfDisplayAttributeMgr *iface, IEnumTfDisplayAttributeInfo **ppEnum) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayAttributeMgr_GetDisplayAttributeInfo(ITfDisplayAttributeMgr *iface, REFGUID guid, ITfDisplayAttributeInfo **ppInfo, CLSID *pclsidOwner) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfDisplayAttributeMgrVtbl DisplayAttributeMgr_DisplayAttributeMgrVtbl = +{ + DisplayAttributeMgr_QueryInterface, + DisplayAttributeMgr_AddRef, + DisplayAttributeMgr_Release, + + DisplayAttributeMgr_OnUpdateInfo, + DisplayAttributeMgr_EnumDisplayAttributeInfo, + DisplayAttributeMgr_GetDisplayAttributeInfo +}; + +HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + DisplayAttributeMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),0,sizeof(DisplayAttributeMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->DisplayAttributeMgrVtbl= &DisplayAttributeMgr_DisplayAttributeMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 62d1ff2..759fe7e 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -88,6 +88,7 @@ static const struct { {&CLSID_TF_InputProcessorProfiles, InputProcessorProfiles_Constructor}, {&CLSID_TF_CategoryMgr, CategoryMgr_Constructor}, {&CLSID_TF_LangBarMgr, LangBarMgr_Constructor}, + {&CLSID_TF_DisplayAttributeMgr, DisplayAttributeMgr_Constructor}, {NULL, NULL} }; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 57423e9..9aaaad0 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -41,6 +41,7 @@ extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt); diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index 2af1f24..65ebb1d 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -469,6 +469,13 @@ static struct regsvr_coclass const coclass_list[] = { "msctf.dll", "Apartment" }, + { + &CLSID_TF_DisplayAttributeMgr, + "TF_DisplayAttributeMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index e27dcac..5a1a255 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -121,6 +121,7 @@ DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9 DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); +DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); diff --git a/include/msctf.idl b/include/msctf.idl index fcb568e..2ed3866 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -44,7 +44,7 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_LangBarMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") -cpp_quote("DEFINE_GUID(CLSID_TF_DisplayAttributeMgr,0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53);") +cpp_quote("EXTERN_C const CLSID CLSID_TF_DisplayAttributeMgr;") /* GUIDs for Compartments */ cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_DISABLED;")

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::onload property implementation .
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 21f0c64de48e4a744ad12a2b614d1ccaac75de1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f0c64de48e4a744ad12a2b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:06:05 2010 +0100 mshtml: Added IHTMLImgElement::onload property implementation. --- dlls/mshtml/htmlimg.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 17b6cce..a4448f9 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -388,15 +389,19 @@ static HRESULT WINAPI HTMLImgElement_get_align(IHTMLImgElement *iface, BSTR *p) static HRESULT WINAPI HTMLImgElement_put_onload(IHTMLImgElement *iface, VARIANT v) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLImgElement_get_onload(IHTMLImgElement *iface, VARIANT *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLImgElement_put_onerror(IHTMLImgElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::onload tests.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: e7615e004a85160f70cabec977733801a2831691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7615e004a85160f70cabec97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:06:28 2010 +0100 mshtml: Added IHTMLImgElement::onload tests. --- dlls/mshtml/tests/events.c | 60 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 55171be..d62df7a 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -68,6 +68,7 @@ DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); +DEFINE_EXPECT(img_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -93,7 +94,10 @@ static const char click_doc_str[] = "</body></html>"; static const char readystate_doc_str[] = - "<<html><body><iframe id=\"iframe\"></iframe></body></html>"; + "<html><body><iframe id=\"iframe\"></iframe></body></html>"; + +static const char img_doc_str[] = + "<html><body><img id=\"imgid\"></img></body></html>"; static const char *debugstr_guid(REFIID riid) { @@ -880,6 +884,17 @@ static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WOR EVENT_HANDLER_FUNC_OBJ(body_onclick); +static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(img_onload); + test_event_args(&DIID_DispHTMLImg, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("IMG"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(img_onload); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1359,6 +1374,48 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) IHTMLFrameBase_Release(iframe); } +static void test_imgload(IHTMLDocument2 *doc) +{ + IHTMLImgElement *img; + IHTMLElement *elem; + VARIANT v; + BSTR str; + HRESULT hres; + + elem = get_elem_id(doc, "imgid"); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLImgElement, (void**)&img); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLImgElement_get_onload(img, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&img_onload_obj; + hres = IHTMLImgElement_put_onload(img, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLImgElement_get_onload(img, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&img_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); + VariantClear(&v); + + str = a2bstr("http://www.winehq.org/images/winehq_logo_text.png"); + hres = IHTMLImgElement_put_src(img, str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(img_onload); + pump_msgs(&called_img_onload); + CHECK_CALLED(img_onload); + + IHTMLImgElement_Release(img); +} + static void test_timeout(IHTMLDocument2 *doc) { IHTMLWindow3 *win3; @@ -1998,6 +2055,7 @@ START_TEST(events) run_test(empty_doc_str, test_timeout); run_test(click_doc_str, test_onclick); run_test(readystate_doc_str, test_onreadystatechange); + run_test(img_doc_str, test_imgload); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : cmd: Added @or_broken@ handling to test templates and use it to fix tests on win2k.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: e486a02157f145ccd5853d73cf5b3514d41be9d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e486a02157f145ccd5853d73c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:28:19 2010 +0100 cmd: Added @or_broken@ handling to test templates and use it to fix tests on win2k. --- programs/cmd/tests/batch.c | 39 ++++++++++++++++++++++++----- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index ca40ada..e31fdc0 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -101,9 +101,11 @@ static const char *compare_line(const char *out_line, const char *out_end, const const char *exp_end) { const char *out_ptr = out_line, *exp_ptr = exp_line; + const char *err = NULL; static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'}; + static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { if(*exp_ptr == '@') { @@ -111,11 +113,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const && !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) { exp_ptr += sizeof(pwd_cmd); if(out_end-out_ptr < workdir_len - || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len, - workdir, workdir_len) != CSTR_EQUAL)) - return out_ptr; - out_ptr += workdir_len; - continue; + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len, + workdir, workdir_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += workdir_len; + continue; + } }else if(exp_ptr+sizeof(todo_space_cmd) <= exp_end && !memcmp(exp_ptr, todo_space_cmd, sizeof(todo_space_cmd))) { exp_ptr += sizeof(todo_space_cmd); @@ -123,10 +127,31 @@ static const char *compare_line(const char *out_line, const char *out_end, const if(out_ptr < out_end && *out_ptr == ' ') out_ptr++; continue; + }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end + && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { + exp_ptr = exp_end; + continue; } + }else if(out_ptr == out_end || *out_ptr != *exp_ptr) { + err = out_ptr; } - if(out_ptr == out_end || *out_ptr != *exp_ptr++) - return out_ptr; + + if(err) { + if(!broken(1)) + return err; + + while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) + exp_ptr++; + if(!exp_ptr) + return err; + + exp_ptr += sizeof(or_broken_cmd); + out_ptr = out_line; + err = NULL; + continue; + } + + exp_ptr++; out_ptr++; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 696ce13..bae19b8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -23,6 +23,7 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir +echo CD value %CD% echo %% echo P% echo %P diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 55fc9f2..ad50358 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -16,6 +16,7 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ +CD value @pwd@@or_broken(a)CD value % P P

1 0

Alexandre Julliard : kernel32: Don' t try to open builtin exe files during CreateProcess, only check the path syntax.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: c7bed19c0b71188799eff67f562e9072de4e0dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bed19c0b71188799eff67f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 13:02:42 2010 +0100 kernel32: Don't try to open builtin exe files during CreateProcess, only check the path syntax. --- dlls/kernel32/process.c | 86 +++++++++++++++++----------------------------- 1 files changed, 32 insertions(+), 54 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d9d4520..115cd05 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -90,6 +90,7 @@ const WCHAR *DIR_SysWow64 = NULL; #define PDB32_FILE_APIS_OEM 0x0040 /* File APIs are OEM */ #define PDB32_WIN32S_PROC 0x8000 /* Win32s process */ +static const WCHAR exeW[] = {'.','e','x','e',0}; static const WCHAR comW[] = {'.','c','o','m',0}; static const WCHAR batW[] = {'.','b','a','t',0}; static const WCHAR cmdW[] = {'.','c','m','d',0}; @@ -152,6 +153,9 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil void *redir_disabled = 0; unsigned int flags = (sizeof(void*) > sizeof(int) ? BINARY_FLAG_64BIT : 0); + /* builtin names cannot be empty or contain spaces */ + if (!libname[0] || strchrW( libname, ' ' ) || strchrW( libname, '\t' )) return FALSE; + if (is_wow64 && Wow64DisableWow64FsRedirection( &redir_disabled )) Wow64RevertWow64FsRedirection( redir_disabled ); @@ -198,35 +202,6 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil /*********************************************************************** - * open_builtin_exe_file - * - * Open an exe file for a builtin exe. - */ -static void *open_builtin_exe_file( const WCHAR *name, char *error, int error_size, - int test_only, int *file_exists ) -{ - char exename[MAX_PATH]; - WCHAR *p; - UINT i, len; - - *file_exists = 0; - if ((p = strrchrW( name, '/' ))) name = p + 1; - if ((p = strrchrW( name, '\\' ))) name = p + 1; - - /* we don't want to depend on the current codepage here */ - len = strlenW( name ) + 1; - if (len >= sizeof(exename)) return NULL; - for (i = 0; i < len; i++) - { - if (name[i] > 127) return NULL; - exename[i] = (char)name[i]; - if (exename[i] >= 'A' && exename[i] <= 'Z') exename[i] += 'a' - 'A'; - } - return wine_dll_load_main_exe( exename, error, error_size, test_only, file_exists ); -} - - -/*********************************************************************** * open_exe_file * * Open a specific exe file, taking load order into account. @@ -263,27 +238,16 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle, struct binary_info *binary_info ) { - static const WCHAR exeW[] = {'.','e','x','e',0}; - int file_exists; - TRACE("looking for %s\n", debugstr_w(name) ); if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL )) { - if (get_builtin_path( name, exeW, buffer, buflen, binary_info )) + if (contains_path( name ) && get_builtin_path( name, exeW, buffer, buflen, binary_info )) { - TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); - open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); - if (file_exists) - { - *handle = 0; - return TRUE; - } - return FALSE; + *handle = 0; + return TRUE; } - /* no builtin found, try native without extension in case it is a Unix app */ - if (!SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; } @@ -1075,7 +1039,6 @@ void CDECL __wine_kernel_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR dotW[] = {'.',0}; - static const WCHAR exeW[] = {'.','e','x','e',0}; WCHAR *p, main_exe_name[MAX_PATH+1]; PEB *peb = NtCurrentTeb()->Peb; @@ -1181,6 +1144,8 @@ void CDECL __wine_kernel_init(void) debugstr_w(__wine_main_wargv[3]) ); ExitProcess( ERROR_BAD_EXE_FORMAT ); } + MESSAGE( "wine: cannot find %s\n", debugstr_w(main_exe_name) ); + ExitProcess( ERROR_FILE_NOT_FOUND ); } args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, @@ -1898,9 +1863,8 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, { static const WCHAR quotesW[] = {'"','%','s','"',0}; - WCHAR *name, *pos, *ret = NULL; + WCHAR *name, *pos, *first_space, *ret = NULL; const WCHAR *p; - BOOL got_space; /* if we have an app name, everything is easy */ @@ -1928,8 +1892,12 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, memcpy( name, cmdline + 1, len * sizeof(WCHAR) ); name[len] = 0; - if (find_exe_file( name, buffer, buflen, handle, binary_info )) - ret = cmdline; /* no change necessary */ + if (!find_exe_file( name, buffer, buflen, handle, binary_info )) + { + if (!get_builtin_path( name, exeW, buffer, buflen, binary_info )) goto done; + *handle = 0; + } + ret = cmdline; /* no change necessary */ goto done; } @@ -1939,28 +1907,38 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, return NULL; pos = name; p = cmdline; - got_space = FALSE; + first_space = NULL; - while (*p) + for (;;) { - do *pos++ = *p++; while (*p && *p != ' ' && *p != '\t'); + while (*p && *p != ' ' && *p != '\t') *pos++ = *p++; *pos = 0; if (find_exe_file( name, buffer, buflen, handle, binary_info )) { ret = cmdline; break; } - if (*p) got_space = TRUE; + if (!(*pos++ = *p++)) break; + if (!first_space) first_space = pos; } - if (ret && got_space) /* now build a new command-line with quotes */ + if (!ret) + { + if (first_space) *first_space = 0; /* try only the first word as a builtin */ + if (get_builtin_path( name, exeW, buffer, buflen, binary_info )) + { + *handle = 0; + ret = cmdline; + } + else SetLastError( ERROR_FILE_NOT_FOUND ); + } + else if (first_space) /* build a new command-line with quotes */ { if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) ))) goto done; sprintfW( ret, quotesW, name ); strcatW( ret, p ); } - else if (!ret) SetLastError( ERROR_FILE_NOT_FOUND ); done: HeapFree( GetProcessHeap(), 0, name );

1 0

Alexandre Julliard : user32/tests: Add some tests demonstrating that SetCursor uses the thread input data.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 5a18e2a925144e410517463b1c2bf1238615414e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a18e2a925144e410517463b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 13:03:39 2010 +0100 user32/tests: Add some tests demonstrating that SetCursor uses the thread input data. --- dlls/user32/tests/cursoricon.c | 85 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ff86cd0..1ebe665 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1353,6 +1353,90 @@ cleanup: DeleteDC(hdcDst); } +static DWORD parent_id; + +static DWORD CALLBACK set_cursor_thread( void *arg ) +{ + HCURSOR ret; + + PeekMessage( 0, 0, 0, 0, PM_NOREMOVE ); /* create a msg queue */ + if (parent_id) + { + BOOL ret = AttachThreadInput( GetCurrentThreadId(), parent_id, TRUE ); + ok( ret, "AttachThreadInput failed\n" ); + } + if (arg) ret = SetCursor( (HCURSOR)arg ); + else ret = GetCursor(); + return (DWORD_PTR)ret; +} + +static void test_SetCursor(void) +{ + static const BYTE bmp_bits[4096]; + ICONINFO cursorInfo; + HCURSOR cursor, old_cursor; + DWORD error, id, result; + UINT display_bpp; + HDC hdc; + HANDLE thread; + + cursor = GetCursor(); + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)cursor, "wrong thread cursor %x/%p\n", result, cursor ); + + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + cursorInfo.fIcon = FALSE; + cursorInfo.xHotspot = 0; + cursorInfo.yHotspot = 0; + cursorInfo.hbmMask = CreateBitmap(32, 32, 1, 1, bmp_bits); + cursorInfo.hbmColor = CreateBitmap(32, 32, 1, display_bpp, bmp_bits); + + cursor = CreateIconIndirect(&cursorInfo); + ok(cursor != NULL, "CreateIconIndirect returned %p\n", cursor); + old_cursor = SetCursor( cursor ); + + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + + SetCursor( 0 ); + ok( GetCursor() == 0, "wrong cursor %p\n", GetCursor() ); + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + + thread = CreateThread( NULL, 0, set_cursor_thread, cursor, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + ok( GetCursor() == 0, "wrong cursor %p/0\n", GetCursor() ); + + parent_id = GetCurrentThreadId(); + thread = CreateThread( NULL, 0, set_cursor_thread, cursor, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + todo_wine ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); + + SetCursor( old_cursor ); + DestroyCursor( cursor ); + + SetLastError( 0xdeadbeef ); + cursor = SetCursor( (HCURSOR)0xbadbad ); + error = GetLastError(); + ok( cursor == 0, "wrong cursor %p/0\n", cursor ); + todo_wine ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ + "wrong error %u\n", error ); +} + + static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; @@ -1463,6 +1547,7 @@ START_TEST(cursoricon) test_DrawIcon(); test_DrawIconEx(); test_DrawState(); + test_SetCursor(); test_DestroyCursor(); do_parent(); test_child_process();

1 0

Maarten Lankhorst : winmm: Allow SND_ALIAS|SND_FILENAME in PlaySound.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: b0337ada1abce28d86d0cd063b494b8ad66e9d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0337ada1abce28d86d0cd063… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 17 23:41:09 2010 +0100 winmm: Allow SND_ALIAS|SND_FILENAME in PlaySound. --- dlls/winmm/playsound.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 54db68f..7b6c946 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -200,6 +200,7 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz) case SND_MEMORY: return FALSE; case SND_ALIAS: case SND_FILENAME: + case SND_ALIAS|SND_FILENAME: case 0: return TRUE; default: FIXME("WTF\n"); return FALSE; } @@ -308,7 +309,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) TRACE("Memory sound %p\n", data); hmmio = mmioOpenW(NULL, &mminfo, MMIO_READ); } - else if (wps->fdwSound & SND_ALIAS) + if (!hmmio && wps->fdwSound & SND_ALIAS) { if ((wps->fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { @@ -342,11 +343,11 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); } - else if (wps->fdwSound & SND_FILENAME) + if (!hmmio && wps->fdwSound & SND_FILENAME) { hmmio = get_mmioFromFile(wps->pszSound); } - else + if (!(wps->fdwSound & (SND_FILENAME|SND_ALIAS|SND_MEMORY))) { if ((hmmio = get_mmioFromProfile(wps->fdwSound | SND_NODEFAULT, wps->pszSound)) == 0) {

1 0

Nikolay Sivov : urlmon: Add CoInternetIsFeatureEnabled stub.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: dd50af9464221a4ac927a972971f495abc9d9c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd50af9464221a4ac927a9729… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 01:24:42 2010 +0300 urlmon: Add CoInternetIsFeatureEnabled stub. --- dlls/urlmon/internet.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 6a79e48..3d41def 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -405,3 +405,12 @@ HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD fl FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); return E_NOTIMPL; } + +/*********************************************************************** + * CoInternetIsFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags) +{ + FIXME("%d, 0x%08x, stub\n", feature, flags); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 4c08bb2..e79850c 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -17,6 +17,7 @@ @ stub CoInternetGetProtocolFlags @ stdcall CoInternetGetSecurityUrl(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) +@ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long)

1 0

Nikolay Sivov : shlwapi: Add a forward to DelayLoadFailureHook.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: d16bf5f9ba95394dff19bfe38e67238b91bac866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16bf5f9ba95394dff19bfe38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 02:22:50 2010 +0300 shlwapi: Add a forward to DelayLoadFailureHook. --- dlls/shlwapi/shlwapi.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 6047646..d899232 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -559,6 +559,7 @@ @ stdcall ColorAdjustLuma(long long long) @ stdcall ColorHLSToRGB(long long long) @ stdcall ColorRGBToHLS(long ptr ptr ptr) +@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook @ stdcall -private DllGetVersion(ptr) @ stdcall GetMenuPosFromID(ptr long) @ stdcall HashData (ptr long ptr long)

1 0

Jacek Caban : mshtml: Make sure that readState is READYSTATE_LOADING in read_stream_data.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 2b94ad52871294847b34304c3ba5b08adcc9b481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b94ad52871294847b34304c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:04:15 2010 +0100 mshtml: Make sure that readState is READYSTATE_LOADING in read_stream_data. --- dlls/mshtml/navigate.c | 5 ++++- dlls/mshtml/tests/events.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a09ea7f..cc2aeb3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -972,8 +972,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); - if(This->window) + if(This->window) { update_window_doc(This->window); + if(This->window->readystate != READYSTATE_LOADING) + set_ready_state(This->window, READYSTATE_LOADING); + } } This->bsc.readed += This->nsstream->buf_size; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 16f727f..d2d1db7 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1310,7 +1310,6 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) SET_EXPECT(iframe_onreadystatechange_interactive); SET_EXPECT(iframe_onreadystatechange_complete); pump_msgs(&called_iframe_onreadystatechange_complete); - todo_wine CHECK_CALLED(iframe_onreadystatechange_loading); CHECK_CALLED(iframe_onreadystatechange_interactive); CHECK_CALLED(iframe_onreadystatechange_complete);

1 0