July 2013 - Wine-Commits - list.winehq.org

Akihiro Sagawa : gdi32: Adjust bitmap font height when it has an external leading.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 7444c1d6b02b463401a7bd5f0c934add6d507d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7444c1d6b02b463401a7bd5f0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 31 23:16:28 2013 +0900 gdi32: Adjust bitmap font height when it has an external leading. This fixes wine test failures in Japanese locale. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index abdc25d..0e6f4e1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1910,8 +1910,13 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) face_size->x_ppem = size->x_ppem; face_size->y_ppem = size->y_ppem; - if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) { face_size->internal_leading = winfnt_header.internal_leading; + if (winfnt_header.external_leading > 0 && + (face_size->height == + winfnt_header.pixel_height + winfnt_header.external_leading)) + face_size->height = winfnt_header.pixel_height; + } } static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs )

1 0

Alexandre Julliard : configure: Add pkg-config support for libjpeg.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 6b1a96991c986014a8ac11dc6446b715efb5e6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1a96991c986014a8ac11dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 14:19:08 2013 +0200 configure: Add pkg-config support for libjpeg. --- configure | 53 +++++++++++++++++++++++++++++++++++---- configure.ac | 15 +++++++---- dlls/gphoto2.ds/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 5b1e50f..531fbb3 100755 --- a/configure +++ b/configure @@ -643,6 +643,8 @@ LIBOPENAL LIBMPG123 PNG_LIBS PNG_CFLAGS +JPEG_LIBS +JPEG_CFLAGS FONTCONFIGINCL CUPSINCL OSS4INCL @@ -886,6 +888,8 @@ FREETYPE_CFLAGS FREETYPE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS +JPEG_CFLAGS +JPEG_LIBS PNG_CFLAGS PNG_LIBS' @@ -1607,6 +1611,8 @@ Some influential environment variables: C compiler flags for gstreamer-app-0.10, overriding pkg-config GSTREAMER_LIBS Linker flags for gstreamer-app-0.10, overriding pkg-config + JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config + JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config PNG_LIBS Linker flags for libpng, overriding pkg-config @@ -2704,7 +2710,7 @@ fi # Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then : - withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi + withval=$with_jpeg; fi @@ -5951,7 +5957,6 @@ for ac_header in \ ieeefp.h \ inet/mib2.h \ io.h \ - jpeglib.h \ kstat.h \ lber.h \ ldap.h \ @@ -11802,15 +11807,44 @@ This is an error since --with-gsm was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_jpeglib_h" = "yes" +if test "x$with_jpeg" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5 + if test -n "$JPEG_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + JPEG_CFLAGS=`$PKG_CONFIG --cflags libjpeg 2>/dev/null` +fi + +if test -n "$JPEG_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + JPEG_LIBS=`$PKG_CONFIG --libs libjpeg 2>/dev/null` +fi + + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" +for ac_header in jpeglib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_JPEGLIB_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_jpeglib_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5 $as_echo_n "checking for -ljpeg... " >&6; } if ${ac_cv_lib_soname_jpeg+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" +LIBS="-ljpeg $JPEG_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11846,7 +11880,7 @@ fi if test "x$ac_cv_lib_soname_jpeg" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + JPEG_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_jpeg" >&5 $as_echo "$ac_cv_lib_soname_jpeg" >&6; } @@ -11857,6 +11891,13 @@ _ACEOF fi + else + JPEG_CFLAGS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$JPEG_CFLAGS" || JPEG_CFLAGS=`echo " $JPEG_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$JPEG_LIBS" || JPEG_LIBS=`echo " $JPEG_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_jpeg" = "x"; then : case "x$with_jpeg" in diff --git a/configure.ac b/configure.ac index f9e35e6..b69c9ab 100644 --- a/configure.ac +++ b/configure.ac @@ -54,8 +54,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06 [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)])) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) -AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]), - [if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi]) +AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library]), @@ -430,7 +429,6 @@ AC_CHECK_HEADERS(\ ieeefp.h \ inet/mib2.h \ io.h \ - jpeglib.h \ kstat.h \ lber.h \ ldap.h \ @@ -1646,9 +1644,16 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) dnl **** Check for libjpeg **** -if test "$ac_cv_header_jpeglib_h" = "yes" +if test "x$with_jpeg" != "xno" then - WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) + WINE_PACKAGE_FLAGS(JPEG,[libjpeg],,,, + [AC_CHECK_HEADERS([jpeglib.h]) + if test "$ac_cv_header_jpeglib_h" = "yes" + then + WINE_CHECK_SONAME(jpeg,jpeg_start_decompress,,[JPEG_CFLAGS=""],[$JPEG_LIBS]) + else + JPEG_CFLAGS="" + fi]) fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 1e716fc..ffde0ae 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,7 +1,7 @@ MODULE = gphoto2.ds IMPORTS = comctl32 user32 gdi32 advapi32 EXTRALIBS = @GPHOTO2_LIBS@ @GPHOTO2_PORT_LIBS@ -EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ +EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ @JPEG_CFLAGS@ C_SRCS = \ capability.c \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 61f02c4..eab1c62 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 -EXTRAINCL = @PNG_CFLAGS@ +EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@

1 0

Nikolay Sivov : kernel32/tests: Test for several assemblies in context with window class redirects.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: db5d9aa9e69b2b8c893cc129d9b9853bba706094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5d9aa9e69b2b8c893cc129d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 08:42:45 2013 +0400 kernel32/tests: Test for several assemblies in context with window class redirects. --- dlls/kernel32/tests/actctx.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 50529f8..0b56c25 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -101,6 +101,39 @@ static const char manifest3[] = "</file>" "</assembly>"; +static const char manifest_wndcls1[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +"<file name=\"testlib1.dll\">" +"<windowClass>wndClass1</windowClass>" +"<windowClass>wndClass2</windowClass>" +"</file>" +"</assembly>"; + +static const char manifest_wndcls2[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"4.3.2.1\" name=\"testdep2\" type=\"win32\" processorArchitecture=\"" ARCH "\" />" +"<file name=\"testlib2.dll\">" +"<windowClass>wndClass3</windowClass>" +"<windowClass>wndClass4</windowClass>" +"</file>" +"</assembly>"; + +static const char manifest_wndcls_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep2\" version=\"4.3.2.1\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + static const char manifest4[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\">" @@ -191,8 +224,12 @@ static const WCHAR testlib2_dll[] = {'t','e','s','t','l','i','b','2','.','d','l','l',0}; static const WCHAR wndClassW[] = {'w','n','d','C','l','a','s','s',0}; +static const WCHAR wndClass1W[] = + {'w','n','d','C','l','a','s','s','1',0}; static const WCHAR wndClass2W[] = {'w','n','d','C','l','a','s','s','2',0}; +static const WCHAR wndClass3W[] = + {'w','n','d','C','l','a','s','s','3',0}; static const WCHAR acr_manifest[] = {'a','c','r','.','m','a','n','i','f','e','s','t',0}; @@ -1088,6 +1125,53 @@ todo_wine data.ulAssemblyRosterIndex, exid); } +static void test_wndclass_section(void) +{ + ACTCTX_SECTION_KEYED_DATA data, data2; + ULONG_PTR cookie; + HANDLE handle; + BOOL ret; + + /* use two dependent manifests, each defines 2 window class redirects */ + create_manifest_file("testdep1.manifest", manifest_wndcls1, -1, NULL, NULL); + create_manifest_file("testdep2.manifest", manifest_wndcls2, -1, NULL, NULL); + create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); + + handle = test_create("main_wndcls.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("testdep2.manifest"); + DeleteFileA("main_wndcls.manifest"); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + memset(&data, 0, sizeof(data)); + memset(&data2, 0, sizeof(data2)); + data.cbSize = sizeof(data); + data2.cbSize = sizeof(data2); + + /* get data for two classes from different assemblies */ + ret = pFindActCtxSectionStringW(0, NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + wndClass1W, &data); + ok(ret, "got %d\n", ret); + ret = pFindActCtxSectionStringW(0, NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + wndClass3W, &data2); + ok(ret, "got %d\n", ret); + + /* For both string same section is returned, meaning it's one wndclass section per context */ +todo_wine + ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); + ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, + data2.ulSectionTotalLength); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + + pReleaseActCtx(handle); +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -1306,6 +1390,7 @@ static void test_actctx(void) pReleaseActCtx(handle); } + test_wndclass_section(); } static void test_app_manifest(void)

1 0

Bruno Jesus : ws2_32: Fix service flags returned from TCP and UDP protocols .
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 63fb7a798c8ed6b97f489bd47b7297938fde21ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fb7a798c8ed6b97f489bd47… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 02:02:18 2013 -0300 ws2_32: Fix service flags returned from TCP and UDP protocols. --- dlls/ws2_32/protocol.c | 4 +- dlls/ws2_32/tests/protocol.c | 61 +++++++++++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 9939257..fa72de8 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -96,7 +96,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) switch (protocol) { case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_EXPEDITED_DATA | + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdIP; @@ -111,7 +111,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) break; case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIP; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 368955b..2b95381 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -26,22 +26,55 @@ #include "wine/test.h" +/* TCP and UDP over IP fixed set of service flags */ +#define TCPIP_SERVICE_FLAGS (XP1_GUARANTEED_DELIVERY \ + | XP1_GUARANTEED_ORDER \ + | XP1_GRACEFUL_CLOSE \ + | XP1_EXPEDITED_DATA \ + | XP1_IFS_HANDLES) + +#define UDPIP_SERVICE_FLAGS (XP1_CONNECTIONLESS \ + | XP1_MESSAGE_ORIENTED \ + | XP1_SUPPORT_BROADCAST \ + | XP1_SUPPORT_MULTIPOINT \ + | XP1_IFS_HANDLES) + +static void test_service_flags(int family, int version, int socktype, int protocol, DWORD testflags) +{ + DWORD expectedflags = 0; + if (socktype == SOCK_STREAM && protocol == IPPROTO_TCP) + expectedflags = TCPIP_SERVICE_FLAGS; + if (socktype == SOCK_DGRAM && protocol == IPPROTO_UDP) + expectedflags = UDPIP_SERVICE_FLAGS; + + /* check if standard TCP and UDP protocols are offering the correct service flags */ + if ((family == AF_INET || family == AF_INET6) && version == 2 && expectedflags) + { + /* QOS may or may not be installed */ + testflags &= ~XP1_QOS_SUPPORTED; + ok(expectedflags == testflags, + "Incorrect flags, expected 0x%x, received 0x%x\n", + expectedflags, testflags); + } +} static void test_WSAEnumProtocolsA(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; ret = WSAEnumProtocolsA( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsA( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -56,6 +89,9 @@ static void test_WSAEnumProtocolsA(void) for (i = 0; i < ret; i++) { ok( strlen( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer ); @@ -65,18 +101,20 @@ static void test_WSAEnumProtocolsA(void) static void test_WSAEnumProtocolsW(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; ret = WSAEnumProtocolsW( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsW( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -91,6 +129,9 @@ static void test_WSAEnumProtocolsW(void) for (i = 0; i < ret; i++) { ok( lstrlenW( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer );

1 0

Nikolay Sivov : msxml3: Unescape '& ' back to '&' in attribute value.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: b1bf9a62f94f6a6103eba0405ed693d4f8f6a39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bf9a62f94f6a6103eba0405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 10:31:04 2013 +0400 msxml3: Unescape '&' back to '&' in attribute value. --- dlls/msxml3/saxreader.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 4 +- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5a0b1c2..9362941 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1265,6 +1265,49 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; +/* Libxml2 escapes '&' back to char reference '&' in attribute value, + so when document has escaped value with '&' it's parsed to '&' and then + escaped to '&'. This function takes care of ampersands only. */ +static BSTR saxreader_get_unescaped_value(const xmlChar *buf, int len) +{ + static const WCHAR ampescW[] = {'&','#','3','8',';',0}; + WCHAR *dest, *ptrW, *str; + DWORD str_len; + BSTR bstr; + + if (!buf) + return NULL; + + str_len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); + if (len != -1) str_len++; + + str = heap_alloc(str_len*sizeof(WCHAR)); + if (!str) return NULL; + + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, str_len); + if (len != -1) str[str_len-1] = 0; + + ptrW = str; + while ((dest = strstrW(ptrW, ampescW))) + { + WCHAR *src; + + /* leave first '&' from a reference as a value */ + src = dest + (sizeof(ampescW)/sizeof(WCHAR) - 1); + dest++; + + /* move together with null terminator */ + memmove(dest, src, (strlenW(src) + 1)*sizeof(WCHAR)); + + ptrW++; + } + + bstr = SysAllocString(str); + heap_free(str); + + return bstr; +} + static HRESULT SAXAttributes_populate(saxlocator *locator, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) @@ -1317,8 +1360,7 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, attrs[i].szURI = find_element_uri(locator, xmlAttributes[i*5+2]); attrs[i].szLocalname = bstr_from_xmlChar(xmlAttributes[i*5]); - attrs[i].szValue = bstr_from_xmlCharN(xmlAttributes[i*5+3], - xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); + attrs[i].szValue = saxreader_get_unescaped_value(xmlAttributes[i*5+3], xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); attrs[i].szQName = QName_from_xmlChar(xmlAttributes[i*5+1], xmlAttributes[i*5]); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5c7d080..a6c399d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -888,10 +888,10 @@ static struct call_entry xmlspaceattr_test_alternate[] = { /* attribute value normalization test */ static const char attribute_normalize[] = "<?xml version=\"1.0\" ?>\n" - "<a attr1=\" \r \n \tattr_value A \t \r \n\r\n \n\"/>\n"; + "<a attr1=\" \r \n \tattr_value A & &\t \r \n\r\n \n\"/>\n"; static struct attribute_entry attribute_norm_attrs[] = { - { "", "attr1", "attr1", " attr_value A " }, + { "", "attr1", "attr1", " attr_value A & & " }, { NULL } };

1 0

Jacek Caban : explorerframe: Fixed debug channel name.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 722adee7bd72166b3747dcc395f455aff4ab3d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722adee7bd72166b3747dcc39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 31 12:30:51 2013 +0200 explorerframe: Fixed debug channel name. --- dlls/explorerframe/taskbarlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index d40f652..26a2c1a 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); struct taskbar_list {

1 0

Alistair Leslie-Hughes : oledb32: Add IErrorInfo Support.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 325b824de586552ed9af9eedfe80d81df51ee2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325b824de586552ed9af9eedf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 10:23:43 2013 +1000 oledb32: Add IErrorInfo Support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/errorinfo.c | 359 ++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 8 + dlls/oledb32/oledb32_classes.idl | 11 ++ dlls/oledb32/oledb_private.h | 1 + dlls/oledb32/tests/database.c | 10 +- 6 files changed, 389 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=325b824de586552ed9af9…

1 0

Alistair Leslie-Hughes : oleacc: Add typelib.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: a1e4af2d1e0f35395e44b5e916a326c6a3ffefed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4af2d1e0f35395e44b5e91… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 31 12:29:21 2013 +1000 oleacc: Add typelib. --- dlls/oleacc/Makefile.in | 2 ++ dlls/oleacc/oleacc_classes.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 29a0e83..c098386 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -5,6 +5,8 @@ IMPORTS = user32 C_SRCS = \ main.c +IDL_TLB_SRCS = oleacc_classes.idl + RC_SRCS = oleacc.rc PO_SRCS = oleacc.rc diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl new file mode 100644 index 0000000..28cb93e --- /dev/null +++ b/dlls/oleacc/oleacc_classes.idl @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2013 Alistair Leslie-Hughes + * + * 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 "oleacc.idl"

1 0

Piotr Caban : oleaut32: Fix ICreateTypeInfo2_fnAddVarDesc implementation.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: c43bf14569cc2c76ad1c62bc81166667ab89ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43bf14569cc2c76ad1c62bc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 13:10:14 2013 +0200 oleaut32: Fix ICreateTypeInfo2_fnAddVarDesc implementation. --- dlls/oleaut32/typelib.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a8916d8..973f453 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -101,6 +101,7 @@ typedef struct static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); +static void TLB_FreeVarDesc(VARDESC*); /**************************************************************************** * FromLExxx @@ -1118,8 +1119,9 @@ typedef struct tagTLBFuncDesc /* internal Variable data */ typedef struct tagTLBVarDesc { - VARDESC vardesc; /* lots of info on the variable and its attributes. */ - const TLBString *Name; /* the name of this variable */ + VARDESC vardesc; /* lots of info on the variable and its attributes. */ + VARDESC *vardesc_create; /* additional data needed for storing VARDESC */ + const TLBString *Name; /* the name of this variable */ int HelpContext; int HelpStringContext; const TLBString *HelpString; @@ -5453,8 +5455,9 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for(i = 0; i < This->cVars; ++i) { TLBVarDesc *pVInfo = &This->vardescs[i]; - if (pVInfo->vardesc.varkind == VAR_CONST) - { + if (pVInfo->vardesc_create) { + TLB_FreeVarDesc(pVInfo->vardesc_create); + } else if (pVInfo->vardesc.varkind == VAR_CONST) { VariantClear(pVInfo->vardesc.u.lpvarValue); heap_free(pVInfo->vardesc.u.lpvarValue); } @@ -5720,6 +5723,14 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return S_OK; } +static void TLB_FreeVarDesc(VARDESC *var_desc) +{ + TLB_FreeElemDesc(&var_desc->elemdescVar); + if (var_desc->varkind == VAR_CONST) + VariantClear(var_desc->u.lpvarValue); + SysFreeString((BSTR)var_desc); +} + HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) { ITypeInfoImpl *This = impl_from_ITypeInfo(iface); @@ -7690,10 +7701,7 @@ static void WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); TRACE("(%p)->(%p)\n", This, pVarDesc); - TLB_FreeElemDesc(&pVarDesc->elemdescVar); - if (pVarDesc->varkind == VAR_CONST) - VariantClear(pVarDesc->u.lpvarValue); - SysFreeString((BSTR)pVarDesc); + TLB_FreeVarDesc(pVarDesc); } /* ITypeInfo2::GetTypeKind @@ -10430,11 +10438,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, } } } else - var_desc = This->vardescs = heap_alloc(sizeof(TLBVarDesc)); + var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); - memset(var_desc, 0, sizeof(TLBVarDesc)); TLBVarDesc_Constructor(var_desc); - var_desc->vardesc = *varDesc; + TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + var_desc->vardesc = *var_desc->vardesc_create; ++This->cVars;

1 0

Nikolay Sivov : msdaps: Implement some proxy/stub methods.
by Alexandre Julliard July 31, 2013

July 31, 2013

Module: wine Branch: master Commit: 387b5a3c12bed6d92d7cccd7c1ecd3531d8c907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b5a3c12bed6d92d7cccd7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 09:12:06 2013 +0400 msdaps: Implement some proxy/stub methods. --- dlls/msdaps/usrmarshal.c | 210 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 174 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387b5a3c12bed6d92d7cc…

1 0