wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Vincent Povirk : mscoree: Add test for creating CLRMetaHost.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: ddda173064a7f7e19004e340b882107d8e5af57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddda173064a7f7e19004e340b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 15:55:05 2010 -0500 mscoree: Add test for creating CLRMetaHost. --- dlls/mscoree/tests/Makefile.in | 1 + dlls/mscoree/tests/metahost.c | 71 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 5077958..0ff1e2b 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = mscoree.dll C_SRCS = \ + metahost.c \ mscoree.c @MAKE_TEST_RULES@ diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c new file mode 100644 index 0000000..b79c9b6 --- /dev/null +++ b/dlls/mscoree/tests/metahost.c @@ -0,0 +1,71 @@ +/* + * Copyright 2010 Vincent Povirk + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "ole2.h" + +#include "initguid.h" +#include "metahost.h" +#include "wine/test.h" + +static HMODULE hmscoree; + +static HRESULT (WINAPI *pCLRCreateInstance)(REFCLSID clsid, REFIID riid, LPVOID *ppInterface); + +static ICLRMetaHost *metahost; + +BOOL init_pointers(void) +{ + HRESULT hr = E_FAIL; + + hmscoree = LoadLibraryA("mscoree.dll"); + + if (hmscoree) + pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); + + if (pCLRCreateInstance) + hr = pCLRCreateInstance(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void**)&metahost); + + if (FAILED(hr)) + { + todo_wine win_skip(".NET 4 is not installed\n"); + FreeLibrary(hmscoree); + return FALSE; + } + + return TRUE; +} + +void cleanup(void) +{ + ICLRMetaHost_Release(metahost); + + FreeLibrary(hmscoree); +} + +START_TEST(metahost) +{ + if (!init_pointers()) + return; + + cleanup(); +}

1 0

Vincent Povirk : mscoree: Stub CLRCreateInstance.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 1fbb2142488c1fc171b840f42c93237f949c805c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbb2142488c1fc171b840f42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 15:34:18 2010 -0500 mscoree: Stub CLRCreateInstance. --- dlls/mscoree/mscoree.spec | 1 + dlls/mscoree/mscoree_main.c | 9 +++++++++ include/metahost.idl | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 2654813..1d4d7f7 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -7,6 +7,7 @@ @ stub CallFunctionShim @ stub CloseCtrs +@ stdcall CLRCreateInstance(ptr ptr ptr) @ stdcall ClrCreateManagedInstance(wstr ptr ptr) @ stub CoEEShutDownCOM @ stdcall CoInitializeCor(long) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 980bed1..7b33619 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -29,12 +29,14 @@ #include "winnls.h" #include "winreg.h" #include "ole2.h" +#include "ocidl.h" #include "shellapi.h" #include "initguid.h" #include "cor.h" #include "corerror.h" #include "mscoree.h" +#include "metahost.h" #include "mscoree_private.h" #include "wine/debug.h" @@ -638,6 +640,13 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi return FALSE; } +HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) +{ + FIXME("(%s,%s,%p): stub\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); + + return E_NOTIMPL; +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); diff --git a/include/metahost.idl b/include/metahost.idl index d0d3355..369addb 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -65,3 +65,5 @@ interface ICLRMetaHost : IUnknown HRESULT ExitProcess( [in] INT32 iExitCode); }; + +cpp_quote("HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface);")

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

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

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

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

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

Jacek Caban : urlmon: Added Abort tests.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 2e59b5ac1a6ecdf1e98dad785c8fd249766aec32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e59b5ac1a6ecdf1e98dad785… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 4 14:00:34 2010 +0200 urlmon: Added Abort tests. --- dlls/urlmon/tests/protocol.c | 85 +++++++++++++++++++++++++++++++++-------- 1 files changed, 68 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 699b0b6..a116cf3 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -147,7 +147,7 @@ static BOOL binding_test; static PROTOCOLDATA protocoldata, *pdata, continue_protdata; static DWORD prot_read, pi, filter_state; static BOOL security_problem; -static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read; +static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; static enum { FILE_TEST, @@ -823,7 +823,7 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR else ok(hrResult == expect_hrResult, "hrResult = %08x, expected: %08x\n", hrResult, expect_hrResult); - if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST) + if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS || @@ -1959,14 +1959,15 @@ static const IClassFactoryVtbl MimeFilterCFVtbl = { static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; -#define TEST_BINDING 0x01 -#define TEST_FILTER 0x02 -#define TEST_FIRST_HTTP 0x04 -#define TEST_DIRECT_READ 0x08 -#define TEST_POST 0x10 -#define TEST_EMULATEPROT 0x20 -#define TEST_SHORT_READ 0x40 -#define TEST_REDIRECT 0x80 +#define TEST_BINDING 0x0001 +#define TEST_FILTER 0x0002 +#define TEST_FIRST_HTTP 0x0004 +#define TEST_DIRECT_READ 0x0008 +#define TEST_POST 0x0010 +#define TEST_EMULATEPROT 0x0020 +#define TEST_SHORT_READ 0x0040 +#define TEST_REDIRECT 0x0080 +#define TEST_ABORT 0x0100 static void init_test(int prot, DWORD flags) { @@ -1993,6 +1994,7 @@ static void init_test(int prot, DWORD flags) wait_for_switch = TRUE; short_read = (flags & TEST_SHORT_READ) != 0; test_redirect = (flags & TEST_REDIRECT) != 0; + test_abort = (flags & TEST_ABORT) != 0; } static void test_priority(IInternetProtocol *protocol) @@ -2021,6 +2023,24 @@ static void test_priority(IInternetProtocol *protocol) IInternetPriority_Release(priority); } +static void test_early_abort(const CLSID *clsid) +{ + IInternetProtocol *protocol; + HRESULT hres; + + hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + 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); +} + static BOOL file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, IInternetProtocolEx *protocolex, IUri *uri, BOOL is_first) { @@ -2413,7 +2433,7 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 1, &cb); - ok(hres == S_FALSE, "Read failed: %08x\n", hres); + ok(hres == test_abort ? S_OK : S_FALSE, "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres); @@ -2507,9 +2527,9 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) if(!http_protocol_start(url)) return; - if(!direct_read) + if(!direct_read && !test_abort) SET_EXPECT(ReportResult); - expect_hrResult = S_OK; + expect_hrResult = test_abort ? E_ABORT : S_OK; if(direct_read) { while(wait_for_switch) { @@ -2547,6 +2567,19 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) CHECK_CALLED(Switch); else CHECK_CALLED(ReportData); + + if(test_abort) { + HRESULT hres; + + SET_EXPECT(ReportResult); + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + CHECK_CALLED(ReportResult); + + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); + ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + break; + } }else { if(bindf & BINDF_FROMURLMON) CHECK_NOT_CALLED(Switch); @@ -2555,15 +2588,24 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) if(cb == 0) break; } } - ok(hres == S_FALSE, "Read failed: %08x\n", hres); - CHECK_CALLED(ReportResult); + if(!test_abort) { + ok(hres == S_FALSE, "Read failed: %08x\n", hres); + CHECK_CALLED(ReportResult); + } } if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); + ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + test_protocol_terminate(async_protocol); + + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); + ok(hres == S_OK, "Abort failed: %08x\n", hres); + ref = IInternetProtocol_Release(async_protocol); - ok(!ref, "ref=%x\n", hres); + ok(!ref, "ref=%x\n", ref); } IClassFactory_Release(factory); @@ -2607,6 +2649,12 @@ static void test_http_protocol(void) trace("Testing http protocol (redirected)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT); + + trace("Testing http protocol abort...\n"); + test_http_protocol_url(winehq_url, HTTP_TEST, TEST_ABORT); + + test_early_abort(&CLSID_HttpProtocol); + test_early_abort(&CLSID_HttpSProtocol); } static void test_https_protocol(void) @@ -2684,7 +2732,6 @@ static void test_ftp_protocol(void) WaitForSingleObject(event_complete, INFINITE); while(1) { - hres = IInternetProtocol_Read(async_protocol, buf, sizeof(buf), &cb); if(hres == E_PENDING) WaitForSingleObject(event_complete, INFINITE); @@ -2700,6 +2747,8 @@ static void test_ftp_protocol(void) ref = IInternetProtocol_Release(async_protocol); ok(!ref, "ref=%d\n", ref); + + test_early_abort(&CLSID_FtpProtocol); } static void test_gopher_protocol(void) @@ -2735,6 +2784,8 @@ static void test_gopher_protocol(void) test_priority(async_protocol); IInternetProtocol_Release(async_protocol); + + test_early_abort(&CLSID_GopherProtocol); } static void test_mk_protocol(void)

1 0

Jacek Caban : urlmon: Added Abort implementation to wininet-based protocols .
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 159c23e1372fcf80fcc15cca185f5718107b5920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159c23e1372fcf80fcc15cca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 4 14:00:17 2010 +0200 urlmon: Added Abort implementation to wininet-based protocols. --- dlls/urlmon/ftp.c | 6 ++++-- dlls/urlmon/gopher.c | 6 ++++-- dlls/urlmon/http.c | 7 +++++-- dlls/urlmon/protocol.c | 12 ++++++++++++ dlls/urlmon/urlmon_main.h | 1 + 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 4fa0924..86ddab7 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -186,8 +186,10 @@ static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas DWORD dwOptions) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + + return protocol_abort(&This->base, hrReason); } static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index d8781ce..4fb61b3 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -161,8 +161,10 @@ static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrR DWORD dwOptions) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + + return protocol_abort(&This->base, hrReason); } static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 722ec50..52a2425 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -162,6 +162,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques &IID_IHttpNegotiate, (void **)&This->http_negotiate); if (hres != S_OK) { WARN("IServiceProvider_QueryService IID_IHttpNegotiate failed: %08x\n", hres); + IServiceProvider_Release(service_provider); return hres; } @@ -438,8 +439,10 @@ static HRESULT WINAPI HttpProtocol_Abort(IInternetProtocol *iface, HRESULT hrRea DWORD dwOptions) { HttpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + + return protocol_abort(&This->base, hrReason); } static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index b423c67..85af513 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -428,6 +428,18 @@ HRESULT protocol_unlock_request(Protocol *protocol) return S_OK; } +HRESULT protocol_abort(Protocol *protocol, HRESULT reason) +{ + if(!protocol->protocol_sink) + return S_OK; + + if(protocol->flags & FLAG_RESULT_REPORTED) + return INET_E_RESULT_DISPATCHED; + + report_result(protocol, reason); + return S_OK; +} + void protocol_close_connection(Protocol *protocol) { protocol->vtbl->close_connection(protocol); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 3aada09..62e461d 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -115,6 +115,7 @@ HRESULT protocol_continue(Protocol*,PROTOCOLDATA*); HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*); HRESULT protocol_lock_request(Protocol*); HRESULT protocol_unlock_request(Protocol*); +HRESULT protocol_abort(Protocol*,HRESULT); void protocol_close_connection(Protocol*); typedef struct {

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010