wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Dmitry Timoshkov : windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.
by Alexandre Julliard 07 Dec '18

07 Dec '18

Module: wine Branch: master Commit: a4a5c38089afad9b3f53c7cd06d034c87e53a16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a5c38089afad9b3f53c7cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:02:58 2018 +0300 windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7b0fbf8..9a580c6 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1736,6 +1736,8 @@ static BYTE const channel_mask_16bit2[] = { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, static BYTE const channel_mask_16bit3[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 }; static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1752,6 +1754,8 @@ static BYTE const * const channel_masks_8bit[] = { channel_mask_8bit, static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; +static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; + static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -1946,6 +1950,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppGrayFloat, + "The Wine Project", + "32bpp GrayFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 1, /* channel count */ + channel_masks_32bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", "48bpp RGB",

1 0

Jacek Caban : secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc5b102c1b0a66aa63b66f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 18:09:18 2018 +0100 secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 05e922d..0a49421 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -166,7 +166,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -178,8 +178,9 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre p = priority + strlen(priority); for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { + if (!(cred->enabled_protocols & protocol_priority_flags[i].enable_flag)) continue; *p++ = ':'; - *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; + *p++ = '+'; strcpy(p, protocol_priority_flags[i].gnutls_flag); p += strlen(p); }

1 0

Jacek Caban : include: Add DTLS defines.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 2d61c5f379181246d8a0aefdd164aed51b37b227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d61c5f379181246d8a0aefd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 17:38:17 2018 +0100 include: Add DTLS defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index 6dac2e9..b48a719 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -107,6 +107,12 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_ALL 0xffffffff #define SP_PROT_UNI_CLIENT 0x80000000 #define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_DTLS1_2_SERVER 0x00040000 +#define SP_PROT_DTLS1_2_CLIENT 0x00080000 +#define SP_PROT_DTLS_SERVER 0x00010000 +#define SP_PROT_DTLS_CLIENT 0x00020000 +#define SP_PROT_DTLS1_0_SERVER SP_PROT_DTLS_SERVER +#define SP_PROT_DTLS1_0_CLIENT SP_PROT_DTLS_CLIENT #define SP_PROT_TLS1_3_SERVER 0x00001000 #define SP_PROT_TLS1_3_CLIENT 0x00002000 #define SP_PROT_TLS1_2_CLIENT 0x00000800 @@ -126,6 +132,9 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_NONE 0x00000000 #define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_DTLS (SP_PROT_DTLS_SERVER | SP_PROT_DTLS_CLIENT) +#define SP_PROT_DTLS1_0 (SP_PROT_DTLS1_0_SERVER | SP_PROT_DTLS1_0_CLIENT) +#define SP_PROT_DTLS1_2 (SP_PROT_DTLS1_2_SERVER | SP_PROT_DTLS1_2_CLIENT) #define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) #define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) #define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) @@ -153,12 +162,22 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_TLS1_1PLUS_SERVER ( SP_PROT_TLS1_1_SERVER \ | SP_PROT_TLS1_2_SERVER \ | SP_PROT_TLS1_3_SERVER ) +#define SP_PROT_DTLS1_X_SERVER ( SP_PROT_DTLS1_0_SERVER \ + | SP_PROT_DTLS1_2_SERVER ) +#define SP_PROT_DTLS1_X_CLIENT ( SP_PROT_DTLS1_0_CLIENT \ + | SP_PROT_DTLS1_2_CLIENT ) +#define SP_PROT_DTLS1_X ( SP_PROT_DTLS1_X_SERVER \ + | SP_PROT_DTLS1_X_CLIENT ) #define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) #define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \ | SP_PROT_TLS1_SERVER | SP_PROT_UNI_SERVER) -#define SP_PROT_X_CLIENTS (SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT) -#define SP_PROT_X_SERVERS (SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_X_CLIENTS ( SP_PROT_CLIENTS \ + | SP_PROT_TLS1_X_CLIENT \ + | SP_PROT_DTLS1_X_CLIENT) +#define SP_PROT_X_SERVERS ( SP_PROT_SERVERS \ + | SP_PROT_TLS1_X_SERVER \ + | SP_PROT_DTLS1_X_SERVER) #define SP_PROT_SSL3TLS1 (SP_PROT_SSL3 | SP_PROT_TLS1) #define SP_PROT_SSL3TLS1_X (SP_PROT_SSL3 | SP_PROT_TLS1_X)

1 0

Akihiro Sagawa : kernel32: Resolve an MUI time zone name.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: afad5636cb3a49dff1e40054b47a8407629b3c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afad5636cb3a49dff1e40054… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 7 00:33:26 2018 +0900 kernel32: Resolve an MUI time zone name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 57ad10d..69ebd82 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -59,6 +59,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define FILETIME2LL( pft, ll) \ ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; +static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; +static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; static const int MonthLengths[2][12] = { @@ -367,6 +369,24 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } +static BOOL reg_load_mui_string(HKEY hkey, LPCWSTR value, LPWSTR buffer, DWORD size) +{ + static const WCHAR advapi32W[] = {'a','d','v','a','p','i','3','2','.','d','l','l',0}; + DWORD (WINAPI *pRegLoadMUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD, DWORD *, DWORD, LPCWSTR); + HMODULE hDll; + BOOL ret = FALSE; + + hDll = LoadLibraryExW(advapi32W, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + if (hDll) { + pRegLoadMUIStringW = (void *)GetProcAddress(hDll, "RegLoadMUIStringW"); + if (pRegLoadMUIStringW && + !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, NULL)) + ret = TRUE; + FreeLibrary(hDll); + } + return ret; +} + /*********************************************************************** * TIME_GetSpecificTimeZoneInfo * @@ -406,8 +426,15 @@ static BOOL TIME_GetSpecificTimeZoneInfo( const WCHAR *key_name, WORD year, if (!TIME_GetSpecificTimeZoneKey( key_name, &time_zone_key )) return FALSE; - if (!reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName)) || - !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName))) + if (!reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ) && + !reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName) )) + { + NtClose( time_zone_key ); + return FALSE; + } + + if (!reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ) && + !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) )) { NtClose( time_zone_key ); return FALSE; @@ -577,17 +604,14 @@ BOOL WINAPI SetSystemTimeAdjustment( DWORD dwTimeAdjustment, BOOL bTimeAdjustmen * TIME_ZONE_ID_STANDARD Current time is standard time * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time */ -DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION tzinfo ) +DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION ret ) { - NTSTATUS status; + DYNAMIC_TIME_ZONE_INFORMATION tzinfo; + DWORD time_zone_id; - status = RtlQueryTimeZoneInformation( (RTL_TIME_ZONE_INFORMATION*)tzinfo ); - if ( status != STATUS_SUCCESS ) - { - SetLastError( RtlNtStatusToDosError(status) ); - return TIME_ZONE_ID_INVALID; - } - return TIME_ZoneID( tzinfo ); + time_zone_id = GetDynamicTimeZoneInformation( &tzinfo ); + memcpy( ret, &tzinfo, sizeof(*ret) ); + return time_zone_id; } /*********************************************************************** @@ -1437,6 +1461,7 @@ BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFIL DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo) { NTSTATUS status; + HANDLE time_zone_key; status = RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION*)tzinfo ); if ( status != STATUS_SUCCESS ) @@ -1444,6 +1469,13 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo SetLastError( RtlNtStatusToDosError(status) ); return TIME_ZONE_ID_INVALID; } + + if (!TIME_GetSpecificTimeZoneKey( tzinfo->TimeZoneKeyName, &time_zone_key )) + return TIME_ZONE_ID_INVALID; + reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ); + reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ); + NtClose( time_zone_key ); + return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo ); }

1 0

Akihiro Sagawa : ntdll: Use an MUI time zone name if available.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 434bc1baf5da24b744753d1b230dba14e4739731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434bc1baf5da24b744753d1b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 7 00:33:24 2018 +0900 ntdll: Use an MUI time zone name if available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b0eefb8..a4762fa 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -681,6 +681,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* { static const WCHAR stdW[] = { 'S','t','d',0 }; static const WCHAR dltW[] = { 'D','l','t',0 }; + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; + static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; static const WCHAR tziW[] = { 'T','Z','I',0 }; RTL_DYNAMIC_TIME_ZONE_INFORMATION reg_tzi; HANDLE hSubkey, hSubkeyDynamicDST; @@ -715,8 +717,10 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* continue; \ } - get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); - get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)); + if (!reg_query_value(hSubkey, mui_stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName))) + get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); + if (!reg_query_value(hSubkey, mui_dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName))) + get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)); memcpy(reg_tzi.TimeZoneKeyName, nameW.Buffer, nameW.Length); reg_tzi.TimeZoneKeyName[nameW.Length/sizeof(WCHAR)] = 0;

1 0

Denil Verghese : libwine: Fix missing semi-colon.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 86bab890dd2de7ab820cfd0aa0c9fe8c1b37aec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bab890dd2de7ab820cfd0a… Author: Denil Verghese <denilverghese(a)gmail.com> Date: Thu Dec 6 15:19:33 2018 +0530 libwine: Fix missing semi-colon. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index d5ce07a..29e9091 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -126,7 +126,7 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * __asm call [ecx]; __asm mov esp, esi; __asm pop esi; - __asm pop ebp + __asm pop ebp; __asm ret; } #elif defined(__x86_64__) && defined(__GNUC__)

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in PNG encoder.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 38b222c6620d01c134ac62fb3018863ae0cb0c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b222c6620d01c134ac62fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:15 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in PNG encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59..786d836 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in TIFF encoder.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: d88eb99e57f9ec4e51234970287da07d01e3992f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88eb99e57f9ec4e51234970… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:11 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 01d62d9..95a39cd 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1921,11 +1921,22 @@ static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in JPEG encoder.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: c2451240dc273b0571173e7363acc5598a8c1c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2451240dc273b0571173e73… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:08 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 451d725..a060d56 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G return S_OK; } -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in BMP encoder.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: e246dd46eccf68ef74ef14c95cb4430d5f288bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e246dd46eccf68ef74ef14c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:03 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 8e2bbe8..3b77517 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -510,11 +510,22 @@ static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICBmpEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2018