January 2012 - Wine-commits

Nikolay Sivov : msxml3: Put all defined document namespaces in collection.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 95b9b8218188adc0af5099cb52910f92f1b74704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b9b8218188adc0af5099cb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 10:40:56 2012 +0300 msxml3: Put all defined document namespaces in collection. --- dlls/msxml3/domdoc.c | 38 +++++++++++- dlls/msxml3/msxml_private.h | 5 +- dlls/msxml3/schema.c | 131 ++++++++++++++++++++++++++++++++----------- dlls/msxml3/tests/domdoc.c | 117 +++++++++++++++++++++++++------------- 4 files changed, 211 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95b9b8218188adc0af509…

1 0

Nikolay Sivov : msxml3: Block ::add() if collection is read-only.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 85cf92aed04a00db017330ff1ba7b7e38ab588a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cf92aed04a00db017330ff1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 10:44:19 2012 +0300 msxml3: Block ::add() if collection is read-only. --- dlls/msxml3/schema.c | 8 +++++++- dlls/msxml3/tests/domdoc.c | 9 +-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index c614d39..253f901 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -102,6 +102,7 @@ typedef struct xmlHashTablePtr cache; VARIANT_BOOL validateOnLoad; + int read_only; } schema_cache; typedef struct @@ -966,11 +967,13 @@ static void cache_free(void* data, xmlChar* name /* ignored */) queried at libxml2 level here. */ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) { - static const xmlChar query[] = "//*/namespace::*"; schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + static const xmlChar query[] = "//*/namespace::*"; xmlXPathObjectPtr nodeset; xmlXPathContextPtr ctxt; + This->read_only = 1; + ctxt = xmlXPathNewContext(node->node->doc); nodeset = xmlXPathEvalExpression(query, ctxt); @@ -1111,6 +1114,8 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); TRACE("(%p)->(%s %s)\n", This, debugstr_w(uri), debugstr_variant(&var)); + if (This->read_only) return E_FAIL; + switch (V_VT(&var)) { case VT_NULL: @@ -1498,6 +1503,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE; + This->read_only = 0; init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSchemaCollection2_iface, &schemacache_dispex); *obj = &This->IXMLDOMSchemaCollection2_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df8e1cb..fb3eab4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11400,7 +11400,6 @@ static void test_get_namespaces(void) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)doc2; hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v); -todo_wine EXPECT_HR(hr, E_FAIL); hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s); @@ -11410,16 +11409,13 @@ todo_wine hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); -todo_wine ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); -todo_wine { EXPECT_HR(hr, E_FAIL); ok(s == (void*)0xdeadbeef, "got %p\n", s); -} /* enumerate */ enumv = (void*)0xdeadbeef; @@ -11513,7 +11509,6 @@ todo_wine V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)doc2; hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v); -todo_wine EXPECT_HR(hr, E_FAIL); IXMLDOMSchemaCollection_Release(doc2); @@ -11524,16 +11519,14 @@ todo_wine hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); -todo_wine ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); -todo_wine { EXPECT_HR(hr, E_FAIL); ok(s == (void*)0xdeadbeef, "got %p\n", s); -} + /* enumerate */ enumv = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv);

1 0

Francois Gouget : cmd: Fix an internationalization issue in WCMD_ask_confirm().
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: af3d368acaf546df40a05a80eb7e268e3cb6d07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3d368acaf546df40a05a80e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 17:37:47 2012 +0100 cmd: Fix an internationalization issue in WCMD_ask_confirm(). Don't break the strings to translate in little chunks: this makes it hard or even impossible to translate them correctly. For instance it must be possible to insert an unbreakable space before question marks for French. --- po/ar.po | 14 +++++++++++--- po/bg.po | 14 +++++++++++--- po/ca.po | 21 +++++++++++++++++---- po/cs.po | 14 +++++++++++--- po/da.po | 19 +++++++++++++++---- po/de.po | 21 +++++++++++++++++---- po/el.po | 14 +++++++++++--- po/en.po | 20 ++++++++++++++------ po/en_US.po | 20 ++++++++++++++------ po/eo.po | 14 +++++++++++--- po/es.po | 19 +++++++++++++++---- po/fa.po | 14 +++++++++++--- po/fi.po | 14 +++++++++++--- po/fr.po | 21 +++++++++++++++++---- po/he.po | 21 +++++++++++++++++---- po/hi.po | 14 +++++++++++--- po/hu.po | 14 +++++++++++--- po/it.po | 21 +++++++++++++++++---- po/ja.po | 21 +++++++++++++++++---- po/ko.po | 21 +++++++++++++++++---- po/lt.po | 21 +++++++++++++++++---- po/ml.po | 14 +++++++++++--- po/nb_NO.po | 17 ++++++++++++++--- po/nl.po | 21 +++++++++++++++++---- po/or.po | 14 +++++++++++--- po/pa.po | 14 +++++++++++--- po/pl.po | 21 +++++++++++++++++---- po/pt_BR.po | 21 +++++++++++++++++---- po/pt_PT.po | 16 +++++++++++++--- po/rm.po | 14 +++++++++++--- po/ro.po | 19 +++++++++++++++---- po/ru.po | 21 +++++++++++++++++---- po/sk.po | 14 +++++++++++--- po/sl.po | 21 +++++++++++++++++---- po/sr_RS(a)cyrillic.po | 16 +++++++++++++--- po/sr_RS(a)latin.po | 16 +++++++++++++--- po/sv.po | 19 +++++++++++++++---- po/te.po | 14 +++++++++++--- po/th.po | 14 +++++++++++--- po/tr.po | 14 +++++++++++--- po/uk.po | 19 +++++++++++++++---- po/wa.po | 14 +++++++++++--- po/wine.pot | 14 +++++++++++--- po/zh_CN.po | 14 +++++++++++--- po/zh_TW.po | 14 +++++++++++--- programs/cmd/builtins.c | 40 +++++++++++++++++----------------------- programs/cmd/cmd.rc | 8 +++++--- programs/cmd/wcmd.h | 2 ++ 48 files changed, 632 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af3d368acaf546df40a05…

1 0

Francois Gouget : shell32: Don't translate the shell folder paths.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 6fc6cf6935ff7aac005c080873db31fd706e359a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc6cf6935ff7aac005c08087… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 18:44:50 2012 +0100 shell32: Don't translate the shell folder paths. --- dlls/shell32/shell32.rc | 37 +++----- dlls/shell32/shellpath.c | 132 +++++++++++++++++---------- dlls/shell32/shresdef.h | 19 +---- po/ar.po | 213 ++++++++++++++++--------------------------- po/bg.po | 228 +++++++++++++++++---------------------------- po/ca.po | 222 +++++++++++++++++--------------------------- po/cs.po | 217 ++++++++++++++++---------------------------- po/da.po | 228 +++++++++++++++++---------------------------- po/de.po | 222 +++++++++++++++++--------------------------- po/el.po | 214 ++++++++++++++++--------------------------- po/en.po | 216 ++++++++++++++++---------------------------- po/en_US.po | 228 +++++++++++++++++----------------------------- po/eo.po | 222 +++++++++++++++++---------------------------- po/es.po | 228 +++++++++++++++++---------------------------- po/fa.po | 213 ++++++++++++++++--------------------------- po/fi.po | 222 +++++++++++++++++--------------------------- po/fr.po | 222 +++++++++++++++++--------------------------- po/he.po | 222 +++++++++++++++++--------------------------- po/hi.po | 204 +++++++++++++++-------------------------- po/hu.po | 228 +++++++++++++++++---------------------------- po/it.po | 222 +++++++++++++++++--------------------------- po/ja.po | 222 +++++++++++++++++--------------------------- po/ko.po | 222 +++++++++++++++++--------------------------- po/lt.po | 222 +++++++++++++++++--------------------------- po/ml.po | 204 +++++++++++++++-------------------------- po/nb_NO.po | 228 +++++++++++++++++---------------------------- po/nl.po | 222 +++++++++++++++++--------------------------- po/or.po | 204 +++++++++++++++-------------------------- po/pa.po | 204 +++++++++++++++-------------------------- po/pl.po | 222 +++++++++++++++++--------------------------- po/pt_BR.po | 222 +++++++++++++++++--------------------------- po/pt_PT.po | 222 +++++++++++++++++--------------------------- po/rm.po | 205 +++++++++++++++--------------------------- po/ro.po | 228 +++++++++++++++++---------------------------- po/ru.po | 222 +++++++++++++++++--------------------------- po/sk.po | 213 ++++++++++++++++--------------------------- po/sl.po | 222 +++++++++++++++++--------------------------- po/sr_RS(a)cyrillic.po | 222 +++++++++++++++++--------------------------- po/sr_RS(a)latin.po | 222 +++++++++++++++++--------------------------- po/sv.po | 222 +++++++++++++++++--------------------------- po/te.po | 204 +++++++++++++++-------------------------- po/th.po | 213 ++++++++++++++++--------------------------- po/tr.po | 228 +++++++++++++++++---------------------------- po/uk.po | 222 +++++++++++++++++--------------------------- po/wa.po | 213 ++++++++++++++++--------------------------- po/wine.pot | 204 +++++++++++++++-------------------------- po/zh_CN.po | 222 +++++++++++++++++--------------------------- po/zh_TW.po | 226 +++++++++++++++++---------------------------- 48 files changed, 3778 insertions(+), 6263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fc6cf6935ff7aac005c0…

1 0

Francois Gouget : cmd: Remove an unused variable.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 774eb34e3687161a25067759f223a9ccacc65610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=774eb34e3687161a25067759f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 17:24:30 2012 +0100 cmd: Remove an unused variable. --- programs/cmd/builtins.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ca4fa87..272bac0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1714,9 +1714,6 @@ void WCMD_move (void) /* Prompt if overwriting */ if (!force) { WCHAR* question; - WCHAR yesChar[10]; - - strcpyW(yesChar, WCMD_LoadMessage(WCMD_YES)); /* Ask for confirmation */ question = WCMD_format_string(WCMD_LoadMessage(WCMD_OVERWRITE), dest);

1 0

Francois Gouget : cmd: Fix asking for a Yes / No / All confirmation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: c2a9aae4ca93d1187a0f9071c198bd46201e6684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a9aae4ca93d1187a0f9071c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 17:37:18 2012 +0100 cmd: Fix asking for a Yes / No / All confirmation. --- programs/cmd/builtins.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 272bac0..ca486b4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -108,8 +108,7 @@ static BOOL verify_mode = FALSE; /************************************************************************** * WCMD_ask_confirm * - * Issue a message and ask 'Are you sure (Y/N)', waiting on a valid - * answer. + * Issue a message and ask for confirmation, waiting on a valid answer. * * Returns True if Y (or A) answer is selected * If optionAll contains a pointer, ALL is allowed, and if answered @@ -117,7 +116,7 @@ static BOOL verify_mode = FALSE; * */ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, - const BOOL *optionAll) { + BOOL *optionAll) { WCHAR msgbuffer[MAXSTRING]; WCHAR Ybuffer[MAXSTRING]; @@ -132,8 +131,10 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, LoadStringW(hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR)); LoadStringW(hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR)); - /* Loop waiting on a Y or N */ - while (answer[0] != Ybuffer[0] && answer[0] != Nbuffer[0]) { + /* Loop waiting on a valid answer */ + if (optionAll) + *optionAll = FALSE; + while (1) { static const WCHAR startBkt[] = {' ','(','\0'}; static const WCHAR endBkt[] = {')','?','\0'}; @@ -152,11 +153,16 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, WCMD_output_asis (endBkt); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); answer[0] = toupperW(answer[0]); + if (answer[0] == Ybuffer[0]) + return TRUE; + if (answer[0] == Nbuffer[0]) + return FALSE; + if (optionAll && answer[0] == Abuffer[0]) + { + *optionAll = TRUE; + return TRUE; + } } - - /* Return the answer */ - return ((answer[0] == Ybuffer[0]) || - (optionAll && (answer[0] == Abuffer[0]))); } /****************************************************************************

1 0

Jacek Caban : mshtml: Added IHTMLWindow5 stub implementation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 58776e9f9a971ca7b7858d4b91c21b1a40f677e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58776e9f9a971ca7b7858d4b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 23 16:42:15 2012 +0100 mshtml: Added IHTMLWindow5 stub implementation. --- dlls/mshtml/htmlwindow.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1d6ed5d..25fd1ce 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -159,6 +159,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; + }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { + TRACE("(%p)->(IID_IHTMLWindow5 %p)\n", This, ppv); + *ppv = &This->IHTMLWindow5_iface; }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); *ppv = &This->IHTMLWindow6_iface; @@ -1656,6 +1659,92 @@ static const IHTMLWindow4Vtbl HTMLWindow4Vtbl = { HTMLWindow4_get_frameElement }; +static inline HTMLWindow *impl_from_IHTMLWindow5(IHTMLWindow5 *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow5_iface); +} + +static HRESULT WINAPI HTMLWindow5_QueryInterface(IHTMLWindow5 *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI HTMLWindow5_AddRef(IHTMLWindow5 *iface) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI HTMLWindow5_Release(IHTMLWindow5 *iface) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI HTMLWindow5_GetTypeInfoCount(IHTMLWindow5 *iface, UINT *pctinfo) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLWindow5_GetTypeInfo(IHTMLWindow5 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLWindow5_GetIDsOfNames(IHTMLWindow5 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI HTMLWindow5_Invoke(IHTMLWindow5 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLWindow5_put_XMLHttpRequest(IHTMLWindow5 *iface, VARIANT v) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow5_get_XMLHttpRequest(IHTMLWindow5 *iface, VARIANT *p) +{ + HTMLWindow *This = impl_from_IHTMLWindow5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLWindow5Vtbl HTMLWindow5Vtbl = { + HTMLWindow5_QueryInterface, + HTMLWindow5_AddRef, + HTMLWindow5_Release, + HTMLWindow5_GetTypeInfoCount, + HTMLWindow5_GetTypeInfo, + HTMLWindow5_GetIDsOfNames, + HTMLWindow5_Invoke, + HTMLWindow5_put_XMLHttpRequest, + HTMLWindow5_get_XMLHttpRequest +}; + static inline HTMLWindow *impl_from_IHTMLWindow6(IHTMLWindow6 *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow6_iface); @@ -2443,6 +2532,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; window->IHTMLWindow3_iface.lpVtbl = &HTMLWindow3Vtbl; window->IHTMLWindow4_iface.lpVtbl = &HTMLWindow4Vtbl; + window->IHTMLWindow5_iface.lpVtbl = &HTMLWindow5Vtbl; window->IHTMLWindow6_iface.lpVtbl = &HTMLWindow6Vtbl; window->IHTMLPrivateWindow_iface.lpVtbl = &HTMLPrivateWindowVtbl; window->IDispatchEx_iface.lpVtbl = &WindowDispExVtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 90fab6d..7373e15 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -291,6 +291,7 @@ struct HTMLWindow { IHTMLWindow2 IHTMLWindow2_iface; IHTMLWindow3 IHTMLWindow3_iface; IHTMLWindow4 IHTMLWindow4_iface; + IHTMLWindow5 IHTMLWindow5_iface; IHTMLWindow6 IHTMLWindow6_iface; IHTMLPrivateWindow IHTMLPrivateWindow_iface; IDispatchEx IDispatchEx_iface;

1 0

Francois Gouget : shell32: Use the plural for 'My Videos' wherever appropriate.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: deffb92c9d6194189052343b3e3d6d9d7be06b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=deffb92c9d6194189052343b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 15:56:35 2012 +0100 shell32: Use the plural for 'My Videos' wherever appropriate. --- dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shellpath.c | 22 +++++++++++----------- dlls/shell32/shresdef.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 9c5ba78..88959d9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -204,7 +204,7 @@ the folder?" IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" - IDS_MYVIDEO "My Videos" + IDS_MYVIDEOS "My Videos" IDS_DESKTOPDIRECTORY "#msgctxt#directory#Desktop" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -223,7 +223,7 @@ the folder?" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Music" IDS_COMMON_PICTURES "Pictures" - IDS_COMMON_VIDEO "Videos" + IDS_COMMON_VIDEOS "Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_CONTACTS "Contacts" IDS_LINKS "Links" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 71d82c8..943f5c1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -781,7 +781,7 @@ static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'}; static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','s','\0'}; +static const WCHAR My_VideosW[] = {'M','y',' ','V','i','d','e','o','s','\0'}; static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'}; @@ -918,8 +918,8 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x0e - CSIDL_MYVIDEO */ &FOLDERID_Videos, CSIDL_Type_User, - My_VideoW, - MAKEINTRESOURCEW(IDS_MYVIDEO) + My_VideosW, + MAKEINTRESOURCEW(IDS_MYVIDEOS) }, { /* 0x0f - unassigned */ &GUID_NULL, @@ -1165,7 +1165,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PublicVideos, CSIDL_Type_AllUsers, CommonVideoW, - MAKEINTRESOURCEW(IDS_COMMON_VIDEO) + MAKEINTRESOURCEW(IDS_COMMON_VIDEOS) }, { /* 0x38 - CSIDL_RESOURCES */ &FOLDERID_ResourceDir, @@ -2503,8 +2503,8 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { case IDS_MYPICTURES: lstrcpyW(wszSubPath, My_PicturesW); break; - case IDS_MYVIDEO: - lstrcpyW(wszSubPath, My_VideoW); + case IDS_MYVIDEOS: + lstrcpyW(wszSubPath, My_VideosW); break; default: ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); @@ -2537,7 +2537,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { * - If there is a 'My Documents' directory in $HOME, the user probably wants * wine's 'My Documents' to point there. Furthermore, we imply that the user * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Video' subfolders under '$HOME/My Documents', if those + * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those * do not already exits. We put appropriate symbolic links in place for those, * too. * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' @@ -2546,7 +2546,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds fo 'My Pictures' and 'My Video'. + * $HOME directly. The same holds fo 'My Pictures' and 'My Videos'. * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave * it alone. @@ -2554,7 +2554,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { */ static void _SHCreateSymbolicLinks(void) { - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; + UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; static const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); @@ -2614,7 +2614,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Create symbolic links for 'My Pictures', 'My Video' and 'My Music'. */ + /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { /* Create the current 'My Whatever' folder and get it's unix path. */ hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, @@ -2797,7 +2797,7 @@ HRESULT SHELL_RegisterShellFolders(void) HRESULT hr; /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Video', 'My Music' and 'Desktop' in advance, so that the + * 'My Videos', 'My Music' and 'Desktop' in advance, so that the * _SHRegister*ShellFolders() functions will find everything nice and clean * and thus will not attempt to create them in the profile directory. */ _SHCreateSymbolicLinks(); diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1c3a381..ad3d2a2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -71,7 +71,7 @@ #define IDS_SENDTO 50 #define IDS_STARTMENU 51 #define IDS_MYMUSIC 52 -#define IDS_MYVIDEO 53 +#define IDS_MYVIDEOS 53 #define IDS_DESKTOPDIRECTORY 54 #define IDS_NETHOOD 55 #define IDS_TEMPLATES 56 @@ -88,7 +88,7 @@ #define IDS_ADMINTOOLS 67 #define IDS_COMMON_MUSIC 68 #define IDS_COMMON_PICTURES 69 -#define IDS_COMMON_VIDEO 70 +#define IDS_COMMON_VIDEOS 70 #define IDS_CDBURN_AREA 71 #define IDS_PROGRAM_FILESX86 72 #define IDS_PROGRAM_FILES_COMMONX86 73

1 0

Alistair Leslie-Hughes : mscoree: Implement DllGetClassObject.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 3f1c63c5bdd8889b1e8fae34b20e0d04b06059c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1c63c5bdd8889b1e8fae34b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 14:33:19 2012 +1100 mscoree: Implement DllGetClassObject. --- dlls/mscoree/corruntimehost.c | 144 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 119 ++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 263 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 00966ee..ff789d4 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -38,6 +38,7 @@ #include "mscoree_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -939,3 +940,146 @@ HRESULT RuntimeHost_Destroy(RuntimeHost *This) HeapFree( GetProcessHeap(), 0, This ); return S_OK; } + +#define CHARS_IN_GUID 39 +#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + +HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) +{ + static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; + static const WCHAR wszClass[] = {'C','l','a','s','s',0}; + static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; + static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + MonoDomain *domain; + MonoAssembly *assembly; + ICLRRuntimeInfo *info; + RuntimeHost *host; + HRESULT hr; + HKEY key; + LONG res; + int offset = 0; + WCHAR codebase[MAX_PATH + 8]; + WCHAR classname[350]; + WCHAR filename[MAX_PATH]; + + DWORD dwBufLen = 350; + + lstrcpyW(path, wszCLSIDSlash); + StringFromGUID2(riid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); + lstrcatW(path, wszInprocServer32); + + TRACE("Registry key: %s\n", debugstr_w(path)); + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return CLASS_E_CLASSNOTAVAILABLE; + + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + TRACE("classname (%s)\n", debugstr_w(classname)); + + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("CodeBase value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + + TRACE("codebase (%s)\n", debugstr_w(filename)); + + *ppObj = NULL; + + + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + if (SUCCEEDED(hr)) + { + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + MonoImage *image; + MonoClass *klass; + MonoObject *result; + IUnknown *unk = NULL; + char *filenameA, *ns; + char *classA; + + hr = CLASS_E_CLASSNOTAVAILABLE; + + filenameA = WtoA(filename); + assembly = host->mono->mono_domain_assembly_open(domain, filenameA); + HeapFree(GetProcessHeap(), 0, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = host->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(classname); + ns = strrchr(classA, '.'); + *ns = '\0'; + + klass = host->mono->mono_class_from_name(image, classA, ns+1); + HeapFree(GetProcessHeap(), 0, classA); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + /* + * Use the default constructor for the .NET class. + */ + result = host->mono->mono_object_new(domain, klass); + host->mono->mono_runtime_object_init(result); + + hr = RuntimeHost_GetIUnknownForObject(host, result, &unk); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, ppObj); + + IUnknown_Release(unk); + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + +cleanup: + if(info) + ICLRRuntimeInfo_Release(info); + + RegCloseKey(key); + + return hr; +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 8b72ec8..b6ae490 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -52,6 +52,8 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static HINSTANCE MSCOREE_hInstance; +typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); + char *WtoA(LPCWSTR wstr) { int length; @@ -89,6 +91,105 @@ static BOOL get_install_root(LPWSTR install_dir) return TRUE; } +typedef struct mscorecf +{ + IClassFactory IClassFactory_iface; + LONG ref; + + fnCreateInstance pfnCreateInstance; + + CLSID clsid; +} mscorecf; + +static inline mscorecf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD(iface, mscorecf, IClassFactory_iface); +} + +static HRESULT WINAPI mscorecf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + ERR("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI mscorecf_AddRef(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mscorecf_Release(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mscorecf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + mscorecf *This = impl_from_IClassFactory( iface ); + HRESULT hr; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + hr = This->pfnCreateInstance( &This->clsid, (LPVOID*) &punk ); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface( punk, riid, ppobj ); + + IUnknown_Release( punk ); + } + else + { + WARN("Cannot create an instance object. 0x%08x\n", hr); + } + return hr; +} + +static HRESULT WINAPI mscorecf_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl mscorecf_vtbl = +{ + mscorecf_QueryInterface, + mscorecf_AddRef, + mscorecf_Release, + mscorecf_CreateInstance, + mscorecf_LockServer +}; + HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, LPCWSTR pwszHostConfigFile, VOID *pReserved, DWORD startupFlags, REFCLSID rclsid, @@ -504,11 +605,25 @@ HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterfac HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + mscorecf *This; + HRESULT hr; + + TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) return E_INVALIDARG; - return E_NOTIMPL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); + + This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; + This->pfnCreateInstance = &create_monodata; + This->ref = 1; + This->clsid = *rclsid; + + hr = IClassFactory_QueryInterface( &This->IClassFactory_iface, riid, ppv ); + IClassFactory_Release(&This->IClassFactory_iface); + + return hr; } HRESULT WINAPI DllRegisterServer(void) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a45a405..d033275 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -186,4 +186,6 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, R extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN; +extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; + #endif /* __MSCOREE_PRIVATE__ */

1 0

Aric Stewart : winex11: Strip the _L or _R from X11DRV_GetKeyNameText when appropriate.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: f624876d3e4ff07f4c2cca8996ea5fe831b27dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f624876d3e4ff07f4c2cca899… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 20 14:07:05 2012 -0600 winex11: Strip the _L or _R from X11DRV_GetKeyNameText when appropriate. --- dlls/winex11.drv/keyboard.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index c561102..160b986 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2301,6 +2301,24 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) keys = keycode_to_keysym(display, keyc, 0); name = XKeysymToString(keys); wine_tsx11_unlock(); + + if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) + { + char* idx = strrchr(name, '_'); + if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) + { + INT rc = 0; + TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", + scanCode, keyc, keys, debugstr_an(name,idx-name)); + if (lpBuffer && nSize) + { + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); + if (rc > 0) lpBuffer[rc - 1] = 0; + } + return rc; + } + } + TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n", scanCode, keyc, (int)keys, debugstr_a(name)); if (lpBuffer && nSize && name)

1 0