November 2010 - Wine-commits

Jörg Höhle : winmm/tests: Fix test failure in multi-byte locale.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: c138970ea2ce0661ebb80a5e0079e284a19d3176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c138970ea2ce0661ebb80a5e0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 10 18:45:27 2010 +0100 winmm/tests: Fix test failure in multi-byte locale. --- dlls/winmm/tests/mci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ec88ad9..cb6df72 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -489,14 +489,17 @@ static void test_openCloseWAVE(HWND hwnd) ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); ok(!strcmp(buf,"K"), "output buffer %s\n", buf); - buf[1] = 'L'; + buf[0] = 0; buf[1] = 'A'; buf[2] = 'j'; buf[3] = 0; parm.info.lpstrReturn = buf; parm.info.dwRetSize = 2; - err = mciSendCommand(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); + err = mciSendCommandA(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); ok(!err, "mciCommand MCI_INFO product: %s\n", dbg_mcierr(err)); - ok(buf[0] && !buf[1], "info product output buffer %s\n", buf); + ok(buf[0] /* && !buf[1] */ && (buf[2] == 'j' || broken(!buf[2])), "info product output buffer %s\n", buf); + /* Producing non-ASCII multi-byte output, native forgets to zero-terminate a too small buffer + * with SendStringA, while SendStringW works correctly (jap. and chin. locale): ignore buf[1] */ + /* Bug in 64 bit Vista/w2k8/w7: mciSendStringW is used! (not in xp nor w2k3) */ - buf[0] = 'K'; + buf[0] = 'K'; buf[1] = 0; parm.info.dwRetSize = sizeof(buf); err = mciSendCommandW(1, MCI_INFO, 0x07000000, (DWORD_PTR)&parm); ok(err==MCIERR_UNRECOGNIZED_KEYWORD || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_INFO other: %s\n", dbg_mcierr(err)); @@ -1123,6 +1126,9 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendString("play tempfile.wav notify", buf, sizeof(buf), hwnd); + if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + else ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */

1 0

Henri Verbeet : wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 78abb8ae07190714546ecc770680e54fcee20d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78abb8ae07190714546ecc770… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:19 2010 +0100 wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD. The call to surface_add_dirty_rect() would have taken care of evicting the other locations anyway, but we really shouldn't be touching the location flags directly. --- dlls/wined3d/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a18f067..394ae6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1655,11 +1655,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, TRACE("Warning: trying to lock unlockable surf@%p\n", This); } - if (Flags & WINED3DLOCK_DISCARD) { - /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ - TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - This->Flags |= SFLAG_INSYSMEM; + if (Flags & WINED3DLOCK_DISCARD) + { + TRACE("WINED3DLOCK_DISCARD flag passed, marking SYSMEM as up to date.\n"); + surface_prepare_system_memory(This); + surface_modify_location(This, SFLAG_INSYSMEM, TRUE); goto lock_end; }

1 0

Henri Verbeet : wined3d: Remove some useless code.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 3bbe658ef1b2a992ad44cd9503ad65889a1c6896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbe658ef1b2a992ad44cd950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:20 2010 +0100 wined3d: Remove some useless code. --- dlls/wined3d/surface.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 394ae6d..dbac947 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1663,12 +1663,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, goto lock_end; } - if (This->Flags & SFLAG_INSYSMEM) { - TRACE("Local copy is up to date, not downloading data\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - goto lock_end; - } - /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (pRect && !pRect->top && !pRect->left

1 0

Eryk Wieliczko : msvcrt: Fixed (_w)fopen_s with test.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: c9bd269db11dcc7e3b0fe49135ba9d0d0a4f8eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd269db11dcc7e3b0fe4913… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 10 12:34:42 2010 +0100 msvcrt: Fixed (_w)fopen_s with test. --- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/tests/file.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 329cdeb..91cd448 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2742,7 +2742,7 @@ int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, const char *filename, const char *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -2769,7 +2769,7 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ef7b28d..488c219 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -36,6 +36,17 @@ static HANDLE proc_handles[2]; +static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); +static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); + p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); +} + static void test_filbuf( void ) { FILE *fp; @@ -1201,6 +1212,82 @@ static void test_fopen_fclose_fcloseall( void ) ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); } +static void test_fopen_s( void ) +{ + const char name[] = "empty1"; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p_fopen_s) + { + win_skip("Skipping fopen_s test\n"); + return; + } + /* testing fopen_s */ + ret = p_fopen_s(&file, name, "w"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + ok(file != 0, "fopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + +static void test__wfopen_s( void ) +{ + const char name[] = "empty1"; + const WCHAR wname[] = { + 'e','m','p','t','y','1',0 + }; + const WCHAR wmode[] = { + 'w',0 + }; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p__wfopen_s) + { + win_skip("Skipping _wfopen_s test\n"); + return; + } + /* testing _wfopen_s */ + ret = p__wfopen_s(&file, wname, wmode); + ok(ret == 0, "_wfopen_s failed with %d\n", ret); + ok(file != 0, "_wfopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + static void test_get_osfhandle(void) { int fd; @@ -1424,6 +1511,8 @@ START_TEST(file) int arg_c; char** arg_v; + init(); + arg_c = winetest_get_mainargs( &arg_v ); /* testing low-level I/O */ @@ -1450,6 +1539,8 @@ START_TEST(file) test_filbuf(); test_fdopen(); test_fopen_fclose_fcloseall(); + test_fopen_s(); + test__wfopen_s(); test_fileops(); test_asciimode(); test_asciimode2();

1 0

André Hentschel : krnl386: Mention DOSBox.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: ac816c2a82e44dff205e850743973bf97059bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac816c2a82e44dff205e85074… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 20:02:21 2010 +0100 krnl386: Mention DOSBox. --- dlls/krnl386.exe16/dosexe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index a3b84ea..55735f3 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -643,7 +643,8 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) if (GetLastError() == ERROR_NOT_SUPPORTED) MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n", + " because vm86 mode is not supported on this platform.\n" + " Try running the application with DOSBox.\n", debugstr_a(env) ); else FIXME( "vm86 mode failed error %u\n", GetLastError() );

1 0

Vincent Povirk : mscoree: Search for mono installs with the 2.0 abi.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 4b3f30219323e4ff558dea528443092465d8568f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3f30219323e4ff558dea528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 14:36:02 2010 -0500 mscoree: Search for mono installs with the 2.0 abi. --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 018c1ee..35e0e32 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -66,7 +66,7 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; -#define NUM_ABI_VERSIONS 1 +#define NUM_ABI_VERSIONS 2 static loaded_mono loaded_monos[NUM_ABI_VERSIONS]; @@ -122,8 +122,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if (!find_mono_dll(This->mono_path, mono_dll_path, This->mono_abi_version)) goto fail; - if (This->mono_abi_version != 1) goto fail; - (*result)->mono_handle = LoadLibraryW(mono_dll_path); if (!(*result)->mono_handle) goto fail; @@ -451,6 +449,8 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; + static const WCHAR mono2_dll[] = {'\\','b','i','n','\\','m','o','n','o','-','2','.','0','.','d','l','l',0}; + static const WCHAR libmono2_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; DWORD attributes=INVALID_FILE_ATTRIBUTES; if (abi_version == 1) @@ -466,6 +466,19 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) attributes = GetFileAttributesW(dll_path); } } + else if (abi_version == 2) + { + strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, libmono2_dll); + attributes = GetFileAttributesW(dll_path); + } + } return (attributes != INVALID_FILE_ATTRIBUTES); } @@ -514,6 +527,7 @@ static BOOL get_mono_path_from_registry(LPWSTR path, int abi_version) static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_version) { static const WCHAR mono_one_dot_zero[] = {'\\','m','o','n','o','-','1','.','0', 0}; + static const WCHAR mono_two_dot_zero[] = {'\\','m','o','n','o','-','2','.','0', 0}; WCHAR mono_dll_path[MAX_PATH]; BOOL found = FALSE; @@ -521,6 +535,8 @@ static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_ if (abi_version == 1) strcatW(mono_path, mono_one_dot_zero); + else if (abi_version == 2) + strcatW(mono_path, mono_two_dot_zero); found = find_mono_dll(mono_path, mono_dll_path, abi_version); @@ -593,7 +609,7 @@ static void find_runtimes(void) if (runtimes_initialized) goto end; - for (abi_version=1; abi_version>0; abi_version--) + for (abi_version=NUM_ABI_VERSIONS; abi_version>0; abi_version--) { if (!get_mono_path(mono_path, abi_version)) continue;

1 0

Vincent Povirk : mscoree: Implement config file parsing.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 4ce33c69607e8f35e7ffc9c72d37d8362bf1efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce33c69607e8f35e7ffc9c72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 4 17:37:00 2010 -0500 mscoree: Implement config file parsing. --- dlls/mscoree/Makefile.in | 3 +- dlls/mscoree/assembly.c | 1 + dlls/mscoree/config.c | 469 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 44 ++++- dlls/mscoree/mscoree_main.c | 4 + dlls/mscoree/mscoree_private.h | 15 ++ 7 files changed, 533 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ce33c69607e8f35e7ffc…

1 0

Vincent Povirk : include: Rename cor.h to cor.idl.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 498752dd109340004dfa83945e889bd0a900707e URL: http://source.winehq.org/git/wine.git/?a=commit;h=498752dd109340004dfa83945… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 11:54:13 2010 -0500 include: Rename cor.h to cor.idl. --- .gitignore | 1 + include/Makefile.in | 2 +- include/{cor.h => cor.idl} | 29 ++++++++--------------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index b57ea54..a340baf 100644 --- a/.gitignore +++ b/.gitignore @@ -159,6 +159,7 @@ include/comcat.h include/commoncontrols.h include/config.h include/control.h +include/cor.h include/ctfutb.h include/ctxtcall.h include/d3d10.h diff --git a/include/Makefile.in b/include/Makefile.in index 1f434c7..3f4f9de 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -17,6 +17,7 @@ PUBLIC_IDL_H_SRCS = \ comcat.idl \ commoncontrols.idl \ control.idl \ + cor.idl \ ctfutb.idl \ ctxtcall.idl \ d3d10.idl \ @@ -142,7 +143,6 @@ SRCDIR_INCLUDES = \ commctrl.rh \ commdlg.h \ compobj.h \ - cor.h \ corerror.h \ corhdr.h \ cpl.h \ diff --git a/include/cor.h b/include/cor.idl similarity index 63% rename from include/cor.h rename to include/cor.idl index cdf89dd..4c5e639 100644 --- a/include/cor.h +++ b/include/cor.idl @@ -16,28 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_COR_H -#define __WINE_COR_H - -#include "ole2.h" +cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ -#ifdef __cplusplus -extern "C" { -#endif - -BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID); -__int32 WINAPI _CorExeMain(void); -__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR); -VOID WINAPI _CorImageUnloading(PVOID); -HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR); -HRESULT WINAPI CoInitializeCor(DWORD); -void WINAPI CoUninitializeCor(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_COR_H */ +cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") +cpp_quote("__int32 WINAPI _CorExeMain(void);") +cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);") +cpp_quote("VOID WINAPI _CorImageUnloading(PVOID);") +cpp_quote("HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR);") +cpp_quote("HRESULT WINAPI CoInitializeCor(DWORD);") +cpp_quote("void WINAPI CoUninitializeCor(void);")

1 0

Vincent Povirk : include: Add definitions for IMetaDataDispenserEx.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 6ad97b7c08bece95fd134bc9ccd12873b8ef5c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad97b7c08bece95fd134bc9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 12:34:28 2010 -0500 include: Add definitions for IMetaDataDispenserEx. --- include/cor.idl | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/cor.idl b/include/cor.idl index 4c5e639..8d8154b 100644 --- a/include/cor.idl +++ b/include/cor.idl @@ -16,11 +16,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "propidl.idl"; + cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenser, 0xe5cb7a31,0x7512,0x11d2,0x89,0xce,0x00,0x80,0xc7,0x92,0xe5,0xd8);") +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenserRuntime, 0x1ec2de53,0x75cc,0x11d2,0x97,0x75,0x00,0xa0,0xc9,0xb4,0xd5,0x0c);") + +[ + object, + local, + uuid(809c652e-7396-11d2-9771-00a0c9b4d50c) +] +interface IMetaDataDispenser : IUnknown +{ + HRESULT DefineScope( + [in] REFCLSID rclsid, + [in] DWORD dwCreateFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScope( + [in] LPCWSTR szScope, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScopeOnMemory( + [in] const void *pData, + [in] ULONG cbData, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); +} + +[ + object, + local, + uuid(31bcfce2-dafb-11d2-9f81-00c04f79a0a3) +] +interface IMetaDataDispenserEx : IMetaDataDispenser +{ + HRESULT SetOption( + [in] REFGUID optionid, + [in] const VARIANT *value); + + HRESULT GetOption( + [in] REFGUID optionid, + [out] VARIANT *pvalue); + + HRESULT OpenScopeOnITypeInfo( + [in] ITypeInfo *pITI, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT GetCORSystemDirectory( + [out, size_is(cchBuffer)] LPWSTR szBuffer, + [in] DWORD cchBuffer, + [out] DWORD *pchBuffer); + + HRESULT FindAssembly( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); + + HRESULT FindAssemblyModule( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [in] LPCWSTR szModuleName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); +} + cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") cpp_quote("__int32 WINAPI _CorExeMain(void);") cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);")

1 0

Vincent Povirk : mscoree: Add stub implementation of IMetaDataDispenserEx.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 9e20c21dbdf442138afb45884fcf7f5998352302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e20c21dbdf442138afb45884… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 13:21:25 2010 -0500 mscoree: Add stub implementation of IMetaDataDispenserEx. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/corruntimehost.c | 22 ++++- dlls/mscoree/metadata.c | 202 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 2 + 4 files changed, 226 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 284b18f..914aff4 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ assembly.c \ config.c \ corruntimehost.c \ + metadata.c \ metahost.c \ mscoree_main.c diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 58d5e3b..8145948 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -618,16 +618,36 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) { IUnknown *unk; + HRESULT hr; if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) + { unk = (IUnknown*)&This->lpVtbl; + IUnknown_AddRef(unk); + } else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) + { unk = (IUnknown*)&This->lpCLRHostVtbl; + IUnknown_AddRef(unk); + } + else if (IsEqualGUID(clsid, &CLSID_CorMetaDataDispenser) || + IsEqualGUID(clsid, &CLSID_CorMetaDataDispenserRuntime)) + { + hr = MetaDataDispenser_CreateInstance(&unk); + if (FAILED(hr)) + return hr; + } else unk = NULL; if (unk) - return IUnknown_QueryInterface(unk, riid, ppv); + { + hr = IUnknown_QueryInterface(unk, riid, ppv); + + IUnknown_Release(unk); + + return hr; + } else FIXME("not implemented for class %s\n", debugstr_guid(clsid)); diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c new file mode 100644 index 0000000..c9b8c72 --- /dev/null +++ b/dlls/mscoree/metadata.c @@ -0,0 +1,202 @@ +/* + * IMetaDataDispenserEx - dynamic creation/editing of assemblies + * + * 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 <stdio.h> +#include <stdarg.h> +#include <assert.h> + +#define COBJMACROS + +#include "wine/library.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "ole2.h" + +#include "cor.h" +#include "metahost.h" +#include "wine/list.h" +#include "mscoree_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); + +typedef struct MetaDataDispenser +{ + const struct IMetaDataDispenserExVtbl *lpVtbl; + LONG ref; +} MetaDataDispenser; + +static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* iface, + REFIID riid, void **ppvObject) +{ + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IMetaDataDispenserEx) || + IsEqualGUID(riid, &IID_IMetaDataDispenser) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IMetaDataDispenserEx_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) +{ + MetaDataDispenser *This = (MetaDataDispenser*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + MSCOREE_LockModule(); + + return ref; +} + +static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) +{ + MetaDataDispenser *This = (MetaDataDispenser*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + MSCOREE_UnlockModule(); + + return ref; +} + +static HRESULT WINAPI MetaDataDispenser_DefineScope(IMetaDataDispenserEx* iface, + REFCLSID rclsid, DWORD dwCreateFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %s %x %s %p\n", iface, debugstr_guid(rclsid), dwCreateFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScope(IMetaDataDispenserEx* iface, + LPCWSTR szScope, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %s %x %s %p\n", iface, debugstr_w(szScope), dwOpenFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScopeOnMemory(IMetaDataDispenserEx* iface, + const void *pData, ULONG cbData, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %p %u %x %s %p\n", iface, pData, cbData, dwOpenFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_SetOption(IMetaDataDispenserEx* iface, + REFGUID optionid, const VARIANT *value) +{ + FIXME("%p %s\n", iface, debugstr_guid(optionid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_GetOption(IMetaDataDispenserEx* iface, + REFGUID optionid, VARIANT *pvalue) +{ + FIXME("%p %s\n", iface, debugstr_guid(optionid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScopeOnITypeInfo(IMetaDataDispenserEx* iface, + ITypeInfo *pITI, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %p %u %s %p\n", iface, pITI, dwOpenFlags, debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_GetCORSystemDirectory(IMetaDataDispenserEx* iface, + LPWSTR szBuffer, DWORD cchBuffer, DWORD *pchBuffer) +{ + FIXME("%p %p %u %p\n", iface, szBuffer, cchBuffer, pchBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_FindAssembly(IMetaDataDispenserEx* iface, + LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, + LPWSTR szName, ULONG cchName, ULONG *pcName) +{ + FIXME("%p %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), + debugstr_w(szAssemblyName), szName, cchName, pcName); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_FindAssemblyModule(IMetaDataDispenserEx* iface, + LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, + LPCWSTR szModuleName, LPWSTR szName, ULONG cchName, ULONG *pcName) +{ + FIXME("%p %s %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), debugstr_w(szAssemblyName), + debugstr_w(szModuleName), szName, cchName, pcName); + return E_NOTIMPL; +} + +const struct IMetaDataDispenserExVtbl MetaDataDispenserVtbl = +{ + MetaDataDispenser_QueryInterface, + MetaDataDispenser_AddRef, + MetaDataDispenser_Release, + MetaDataDispenser_DefineScope, + MetaDataDispenser_OpenScope, + MetaDataDispenser_OpenScopeOnMemory, + MetaDataDispenser_SetOption, + MetaDataDispenser_GetOption, + MetaDataDispenser_OpenScopeOnITypeInfo, + MetaDataDispenser_GetCORSystemDirectory, + MetaDataDispenser_FindAssembly, + MetaDataDispenser_FindAssemblyModule +}; + +HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) +{ + MetaDataDispenser *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetaDataDispenser)); + + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &MetaDataDispenserVtbl; + This->ref = 1; + + *ppUnk = (IUnknown*)This; + + return S_OK; +} diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 49cd6a2..46c49c6 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -54,6 +54,8 @@ extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); +extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk); + typedef struct parsed_config_file { struct list supported_runtimes;

1 0