October 2010 - Wine-commits

Stefan Oberhumer : ntdll: Fix possible overflow computing middle in NTDLL_mergesort().
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 6a3ca3ca5dbd45126c11fb714ef50121773f1e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3ca3ca5dbd45126c11fb714… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Tue Oct 5 00:03:34 2010 +0200 ntdll: Fix possible overflow computing middle in NTDLL_mergesort(). --- dlls/ntdll/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 7a939c2..8496113 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -260,7 +260,7 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co { if(right>left) { size_t i, j, k, m; - m=(right+left)/2; + m=left+(right-left)/2; NTDLL_mergesort( arr, barr, elemsize, compar, left, m); NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);

1 0

Austin Lund : comctl32/tests: Add tests for negative subitems independent of local settings.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 227b1fe2ca387f53895df7f5b1036dc8cff54835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227b1fe2ca387f53895df7f5b… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Oct 5 09:54:26 2010 +1000 comctl32/tests: Add tests for negative subitems independent of local settings. --- dlls/comctl32/tests/listview.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index de7369c..d249af8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2992,7 +2992,8 @@ static void test_hittest(void) LVITEMA item; static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; POINT pos; - INT x, y; + INT x, y, i; + WORD horiz, vert; HIMAGELIST himl, himl2; HBITMAP hbmp; @@ -3020,6 +3021,11 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); + r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0); + horiz = LOWORD(r); + vert = HIWORD(r); + ok(bounds.bottom - bounds.top == vert, + "Horizontal spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); expect(TRUE, r); @@ -3052,8 +3058,18 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* subitem returned with -1 item too */ x = pos.x + 150; - y = -1; + y = bounds.top - vert; test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE); + test_lvm_subitemhittest(hwnd, x, y - vert + 1, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE); + /* return values appear to underflow with negative indices */ + i = -2; + y = y - vert; + while (i > -10) { + test_lvm_subitemhittest(hwnd, x, y, i, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE); + test_lvm_subitemhittest(hwnd, x, y - vert + 1, i, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE); + y = y - vert; + i--; + } /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */

1 0

Francois Gouget : shdocvw: Add a space before ellipses in the Slovenian translation.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: bb4ba69942e7928222f8c6e036afee5bd19dd60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4ba69942e7928222f8c6e03… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 4 18:05:11 2010 +0200 shdocvw: Add a space before ellipses in the Slovenian translation. --- dlls/shdocvw/Si.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/Si.rc b/dlls/shdocvw/Si.rc index c6b1a26..35d5014 100644 --- a/dlls/shdocvw/Si.rc +++ b/dlls/shdocvw/Si.rc @@ -42,15 +42,15 @@ IDR_BROWSE_MAIN_MENU MENU { MENUITEM "&Okno" ID_BROWSE_NEW_WINDOW } - MENUITEM "&Odpri...", ID_BROWSE_OPEN + MENUITEM "&Odpri ...", ID_BROWSE_OPEN MENUITEM "&Shrani", ID_BROWSE_SAVE - MENUITEM "Shrani &kot...", ID_BROWSE_SAVE_AS + MENUITEM "Shrani &kot ...", ID_BROWSE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Nastavitve tiskanja...", ID_BROWSE_PRINT_FORMAT - MENUITEM "Na&tisni...", ID_BROWSE_PRINT - MENUITEM "Predo&gled tiskanja...", ID_BROWSE_PRINT_PREVIEW + MENUITEM "Nastavitve tiskanja ...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Na&tisni ...", ID_BROWSE_PRINT + MENUITEM "Predo&gled tiskanja ...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Lastnosti...", ID_BROWSE_PROPERTIES + MENUITEM "&Lastnosti ...", ID_BROWSE_PROPERTIES MENUITEM "&Zapri", ID_BROWSE_QUIT } POPUP "Pogl&ed" @@ -63,12 +63,12 @@ IDR_BROWSE_MAIN_MENU MENU } POPUP "&Priljubljene" { - MENUITEM "&Dodaj med priljubljene..." ID_BROWSE_ADDFAV + MENUITEM "&Dodaj med priljubljene ..." ID_BROWSE_ADDFAV MENUITEM SEPARATOR } POPUP "&Pomoč" { - MENUITEM "O programu Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "O programu Internet Explorer ...",ID_BROWSE_ABOUT } }

1 0

Vincent Povirk : fusion: Return the path from IAssemblyCacheImpl_QueryAssemblyInfo.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 1b978eadde8d78f5f03c28fdafd95ab350b62a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b978eadde8d78f5f03c28fda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 4 14:14:23 2010 -0500 fusion: Return the path from IAssemblyCacheImpl_QueryAssemblyInfo. --- dlls/fusion/asmcache.c | 2 + dlls/fusion/asmenum.c | 21 ++++++-- dlls/fusion/asmname.c | 41 ++++++++++++++++ dlls/fusion/fusionpriv.h | 3 + dlls/fusion/tests/asmcache.c | 107 ++++++++++++++++++++--------------------- 5 files changed, 113 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b978eadde8d78f5f03c2…

1 0

Vincent Povirk : mscoree: Add stub implementation of ICLRMetaHost.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: fce6f93b48b9bd5e13cb52a2c122f79575a476ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce6f93b48b9bd5e13cb52a2c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 14:09:04 2010 -0500 mscoree: Add stub implementation of ICLRMetaHost. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/metahost.c | 154 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 9 ++- dlls/mscoree/mscoree_private.h | 2 + dlls/mscoree/tests/metahost.c | 4 +- 5 files changed, 166 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 9f7149d..6346aa9 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = uuid shell32 advapi32 C_SRCS = \ corruntimehost.c \ + metahost.c \ mscoree_main.c @MAKE_DLL_RULES@ diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c new file mode 100644 index 0000000..a6de737 --- /dev/null +++ b/dlls/mscoree/metahost.c @@ -0,0 +1,154 @@ +/* + * ICLRMetaHost - discovery and management of available .NET runtimes + * + * Copyright 2010 Vincent Povirk for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "wine/unicode.h" +#include "wine/library.h" +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +#include "mscoree.h" +#include "metahost.h" +#include "mscoree_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); + +struct CLRMetaHost +{ + const struct ICLRMetaHostVtbl *CLRMetaHost_vtbl; +}; + +static const struct CLRMetaHost GlobalCLRMetaHost; + +static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, + REFIID riid, + void **ppvObject) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_ICLRMetaHost ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ICLRMetaHost_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) +{ + return 2; +} + +static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) +{ + return 1; +} + +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); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, + LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) +{ + FIXME("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface, + IEnumUnknown **ppEnumerator) +{ + FIXME("%p\n", ppEnumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_EnumerateLoadedRuntimes(ICLRMetaHost* iface, + HANDLE hndProcess, IEnumUnknown **ppEnumerator) +{ + FIXME("%p %p\n", hndProcess, ppEnumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_RequestRuntimeLoadedNotification(ICLRMetaHost* iface, + RuntimeLoadedCallbackFnPtr pCallbackFunction) +{ + FIXME("%p\n", pCallbackFunction); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_QueryLegacyV2RuntimeBinding(ICLRMetaHost* iface, + REFIID riid, LPVOID *ppUnk) +{ + FIXME("%s %p\n", debugstr_guid(riid), ppUnk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) +{ + FIXME("%i: stub\n", iExitCode); + + ExitProcess(iExitCode); +} + +static const struct ICLRMetaHostVtbl CLRMetaHost_vtbl = +{ + CLRMetaHost_QueryInterface, + CLRMetaHost_AddRef, + CLRMetaHost_Release, + CLRMetaHost_GetRuntime, + CLRMetaHost_GetVersionFromFile, + CLRMetaHost_EnumerateInstalledRuntimes, + CLRMetaHost_EnumerateLoadedRuntimes, + CLRMetaHost_RequestRuntimeLoadedNotification, + CLRMetaHost_QueryLegacyV2RuntimeBinding, + CLRMetaHost_ExitProcess +}; + +static const struct CLRMetaHost GlobalCLRMetaHost = { + &CLRMetaHost_vtbl +}; + +extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) +{ + return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7b33619..5203a41 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -642,9 +642,14 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { - FIXME("(%s,%s,%p): stub\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); + TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); - return E_NOTIMPL; + if (IsEqualGUID(clsid, &CLSID_CLRMetaHost)) + return CLRMetaHost_CreateInstance(riid, ppInterface); + + FIXME("not implemented for class %s\n", debugstr_guid(clsid)); + + return CLASS_E_CLASSNOTAVAILABLE; } HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f14da1d..dda9bc0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -22,6 +22,8 @@ extern IUnknown* create_corruntimehost(void); +extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 27bed7f..5b3ed2c 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -47,7 +47,7 @@ BOOL init_pointers(void) if (FAILED(hr)) { - todo_wine win_skip(".NET 4 is not installed\n"); + win_skip(".NET 4 is not installed\n"); FreeLibrary(hmscoree); return FALSE; } @@ -72,7 +72,7 @@ void test_enumruntimes(void) WCHAR buf[MAX_PATH]; hr = ICLRMetaHost_EnumerateInstalledRuntimes(metahost, &runtime_enum); - ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); + todo_wine ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); if (FAILED(hr)) return; while ((hr = IEnumUnknown_Next(runtime_enum, 1, &unk, &count)) == S_OK)

1 0

Vincent Povirk : mscoree: Implement ICLRMetaHost_GetVersionFromFile.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 3f211a5126ae29c817fa0ca1e298b8097d754c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f211a5126ae29c817fa0ca1e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 15:27:52 2010 -0500 mscoree: Implement ICLRMetaHost_GetVersionFromFile. --- dlls/mscoree/Makefile.in | 3 +- dlls/mscoree/assembly.c | 246 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 31 +++++- dlls/mscoree/mscoree_private.h | 6 + 4 files changed, 283 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 6346aa9..dfbd58a 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,7 +1,8 @@ MODULE = mscoree.dll -IMPORTS = uuid shell32 advapi32 +IMPORTS = dbghelp uuid shell32 advapi32 C_SRCS = \ + assembly.c \ corruntimehost.c \ metahost.c \ mscoree_main.c diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c new file mode 100644 index 0000000..b4b72d4 --- /dev/null +++ b/dlls/mscoree/assembly.c @@ -0,0 +1,246 @@ +/* + * assembly parser + * + * Copyright 2008 James Hawkins + * + * 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 <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" +#include "dbghelp.h" +#include "ole2.h" +#include "corhdr.h" +#include "mscoree_private.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +typedef struct +{ + ULONG Signature; + USHORT MajorVersion; + USHORT MinorVersion; + ULONG Reserved; + ULONG VersionLength; + LPSTR Version; + BYTE Flags; + WORD Streams; +} METADATAHDR; + +typedef struct +{ + DWORD Offset; + DWORD Size; +} METADATASTREAMHDR; + +typedef struct tagCLRTABLE +{ + INT rows; + DWORD offset; +} CLRTABLE; + +struct tagASSEMBLY +{ + LPWSTR path; + + HANDLE hfile; + HANDLE hmap; + BYTE *data; + + IMAGE_NT_HEADERS *nthdr; + IMAGE_COR20_HEADER *corhdr; + + METADATAHDR *metadatahdr; +}; + +static inline LPWSTR strdupW(LPCWSTR src) +{ + LPWSTR dest; + + if (!src) + return NULL; + + dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dest) + lstrcpyW(dest, src); + + return dest; +} + +static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) +{ + METADATAHDR *metadatahdr; + BYTE *ptr, *dest; + DWORD size, ofs; + ULONG rva; + + rva = assembly->corhdr->MetaData.VirtualAddress; + ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + if (!ptr) + return E_FAIL; + + metadatahdr = (METADATAHDR *)ptr; + + assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); + if (!assembly->metadatahdr) + return E_OUTOFMEMORY; + + size = FIELD_OFFSET(METADATAHDR, Version); + memcpy(assembly->metadatahdr, metadatahdr, size); + + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version; + + ofs = FIELD_OFFSET(METADATAHDR, Flags); + ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; + dest = (BYTE *)assembly->metadatahdr + ofs; + memcpy(dest, ptr, sizeof(METADATAHDR) - ofs); + + *hdrsz = sizeof(METADATAHDR) - sizeof(LPSTR) + metadatahdr->VersionLength + 1; + + return S_OK; +} + +static HRESULT parse_clr_metadata(ASSEMBLY *assembly) +{ + HRESULT hr; + DWORD hdrsz; + + hr = parse_metadata_header(assembly, &hdrsz); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +static HRESULT parse_pe_header(ASSEMBLY *assembly) +{ + IMAGE_DATA_DIRECTORY *datadirs; + + assembly->nthdr = ImageNtHeader(assembly->data); + if (!assembly->nthdr) + return E_FAIL; + + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + IMAGE_OPTIONAL_HEADER64 *opthdr = + (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } + else + { + IMAGE_OPTIONAL_HEADER32 *opthdr = + (IMAGE_OPTIONAL_HEADER32 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } + + if (!datadirs) + return E_FAIL; + + if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress || + !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size) + { + return E_FAIL; + } + + assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data, + datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL); + if (!assembly->corhdr) + return E_FAIL; + + return S_OK; +} + +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) +{ + ASSEMBLY *assembly; + HRESULT hr; + + *out = NULL; + + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + if (!assembly) + return E_OUTOFMEMORY; + + assembly->path = strdupW(file); + if (!assembly->path) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + assembly->hfile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (assembly->hfile == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + assembly->hmap = CreateFileMappingW(assembly->hfile, NULL, PAGE_READONLY, + 0, 0, NULL); + if (!assembly->hmap) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + assembly->data = MapViewOfFile(assembly->hmap, FILE_MAP_READ, 0, 0, 0); + if (!assembly->data) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + hr = parse_pe_header(assembly); + if (FAILED(hr)) goto failed; + + hr = parse_clr_metadata(assembly); + if (FAILED(hr)) goto failed; + + *out = assembly; + return S_OK; + +failed: + assembly_release(assembly); + return hr; +} + +HRESULT assembly_release(ASSEMBLY *assembly) +{ + if (!assembly) + return S_OK; + + HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); + HeapFree(GetProcessHeap(), 0, assembly->path); + UnmapViewOfFile(assembly->data); + CloseHandle(assembly->hmap); + CloseHandle(assembly->hfile); + HeapFree(GetProcessHeap(), 0, assembly); + + return S_OK; +} + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + + return S_OK; +} diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a6de737..619743f 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -86,9 +86,36 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { - FIXME("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + ASSEMBLY *assembly; + HRESULT hr; + LPSTR version; + ULONG buffer_size=*pcchBuffer; - return E_NOTIMPL; + TRACE("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + + hr = assembly_create(&assembly, pwzFilePath); + + if (SUCCEEDED(hr)) + { + hr = assembly_get_runtime_version(assembly, &version); + + if (SUCCEEDED(hr)) + { + *pcchBuffer = MultiByteToWideChar(CP_UTF8, 0, version, -1, NULL, 0); + + if (pwzBuffer) + { + if (buffer_size >= *pcchBuffer) + MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size); + else + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + } + + assembly_release(assembly); + } + + return hr; } static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface, diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index dda9bc0..5c80848 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -24,6 +24,12 @@ extern IUnknown* create_corruntimehost(void); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); +typedef struct tagASSEMBLY ASSEMBLY; + +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); +HRESULT assembly_release(ASSEMBLY *assembly); +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly;

1 0

Vincent Povirk : mscoree: Implement ICLRMetaHost_EnumerateInstalledRuntimes .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 0d1c687563013b6d2f8228d5ed9672d581c4b24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1c687563013b6d2f8228d5e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 17:24:56 2010 -0500 mscoree: Implement ICLRMetaHost_EnumerateInstalledRuntimes. --- dlls/mscoree/metahost.c | 556 ++++++++++++++++++++++++++++++++++++++++- dlls/mscoree/tests/metahost.c | 2 +- 2 files changed, 555 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1c687563013b6d2f822…

1 0

Vincent Povirk : mscoree: Implement ICLRRuntimeInfo_GetInterface.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: d54b800793046e9f15718bebf9d4bd13c9614191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54b800793046e9f15718bebf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 26 15:54:13 2010 -0500 mscoree: Implement ICLRRuntimeInfo_GetInterface. --- dlls/mscoree/corruntimehost.c | 78 ++++++++++++++++++++++++++++++++------- dlls/mscoree/metahost.c | 73 +++++++++++++++++++++++++++++++------ dlls/mscoree/mscoree_main.c | 1 + dlls/mscoree/mscoree_private.h | 29 +++++++++++++++ include/mscoree.idl | 2 + 5 files changed, 157 insertions(+), 26 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9de9bf5..794f1c8 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,20 +29,24 @@ #include "cor.h" #include "mscoree.h" +#include "mscoree_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -typedef struct _corruntimehost +struct RuntimeHost { const struct ICorRuntimeHostVtbl *lpVtbl; + const CLRRuntimeInfo *version; + const loaded_mono *mono; LONG ref; -} corruntimehost; + BOOL legacy; /* if True, this was created by create_corruntimehost, and Release frees it */ +}; -static inline corruntimehost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) +static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { - return (corruntimehost *)((char*)iface - FIELD_OFFSET(corruntimehost, lpVtbl)); + return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); } /*** IUnknown methods ***/ @@ -50,7 +54,7 @@ static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, REFIID riid, void **ppvObject) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_ICorRuntimeHost ) || @@ -71,19 +75,19 @@ static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); return InterlockedIncrement( &This->ref ); } static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) { - corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 ) + if ( ref == 0 && This->legacy ) { - HeapFree( GetProcessHeap(), 0, This ); + RuntimeHost_Destroy(This); } return ref; @@ -271,18 +275,64 @@ static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = corruntimehost_CurrentDomain }; -IUnknown* create_corruntimehost(void) +HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, + const loaded_mono *loaded_mono, RuntimeHost** result) { - corruntimehost *This; + RuntimeHost *This; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) - return NULL; + return E_OUTOFMEMORY; This->lpVtbl = &corruntimehost_vtbl; This->ref = 1; + This->version = runtime_version; + This->mono = loaded_mono; + This->legacy = FALSE; + + return S_OK; +} + +HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) +{ + IUnknown *unk; + + if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) + unk = (IUnknown*)&This->lpVtbl; + else + unk = NULL; + + if (unk) + return IUnknown_QueryInterface(unk, riid, ppv); + else + FIXME("not implemented for class %s\n", debugstr_guid(clsid)); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT RuntimeHost_Destroy(RuntimeHost *This) +{ + HeapFree( GetProcessHeap(), 0, This ); + return S_OK; +} + +IUnknown* create_corruntimehost(void) +{ + RuntimeHost *This; + IUnknown *result; + + if (FAILED(RuntimeHost_Construct(NULL, NULL, &This))) + return NULL; + + This->legacy = TRUE; + + if (FAILED(RuntimeHost_GetInterface(This, &CLSID_CorRuntimeHost, &IID_IUnknown, (void**)&result))) + { + RuntimeHost_Destroy(This); + return NULL; + } - FIXME("return iface %p\n", This); + FIXME("return iface %p\n", result); - return (IUnknown*) &This->lpVtbl; + return result; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 159258b..f32afed 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -43,16 +43,6 @@ static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; static const WCHAR net_40_subdir[] = {'4','.','0',0}; -struct CLRRuntimeInfo -{ - const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; - LPCWSTR mono_libdir; - DWORD major; - DWORD minor; - DWORD build; - int mono_abi_version; -}; - const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 @@ -75,6 +65,53 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; +static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) +{ + /* FIXME: stub */ + *result = NULL; + + return S_OK; +} + +static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result) +{ + HRESULT hr = S_OK; + loaded_mono *ploaded_mono; + + if (This->loaded_runtime) + { + *result = This->loaded_runtime; + return hr; + } + + 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)) + *result = This->loaded_runtime; + + return hr; +} + +void unload_all_runtimes(void) +{ + int i; + + for (i=0; i<NUM_RUNTIMES; i++) + if (runtimes[i].loaded_runtime) + RuntimeHost_Destroy(runtimes[i].loaded_runtime); +} + static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, REFIID riid, void **ppvObject) @@ -178,9 +215,18 @@ static HRESULT WINAPI CLRRuntimeInfo_GetProcAddress(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_GetInterface(ICLRRuntimeInfo* iface, REFCLSID rclsid, REFIID riid, LPVOID *ppUnk) { - FIXME("%p %s %s %p\n", iface, debugstr_guid(rclsid), debugstr_guid(riid), ppUnk); + struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + RuntimeHost *host; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_guid(rclsid), debugstr_guid(riid), ppUnk); + + hr = CLRRuntimeInfo_GetRuntimeHost(This, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetInterface(host, rclsid, riid, ppUnk); + + return hr; } static HRESULT WINAPI CLRRuntimeInfo_IsLoadable(ICLRRuntimeInfo* iface, @@ -404,6 +450,9 @@ static void find_runtimes(void) { runtimes[i].mono_abi_version = abi_version; + strcpyW(runtimes[i].mono_path, mono_path); + strcpyW(runtimes[i].mscorlib_path, lib_path); + any_runtimes_found = TRUE; } } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 5203a41..fe7c35b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -343,6 +343,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + unload_all_runtimes(); break; } return TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5c80848..8604c81 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -30,6 +30,21 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); +typedef struct RuntimeHost RuntimeHost; + +typedef struct CLRRuntimeInfo +{ + const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; + LPCWSTR mono_libdir; + DWORD major; + DWORD minor; + DWORD build; + int mono_abi_version; + WCHAR mono_path[MAX_PATH]; + WCHAR mscorlib_path[MAX_PATH]; + struct RuntimeHost *loaded_runtime; +} CLRRuntimeInfo; + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; @@ -44,4 +59,18 @@ extern MonoDomain* (*mono_jit_init)(const char *file); extern int (*mono_jit_set_trace_options)(const char* options); extern void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); +typedef struct loaded_mono +{ +} loaded_mono; + +/* loaded runtime interfaces */ +extern void unload_all_runtimes(void); + +extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, + const loaded_mono *loaded_mono, RuntimeHost** result); + +extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv); + +extern HRESULT RuntimeHost_Destroy(RuntimeHost *This); + #endif /* __MSCOREE_PRIVATE__ */ diff --git a/include/mscoree.idl b/include/mscoree.idl index 56861cd..07231af 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -131,6 +131,8 @@ interface IHostControl : IUnknown [in] IUnknown* appDomainManager); } +cpp_quote("DEFINE_GUID(CLSID_CorRuntimeHost, 0xcb2f6723,0xab3a,0x11d2,0x9c,0x40,0x00,0xc0,0x4f,0xa3,0x0a,0x3e);") + [ uuid(CB2F6722-AB3A-11d2-9C40-00C04FA30A3E), version(1.0),

1 0

Vincent Povirk : mscoree: Add test for ICLRMetaHost_GetRuntime.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: f9db77231786273693f14394123c6d951657170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9db77231786273693f143941… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 28 16:52:01 2010 -0500 mscoree: Add test for ICLRMetaHost_GetRuntime. --- dlls/mscoree/tests/metahost.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index f09038e..75f1220 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -23,6 +23,7 @@ #include "windef.h" #include "ole2.h" +#include "corerror.h" #include "initguid.h" #include "metahost.h" #include "wine/test.h" @@ -107,6 +108,35 @@ void test_enumruntimes(void) IEnumUnknown_Release(runtime_enum); } +void test_getruntime(void) +{ + static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0}; + HRESULT hr; + ICLRRuntimeInfo *info; + DWORD count; + 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); + + hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info); + todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + if (hr != S_OK) return; + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); + ok(lstrcmpW(buf, twodotzero) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(info); + + /* 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); +} + START_TEST(metahost) { if (!init_pointers()) @@ -114,5 +144,7 @@ START_TEST(metahost) test_enumruntimes(); + test_getruntime(); + cleanup(); }

1 0

Austin English : psapi/tests: Macro cleanup.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: f2d1145142d9a5736dbf8517b9d83a700b267f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d1145142d9a5736dbf8517b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 5 00:56:49 2010 +0000 psapi/tests: Macro cleanup. --- dlls/psapi/tests/psapi_main.c | 138 ++++++++++++++++++++++++++++++----------- 1 files changed, 101 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2d1145142d9a5736dbf8…

1 0