October 2010 - Wine-commits

Vincent Povirk : include: Add definition of ICLRRuntimeInfo.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: d1dd372a0c96b0c541ba0780d80e9b052be12b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dd372a0c96b0c541ba0780d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 16:36:43 2010 -0500 include: Add definition of ICLRRuntimeInfo. --- include/metahost.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/include/metahost.idl b/include/metahost.idl index 369addb..a352556 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -19,7 +19,66 @@ import "wtypes.idl"; import "propidl.idl"; -interface ICLRRuntimeInfo; +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef LoadLibrary") +cpp_quote("#endif") + +[ + object, + local, + uuid(bd39d1d2-ba2f-486a-89b0-b4b0cb466891) +] +interface ICLRRuntimeInfo : IUnknown +{ + HRESULT GetVersionString( + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer); + + HRESULT GetRuntimeDirectory( + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer); + + HRESULT IsLoaded( + [in] HANDLE hndProcess, + [out, retval] BOOL *pbLoaded); + + HRESULT LoadErrorString( + [in] UINT iResourceID, + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer, + [in] LONG iLocaleid); + + HRESULT LoadLibrary( + [in] LPCWSTR pwzDllName, + [out, retval] HMODULE *phndModule); + + HRESULT GetProcAddress( + [in] LPCSTR pszProcName, + [out, retval] LPVOID *ppProc); + + HRESULT GetInterface( + [in] REFCLSID rclsid, + [in] REFIID riid, + [out, iid_is(riid), retval] LPVOID *ppUnk); + + HRESULT IsLoadable( + [out, retval] BOOL *pbLoadable); + + HRESULT SetDefaultStartupFlags( + [in] DWORD dwStartupFlags, + [in] LPCWSTR pwzHostConfigFile); + + HRESULT GetDefaultStartupFlags( + [out] DWORD *pdwStartupFlags, + [out, size_is(*pcchHostConfigFile)] LPWSTR pwzHostConfigFile, + [in, out] DWORD *pcchHostConfigFile); + + HRESULT BindAsLegacyV2Runtime(); + + HRESULT IsStarted( + [out] BOOL *pbStarted, + [out] DWORD *pdwStartupFlags); +}; typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)();

1 0

Vincent Povirk : mscoree: Add a test that enumerates .NET runtimes.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 79ed8429319509db1ca7723661af5fb4a8017320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ed8429319509db1ca772366… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 16:40:07 2010 -0500 mscoree: Add a test that enumerates .NET runtimes. --- dlls/mscoree/tests/metahost.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index b79c9b6..27bed7f 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -62,10 +62,57 @@ void cleanup(void) FreeLibrary(hmscoree); } +void test_enumruntimes(void) +{ + IEnumUnknown *runtime_enum; + IUnknown *unk; + DWORD count; + ICLRRuntimeInfo *runtime_info; + HRESULT hr; + WCHAR buf[MAX_PATH]; + + hr = ICLRMetaHost_EnumerateInstalledRuntimes(metahost, &runtime_enum); + ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); + if (FAILED(hr)) return; + + while ((hr = IEnumUnknown_Next(runtime_enum, 1, &unk, &count)) == S_OK) + { + hr = IUnknown_QueryInterface(unk, &IID_ICLRRuntimeInfo, (void**)&runtime_info); + ok(hr == S_OK, "QueryInterface returned %x\n", hr); + + count = 1; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetVersionString returned %x\n", hr); + ok(count > 1, "GetVersionString returned count %u\n", count); + + count = 0xdeadbeef; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, NULL, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count > 1 && count != 0xdeadbeef, "GetVersionString returned count %u\n", count); + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count > 1, "GetVersionString returned count %u\n", count); + + trace("runtime found: %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(runtime_info); + + IUnknown_Release(unk); + } + + ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr); + + IEnumUnknown_Release(runtime_enum); +} + START_TEST(metahost) { if (!init_pointers()) return; + test_enumruntimes(); + cleanup(); }

1 0

Jacek Caban : urlmon: Added Abort support to BindProtocol.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 0d27b740b3b3c56ebba4e57ca2c6a92add3eef76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d27b740b3b3c56ebba4e57ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 4 14:00:48 2010 +0200 urlmon: Added Abort support to BindProtocol. --- dlls/urlmon/bindprot.c | 15 ++++++++++--- dlls/urlmon/tests/protocol.c | 43 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 01443e3..3e1fb58 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -423,8 +423,10 @@ static HRESULT WINAPI BindProtocol_Abort(IInternetProtocol *iface, HRESULT hrRea DWORD dwOptions) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + + return IInternetProtocol_Abort(This->protocol_handler, hrReason, dwOptions); } static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) @@ -653,8 +655,13 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hr DWORD dwOptions) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + + if(This->protocol && !This->reported_result) + return IInternetProtocol_Abort(This->protocol, hrReason, dwOptions); + + return S_OK; } static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD dwOptions) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a116cf3..15c3bc4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -108,6 +108,7 @@ DEFINE_EXPECT(Read2); DEFINE_EXPECT(SetPriority); DEFINE_EXPECT(LockRequest); DEFINE_EXPECT(UnlockRequest); +DEFINE_EXPECT(Abort); DEFINE_EXPECT(MimeFilter_CreateInstance); DEFINE_EXPECT(MimeFilter_Start); DEFINE_EXPECT(MimeFilter_ReportProgress); @@ -1159,8 +1160,16 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + HRESULT hres; + + CHECK_EXPECT(Abort); + + SET_EXPECT(ReportResult); + hres = IInternetProtocolSink_ReportResult(binding_sink, S_OK, ERROR_SUCCESS, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + CHECK_CALLED(ReportResult); + + return S_OK; } static HRESULT WINAPI Protocol_Suspend(IInternetProtocol *iface) @@ -1262,6 +1271,11 @@ static DWORD WINAPI thread_proc(PVOID arg) else CHECK_CALLED(Switch); + if(test_abort) { + SetEvent(event_complete); + return 0; + } + prot_state = 2; if(mimefilter_test) SET_EXPECT(MimeFilter_Switch); @@ -2999,6 +3013,18 @@ static void test_CreateBinding(void) IInternetBindInfo_Release(prot_bind_info); IInternetProtocol_Release(protocol); + hres = IInternetSession_CreateBinding(session, NULL, test_url, NULL, NULL, &protocol, 0); + ok(hres == S_OK, "CreateBinding failed: %08x\n", hres); + ok(protocol != NULL, "protocol == NULL\n"); + + hres = IInternetProtocol_Abort(protocol, E_ABORT, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + + hres = IInternetProtocol_Abort(protocol, E_FAIL, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + + IInternetProtocol_Release(protocol); + hres = IInternetSession_UnregisterNameSpace(session, &ClassFactory, wsz_test); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); @@ -3064,6 +3090,17 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) IInternetProtocol_Continue(protocol, pdata); CHECK_CALLED(Continue); } + if(test_abort && prot_state == 2) { + SET_EXPECT(Abort); + hres = IInternetProtocol_Abort(protocol, E_ABORT, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + CHECK_CALLED(Abort); + + hres = IInternetProtocol_Abort(protocol, E_ABORT, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + SetEvent(event_complete2); + break; + } SetEvent(event_complete2); } if(direct_read) @@ -3179,6 +3216,8 @@ START_TEST(protocol) test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_FILTER); trace("Testing http binding (mime verification, emulate prot, direct read)...\n"); test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_DIRECT_READ); + trace("Testing http binding (mime verification, emulate prot, abort)...\n"); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_ABORT); CloseHandle(event_complete); CloseHandle(event_complete2);

1 0

Adam Martinson : msxml3: XSLPattern support.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 4f78c04ec86bd8efcda4af4206da4c7f4fa7516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f78c04ec86bd8efcda4af420… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Sep 30 15:06:01 2010 -0500 msxml3: XSLPattern support. Parse XSLPattern queries and translate them into equivalent XPath queries. XSLPattern built-in functions/operators are translated to their XPath counterparts where applicable. If no direct XPath counterpart exists, they are registered as custom XPath functions for the sake of speed where possible. As a last resort, they are translated into compound XPath expressions to accomplish the task, if more slowly. If the parser encounters an error, the original XSLPattern query is returned, as this is more likely to work than a mangled one. --- .gitignore | 3 + dlls/msxml3/Makefile.in | 4 + dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/queryresult.c | 150 ++++++++++- dlls/msxml3/tests/domdoc.c | 214 +++++++++++++++- dlls/msxml3/xslpattern.h | 56 ++++ dlls/msxml3/xslpattern.l | 182 +++++++++++++ dlls/msxml3/xslpattern.y | 643 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 1248 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f78c04ec86bd8efcda4a…

1 0

Marko Nikolic : cabinet/tests: Removed sign comparison warnings.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 8d9788147c5785437a0cf822cf908a875efbcc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9788147c5785437a0cf822c… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Oct 1 23:51:08 2010 +0200 cabinet/tests: Removed sign comparison warnings. --- dlls/cabinet/tests/fdi.c | 96 +++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 7c7317f..19f9e29 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -100,106 +100,106 @@ static void test_FDICreate(void) if (0) { SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, NULL, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok(erf.erfOper == 0x1abe11ed, "Expected 0x1abe11ed, got %d\n", erf.erfOper); + ok(erf.erfType == 0x5eed1e55, "Expected 0x5eed1e55, got %d\n", erf.erfType); + ok(erf.fError == 0x1ead1e55, "Expected 0x1ead1e55, got %d\n", erf.fError); FDIDestroy(hfdi); } SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, NULL, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, NULL, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, NULL, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, NULL, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, NULL, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, NULL); @@ -212,26 +212,26 @@ static void test_FDICreate(void) /* bad cpu type */ SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, 0xcafebabe, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); - ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); - ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); + ok((erf.erfOper == 0x1abe11ed || erf.erfOper == 0 /* Vista */), "Expected 0x1abe11ed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0x5eed1e55 || erf.erfType == 0 /* Vista */), "Expected 0x5eed1e55 or 0, got %d\n", erf.erfType); + ok((erf.fError == 0x1ead1e55 || erf.fError == 0 /* Vista */), "Expected 0x1ead1e55 or 0, got %d\n", erf.fError); FDIDestroy(hfdi); /* pfnalloc fails */ SetLastError(0xdeadbeef); - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; + erf.erfOper = 0x1abe11ed; + erf.erfType = 0x5eed1e55; + erf.fError = 0x1ead1e55; hfdi = FDICreate(fdi_alloc_bad, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warnings.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: abed5b49b9cdcb6b780694610fdc40cc0e67c1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=abed5b49b9cdcb6b780694610… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Oct 2 01:29:45 2010 +0200 comctl32/tests: Removed sign comparison warnings. --- dlls/comctl32/tests/comboex.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f9a42df..a747500 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -234,7 +234,8 @@ static void test_WM_LBUTTONDOWN(void) COMBOBOXINFO cbInfo; UINT x, y, item_height; LRESULT result; - int i, idx; + UINT i; + int idx; RECT rect; WCHAR buffer[3]; static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; @@ -503,16 +504,16 @@ static void test_get_set_item(void) item.lParam = 0xdeadbeef; ret = SendMessage(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, ret); - ok(item.lParam == 0, "Expected zero, got %ld\n", item.lParam); + ok(item.lParam == 0, "Expected zero, got %lx\n", item.lParam); - item.lParam = 0xdeadbeef; + item.lParam = 0x1abe11ed; ret = SendMessage(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); expect(TRUE, ret); item.lParam = 0; ret = SendMessage(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, ret); - ok(item.lParam == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", item.lParam); + ok(item.lParam == 0x1abe11ed, "Expected 0x1abe11ed, got %lx\n", item.lParam); DestroyWindow(hComboEx); }

1 0

Vincent Povirk : include: Add declaration for ICLRMetaHost.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: c7d82418a6f3d1a9c06b758a6e6aa83b212736cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d82418a6f3d1a9c06b758a6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 15:16:56 2010 -0500 include: Add declaration for ICLRMetaHost. --- .gitignore | 1 + include/Makefile.in | 1 + include/metahost.idl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3f72357..5666c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -178,6 +178,7 @@ include/imnact.h include/imnxport.h include/indexsrv.h include/mediaobj.h +include/metahost.h include/mimeinfo.h include/mimeole.h include/mlang.h diff --git a/include/Makefile.in b/include/Makefile.in index fc6df0f..0c41dd4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -41,6 +41,7 @@ PUBLIC_IDL_H_SRCS = \ imnxport.idl \ indexsrv.idl \ mediaobj.idl \ + metahost.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/metahost.idl b/include/metahost.idl new file mode 100644 index 0000000..d0d3355 --- /dev/null +++ b/include/metahost.idl @@ -0,0 +1,67 @@ +/* + * 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 + */ + +import "wtypes.idl"; +import "propidl.idl"; + +interface ICLRRuntimeInfo; + +typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); +typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)(); + +typedef void (__stdcall *RuntimeLoadedCallbackFnPtr)( + ICLRRuntimeInfo *pRuntimeInfo, + CallbackThreadSetFnPtr pfnCallbackThreadSet, + CallbackThreadUnsetFnPtr pfnCallbackThreadUnset); + +cpp_quote("DEFINE_GUID(CLSID_CLRMetaHost, 0x9280188d,0x0e8e,0x4867,0xb3,0x0c,0x7f,0xa8,0x38,0x84,0xe8,0xde);") + +[ + object, + local, + uuid(d332db9e-b9b3-4125-8207-a14884f53216) +] +interface ICLRMetaHost : IUnknown +{ + HRESULT GetRuntime( + [in] LPCWSTR pwzVersion, + [in] REFIID iid, + [out, iid_is(iid), retval] LPVOID *ppRuntime); + + HRESULT GetVersionFromFile( + [in] LPCWSTR pwzFilePath, + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer); + + HRESULT EnumerateInstalledRuntimes( + [out, retval] IEnumUnknown **ppEnumerator); + + HRESULT EnumerateLoadedRuntimes( + [in] HANDLE hndProcess, + [out, retval] IEnumUnknown **ppEnumerator); + + HRESULT RequestRuntimeLoadedNotification( + [in] RuntimeLoadedCallbackFnPtr pCallbackFunction); + + HRESULT QueryLegacyV2RuntimeBinding( + [in] REFIID riid, + [out, iid_is(riid), retval] LPVOID *ppUnk); + + HRESULT ExitProcess( + [in] INT32 iExitCode); +};

1 0

Amine Khaldi : xcopy: Fix translations.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: ef88584afa83187603bb81f5100c98be274ed6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef88584afa83187603bb81f51… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Fri Oct 1 00:16:22 2010 +0100 xcopy: Fix translations. --- programs/xcopy/Da.rc | 6 +++--- programs/xcopy/De.rc | 6 +++--- programs/xcopy/En.rc | 10 +++++----- programs/xcopy/Fr.rc | 6 +++--- programs/xcopy/It.rc | 6 +++--- programs/xcopy/Ja.rc | 6 +++--- programs/xcopy/Ko.rc | 12 ++++++------ programs/xcopy/Lt.rc | 6 +++--- programs/xcopy/Nl.rc | 6 +++--- programs/xcopy/No.rc | 6 +++--- programs/xcopy/Pl.rc | 10 +++++----- programs/xcopy/Pt.rc | 12 ++++++------ programs/xcopy/Ro.rc | 6 +++--- programs/xcopy/Ru.rc | 8 ++++---- programs/xcopy/Si.rc | 8 ++++---- programs/xcopy/Uk.rc | 6 +++--- 16 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef88584afa83187603bb8…

1 0

Hwang YunSong : inetcpl.cpl: Update Korean resource.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: ef79dc1b952bc7e2b776b579ea62989c81cfc890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef79dc1b952bc7e2b776b579e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 4 10:46:47 2010 +0900 inetcpl.cpl: Update Korean resource. --- dlls/inetcpl.cpl/cpl_Ko.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index 6301701..b2f81a9 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -32,6 +32,23 @@ BEGIN IDS_CPL_INFO "Wine 인터넷 브라우저와 관련 설정 처리" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "일반" +BEGIN + + GROUPBOX " 홈 페이지 ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "홈페이지로 사용할 주소를 선택할 수 있습니다.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "현재 페이지(&C)", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "기본 페이지(&D)", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "빈 페이지(&B)", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Hwang YunSong : kernel32: Update Korean resource.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 140f08bd420676b7a9abf5846855cf6ace4078df URL: http://source.winehq.org/git/wine.git/?a=commit;h=140f08bd420676b7a9abf5846… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 4 10:53:13 2010 +0900 kernel32: Update Korean resource. --- dlls/kernel32/nls/winerr_kor.mc | 137 +++++++++++++++++++-------------------- 1 files changed, 66 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=140f08bd420676b7a9abf…

1 0