August 2014 - Wine-commits - list.winehq.org

Aric Stewart : dwrite: Make dwritefactory an allocated object.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: bb54479df01e1cc861d489eb3d75cb932b420edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb54479df01e1cc861d489eb3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 6 16:59:39 2014 -0500 dwrite: Make dwritefactory an allocated object. --- dlls/dwrite/main.c | 106 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 79 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb54479df01e1cc861d48…

1 0

Aric Stewart : dwrite: Basic implementation for FontCollectionLoader registration.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: a6fa8599b043c480a932db5e17a9a832d9f20e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fa8599b043c480a932db5e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 6 17:01:09 2014 -0500 dwrite: Basic implementation for FontCollectionLoader registration. --- dlls/dwrite/main.c | 56 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3e2553c..566a6eb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -362,6 +362,9 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, struct dwritefactory{ IDWriteFactory IDWriteFactory_iface; LONG ref; + + IDWriteFontCollectionLoader **loaders; + LONG loader_count; }; static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface) @@ -404,6 +407,11 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { + int i; + for (i = 0; i < This->loader_count; i++) + if (This->loaders[i]) + IDWriteFontCollectionLoader_Release(This->loaders[i]); + heap_free(This->loaders); heap_free(This); } @@ -433,17 +441,55 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *i static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { + int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p): stub\n", This, loader); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, loader); + + for (i = 0; i < This->loader_count; i++) + if (This->loaders[i] == loader) + return DWRITE_E_ALREADYREGISTERED; + else if (This->loaders[i] == NULL) + break; + + if (i == This->loader_count) + { + IDWriteFontCollectionLoader **new_list = NULL; + int new_count = 0; + + new_count = This->loader_count * 2; + new_list = heap_realloc(This->loaders, new_count * sizeof(*This->loaders)); + + if (!new_list) + return E_OUTOFMEMORY; + else + { + This->loader_count = new_count; + This->loaders = new_list; + } + } + IDWriteFontCollectionLoader_AddRef(loader); + This->loaders[i] = loader; + + return S_OK; } static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { + int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p): stub\n", This, loader); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, loader); + + for (i = 0; i < This->loader_count; i++) + if (This->loaders[i] == loader) break; + if (i == This->loader_count) + return E_INVALIDARG; + IDWriteFontCollectionLoader_Release(This->loaders[i]); + This->loaders[i] = NULL; + + return S_OK; } static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *iface, @@ -639,6 +685,8 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno This->IDWriteFactory_iface.lpVtbl = &dwritefactoryvtbl; This->ref = 1; + This->loader_count = 2; + This->loaders = heap_alloc_zero(sizeof(*This->loaders) * 2); *factory = (IUnknown*)&This->IDWriteFactory_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 50b01a8..6366817 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -673,6 +673,55 @@ if (0) /* crashes on native */ IDWriteFontFace_Release(fontface); } +static HRESULT WINAPI fontcollectionloader_QueryInterface(IDWriteFontCollectionLoader *iface, REFIID riid, void **obj) +{ + *obj = iface; + return S_OK; +} + +static ULONG WINAPI fontcollectionloader_AddRef(IDWriteFontCollectionLoader *iface) +{ + return 2; +} + +static ULONG WINAPI fontcollectionloader_Release(IDWriteFontCollectionLoader *iface) +{ + return 1; +} + +static HRESULT WINAPI fontcollectionloader_CreateEnumeratorFromKey(IDWriteFontCollectionLoader *iface, IDWriteFactory * factory, const void * collectionKey, UINT32 collectionKeySize, IDWriteFontFileEnumerator ** fontFileEnumerator) +{ + return S_OK; +} + +static const struct IDWriteFontCollectionLoaderVtbl dwritefontcollectionloadervtbl = { + fontcollectionloader_QueryInterface, + fontcollectionloader_AddRef, + fontcollectionloader_Release, + fontcollectionloader_CreateEnumeratorFromKey +}; + +static void test_CustomFontCollection(void) +{ + IDWriteFontCollectionLoader collection = { &dwritefontcollectionloadervtbl }; + IDWriteFontCollectionLoader collection2 = { &dwritefontcollectionloadervtbl }; + HRESULT hr; + + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection2); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + START_TEST(font) { HRESULT hr; @@ -693,6 +742,7 @@ START_TEST(font) test_GetMetrics(); test_system_fontcollection(); test_ConvertFontFaceToLOGFONT(); + test_CustomFontCollection(); IDWriteFactory_Release(factory); }

1 0

Bernhard Reiter : imagehlp/tests: Add test for BindImageEx.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: bdeb761357c87d41247e0960f71e20d3f05e40e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdeb761357c87d41247e0960f… Author: Bernhard Reiter <ockham(a)raz.or.at> Date: Wed May 7 20:58:23 2014 +0200 imagehlp/tests: Add test for BindImageEx. --- dlls/imagehlp/tests/image.c | 103 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index e008b0b..1f1862b 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -31,6 +31,8 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); +static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, + const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); /* minimal PE file image */ #define VA_START 0x400000 @@ -149,6 +151,9 @@ struct expected_update_accum BOOL todo; }; +static int status_routine_called[BindSymbolsNotUpdated+1]; + + static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb, DWORD cb) { @@ -273,6 +278,40 @@ static void update_checksum(void) bin.nt_headers.OptionalHeader.CheckSum = sum; } +static BOOL CALLBACK testing_status_routine(IMAGEHLP_STATUS_REASON reason, const char *ImageName, + const char *DllName, ULONG_PTR Va, ULONG_PTR Parameter) +{ + char kernel32_path[MAX_PATH]; + + if (0 <= (int)reason && reason <= BindSymbolsNotUpdated) + status_routine_called[reason]++; + else + ok(0, "expected reason between 0 and %d, got %d\n", BindSymbolsNotUpdated+1, reason); + + switch(reason) + { + case BindImportModule: + ok(!strcmp(DllName, "KERNEL32.DLL"), "expected DllName to be KERNEL32.DLL, got %s\n", + DllName); + break; + + case BindImportProcedure: + case BindForwarderNOT: + GetSystemDirectoryA(kernel32_path, MAX_PATH); + strcat(kernel32_path, "\\KERNEL32.DLL"); + ok(!lstrcmpiA(DllName, kernel32_path), "expected DllName to be %s, got %s\n", + kernel32_path, DllName); + ok(!strcmp((char *)Parameter, "ExitProcess"), + "expected Parameter to be ExitProcess, got %s\n", (char *)Parameter); + break; + + default: + ok(0, "got unexpected reason %d\n", reason); + break; + } + return TRUE; +} + static void test_get_digest_stream(void) { BOOL ret; @@ -281,6 +320,11 @@ static void test_get_digest_stream(void) DWORD count; struct update_accum accum = { 0, NULL }; + if (!pImageGetDigestStream) + { + win_skip("ImageGetDigestStream function is not available\n"); + return; + } SetLastError(0xdeadbeef); ret = pImageGetDigestStream(NULL, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, @@ -329,6 +373,55 @@ static void test_get_digest_stream(void) DeleteFileA(temp_file); } +static void test_bind_image_ex(void) +{ + BOOL ret; + HANDLE file; + char temp_file[MAX_PATH]; + DWORD count; + + if (!pBindImageEx) + { + win_skip("BindImageEx function is not available\n"); + return; + } + + /* call with a non-existent file */ + SetLastError(0xdeadbeef); + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, + testing_status_routine); + todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + /* call with a proper PE file */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + testing_status_routine); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + todo_wine ok(status_routine_called[BindImportModule] == 1, + "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + + todo_wine ok((status_routine_called[BindImportProcedure] == 1) +#if defined(_WIN64) + || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ +#endif + , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -340,14 +433,10 @@ START_TEST(image) } pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); + pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); - if (!pImageGetDigestStream) - { - win_skip("ImageGetDigestStream function is not available\n"); - } else - { - test_get_digest_stream(); - } + test_get_digest_stream(); + test_bind_image_ex(); FreeLibrary(hImageHlp); }

1 0

André Hentschel : wpcap: Implement pcap_lib_version.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: fa67586811765d88d3b4108b3e5b4e51bb07868f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa67586811765d88d3b4108b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 7 00:15:00 2014 +0200 wpcap: Implement pcap_lib_version. --- configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++++++++ dlls/wpcap/Makefile.in | 4 ++++ dlls/wpcap/wpcap.c | 31 ++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- include/config.h.in | 3 +++ 6 files changed, 115 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 62e8abc..118fbc4 100755 --- a/configure +++ b/configure @@ -676,6 +676,7 @@ XSLT_LIBS XSLT_CFLAGS XML2_LIBS XML2_CFLAGS +LIBPCAP X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -822,6 +823,7 @@ with_opencl with_opengl with_osmesa with_oss +with_pcap with_png with_pthread with_sane @@ -2091,6 +2093,7 @@ Optional Packages: --without-opengl do not use OpenGL --without-osmesa do not use the OSMesa library --without-oss do not use the OSS sound support + --without-pcap do not use the Packet Capture library --without-png do not use PNG --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) @@ -3322,6 +3325,12 @@ if test "${with_oss+set}" = set; then : fi +# Check whether --with-pcap was given. +if test "${with_pcap+set}" = set; then : + withval=$with_pcap; if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi +fi + + # Check whether --with-png was given. if test "${with_png+set}" = set; then : withval=$with_png; @@ -6495,6 +6504,7 @@ for ac_header in \ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ + pcap/pcap.h \ poll.h \ port.h \ process.h \ @@ -10510,6 +10520,60 @@ esac fi test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_opencl:-no} +if test "$ac_cv_header_pcap_pcap_h" = "yes" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5 +$as_echo_n "checking for pcap_create in -lpcap... " >&6; } +if ${ac_cv_lib_pcap_pcap_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcap $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcap_create (); +int +main () +{ +return pcap_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcap_pcap_create=yes +else + ac_cv_lib_pcap_pcap_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5 +$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; } +if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then : + LIBPCAP="-lpcap" + +fi + +fi +if test "x$ac_cv_lib_pcap_pcap_create" != xyes; then : + case "x$with_pcap" in + x) as_fn_append wine_notices "|pcap ${notice_platform}development files not found, wpcap won't be supported." ;; + xno) ;; + *) as_fn_error $? "pcap ${notice_platform}development files not found, wpcap won't be supported. +This is an error since --with-pcap was requested." "$LINENO" 5 ;; +esac +fi +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} + if test "x$with_xml" != "xno" then diff --git a/configure.ac b/configure.ac index deb6b19..7de7a87 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,8 @@ AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) +AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), + [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) @@ -448,6 +450,7 @@ AC_CHECK_HEADERS(\ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ + pcap/pcap.h \ poll.h \ port.h \ process.h \ @@ -1268,6 +1271,15 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes], [OpenCL ${notice_platform}development files not found, OpenCL won't be supported.]) test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_opencl:-no} +dnl **** Check for libpcap **** +if test "$ac_cv_header_pcap_pcap_h" = "yes" +then + AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(LIBPCAP,["-lpcap"])]) +fi +WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], + [pcap ${notice_platform}development files not found, wpcap won't be supported.]) +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} + dnl **** Check for libxml2 **** if test "x$with_xml" != "xno" diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 5841adc..70a0fec 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1 +1,5 @@ MODULE = wpcap.dll +EXTRALIBS = @LIBPCAP@ + +C_SRCS = \ + wpcap.c diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c new file mode 100644 index 0000000..e143294 --- /dev/null +++ b/dlls/wpcap/wpcap.c @@ -0,0 +1,31 @@ +/* + * WPcap.dll Proxy. + * + * Copyright 2011 André Hentschel + * + * 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 <pcap/pcap.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wpcap); + +const char* CDECL wine_pcap_lib_version(void) +{ + const char* ret = pcap_lib_version(); + TRACE("%s\n", debugstr_a(ret)); + return ret; +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 81df1b9..1b36f33 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -33,7 +33,7 @@ @ stub pcap_getevent @ stub pcap_getnonblock @ stub pcap_is_swapped -@ stub pcap_lib_version +@ cdecl pcap_lib_version() wine_pcap_lib_version @ stub pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended diff --git a/include/config.h.in b/include/config.h.in index 50cfcb8..a58c0b5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -570,6 +570,9 @@ /* Define to 1 if `numaudioengines' is a member of `oss_sysinfo'. */ #undef HAVE_OSS_SYSINFO_NUMAUDIOENGINES +/* Define to 1 if you have the <pcap/pcap.h> header file. */ +#undef HAVE_PCAP_PCAP_H + /* Define to 1 if you have the `pclose' function. */ #undef HAVE_PCLOSE

1 0

Zhenbo Li : mshtml/tests: Better output when an exception is caught.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: c5d75c3ae188ed7fbb4738749a0056d9b564aa0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d75c3ae188ed7fbb4738749… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Aug 7 08:30:21 2014 +0800 mshtml/tests: Better output when an exception is caught. --- dlls/mshtml/tests/exectest.html | 4 ++-- dlls/mshtml/tests/jstest.html | 2 +- dlls/mshtml/tests/vbtest.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index ca06e3c..6bf5e8e 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -55,7 +55,7 @@ try { testPutSrc(); testPutText(); }catch(e) { - ok(false, "Got an exception"); + ok(false, "Got an exception " + e.message); } function testPutSrc2() { @@ -123,7 +123,7 @@ document.body.onload = function() { testPutSrc2(); testPutText2(); }catch(e) { - ok(false, "got an exception"); + ok(false, "got an exception " + e.message); } external.reportSuccess(); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index b47de42..7861196 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -248,7 +248,7 @@ function runTest() { try { runTests(); }catch(e) { - ok(false, "got exception"); + ok(false, "got exception " + e.message); } external.reportSuccess(); diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index c965f42..382442a 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -24,7 +24,7 @@ try { counter++; incCounter(2); }catch(e) { - ok(false, "got an exception"); + ok(false, "got an exception " + e.message); } </script> <script>

1 0

Michael Müller : windowscodecs: Fix number of returned properties in PropertyBag_GetPropertyInfo.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: 23988fef9cfc0c91d2770f66786d60c717385285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23988fef9cfc0c91d2770f667… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Aug 7 02:41:09 2014 +0200 windowscodecs: Fix number of returned properties in PropertyBag_GetPropertyInfo. --- dlls/windowscodecs/propertybag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 02914ec..11fa5b1 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -248,7 +248,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP if (iProperty+cProperties > This->prop_count ) return WINCODEC_ERR_VALUEOUTOFRANGE; - *pcProperties = max(cProperties, This->prop_count-iProperty); + *pcProperties = min(cProperties, This->prop_count-iProperty); for (i=0; i < *pcProperties; i++) {

1 0

Andrei Slăvoiu : wined3d: Make d3d_level_from_gl_info return an enum instead of a plain int.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: 48e25d0d21b8c9b8e15f62a4bc2fb0e351c8ea17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e25d0d21b8c9b8e15f62a4b… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Wed Aug 6 23:13:08 2014 +0300 wined3d: Make d3d_level_from_gl_info return an enum instead of a plain int. --- dlls/wined3d/directx.c | 58 +++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd425f9..82e499d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -78,6 +78,16 @@ enum wined3d_gl_vendor GL_VENDOR_NVIDIA, }; +enum wined3d_d3d_level +{ + WINED3D_D3D_LEVEL_5, + WINED3D_D3D_LEVEL_6, + WINED3D_D3D_LEVEL_7, + WINED3D_D3D_LEVEL_8, + WINED3D_D3D_LEVEL_9, + WINED3D_D3D_LEVEL_10, +}; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -1656,25 +1666,25 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +static enum wined3d_d3d_level d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) { - UINT level = 0; + enum wined3d_d3d_level level = WINED3D_D3D_LEVEL_5; if (gl_info->supported[ARB_MULTITEXTURE]) - level = 6; + level = WINED3D_D3D_LEVEL_6; if (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) - level = 7; - if (level == 7 && gl_info->supported[ARB_MULTISAMPLE] + level = WINED3D_D3D_LEVEL_7; + if (level == WINED3D_D3D_LEVEL_7 && gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - level = 8; - if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] + level = WINED3D_D3D_LEVEL_8; + if (level == WINED3D_D3D_LEVEL_8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) - level = 9; - if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4] + level = WINED3D_D3D_LEVEL_9; + if (level == WINED3D_D3D_LEVEL_9 && (gl_info->supported[EXT_GPU_SHADER4] || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) - level = 10; + level = WINED3D_D3D_LEVEL_10; return level; } @@ -2140,40 +2150,40 @@ intel_gl_vendor_table[] = static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_gl_info *gl_info) { - UINT d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= 10) + enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= WINED3D_D3D_LEVEL_10) return CARD_NVIDIA_GEFORCE_8800GTX; - if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (d3d_level >= WINED3D_D3D_LEVEL_9 && gl_info->supported[NV_VERTEX_PROGRAM3]) return CARD_NVIDIA_GEFORCE_6800; - if (d3d_level >= 9) + if (d3d_level >= WINED3D_D3D_LEVEL_9) return CARD_NVIDIA_GEFORCEFX_5800; - if (d3d_level >= 8) + if (d3d_level >= WINED3D_D3D_LEVEL_8) return CARD_NVIDIA_GEFORCE3; - if (d3d_level >= 7) + if (d3d_level >= WINED3D_D3D_LEVEL_7) return CARD_NVIDIA_GEFORCE; - if (d3d_level >= 6) + if (d3d_level >= WINED3D_D3D_LEVEL_6) return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_info *gl_info) { - UINT d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= 10) + enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= WINED3D_D3D_LEVEL_10) return CARD_AMD_RADEON_HD2900; - if (d3d_level >= 9) + if (d3d_level >= WINED3D_D3D_LEVEL_9) return CARD_AMD_RADEON_9500; - if (d3d_level >= 8) + if (d3d_level >= WINED3D_D3D_LEVEL_8) return CARD_AMD_RADEON_8500; - if (d3d_level >= 7) + if (d3d_level >= WINED3D_D3D_LEVEL_7) return CARD_AMD_RADEON_7200; return CARD_AMD_RAGE_128PRO; } static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_gl_info *gl_info) { - UINT d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= 10) + enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= WINED3D_D3D_LEVEL_10) return CARD_INTEL_G45; return CARD_INTEL_915G; }

1 0

Andrei Slăvoiu : wined3d: Use capabilities from the shader backend or the fragment pipeline to determine the D3D level.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: wine Branch: master Commit: e9b0a0e181daa98c645a2c1527b6434624d83ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b0a0e181daa98c645a2c152… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Wed Aug 6 23:13:09 2014 +0300 wined3d: Use capabilities from the shader backend or the fragment pipeline to determine the D3D level. --- dlls/wined3d/directx.c | 69 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 82e499d..d1eeee8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -84,8 +84,10 @@ enum wined3d_d3d_level WINED3D_D3D_LEVEL_6, WINED3D_D3D_LEVEL_7, WINED3D_D3D_LEVEL_8, - WINED3D_D3D_LEVEL_9, + WINED3D_D3D_LEVEL_9_SM2, + WINED3D_D3D_LEVEL_9_SM3, WINED3D_D3D_LEVEL_10, + WINED3D_D3D_LEVEL_11, }; /* The d3d device ID */ @@ -1666,27 +1668,50 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } +static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info); +static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops); + static enum wined3d_d3d_level d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) { - enum wined3d_d3d_level level = WINED3D_D3D_LEVEL_5; + struct shader_caps shader_caps; + struct fragment_caps fragment_caps; + const struct wined3d_shader_backend_ops *shader_backend; + const struct fragment_pipeline *fragment_pipeline; - if (gl_info->supported[ARB_MULTITEXTURE]) - level = WINED3D_D3D_LEVEL_6; - if (gl_info->supported[ARB_TEXTURE_COMPRESSION] - && gl_info->supported[ARB_TEXTURE_CUBE_MAP] - && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) - level = WINED3D_D3D_LEVEL_7; - if (level == WINED3D_D3D_LEVEL_7 && gl_info->supported[ARB_MULTISAMPLE] - && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - level = WINED3D_D3D_LEVEL_8; - if (level == WINED3D_D3D_LEVEL_8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] - && gl_info->supported[ARB_VERTEX_SHADER]) - level = WINED3D_D3D_LEVEL_9; - if (level == WINED3D_D3D_LEVEL_9 && (gl_info->supported[EXT_GPU_SHADER4] - || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) - level = WINED3D_D3D_LEVEL_10; - - return level; + shader_backend = select_shader_backend(gl_info); + shader_backend->shader_get_caps(gl_info, &shader_caps); + + if (shader_caps.vs_version >= 5) + return WINED3D_D3D_LEVEL_11; + if (shader_caps.vs_version == 4) + { + /* No backed supports SM 5 at the moment */ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 00)) + return WINED3D_D3D_LEVEL_11; + return WINED3D_D3D_LEVEL_10; + } + if (shader_caps.vs_version == 3) + { + /* Wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed + * on compatibility contexts */ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) + return WINED3D_D3D_LEVEL_10; + return WINED3D_D3D_LEVEL_9_SM3; + } + if (shader_caps.vs_version == 2) + return WINED3D_D3D_LEVEL_9_SM2; + if (shader_caps.vs_version == 1) + return WINED3D_D3D_LEVEL_8; + + fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); + fragment_pipeline->get_caps(gl_info, &fragment_caps); + + if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) + return WINED3D_D3D_LEVEL_7; + if (fragment_caps.MaxSimultaneousTextures > 1) + return WINED3D_D3D_LEVEL_6; + + return WINED3D_D3D_LEVEL_5; } static const struct wined3d_renderer_table @@ -2153,9 +2178,9 @@ static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_ enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); if (d3d_level >= WINED3D_D3D_LEVEL_10) return CARD_NVIDIA_GEFORCE_8800GTX; - if (d3d_level >= WINED3D_D3D_LEVEL_9 && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (d3d_level >= WINED3D_D3D_LEVEL_9_SM3) return CARD_NVIDIA_GEFORCE_6800; - if (d3d_level >= WINED3D_D3D_LEVEL_9) + if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2) return CARD_NVIDIA_GEFORCEFX_5800; if (d3d_level >= WINED3D_D3D_LEVEL_8) return CARD_NVIDIA_GEFORCE3; @@ -2171,7 +2196,7 @@ static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_ enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); if (d3d_level >= WINED3D_D3D_LEVEL_10) return CARD_AMD_RADEON_HD2900; - if (d3d_level >= WINED3D_D3D_LEVEL_9) + if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2) return CARD_AMD_RADEON_9500; if (d3d_level >= WINED3D_D3D_LEVEL_8) return CARD_AMD_RADEON_8500;

1 0

Francois Gouget : testbot: Escape error messages for HTML as they may contain troublesome characters.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: 854659751fcc17aa29edefa3316e262064298224 URL: http://source.winehq.org/git/tools.git/?a=commit;h=854659751fcc17aa29edefa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:19:42 2014 +0200 testbot: Escape error messages for HTML as they may contain troublesome characters. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index a724507..50e1629 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -340,7 +340,7 @@ sub GenerateErrorDiv($$) if ($ErrMessage) { print "<noscript>\n"; - print "<div id='errormessage'>", $ErrMessage, "</div>\n"; + print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; print "</noscript>\n"; } }

1 0

Francois Gouget : testbot: Always escape GetPageTitle() and GetTitle() before putting them in an HTML page.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: 4197bd0045bc3a03828c6d797972f2e17c3cb94d URL: http://source.winehq.org/git/tools.git/?a=commit;h=4197bd0045bc3a03828c6d79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:20:58 2014 +0200 testbot: Always escape GetPageTitle() and GetTitle() before putting them in an HTML page. --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 2 +- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- testbot/lib/ObjectModel/CGI/ItemPage.pm | 13 ++----------- testbot/lib/ObjectModel/CGI/Page.pm | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index e0714bf..1652190 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -65,7 +65,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>$Title</h1>\n"; + print "<h1>", $self->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 740b97e..197cdb9 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -87,7 +87,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>$Title</h1>\n"; + print "<h1>", $self->CGI->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index f434dd3..7c6b361 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -92,17 +92,8 @@ sub GetTitle($) { my ($self) = @_; - my $Title; - if ($self->GetParam("Key")) - { - $Title = $self->GetParam("Key"); - } - else - { - $Title = "Add " . $self->{Collection}->GetItemName(); - } - - return $self->escapeHTML($Title); + return $self->GetParam("Key") ? $self->GetParam("Key") : + "Add " . $self->{Collection}->GetItemName(); } sub DisplayProperty($$) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 7946603..2abe066 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -113,6 +113,17 @@ sub SetCookies($) $self->{PageBase}->SetCookies($self); } +=pod +=over 12 + +=head1 C<GetPageTitle()> + +This returns the page title as put in the HTML header. +Note that this may not be valid HTML and thus need escaping. + +=back +=cut + sub GetPageTitle($) { my ($self) = @_; @@ -120,6 +131,17 @@ sub GetPageTitle($) return $self->{PageBase}->GetPageTitle($self); } +=pod +=over 12 + +=head1 C<GetTitle()> + +This returns the title for the current web page or email section. +Note that this may not be valid HTML and thus need escaping. + +=back +=cut + sub GetTitle($) { #my ($self) = @_;

1 0