January 2015 - Wine-Commits

Daniel Scharrer : kernel32: Add stub implementation for EnumResourceLanguagesEx.
by Alexandre Julliard Jan. 27, 2015

Jan. 27, 2015

Module: wine Branch: master Commit: 4d05cfe57700dd87cae58d9b7d0a4839bb92e042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d05cfe57700dd87cae58d9b7… Author: Daniel Scharrer <daniel(a)constexpr.org> Date: Fri Jan 23 14:58:30 2015 +0100 kernel32: Add stub implementation for EnumResourceLanguagesEx. --- .../api-ms-win-core-libraryloader-l1-1-1.spec | 4 +- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/resource.c | 54 ++++++++++++++++++---- include/winbase.h | 8 ++++ 4 files changed, 58 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec index 3a8e3d9..afd1407 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec @@ -1,7 +1,7 @@ @ stub AddDllDirectory @ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls -@ stub EnumResourceLanguagesExA -@ stub EnumResourceLanguagesExW +@ stdcall EnumResourceLanguagesExA(long str str ptr long long long) kernel32.EnumResourceLanguagesExA +@ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long) kernel32.EnumResourceLanguagesExW @ stub EnumResourceNamesExA @ stub EnumResourceNamesExW @ stub EnumResourceTypesExA diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 71478dc..0c2d0c1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -323,6 +323,8 @@ @ stdcall EnumLanguageGroupLocalesA(ptr long long ptr) @ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) @ stdcall EnumResourceLanguagesA(long str str ptr long) +@ stdcall EnumResourceLanguagesExA(long str str ptr long long long) +@ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long) @ stdcall EnumResourceLanguagesW(long wstr wstr ptr long) @ stdcall EnumResourceNamesA(long str ptr long) @ stdcall EnumResourceNamesW(long wstr ptr long) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 06b93db..8d9009c 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -437,10 +437,11 @@ done: /********************************************************************** - * EnumResourceLanguagesA (KERNEL32.@) + * EnumResourceLanguagesExA (KERNEL32.@) */ -BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, - ENUMRESLANGPROCA lpfun, LONG_PTR lparam ) +BOOL WINAPI EnumResourceLanguagesExA( HMODULE hmod, LPCSTR type, LPCSTR name, + ENUMRESLANGPROCA lpfun, LONG_PTR lparam, + DWORD flags, LANGID lang ) { int i; BOOL ret = FALSE; @@ -450,7 +451,15 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; - TRACE( "%p %s %s %p %lx\n", hmod, debugstr_a(type), debugstr_a(name), lpfun, lparam ); + TRACE( "%p %s %s %p %lx %x %d\n", hmod, debugstr_a(type), debugstr_a(name), + lpfun, lparam, flags, lang ); + + if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE)) + FIXME( "unimplemented flags: %x\n", flags ); + + if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI; + + if (!(flags & RESOURCE_ENUM_LN)) return ret; if (!hmod) hmod = GetModuleHandleA( NULL ); typeW.Buffer = nameW.Buffer = NULL; @@ -489,10 +498,21 @@ done: /********************************************************************** - * EnumResourceLanguagesW (KERNEL32.@) + * EnumResourceLanguagesA (KERNEL32.@) */ -BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, - ENUMRESLANGPROCW lpfun, LONG_PTR lparam ) +BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, + ENUMRESLANGPROCA lpfun, LONG_PTR lparam ) +{ + return EnumResourceLanguagesExA( hmod, type, name, lpfun, lparam, 0, 0 ); +} + + +/********************************************************************** + * EnumResourceLanguagesExW (KERNEL32.@) + */ +BOOL WINAPI EnumResourceLanguagesExW( HMODULE hmod, LPCWSTR type, LPCWSTR name, + ENUMRESLANGPROCW lpfun, LONG_PTR lparam, + DWORD flags, LANGID lang ) { int i; BOOL ret = FALSE; @@ -502,7 +522,15 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; - TRACE( "%p %s %s %p %lx\n", hmod, debugstr_w(type), debugstr_w(name), lpfun, lparam ); + TRACE( "%p %s %s %p %lx %x %d\n", hmod, debugstr_w(type), debugstr_w(name), + lpfun, lparam, flags, lang ); + + if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE)) + FIXME( "unimplemented flags: %x\n", flags ); + + if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI; + + if (!(flags & RESOURCE_ENUM_LN)) return ret; if (!hmod) hmod = GetModuleHandleW( NULL ); typeW.Buffer = nameW.Buffer = NULL; @@ -541,6 +569,16 @@ done: /********************************************************************** + * EnumResourceLanguagesW (KERNEL32.@) + */ +BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, + ENUMRESLANGPROCW lpfun, LONG_PTR lparam ) +{ + return EnumResourceLanguagesExW( hmod, type, name, lpfun, lparam, 0, 0 ); +} + + +/********************************************************************** * LoadResource (KERNEL32.@) */ HGLOBAL WINAPI LoadResource( HINSTANCE hModule, HRSRC hRsrc ) diff --git a/include/winbase.h b/include/winbase.h index 561819d..0d8cede 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1542,6 +1542,11 @@ typedef struct _REASON_CONTEXT } Reason; } REASON_CONTEXT, *PREASON_CONTEXT; +#define RESOURCE_ENUM_LN 0x0001 +#define RESOURCE_ENUM_MUI 0x0002 +#define RESOURCE_ENUM_MUI_SYSTEM 0x0004 +#define RESOURCE_ENUM_VALIDATE 0x0008 + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -1749,6 +1754,9 @@ WINBASEAPI void WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit); WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR); WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR); #define EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages) +WINBASEAPI BOOL WINAPI EnumResourceLanguagesExA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR,DWORD,LANGID); +WINBASEAPI BOOL WINAPI EnumResourceLanguagesExW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR,DWORD,LANGID); +#define EnumResourceLanguagesEx WINELIB_NAME_AW(EnumResourceLanguagesEx) WINBASEAPI BOOL WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG_PTR); WINBASEAPI BOOL WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG_PTR); #define EnumResourceNames WINELIB_NAME_AW(EnumResourceNames)

1 0

Mark Harmstone : mmdevapi: Allow PKEY_AudioEndpoint_PhysicalSpeakers to be overridden.
by Alexandre Julliard Jan. 27, 2015

Jan. 27, 2015

Module: wine Branch: master Commit: 7b8dbc477661bf1ac151f499bb1c56557f30ff26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8dbc477661bf1ac151f499b… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Jan 26 22:28:12 2015 +0000 mmdevapi: Allow PKEY_AudioEndpoint_PhysicalSpeakers to be overridden. --- dlls/mmdevapi/devenum.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index c140437..9a27520 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -372,7 +372,17 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st } if (flow != eCapture) - set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers); + { + PROPVARIANT pv2; + + PropVariantInit(&pv2); + + /* make read-write by not overwriting if already set */ + if (FAILED(MMDevice_GetPropValue(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv2)) || pv2.vt != VT_UI4) + set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers); + + PropVariantClear(&pv2); + } RegCloseKey(keyprop); }

1 0

Charles Davis : configure: Check that we can link to QuickTime.framework before using it.
by Alexandre Julliard Jan. 27, 2015

Jan. 27, 2015

Module: wine Branch: master Commit: b218e81de352e3cf457b08ad358ea42028358c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b218e81de352e3cf457b08ad3… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 26 16:28:10 2015 -0700 configure: Check that we can link to QuickTime.framework before using it. --- configure | 34 +++++++++++++++++++++++++++++++--- configure.ac | 17 ++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 7413f28..0431209 100755 --- a/configure +++ b/configure @@ -7949,10 +7949,38 @@ done fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the QuickTime framework" >&5 +$as_echo_n "checking for the QuickTime framework... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <QuickTime/ImageCompression.h> +int +main () +{ +CodecManagerVersion(NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ac_cv_header_QuickTime_ImageCompression_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes" diff --git a/configure.ac b/configure.ac index 95c230b..a931730 100644 --- a/configure.ac +++ b/configure.ac @@ -813,9 +813,20 @@ uninstall:: fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + dnl Make sure we can actually use the QuickTime framework + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + AC_MSG_CHECKING([for the QuickTime framework]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], + [AC_MSG_RESULT([yes]) + AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], + [AC_MSG_RESULT([no]) + ac_cv_header_QuickTime_ImageCompression_h=no]) + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes"

1 0

Austin English : include/ddk: Add KWAIT_BLOCK struct to ntddk.h.
by Alexandre Julliard Jan. 27, 2015

Jan. 27, 2015

Module: wine Branch: master Commit: 59e3a851f21aaf9c188cc98b753af09ee7093cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e3a851f21aaf9c188cc98b7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 26 16:14:19 2015 -0600 include/ddk: Add KWAIT_BLOCK struct to ntddk.h. --- include/ddk/ntddk.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 56f2f35..e9c3fba 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -140,6 +140,15 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef struct _KWAIT_BLOCK { + LIST_ENTRY WaitListEntry; + struct _KTHREAD *RESTRICTED_POINTER Thread; + PVOID Object; + struct _KWAIT_BLOCK *RESTRICTED_POINTER NextWaitBlock; + USHORT WaitKey; + USHORT WaitType; +} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO);

1 0

Jacek Caban : mshtml: Added URI_ flags declaration and improved debug traces.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: e62612b2c37e8fc0eccf5920d6483953cc5bc4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62612b2c37e8fc0eccf5920d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 26 16:13:31 2015 +0100 mshtml: Added URI_ flags declaration and improved debug traces. --- dlls/mshtml/nsiface.idl | 21 +++++++++++++++++++++ dlls/mshtml/nsio.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1d8e263..551406c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2731,6 +2731,27 @@ interface nsIDirectoryServiceProvider2 : nsIDirectoryServiceProvider ] interface nsIProtocolHandler : nsISupports { + const unsigned long URI_STD = 0; + const unsigned long URI_NORELATIVE = (1<<0); + const unsigned long URI_NOAUTH = (1<<1); + const unsigned long ALLOWS_PROXY = (1<<2); + const unsigned long ALLOWS_PROXY_HTTP = (1<<3); + const unsigned long URI_INHERITS_SECURITY_CONTEXT = (1<<4); + const unsigned long URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT = (1<<5); + const unsigned long URI_LOADABLE_BY_ANYONE = (1<<6); + const unsigned long URI_DANGEROUS_TO_LOAD = (1<<7); + const unsigned long URI_IS_UI_RESOURCE = (1<<8); + const unsigned long URI_IS_LOCAL_FILE = (1<<9); + const unsigned long URI_LOADABLE_BY_SUBSUMERS = (1<<10); + const unsigned long URI_DOES_NOT_RETURN_DATA = (1<<11); + const unsigned long URI_IS_LOCAL_RESOURCE = (1<<12); + const unsigned long URI_OPENING_EXECUTES_SCRIPT = (1<<13); + const unsigned long URI_NON_PERSISTABLE = (1<<14); + const unsigned long URI_FORBIDS_COOKIE_ACCESS = (1<<15); + const unsigned long URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM = (1<<16); + const unsigned long URI_SYNC_LOAD_IS_OK = (1<<17); + const unsigned long URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT = (1<<18); + nsresult GetScheme(nsACString *aScheme); nsresult GetDefaultPort(int32_t *aDefaultPort); nsresult GetProtocolFlags(uint32_t *aProtocolFlags); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d8e1712..44662b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3622,18 +3622,48 @@ static nsresult NSAPI nsNetUtil_ParseContentType(nsINetUtil *iface, const nsACSt return nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); } +static const char *debugstr_protocol_flags(UINT32 flags) +{ + switch(flags) { +#define X(f) case f: return #f + X(URI_STD); + X(URI_NORELATIVE); + X(URI_NOAUTH); + X(ALLOWS_PROXY); + X(ALLOWS_PROXY_HTTP); + X(URI_INHERITS_SECURITY_CONTEXT); + X(URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT); + X(URI_LOADABLE_BY_ANYONE); + X(URI_DANGEROUS_TO_LOAD); + X(URI_IS_UI_RESOURCE); + X(URI_IS_LOCAL_FILE); + X(URI_LOADABLE_BY_SUBSUMERS); + X(URI_DOES_NOT_RETURN_DATA); + X(URI_IS_LOCAL_RESOURCE); + X(URI_OPENING_EXECUTES_SCRIPT); + X(URI_NON_PERSISTABLE); + X(URI_FORBIDS_COOKIE_ACCESS); + X(URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM); + X(URI_SYNC_LOAD_IS_OK); + X(URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT); +#undef X + default: + return wine_dbg_sprintf("%08x", flags); + } +} + static nsresult NSAPI nsNetUtil_ProtocolHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("()\n"); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); return nsINetUtil_ProtocolHasFlags(net_util, aURI, aFlags, _retval); } static nsresult NSAPI nsNetUtil_URIChainHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("(%p %08x %p)\n", aURI, aFlags, _retval); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); - if(aFlags == (1<<11)) { + if(aFlags == URI_DOES_NOT_RETURN_DATA) { *_retval = FALSE; return NS_OK; }

1 0

Nikolay Sivov : dwrite: Make sure we don't have duplicates in locale/ value pairs for font names.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: 40d9a2b6d234e85d79d599df7dd8ae97e62fad0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d9a2b6d234e85d79d599df7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 26 13:39:18 2015 +0300 dwrite: Make sure we don't have duplicates in locale/value pairs for font names. --- dlls/dwrite/main.c | 20 +++++++++++++++++++- dlls/dwrite/opentype.c | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 58273fe..5a2ce2c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -383,14 +383,32 @@ HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + UINT32 i; + + /* make sure there's no duplicates */ + for (i = 0; i < This->count; i++) + if (!strcmpW(This->data[i].locale, locale)) + return S_OK; if (This->count == This->alloc) { + void *ptr; + + ptr = heap_realloc(This->data, 2*This->alloc*sizeof(struct localizedpair)); + if (!ptr) + return E_OUTOFMEMORY; + This->alloc *= 2; - This->data = heap_realloc(This->data, This->alloc*sizeof(struct localizedpair)); + This->data = ptr; } This->data[This->count].locale = heap_strdupW(locale); This->data[This->count].string = heap_strdupW(string); + if (!This->data[This->count].locale || !This->data[This->count].string) { + heap_free(This->data[This->count].locale); + heap_free(This->data[This->count].string); + return E_OUTOFMEMORY; + } + This->count++; return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8fa5a54..7b3fb1f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1194,6 +1194,14 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (FAILED(hr)) return hr; header = table_data; + + switch (header->format) { + case 0: + break; + default: + FIXME("unsupported NAME format %d\n", header->format); + } + storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); @@ -1219,6 +1227,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA continue; } + /* Skip such entries for now, as it's not clear which locale is implied when + unicode platform is used. Also fonts tend to duplicate those strings as + WIN platform entries. */ + if (platform == OPENTYPE_PLATFORM_UNICODE) + continue; + lang_id = GET_BE_WORD(record->languageID); length = GET_BE_WORD(record->length); offset = GET_BE_WORD(record->offset);

1 0

Piotr Caban : msvcrt: Add _iswspace_l implementation.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: ef69ad9f97255d6f4e7fe1b9b25fc13ea08a9ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef69ad9f97255d6f4e7fe1b9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 23 17:50:55 2015 +0100 msvcrt: Add _iswspace_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c1eb594..d4e9b35 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1026,7 +1026,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c0bc9e1..ef01e77 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1373,7 +1373,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0faf1f0..c439652 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1377,7 +1377,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index eddb27d..3d57267 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1244,7 +1244,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) msvcr120._isxdigit_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13a2270..aafc05c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -699,7 +699,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e53f622..da5d325 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -676,7 +676,7 @@ @ stub _iswlower_l @ stub _iswprint_l @ stub _iswpunct_l -@ stub _iswspace_l +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7156a50..4788dec 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -642,7 +642,7 @@ # stub _iswlower_l(long ptr) # stub _iswprint_l(long ptr) # stub _iswpunct_l(long ptr) -# stub _iswspace_l(long ptr) +@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 771f6f6..f4fd8a8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1596,6 +1596,14 @@ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswspace_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswspace_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isspaceW( wc ); +} + +/********************************************************************* * iswspace (MSVCRT.@) */ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc )

1 0

Piotr Caban : msvcrt: Reset write direction after flush on read/ write stream.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: 90b68f99648a0a0be73673fd99e140e18bfb5c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b68f99648a0a0be73673fd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 23 17:27:29 2015 +0100 msvcrt: Reset write direction after flush on read/write stream. --- dlls/msvcrt/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9ecf129..2e473a9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -613,6 +613,9 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; } + + if(file->_flag & MSVCRT__IORW) + file->_flag &= ~MSVCRT__IOWRT; } file->_ptr=file->_base; @@ -3797,6 +3800,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) res = msvcrt_flush_buffer(file); if(res) return res; + file->_flag |= MSVCRT__IOWRT; file->_cnt=file->_bufsiz; } *file->_ptr++ = c;

1 0

Josh DuBois : buildimage: Allow use of rsvg-convert as alternative to rsvg.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: 52171a8b1553f9e484c3519a721ecdc8d73a31f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52171a8b1553f9e484c3519a7… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jan 23 10:32:36 2015 -0600 buildimage: Allow use of rsvg-convert as alternative to rsvg. --- configure | 2 +- configure.ac | 2 +- tools/buildimage | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4774513..7413f28 100755 --- a/configure +++ b/configure @@ -5771,7 +5771,7 @@ fi done test -n "$FONTFORGE" || FONTFORGE="false" - for ac_prog in rsvg + for ac_prog in rsvg-convert rsvg do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff --git a/configure.ac b/configure.ac index b40fde4..95c230b 100644 --- a/configure.ac +++ b/configure.ac @@ -284,7 +284,7 @@ then else test "$srcdir" = . || AC_MSG_ERROR([Maintainer mode cannot work out of tree.]) AC_CHECK_PROGS(FONTFORGE, fontforge, false) - AC_CHECK_PROGS(RSVG, rsvg, false) + AC_CHECK_PROGS(RSVG, rsvg-convert rsvg, false) AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) test "$FONTFORGE" != "false" || AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]) diff --git a/tools/buildimage b/tools/buildimage index 2216ad8..0a7e466 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -141,7 +141,12 @@ sub svg_element_start } # Render the SVG image -shell $rsvg, $svgFileName, $renderedSVGFileName; +my @rsvgCmd; +push(@rsvgCmd, $rsvg); +push(@rsvgCmd, $svgFileName); +push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert"); +push(@rsvgCmd, $renderedSVGFileName); +shell @rsvgCmd; # Render the images in the SVG my $parser = new XML::Parser(

1 0

Piotr Caban : msvcrt: Handle read buffer flushing in msvcrt_flush_buffer helper.
by Alexandre Julliard Jan. 26, 2015

Jan. 26, 2015

Module: wine Branch: master Commit: 7880525f442f548d2615797fab37e0e342e0b302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7880525f442f548d2615797fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 23 17:27:23 2015 +0100 msvcrt: Handle read buffer flushing in msvcrt_flush_buffer helper. --- dlls/msvcrt/file.c | 49 +++++++++++++++++------------------------------- dlls/msvcrt/tests/file.c | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8c59239..9ecf129 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -606,16 +606,18 @@ void msvcrt_init_io(void) /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(MSVCRT_FILE* file) { - if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { + if((file->_flag & (MSVCRT__IOREAD|MSVCRT__IOWRT)) == MSVCRT__IOWRT && + file->_flag & (MSVCRT__IOMYBUF|MSVCRT__USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) { file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; } - file->_ptr=file->_base; - file->_cnt=0; - } - return 0; + } + + file->_ptr=file->_base; + file->_cnt=0; + return 0; } /********************************************************************* @@ -964,23 +966,17 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) */ int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) { + int res; + if(!file) { msvcrt_flush_all_buffers(MSVCRT__IOWRT); - } else if(file->_flag & MSVCRT__IOWRT) { - int res; - - res = msvcrt_flush_buffer(file); - if(!res && (file->_flag & MSVCRT__IOCOMMIT)) - res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; - - return res; - } else if(file->_flag & MSVCRT__IOREAD) { - file->_cnt = 0; - file->_ptr = file->_base; - return 0; } - return 0; + + res = msvcrt_flush_buffer(file); + if(!res && (file->_flag & MSVCRT__IOCOMMIT)) + res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; + return res; } /********************************************************************* @@ -1333,18 +1329,13 @@ int CDECL MSVCRT__fseeki64_nolock(MSVCRT_FILE* file, __int64 offset, int whence) { int ret; - /* Flush output if needed */ - if(file->_flag & MSVCRT__IOWRT) - msvcrt_flush_buffer(file); - if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { whence = SEEK_SET; offset += MSVCRT__ftelli64_nolock(file); } - /* Discard buffered input */ - file->_cnt = 0; - file->_ptr = file->_base; + /* Flush output if needed */ + msvcrt_flush_buffer(file); /* Reset direction of i/o */ if(file->_flag & MSVCRT__IORW) { file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); @@ -4369,14 +4360,8 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) int ret; MSVCRT__lock_file(file); - /* Note that all this has been lifted 'as is' from fseek */ - if(file->_flag & MSVCRT__IOWRT) - msvcrt_flush_buffer(file); + msvcrt_flush_buffer(file); - /* Discard buffered input */ - file->_cnt = 0; - file->_ptr = file->_base; - /* Reset direction of i/o */ if(file->_flag & MSVCRT__IORW) { file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c253f88..860db6a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2244,6 +2244,7 @@ static void test_write_flush_size(FILE *file, int bufsize) char *inbuffer; char *outbuffer; int size, fd; + fpos_t pos, pos2; fd = fileno(file); inbuffer = calloc(bufsize + 1, 1); @@ -2275,6 +2276,19 @@ static void test_write_flush_size(FILE *file, int bufsize) fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d/2 byte double write\n", bufsize); + + ok(!fseek(file, -1, SEEK_END), "fseek failed\n"); + ok(!fgetpos(file, &pos), "fgetpos failed\n"); + ok(fread(inbuffer, 1, 1, file) == 1, "fread failed\n"); + ok(file->_flag & _IOREAD, "file->_flag = %x\n", file->_flag); + ok(!file->_cnt, "file->_cnt = %d\n", file->_cnt); + ok(file->_ptr != file->_base, "file->_ptr == file->_base\n"); + ok(fwrite(outbuffer, 1, bufsize, file), "fwrite failed\n"); + ok(file->_flag & _IOREAD, "file->_flag = %x\n", file->_flag); + ok(!file->_cnt, "file->_cnt = %d\n", file->_cnt); + ok(file->_ptr == file->_base, "file->_ptr == file->_base\n"); + ok(!fgetpos(file, &pos2), "fgetpos failed\n"); + ok(pos+bufsize+1 == pos2, "pos = %d (%d)\n", (int)pos, (int)pos2); free(inbuffer); free(outbuffer); }

1 0