October 2010 - Wine-Commits

Yaron Shahrabani : setupapi: Added Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: b1dbd845470302879e2fd9168c6b9889fba77f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1dbd845470302879e2fd9168… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 02:11:14 2010 +0200 setupapi: Added Hebrew translation. --- dlls/setupapi/He.rc | 64 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/Makefile.in | 1 + 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/He.rc b/dlls/setupapi/He.rc new file mode 100644 index 0000000..4342410 --- /dev/null +++ b/dlls/setupapi/He.rc @@ -0,0 +1,64 @@ +/* + * ׁHebrew resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2009 Ricardo Filipe + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 + */ + +#include "setupapi_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_PROMPTDISK "הקובץ '%s' שב־%s דרוש" + IDS_UNKNOWN "לא ידוע" + IDS_COPYFROM "העתקת קבצים מ־:" + IDS_INFO "נא להזין את נתיב מיקום הקבצים ואז ללחוץ על אישור." +} + +COPYFILEDLGORD DIALOG 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העתקת קבצים..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "ביטול", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "מקור:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "יעד:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "קבצים נדרשים" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "נא להכניס את תקליטור ההתקנה של היצרן ואז לוודא\nשהכונן שנבחר להלן הוא הכונן הנכון.", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "העתקת קובצי היצרן מ־:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "אישור", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "עיון...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 33d7fa2..7454e11 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : taskmgr: Added Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 510d2bf6826b3f6ee6a405f9221e0807b140b8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510d2bf6826b3f6ee6a405f92… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 8 01:23:19 2010 +0200 taskmgr: Added Hebrew translation. --- programs/taskmgr/He.rc | 582 ++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/Makefile.in | 1 + 2 files changed, 583 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=510d2bf6826b3f6ee6a40…

1 0

Yaron Shahrabani : uninstaller: Added Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: bbceba94458bd5c6111f0ba2e5f2871535d34491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbceba94458bd5c6111f0ba2e… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 8 10:41:10 2010 +0200 uninstaller: Added Hebrew translation. --- programs/uninstaller/He.rc | 31 +++++++++++++++++++++++++++++++ programs/uninstaller/Makefile.in | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/He.rc b/programs/uninstaller/He.rc new file mode 100644 index 0000000..79988ef --- /dev/null +++ b/programs/uninstaller/He.rc @@ -0,0 +1,31 @@ +/* + * Uninstaller (Hebrew Resources) + * + * Copyright 2005 Jonathan Ernst + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "מסיר התכניות מ־Wine" + IDS_UNINSTALLFAILED, "הפעלת פקודת ההסרה '%s' נכשלה, כנראה עקב חוסר בקובץ הפעלה.\r\nהאם ברצונך להסיר את רשומת ההסרה מרישומי המערכת ?" +} diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 6494782..1a8fe42 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Vincent Povirk : mscoree: Implement ICLRRuntimeInfo_GetRuntimeDirectory.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 9d770349dff213566994d172649b7fa4f93272e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d770349dff213566994d1726… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 13:35:47 2010 -0500 mscoree: Implement ICLRRuntimeInfo_GetRuntimeDirectory. --- dlls/mscoree/metahost.c | 57 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 0939eb3..bf62f3c 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -169,12 +169,65 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface, return hr; } +static BOOL get_install_root(LPWSTR install_dir) +{ + const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; + const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; + + DWORD len; + HKEY key; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) + return FALSE; + + len = MAX_PATH; + if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) + { + RegCloseKey(key); + return FALSE; + } + RegCloseKey(key); + + return TRUE; +} + static HRESULT WINAPI CLRRuntimeInfo_GetRuntimeDirectory(ICLRRuntimeInfo* iface, LPWSTR pwzBuffer, DWORD *pcchBuffer) { - FIXME("%p %p %p\n", iface, pwzBuffer, pcchBuffer); + static const WCHAR slash[] = {'\\',0}; + DWORD buffer_size = *pcchBuffer; + WCHAR system_dir[MAX_PATH]; + WCHAR version[MAX_PATH]; + DWORD version_size, size; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p %p %p\n", iface, pwzBuffer, pcchBuffer); + + if (!get_install_root(system_dir)) + { + ERR("error reading registry key for installroot\n"); + return E_FAIL; + } + else + { + version_size = MAX_PATH; + ICLRRuntimeInfo_GetVersionString(iface, version, &version_size); + lstrcatW(system_dir, version); + lstrcatW(system_dir, slash); + size = lstrlenW(system_dir) + 1; + } + + *pcchBuffer = size; + + if (pwzBuffer) + { + if (buffer_size >= size) + strcpyW(pwzBuffer, system_dir); + else + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + return hr; } static HRESULT WINAPI CLRRuntimeInfo_IsLoaded(ICLRRuntimeInfo* iface,

1 0

Nikolay Sivov : msxml3: Fix response text conversion to WCHAR string.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: ac6671b7f3186aedbe6cbe16dee4bb7d7964ef18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6671b7f3186aedbe6cbe16d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 02:49:22 2010 +0400 msxml3: Fix response text conversion to WCHAR string. --- dlls/msxml3/httprequest.c | 6 +++++- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 98372ff..b016016 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -865,7 +865,11 @@ static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR if (encoding == XML_CHAR_ENCODING_UTF8 || encoding == XML_CHAR_ENCODING_NONE ) { - *body = bstr_from_xmlChar(ptr); + DWORD length = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)ptr, size, NULL, 0); + + *body = SysAllocStringLen(NULL, length); + if (*body) + MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)ptr, size, *body, length); } else *body = SysAllocStringByteLen((LPCSTR)ptr, size); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4cb9abe..fd56c61 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3354,7 +3354,7 @@ if (0) * not what the server expects */ if(hr == S_OK) { - todo_wine ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), + ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), "expected %s, got %s\n", wine_dbgstr_w(wszExpectedResponse), wine_dbgstr_w(bstrResponse)); SysFreeString(bstrResponse); }

1 0

Nikolay Sivov : msxml3: Implement POST support with supplied body data.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: ace3a81d13a9fe30be3fe434e13964a716f8f3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace3a81d13a9fe30be3fe434e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 02:41:49 2010 +0400 msxml3: Implement POST support with supplied body data. --- dlls/msxml3/httprequest.c | 46 +++++++++++++++++++++++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 9 +++---- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 504da92..98372ff 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -114,6 +114,9 @@ struct BindStatusCallback /* response data */ IStream *stream; + + /* request body data */ + HGLOBAL body; }; static inline BindStatusCallback *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -194,6 +197,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) { if (This->binding) IBinding_Release(This->binding); if (This->stream) IStream_Release(This->stream); + if (This->body) GlobalFree(This->body); heap_free(This); } @@ -240,7 +244,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, { BindStatusCallback *This = impl_from_IBindStatusCallback(iface); - TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, + TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); return S_OK; @@ -275,10 +279,13 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, *bind_flags = 0; if (This->request->async) *bind_flags |= BINDF_ASYNCHRONOUS; - if (This->request->verb != BINDVERB_GET) + if (This->request->verb != BINDVERB_GET && This->body) { - FIXME("only GET verb supported. Got %d\n", This->request->verb); - return E_FAIL; + pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; + pbindinfo->stgmedData.u.hGlobal = This->body; + pbindinfo->cbstgmedData = GlobalSize(This->body); + /* callback owns passed body pointer */ + IBindStatusCallback_QueryInterface(iface, &IID_IUnknown, (void**)&pbindinfo->stgmedData.pUnkForRelease); } pbindinfo->dwBindVerb = This->request->verb; @@ -410,7 +417,7 @@ static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_OnResponse }; -static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj) +static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj, const VARIANT *body) { BindStatusCallback *bsc; IBindCtx *pbc; @@ -432,6 +439,31 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * bsc->request = This; bsc->binding = NULL; bsc->stream = NULL; + bsc->body = NULL; + + TRACE("created callback %p\n", bsc); + + if (This->verb != BINDVERB_GET) + { + if (V_VT(body) == VT_BSTR) + { + LONG size = SysStringLen(V_BSTR(body)) * sizeof(WCHAR); + void *ptr; + + bsc->body = GlobalAlloc(GMEM_FIXED, size); + if (!bsc->body) + { + heap_free(bsc); + return E_OUTOFMEMORY; + } + + ptr = GlobalLock(bsc->body); + memcpy(ptr, V_BSTR(body), size); + GlobalUnlock(bsc->body); + } + else + FIXME("unsupported body data type %d\n", V_VT(body)); + } hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)bsc, NULL, 0); if (hr == S_OK) @@ -710,7 +742,7 @@ static HRESULT WINAPI httprequest_getAllResponseHeaders(IXMLHTTPRequest *iface, return E_NOTIMPL; } -static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT varBody) +static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); BindStatusCallback *bsc = NULL; @@ -720,7 +752,7 @@ static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT varBody) if (This->state != READYSTATE_LOADING) return E_FAIL; - hr = BindStatusCallback_create(This, &bsc); + hr = BindStatusCallback_create(This, &bsc, &body); if (FAILED(hr)) return hr; BindStatusCallback_Detach(This->bsc); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d85bda9..4cb9abe 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3334,15 +3334,13 @@ if (0) IXMLHttpRequest_Release(pXMLHttpRequest); return; } - todo_wine ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* status code after ::send() */ status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == 200, "got %d\n", status); -} /* another ::send() after completed request */ hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); @@ -3351,12 +3349,13 @@ todo_wine { VariantClear(&varbody); hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, &bstrResponse); - todo_wine ok(hr == S_OK, "IXMLHttpRequest_get_responseText should have succeeded instead of failing with 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* the server currently returns "FAILED" because the Content-Type header is * not what the server expects */ if(hr == S_OK) { - ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), "bstrResponse differs from what was expected\n"); + todo_wine ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), + "expected %s, got %s\n", wine_dbgstr_w(wszExpectedResponse), wine_dbgstr_w(bstrResponse)); SysFreeString(bstrResponse); }

1 0

Vincent Povirk : mscoree: Implement ICLRMetaHost_GetRuntime.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: a7bda5c2b55fc3efd46db2e0f50128c01e98fde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7bda5c2b55fc3efd46db2e0f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 28 17:53:14 2010 -0500 mscoree: Implement ICLRMetaHost_GetRuntime. --- dlls/mscoree/corruntimehost.c | 2 + dlls/mscoree/metahost.c | 78 +++++++++++++++++++++++++++++++++++++--- dlls/mscoree/tests/metahost.c | 10 ++++-- 3 files changed, 81 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 794f1c8..ee0ad44 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -290,6 +290,8 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, This->mono = loaded_mono; This->legacy = FALSE; + *result = This; + return S_OK; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f32afed..0939eb3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -31,6 +31,7 @@ #include "winreg.h" #include "ole2.h" +#include "corerror.h" #include "mscoree.h" #include "metahost.h" #include "mscoree_private.h" @@ -86,15 +87,11 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * EnterCriticalSection(&runtime_list_cs); - if (!This->loaded_runtime) - goto end; - hr = load_mono(This, &ploaded_mono); if (SUCCEEDED(hr)) hr = RuntimeHost_Construct(This, ploaded_mono, &This->loaded_runtime); -end: LeaveCriticalSection(&runtime_list_cs); if (SUCCEEDED(hr)) @@ -662,12 +659,81 @@ static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) return 1; } +static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, DWORD *build) +{ + *major = 0; + *minor = 0; + *build = 0; + + if (version[0] == 'v') + { + version++; + if (!isdigit(*version)) + return FALSE; + + while (isdigit(*version)) + *major = *major * 10 + (*version++ - '0'); + + if (*version == 0) + return TRUE; + + if (*version++ != '.' || !isdigit(*version)) + return FALSE; + + while (isdigit(*version)) + *minor = *minor * 10 + (*version++ - '0'); + + if (*version == 0) + return TRUE; + + if (*version++ != '.' || !isdigit(*version)) + return FALSE; + + while (isdigit(*version)) + *build = *build * 10 + (*version++ - '0'); + + return *version == 0; + } + else + return FALSE; +} + static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) { - FIXME("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); + int i; + DWORD major, minor, build; - return E_NOTIMPL; + TRACE("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); + + if (!pwzVersion) + return E_POINTER; + + if (!parse_runtime_version(pwzVersion, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(pwzVersion)); + return CLR_E_SHIM_RUNTIME; + } + + find_runtimes(); + + for (i=0; i<NUM_RUNTIMES; i++) + { + if (runtimes[i].major == major && runtimes[i].minor == minor && + runtimes[i].build == build) + { + if (runtimes[i].mono_abi_version) + return IUnknown_QueryInterface((IUnknown*)&runtimes[i], iid, ppRuntime); + else + { + ERR("Mono is missing %s runtime\n", debugstr_w(pwzVersion)); + return CLR_E_SHIM_RUNTIME; + } + } + } + + FIXME("Unrecognized version %s\n", debugstr_w(pwzVersion)); + return CLR_E_SHIM_RUNTIME; } static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 75f1220..bf9e383 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -118,10 +118,14 @@ void test_getruntime(void) WCHAR buf[MAX_PATH]; hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); - todo_wine ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + if (hr == CLR_E_SHIM_RUNTIME) + /* FIXME: Get Mono properly packaged so we can fail here. */ + todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + else + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); if (hr != S_OK) return; count = MAX_PATH; @@ -134,7 +138,7 @@ void test_getruntime(void) /* Versions must match exactly. */ hr = ICLRMetaHost_GetRuntime(metahost, twodotzerodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - todo_wine ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); } START_TEST(metahost)

1 0

Nikolay Sivov : shlwapi/assoc: Fix arguments tracing.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 646a49b74a4a467dedb2c07039163c4d9bceecdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=646a49b74a4a467dedb2c0703… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 12 22:23:46 2010 +0400 shlwapi/assoc: Fix arguments tracing. --- dlls/shlwapi/assoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index e7dcb16..877f514 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -113,7 +113,7 @@ HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAsso HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8x,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), + TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), debugstr_w(pszExtra), phkeyOut); hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); @@ -152,7 +152,7 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8x,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), + TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), debugstr_a(pszExtra), phkeyOut); if (SHLWAPI_ParamAToW(pszAssoc, szAssocW, MAX_PATH, &lpszAssocW) && @@ -181,7 +181,7 @@ HRESULT WINAPI AssocQueryStringW(ASSOCF cfFlags, ASSOCSTR str, LPCWSTR pszAssoc, HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8x,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), + TRACE("(0x%x,%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), debugstr_w(pszExtra), pszOut, pcchOut); if (!pcchOut) @@ -225,7 +225,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8x,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), + TRACE("(0x%x,0x%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), debugstr_a(pszExtra), pszOut, pcchOut); if (!pcchOut) @@ -278,7 +278,7 @@ HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8x,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_w(pszExtra), pszOut, pcchOut); hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); @@ -320,7 +320,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc WCHAR szReturnW[MAX_PATH], *lpszReturnW = szReturnW; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8x,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_a(pszExtra), pszOut, pcchOut); if (!pcchOut)

1 0

Jeff Latimer : comctl32: Change stub to return IDYES instead of IDOK.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: ad9507b5f37088d495dea75b92b4ccf3b31e1772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9507b5f37088d495dea75b9… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Oct 13 12:04:56 2010 +1100 comctl32: Change stub to return IDYES instead of IDOK. --- dlls/comctl32/commctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c37c485..a82b233 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1698,7 +1698,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnBu { FIXME("%p, %p, %p, %p\n", pTaskConfig, pnButton, pnRadioButton, pfVerificationFlagChecked); - if (pnButton) *pnButton = IDOK; + if (pnButton) *pnButton = IDYES; if (pnRadioButton) *pnRadioButton = pTaskConfig->nDefaultButton; if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; return S_OK;

1 0

Vincent Povirk : mscoree: Use the new Mono runtime search code in GetRequestedRuntimeInfo.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 2c2d53024f04f785dbcccf309a28f3773d6c4233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2d53024f04f785dbcccf309… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 1 14:11:09 2010 -0500 mscoree: Use the new Mono runtime search code in GetRequestedRuntimeInfo. --- dlls/mscoree/assembly.c | 1 + dlls/mscoree/corruntimehost.c | 1 + dlls/mscoree/metahost.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 35 ++++++++++++++--------------- dlls/mscoree/mscoree_private.h | 3 ++ 5 files changed, 70 insertions(+), 18 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index b4b72d4..04e5d23 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -28,6 +28,7 @@ #include "dbghelp.h" #include "ole2.h" #include "corhdr.h" +#include "metahost.h" #include "mscoree_private.h" #include "wine/debug.h" diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ee0ad44..831f6de 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,6 +29,7 @@ #include "cor.h" #include "mscoree.h" +#include "metahost.h" #include "mscoree_private.h" #include "wine/debug.h" diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index bf62f3c..57fce37 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -899,3 +899,51 @@ extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) { return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); } + +HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, + DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) +{ + static const DWORD supported_startup_flags = 0; + static const DWORD supported_runtime_flags = RUNTIME_INFO_UPGRADE_VERSION; + int i; + + if (exefile) + FIXME("ignoring exe filename %s\n", debugstr_w(exefile)); + + if (config_file) + FIXME("ignoring config filename %s\n", debugstr_w(config_file)); + + if (startup_flags & ~supported_startup_flags) + FIXME("unsupported startup flags %x\n", startup_flags & ~supported_startup_flags); + + if (runtimeinfo_flags & ~supported_runtime_flags) + FIXME("unsupported runtimeinfo flags %x\n", runtimeinfo_flags & ~supported_runtime_flags); + + if (version) + { + return CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + } + + if (runtimeinfo_flags & RUNTIME_INFO_UPGRADE_VERSION) + { + find_runtimes(); + + if (legacy) + i = 2; + else + i = NUM_RUNTIMES; + + while (i--) + { + if (runtimes[i].mono_abi_version) + return IUnknown_QueryInterface((IUnknown*)&runtimes[i], + &IID_ICLRRuntimeInfo, (void**)result); + } + + ERR("No %s.NET runtime installed\n", legacy ? "legacy " : ""); + + return CLR_E_SHIM_RUNTIME; + } + + return CLR_E_SHIM_RUNTIME; +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index fe7c35b..a57d766 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -21,6 +21,7 @@ #include <stdarg.h> +#define COBJMACROS #include "wine/unicode.h" #include "wine/library.h" #include "windef.h" @@ -516,35 +517,33 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { HRESULT ret; - DWORD ver_len, dir_len; - WCHAR dirW[MAX_PATH], verW[MAX_PATH]; + ICLRRuntimeInfo *info; + DWORD length_dummy; - FIXME("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p) semi-stub\n", debugstr_w(pExe), + TRACE("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p)\n", debugstr_w(pExe), debugstr_w(pwszVersion), debugstr_w(pConfigurationFile), startupFlags, runtimeInfoFlags, pDirectory, dwDirectory, dwDirectoryLength, pVersion, cchBuffer, dwlength); - if (!pwszVersion && !(runtimeInfoFlags & RUNTIME_INFO_UPGRADE_VERSION)) - return CLR_E_SHIM_RUNTIME; + if (!dwDirectoryLength) dwDirectoryLength = &length_dummy; - ret = GetCORSystemDirectory(dirW, dwDirectory, &dir_len); + if (!dwlength) dwlength = &length_dummy; - if (ret == S_OK) - { - if (dwDirectoryLength) - *dwDirectoryLength = dir_len; - if (pDirectory) - lstrcpyW(pDirectory, dirW); + ret = get_runtime_info(pExe, pwszVersion, pConfigurationFile, startupFlags, runtimeInfoFlags, TRUE, &info); - ret = GetCORVersion(verW, cchBuffer, &ver_len); + if (SUCCEEDED(ret)) + { + *dwlength = cchBuffer; + ret = ICLRRuntimeInfo_GetVersionString(info, pVersion, dwlength); - if (ret == S_OK) + if (SUCCEEDED(ret)) { - if (dwlength) - *dwlength = ver_len; - if (pVersion) - lstrcpyW(pVersion, verW); + *dwDirectoryLength = dwDirectory; + ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pDirectory, dwDirectoryLength); } + + ICLRRuntimeInfo_Release(info); } + return ret; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8604c81..6273b82 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,6 +45,9 @@ typedef struct CLRRuntimeInfo struct RuntimeHost *loaded_runtime; } CLRRuntimeInfo; +extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, + DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly;

1 0