December 2018 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in TIFF encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

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

Akihiro Sagawa : kernel32: Resolve an MUI time zone name.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

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

Michael Müller : setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 2d6704ba99a7c4e7ec0b4a9384827f328599dd54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6704ba99a7c4e7ec0b4a93… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Dec 5 21:08:11 2018 -0600 setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++------ dlls/setupapi/tests/devinst.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 38da640..5574656 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2702,9 +2702,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2713,6 +2710,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } @@ -2757,9 +2758,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2768,6 +2766,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 55fe104..bfffcb9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -752,6 +752,13 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); ok(size == expectedsize, "Got unexpected size %d.\n", size); + memset(&device, 0, sizeof(device)); + device.cbSize = sizeof(device); + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, NULL, 0, &size, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + heap_free(detail); SetupDiDestroyDeviceInfoList(set); }

1 0

Pierre Schweitzer : mpr: Implement support for making connections persistent.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 23a232fce8899a24e76207518175235b7b0f00cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a232fce8899a24e7620751… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Nov 27 19:54:48 2018 +0100 mpr: Implement support for making connections persistent. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index d0b4ba8..3db0ab1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2004,9 +2004,12 @@ static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCE return ret; } +static const WCHAR providerType[] = { 'P','r','o','v','i','d','e','r','T','y','p','e',0 }; +static const WCHAR userName[] = { 'U','s','e','r','N','a','m','e',0 }; + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { - WNetProvider *provider; + WNetProvider *provider = NULL; DWORD index, ret = WN_NO_NETWORK; BOOL redirect = FALSE; WCHAR letter[3] = {'Z', ':', 0}; @@ -2060,6 +2063,42 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) } } + if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Persistent connection are not supported for printers\n"); + return ret; + } + + if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + HKEY network; + WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', netres.lpLocalName[0], 0}; + + if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) + { + DWORD dword_arg = RESOURCETYPE_DISK; + DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); + static const WCHAR empty[1] = {0}; + + RegSetValueExW(network, connectionType, 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, providerName, 0, REG_SZ, (const BYTE *)provider->name, len); + RegSetValueExW(network, providerType, 0, REG_DWORD, (const BYTE *)&provider->dwNetType, sizeof(DWORD)); + len = (strlenW(netres.lpRemoteName) + 1) * sizeof(WCHAR); + RegSetValueExW(network, remotePath, 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + len = sizeof(empty); + RegSetValueExW(network, userName, 0, REG_SZ, (const BYTE *)empty, len); + RegCloseKey(network); + } + + RegCloseKey(user_profile); + } + } + return ret; }

1 0

Zebediah Figura : setupapi: Use strtoulW().
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 26dd015fdd124548fbfa40c199fb489b01deb357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26dd015fdd124548fbfa40c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 5 21:07:53 2018 -0600 setupapi: Use strtoulW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5685dc3..38da640 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1412,29 +1412,6 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return ret; } -static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) -{ - LPCWSTR ptr; - int devNameLen = lstrlenW(devName); - DWORD devInst = 0; - BOOL valid = TRUE; - - TRACE("%s\n", debugstr_w(devName)); - for (ptr = devName; valid && *ptr && ptr - devName < devNameLen; ) - { - if (isdigitW(*ptr)) - { - devInst *= 10; - devInst |= *ptr - '0'; - ptr++; - } - else - valid = FALSE; - } - TRACE("%d\n", valid ? devInst : 0xffffffff); - return valid ? devInst : 0xffffffff; -} - /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ @@ -1483,14 +1460,16 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + WCHAR *endptr; if (instance_str) instance_str++; else instance_str = device->instanceId; - instance_id = SETUPDI_DevNameToDevID(instance_str); - if (instance_id != 0xffffffff && instance_id > highest_id) - highest_id = instance_id; + + instance_id = strtoulW(instance_str, &endptr, 10); + if (*instance_str && !*endptr) + highest_id = max(highest_id, instance_id); } if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1)

1 0

Pierre Schweitzer : mpr: Implement support for deleting persistent connections.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 773ff2e83b0547540639c6d4aeb9f817b621fb2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=773ff2e83b0547540639c6d4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Thu Dec 6 08:39:37 2018 +0100 mpr: Implement support for deleting persistent connections. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 3db0ab1..df8aef2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2290,6 +2290,23 @@ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce } } } + + if (ret == WN_SUCCESS && dwFlags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + + /* FIXME: Only remove it if that's a drive letter */ + if (isalphaW(lpName[0]) && lpName[1] == ':' && + RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', lpName[0], 0}; + + RegDeleteKeyW(user_profile, subkey); + + RegCloseKey(user_profile); + } + } + return ret; }

1 0

Ken Thomases : loader: Check if the preloader overlaps the reserved range on the Mac.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: cc24255da430c9b23a8e379dd38564e9359b3cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc24255da430c9b23a8e379d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 5 16:21:36 2018 -0600 loader: Check if the preloader overlaps the reserved range on the Mac. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader_mac.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 1d88062..83d24af 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h> +#include <mach-o/ldsyms.h> #endif #include "main.h" @@ -98,6 +99,8 @@ void __stack_chk_fail(void) { return; } static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header +#define target_segment_command segment_command +#define TARGET_LC_SEGMENT LC_SEGMENT #define target_thread_state_t i386_thread_state_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__eip @@ -184,6 +187,8 @@ __ASM_GLOBAL_FUNC( start, static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 +#define target_segment_command segment_command_64 +#define TARGET_LC_SEGMENT LC_SEGMENT_64 #define target_thread_state_t x86_thread_state64_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__rip @@ -376,6 +381,36 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +static int preloader_overlaps_range( const void *start, const void *end ) +{ + intptr_t slide = p_dyld_get_image_slide(&_mh_execute_header); + struct load_command *cmd = (struct load_command*)(&_mh_execute_header + 1); + int i; + + for (i = 0; i < _mh_execute_header.ncmds; ++i) + { + if (cmd->cmd == TARGET_LC_SEGMENT) + { + struct target_segment_command *seg = (struct target_segment_command*)cmd; + const void *seg_start = (const void*)(seg->vmaddr + slide); + const void *seg_end = (const char*)seg_start + seg->vmsize; + + if (end > seg_start && start <= seg_end) + { + char segname[sizeof(seg->segname) + 1]; + memcpy(segname, seg->segname, sizeof(seg->segname)); + segname[sizeof(segname) - 1] = 0; + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %s segment %p-%p\n", + start, end, segname, seg_start, seg_end ); + return 1; + } + } + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + + return 0; +} + /* * preload_reserve * @@ -406,7 +441,8 @@ static void preload_reserve( const char *str ) else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; + if (end <= start || preloader_overlaps_range(start, end)) + start = end = NULL; /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) @@ -562,6 +598,11 @@ void *wld_start( void *stack, int *is_unix_thread ) p++; } + LOAD_POSIX_DYLD_FUNC( dlopen ); + LOAD_POSIX_DYLD_FUNC( dlsym ); + LOAD_POSIX_DYLD_FUNC( dladdr ); + LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); + /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) @@ -576,11 +617,6 @@ void *wld_start( void *stack, int *is_unix_thread ) if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; - LOAD_POSIX_DYLD_FUNC( dlopen ); - LOAD_POSIX_DYLD_FUNC( dlsym ); - LOAD_POSIX_DYLD_FUNC( dladdr ); - LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); - /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] );

1 0

Alistair Leslie-Hughes : ext-ms-win-ntuser-misc-l1-2-0: Add dll.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 9b81989bca798543515c43c2ad1ab845d7067628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b81989bca798543515c43c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 5 23:48:34 2018 +0000 ext-ms-win-ntuser-misc-l1-2-0: Add dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in | 1 + .../ext-ms-win-ntuser-misc-l1-2-0.spec | 48 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 23ba36c..9a9a5e6 100755 --- a/configure +++ b/configure @@ -1272,6 +1272,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -19461,6 +19462,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 8ec69fe..aa1291d 100644 --- a/configure.ac +++ b/configure.ac @@ -3301,6 +3301,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in new file mode 100755 index 0000000..fcf9e0a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-misc-l1-2-0.dll diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec new file mode 100644 index 0000000..917984a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec @@ -0,0 +1,48 @@ +@ stdcall AttachThreadInput(long long long) user32.AttachThreadInput +@ stdcall CloseClipboard() user32.CloseClipboard +@ stub CloseGestureInfoHandle +@ stdcall DrawTextExW(long wstr long ptr long ptr) user32.DrawTextExW +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall EmptyClipboard() user32.EmptyClipboard +@ stdcall EnableScrollBar(long long long) user32.EnableScrollBar +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardData(long) user32.GetClipboardData +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetClipboardOwner() user32.GetClipboardOwner +@ stdcall GetGestureConfig(long long long ptr ptr long) user32.GetGestureConfig +@ stdcall GetGestureInfo(long ptr) user32.GetGestureInfo +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetRawInputData(ptr long ptr ptr long) user32.GetRawInputData +@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) user32.GetRawInputDeviceInfoW +@ stdcall GetRawInputDeviceList(ptr ptr long) user32.GetRawInputDeviceList +@ stdcall GetScrollBarInfo(long long ptr) user32.GetScrollBarInfo +@ stdcall GetScrollInfo(long long ptr) user32.GetScrollInfo +@ stdcall GetScrollPos(long long) user32.GetScrollPos +@ stdcall GetTouchInputInfo(long long ptr long) user32.GetTouchInputInfo +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stub GetWindowFeedbackSetting +@ stdcall IsClipboardFormatAvailable(long) user32.IsClipboardFormatAvailable +@ stdcall IsTouchWindow(long ptr) user32.IsTouchWindow +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall OpenClipboard(long) user32.OpenClipboard +@ stdcall RegisterClipboardFormatA(str) user32.RegisterClipboardFormatA +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall RegisterRawInputDevices(ptr long long) user32.RegisterRawInputDevices +@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) user32.ScrollWindowEx +@ stdcall SetClipboardData(long long) user32.SetClipboardData +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetScrollInfo(long long ptr long) user32.SetScrollInfo +@ stdcall SetScrollPos(long long long long) user32.SetScrollPos +@ stdcall SetScrollRange(long long long long long) user32.SetScrollRange +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stub SetWindowFeedbackSetting +@ stdcall ShowScrollBar(long long long) user32.ShowScrollBar +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index 2b38aed..edc317d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -384,6 +384,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1",

1 0

Nikolay Sivov : shlwapi: Remove unused fields.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 72c28cdb53033805ac4c3c1f3a229900d2ac8014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c28cdb53033805ac4c3c1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 08:00:37 2018 +0300 shlwapi: Remove unused fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 31df82a..decc1f6 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -39,16 +39,10 @@ typedef struct { IStream IStream_iface; LONG ref; - HKEY hKey; LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; DWORD dwMode; - union { - LPSTR keyNameA; - LPWSTR keyNameW; - }u; - BOOL bUnicode; } ISHRegStream; static inline ISHRegStream *impl_from_IStream(IStream *iface) @@ -105,35 +99,6 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { - TRACE(" destroying SHReg IStream (%p)\n",This); - - if (This->hKey) - { - /* write back data in REG_BINARY */ - if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) - { - if (This->dwLength) - { - if (This->bUnicode) - RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - else - RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - } - else - { - if (This->bUnicode) - RegDeleteValueW(This->hKey, This->u.keyNameW); - else - RegDeleteValueA(This->hKey, This->u.keyNameA); - } - } - - RegCloseKey(This->hKey); - } - - HeapFree(GetProcessHeap(),0,This->u.keyNameA); HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; @@ -384,13 +349,10 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { regStream->IStream_iface.lpVtbl = &rstvt; regStream->ref = 1; - regStream->hKey = hKey; regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; regStream->dwMode = STGM_READWRITE; - regStream->u.keyNameA = NULL; - regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); return regStream;

1 0

Dmitry Timoshkov : windowscodecs/tests: Add tests for encoding 2bpp/ 4bpp images with a palette.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 1d7da01ff109500583433cc386a7128476f885cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7da01ff109500583433cc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:49 2018 +0300 windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 323 +++++++++++++++++++++++++++++------ 1 file changed, 267 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d7da01ff10950058343…

1 0

Dmitry Timoshkov : windowscodecs: Add support for palette image formats to TIFF encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: d13d34d10194c087af4dfa05e0fb9c2be31d9d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13d34d10194c087af4dfa05… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:53 2018 +0300 windowscodecs: Add support for palette image formats to TIFF encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/regsvr.c | 5 +++++ dlls/windowscodecs/tests/converter.c | 3 --- dlls/windowscodecs/tiffformat.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 6f781b8..7650c75 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (FAILED(hr)) { ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); - return hr; + return E_NOTIMPL; } stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591..ca02ff9 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,9 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df3cf3b..44a2c08 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1510,8 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1520,7 +1518,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394..01d62d9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -469,7 +476,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) break; default: FIXME("unhandled indexed bit count %u\n", bps); - return E_FAIL; + return E_NOTIMPL; } break; case 4: /* Transparency mask */ @@ -1408,6 +1415,9 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1579,9 +1589,12 @@ static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *ifac return WINCODEC_ERR_WRONGSTATE; } + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -1690,6 +1703,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; }

1 0

Alexandre Julliard : testbot: Fix a typo.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 1db885b190f1375b3f3afd680700f731623ab647 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1db885b190f1375b3f3afd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 19:27:28 2018 +0100 testbot: Fix a typo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 99d7b70..e06f515 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -72,7 +72,7 @@ sub GenerateHeaderCell($$$) { my ($self, $PropertyDescriptor) = @_; - my $PropertyName = $PropertyDescriptor->GetName() + my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n";

1 0

Francois Gouget : testbot/TestAgent: Don't append a '\0' when sending data.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 18afecb4b786e7069e989d1400ee86ccbc818141 URL: https://source.winehq.org/git/tools.git/?a=commit;h=18afecb4b786e7069e989d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 01:39:20 2018 +0100 testbot/TestAgent: Don't append a '\0' when sending data. _SendString() is used to both send data, typically the content of files, and perl strings. In the first case $Type is 'd', and in the latter 's' and a trailing '\0' is added to match the C convention. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8957b9f..a128e34 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -791,10 +791,12 @@ sub _SendUInt64($$$) sub _SendString($$$;$) { my ($self, $Name, $Str, $Type) = @_; + $Type ||= 's'; + debug(" SendString('$Name', '$Str', '$Type')\n"); - debug(" SendString('$Name', '$Str')\n"); - $Str .= "\0"; - return $self->_SendEntryHeader($Name, $Type || 's', length($Str)) && + # Add a trailing '\0' to strings to match the C convention. + $Str .= "\0" if ($Type eq 's'); + return $self->_SendEntryHeader($Name, $Type, length($Str)) && $self->_SendRawData($Name, $Str); }

1 0

Francois Gouget : testbot/web: Show the job and task run time.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 3d2b36946eb1ee9e22b476e93e09162b117c6949 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3d2b36946eb1ee9e22b476e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 14:02:31 2018 +0100 testbot/web: Show the job and task run time. The run time is shown instead of the end time, though the latter is still visible as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 19 ++++++++++---- testbot/web/JobDetails.pl | 35 ++++++++++++++++++++++++++ testbot/web/index.pl | 35 ++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 105280e..f9e590c 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -81,12 +81,21 @@ function Pad2(n) { return n < 10 ? '0' + n : n; } -function ShowDateTime(Sec1970) + +function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - document.write(Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds())); + var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) + if (Id != null) + { + document.getElementById(Id).setAttribute(Attr || "title", Pretty); + } + else + { + document.write(Pretty); + } } //--></script> EOF @@ -450,7 +459,7 @@ sub GetDisplayValue($$$) { if (defined($Value)) { -$Value = + $Value = "<noscript><div>" . strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 37b41ea..99d7b70 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -24,10 +24,12 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use POSIX qw(strftime); use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; +use WineTestBot::Utils; @@ -66,6 +68,21 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub GenerateHeaderCell($$$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName() + if ($PropertyName eq "Ended") + { + print "<th><a class='title' title='Ended'>Time</a></th>\n"; + } + else + { + return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + } +} + sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -135,6 +152,24 @@ sub GenerateDataCell($$$$) } print "</a></td>\n"; } + elsif ($PropertyName eq "Ended") + { + if (defined $Item->Ended) + { + my $Duration = $Item->Ended - $Item->Submitted; + my $TagId = "E". $Item->Id; + print "<td><a id='$TagId' class='title' title='", + strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + "'>", DurationToString($Duration), "</a>\n"; + print "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage);

1 0

Akihiro Sagawa : loader/wine.inf: Remove obsolete time zone entries.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: aa99e9f524a03e7928e95f52de253fad70b27397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa99e9f524a03e7928e95f52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:39 2018 +0900 loader/wine.inf: Remove obsolete time zone entries. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 5a3f8c4..c11d683 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2667,7 +2667,7 @@ system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" ; http://www.twinsun.com/tz/tz-link.htm ; The mapping of Windows timezone names to Olson Tzids is based on the ; Unicode.org CLDR data: -; http://unicode.org/cldr/data/diff/supplemental/windows_tzid.html +; https://www.unicode.org/cldr/charts/latest/supplemental/zone_tzid.html HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Display",,"Asia/Kabul" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Dlt",,"Afghanistan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Std",,"Afghanistan Standard Time" @@ -2692,10 +2692,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Display",,"America/B HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Dlt",,"Argentina Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Display",,"Asia/Yerevan" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Dlt",,"Armenian Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Std",,"Armenian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Display",,"America/Halifax" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Dlt",,"Atlantic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Std",,"Atlantic Standard Time" @@ -3050,18 +3046,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Display",,"Indian/Ma HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Dlt",,"Mauritius Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Std",,"Mauritius Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Display",,"America/Mexico_City" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Dlt",,"Mexico Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Std",,"Mexico Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Display",,"America/Chihuahua" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Dlt",,"Mexico Daylight Time 2" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Std",,"Mexico Standard Time 2" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Display",,"America/Noronha" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Dlt",,"Mid-Atlantic Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Std",,"Mid-Atlantic Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"TZI",1,78,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Display",,"Asia/Beirut" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Dlt",,"Middle East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Std",,"Middle East Standard Time"

1 0

Michael Stefaniuc : ntoskrnl.exe: Drop the WINE_ prefix from debug functions.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 7a43ea94ee01a33d781fc11fb8d34b83619f9e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a43ea94ee01a33d781fc11f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 5 18:57:40 2018 +0100 ntoskrnl.exe: Drop the WINE_ prefix from debug functions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec..aea7d44 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3323,8 +3323,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { - WINE_TRACE( "%s: relocating from %p to %p\n", - wine_dbgstr_w(name), (char *)module - delta, module ); + TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { @@ -3379,7 +3378,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) { - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); + ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); return NULL; } @@ -3435,7 +3434,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn } RegCloseKey( driver_hkey ); - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); + TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); @@ -3473,12 +3472,12 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); - WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); - WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); - WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); + TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); + TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); + TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); + TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); + TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); return status; }

1 0

Alexandre Julliard : loader: Duplicate some preloader code instead of trying to share it.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: df8c5a37ecf236085de4f81a225ab06009ee46ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8c5a37ecf236085de4f81a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:17:05 2018 +0100 loader: Duplicate some preloader code instead of trying to share it. This mostly reverts bd2d795240d996f6cc8884b33e28ea15c2d47afe. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 328 +++++++++++++++++++++++++++---------------------- loader/preloader.h | 66 ---------- loader/preloader_mac.c | 160 +++++++++++++++++++++++- 3 files changed, 337 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df8c5a37ecf236085de4…

1 0

Akihiro Sagawa : loader/wine.inf: Update display names as seen in mapping tables.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 628e8c30d271d86a41f9ebf6ff7838683f0cb102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628e8c30d271d86a41f9ebf6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:44 2018 +0900 loader/wine.inf: Update display names as seen in mapping tables. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=628e8c30d271d86a41f9…

1 0

Michael Stefaniuc : shcore: Print the debugstr instead of the pointer to it.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 1ab06f46659b63b15e3765f40b30394ea8bc7b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab06f46659b63b15e3765f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 5 18:57:39 2018 +0100 shcore: Print the debugstr instead of the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index c5b9856..a544f27 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2285,7 +2285,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, */ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) { - FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_a(subkey), debugstr_a(value), debugstr_a(path), flags); /* FIXME: PathUnExpandEnvStringsA() */

1 0

Akihiro Sagawa : loader/wine.inf: Remove non-standard Chile Standard Time.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 7e83b006aca9a1bc65871bcd4c6523fa20cd69c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e83b006aca9a1bc65871bcd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:42 2018 +0900 loader/wine.inf: Remove non-standard Chile Standard Time. Use Pacific SA Standard Time instead. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c11d683..9ba283f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2779,13 +2779,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Display",,"Chile/Continental" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Dlt",,"Chile Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Std",,"Chile Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"LastEntry",0x10001,2015 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" @@ -3110,7 +3103,10 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff, HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,2015 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time"

1 0

Nikolay Sivov : comctl32/listview: Fix NM_CLICK notification when clicking on checkboxes.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: e6a91103a0027cb206ce276ae4095f83d57604ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6a91103a0027cb206ce276a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 12:49:02 2018 +0300 comctl32/listview: Fix NM_CLICK notification when clicking on checkboxes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c5978b3..1230c55 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10238,7 +10238,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) { + notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); toggle_checkbox_state(infoPtr, nItem); + infoPtr->bLButtonDown = FALSE; return 0; }

1 0

Jacek Caban : jscript: Add Array.prototype.forEach implementation.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: cda846b8cbc39c07ce360a6660a1c8b2e2aca24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda846b8cbc39c07ce360a66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 20:42:27 2018 +0100 jscript: Add Array.prototype.forEach implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 45 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 24 ++++++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e74ca7f..28289cb 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -36,6 +36,7 @@ typedef struct { static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; +static const WCHAR forEachW[] = {'f','o','r','E','a','c','h',0}; static const WCHAR joinW[] = {'j','o','i','n',0}; static const WCHAR popW[] = {'p','o','p',0}; static const WCHAR pushW[] = {'p','u','s','h',0}; @@ -947,6 +948,47 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flag return E_NOTIMPL; } +static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsval_t value, args[3], res; + jsdisp_t *jsthis; + unsigned length, i; + HRESULT hres; + + TRACE("\n"); + + /* FIXME: Check IsCallable */ + if(argc != 1 || !is_object_instance(argv[0])) { + FIXME("Unsupported arguments\n"); + return E_NOTIMPL; + } + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) + return hres; + + for(i = 0; i < length; i++) { + hres = jsdisp_get_idx(jsthis, i, &value); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + return hres; + + args[0] = value; + args[1] = jsval_number(i); + args[2] = jsval_obj(jsthis); + hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + jsval_release(value); + if(FAILED(hres)) + return hres; + jsval_release(res); + } + + if(r) *r = jsval_undefined(); + return S_OK; +} + static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1100,7 +1142,8 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) static const builtin_prop_t Array_props[] = { {concatW, Array_concat, PROPF_METHOD|1}, - {indexOfW, Array_indexOf, PROPF_ES5|PROPF_METHOD|1}, + {forEachW, Array_forEach, PROPF_METHOD|PROPF_ES5|1}, + {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, {joinW, Array_join, PROPF_METHOD|1}, {lengthW, NULL,0, Array_get_length, Array_set_length}, {popW, Array_pop, PROPF_METHOD}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9884def..58c7a4c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -187,6 +187,7 @@ function test_javascript() { test_exposed("now", Date, true); test_exposed("toISOString", Date.prototype, v >= 9); test_exposed("isArray", Array, v >= 9); + test_exposed("forEach", Array.prototype, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); test_exposed("trim", String.prototype, v >= 9); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 3e81961..928c558 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -90,6 +90,28 @@ function test_indexOf() { next_test(); } +function test_array_forEach() { + ok(Array.prototype.forEach.length === 1, "forEach.length = " + Array.prototype.forEach.length); + + function test(array, expect) { + var r = Array.prototype.forEach.call(array, function(value, index, arr) { + ok(arr === array, "unexpected array " + arr); + ok(index === expect[0][0], "index = " + index + " expected " + expect[0][0]); + ok(value === expect[0][1], "value = " + value + " expected " + expect[0][1]); + expect.shift(); + }); + ok(r === undefined, "forEach returned " + r); + ok(expect.length === 0, "too few forEach() calls, expected " + expect.length + " more"); + } + + test(["a",2,"c"], [[0,"a"],[1,2],[2,"c"]]); + test({length: 1000, 500: false, c: 30, 3: "x", 999: 1}, [[3,"x"],[500,false],[999,1]]); + test(new String("abc"), [[0,"a"],[1,"b"],[2,"c"]]); + test([], []); + + next_test(); +} + function test_isArray() { function expect_array(a, exr) { var r = Array.isArray(a); @@ -438,7 +460,6 @@ function test_property_definitions() { if(have_getter) { ok(typeof(desc.get) === "function", "desc.get = " + desc.get); ok(typeof(desc.get.prototype) === "object", "desc.get.prototype = " + desc.get.prototype); - trace("" + desc.get); }else { ok(!("get" in obj), "desc.get = " + desc.get); } @@ -575,6 +596,7 @@ var tests = [ test_date_now, test_toISOString, test_indexOf, + test_array_forEach, test_isArray, test_identifier_keywords, test_getOwnPropertyDescriptor,

1 0

Alexandre Julliard : makefiles: Remove some unused variables.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 05fa21e1883fe0c3a519216e85c1e4595314f4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fa21e1883fe0c3a519216e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 10:47:05 2018 +0100 makefiles: Remove some unused variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 17 ++++------------- configure | 11 ++++------- configure.ac | 9 ++++----- libs/wine/Makefile.in | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index 249c9a2..4990b04 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,8 +34,6 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ SHELL = /bin/sh -RM = rm -f -MV = mv CC = @CC@ CXX = @CXX@ CPPBIN = @CPPBIN@ @@ -55,7 +53,6 @@ EXEEXT = @EXEEXT@ TOOLSEXT = @TOOLSEXT@ DLLTOOL = @DLLTOOL@ AR = @AR@ -ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ @@ -73,17 +70,11 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ -INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) -prog_manext = 1 api_manext = 3w -conf_manext = 5 WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@ @@ -114,12 +105,12 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status # Rules for cleaning distclean:: clean - $(RM) -r autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext) + rm -rf autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext) # Rules for API documentation install-manpages:: manpages - for i in documentation/man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done + for i in documentation/man$(api_manext)/*.$(api_manext); do $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done .PHONY: install-manpages @@ -139,9 +130,9 @@ libs/port libs/wine libs/wpp: include/config.h TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)' TAGS etags: - $(RM) TAGS + rm -f TAGS (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS) tags ctags: - $(RM) tags + rm -f tags (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS) diff --git a/configure b/configure index 4c9b24d..23ba36c 100755 --- a/configure +++ b/configure @@ -755,7 +755,6 @@ EGREP GREP LN_S RANLIB -ARFLAGS STRIP ac_ct_AR AR @@ -5999,8 +5998,6 @@ else STRIP="$ac_cv_prog_STRIP" fi -ARFLAGS=rc - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -20223,13 +20220,13 @@ then rm -f fonts server 2>/dev/null wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: - \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ + rm -f \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ + rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ + rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/configure.ac b/configure.ac index 2222c68..8ec69fe 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,6 @@ fi AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOL(STRIP,strip,strip) -AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_EGREP @@ -4078,13 +4077,13 @@ then WINE_APPEND_RULE( [all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: - \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] + rm -f \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] + rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] + rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5047449..4833eb5 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) version.c: dummy - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) + version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) dummy: .PHONY: dummy

1 0

Nikolay Sivov : shlwapi: Forward IsOS() to shcore.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 47b976e693400509eb016f9c0c4fcebed3dbc13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b976e693400509eb016f9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:19 2018 +0300 shlwapi: Forward IsOS() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 131 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 132 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 810b574..4118d4b 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3806,137 +3806,6 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) } /************************************************************************* - * @ [SHLWAPI.437] - * - * Determine if the OS supports a given feature. - * - * PARAMS - * dwFeature [I] Feature requested (undocumented) - * - * RETURNS - * TRUE If the feature is available. - * FALSE If the feature is not available. - */ -BOOL WINAPI IsOS(DWORD feature) -{ - OSVERSIONINFOA osvi; - DWORD platform, majorv, minorv; - - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - if(!GetVersionExA(&osvi)) { - ERR("GetVersionEx failed\n"); - return FALSE; - } - - majorv = osvi.dwMajorVersion; - minorv = osvi.dwMinorVersion; - platform = osvi.dwPlatformId; - -#define ISOS_RETURN(x) \ - TRACE("(0x%x) ret=%d\n",feature,(x)); \ - return (x); - - switch(feature) { - case OS_WIN32SORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32s - || platform == VER_PLATFORM_WIN32_WINDOWS) - case OS_NT: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_WIN95ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS) - case OS_NT4ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 4) - case OS_WIN2000ORGREATER_ALT: - case OS_WIN2000ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_WIN98ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 10) - case OS_WIN98_GOLD: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 10) - case OS_WIN2000PRO: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_WIN2000SERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000ADVSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000DATACENTER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000TERMINAL: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_EMBEDDED: - FIXME("(OS_EMBEDDED) What should we return here?\n"); - return FALSE; - case OS_TERMINALCLIENT: - FIXME("(OS_TERMINALCLIENT) What should we return here?\n"); - return FALSE; - case OS_TERMINALREMOTEADMIN: - FIXME("(OS_TERMINALREMOTEADMIN) What should we return here?\n"); - return FALSE; - case OS_WIN95_GOLD: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 0) - case OS_MEORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 90) - case OS_XPORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1) - case OS_HOME: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1) - case OS_PROFESSIONAL: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_DATACENTER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_ADVSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_SERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_TERMINALSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_PERSONALTERMINALSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && minorv >= 1 && majorv >= 5) - case OS_FASTUSERSWITCHING: - FIXME("(OS_FASTUSERSWITCHING) What should we return here?\n"); - return TRUE; - case OS_WELCOMELOGONUI: - FIXME("(OS_WELCOMELOGONUI) What should we return here?\n"); - return FALSE; - case OS_DOMAINMEMBER: - FIXME("(OS_DOMAINMEMBER) What should we return here?\n"); - return TRUE; - case OS_ANYSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_WOW6432: - { - BOOL is_wow64; - IsWow64Process(GetCurrentProcess(), &is_wow64); - return is_wow64; - } - case OS_WEBSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_SMALLBUSINESSSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_TABLETPC: - FIXME("(OS_TABLETPC) What should we return here?\n"); - return FALSE; - case OS_SERVERADMINUI: - FIXME("(OS_SERVERADMINUI) What should we return here?\n"); - return FALSE; - case OS_MEDIACENTER: - FIXME("(OS_MEDIACENTER) What should we return here?\n"); - return FALSE; - case OS_APPLIANCE: - FIXME("(OS_APPLIANCE) What should we return here?\n"); - return FALSE; - case 0x25: /*OS_VISTAORGREATER*/ - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 6) - } - -#undef ISOS_RETURN - - WARN("(0x%x) unknown parameter\n",feature); - - return FALSE; -} - -/************************************************************************* * @ [SHLWAPI.439] */ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 55655a6..060dacc 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -434,7 +434,7 @@ 434 stdcall -noname SendMessageTimeoutWrapW(long long long long long long ptr) user32.SendMessageTimeoutW 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) -437 stdcall -ordinal IsOS(long) +437 stdcall -ordinal IsOS(long) shcore.IsOS 438 stub -noname SHLoadRegUIStringA 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long)

1 0

Nikolay Sivov : shlwapi: Forward SHAnsiToAnsi() to shcore.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 454264f0bf15f9c5a6abe6adec222dcd8fb6b8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454264f0bf15f9c5a6abe6ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:17 2018 +0300 shlwapi: Forward SHAnsiToAnsi() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c96fcf0..c104d82 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -342,7 +342,7 @@ 342 stdcall -noname SHInterlockedCompareExchange(ptr ptr ptr) 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) -345 stdcall -ordinal SHAnsiToAnsi(str ptr long) +345 stdcall -ordinal SHAnsiToAnsi(str ptr long) shcore.SHAnsiToAnsi 346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index baa9c29..d400f8b 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2750,30 +2750,6 @@ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) } /************************************************************************* - * @ [SHLWAPI.345] - * - * Copy one string to another. - * - * PARAMS - * lpszSrc [I] Source string to copy - * lpszDst [O] Destination for copy - * iLen [I] Length of lpszDst in characters - * - * RETURNS - * The length of the copied string, including the terminating NUL. lpszDst - * contains iLen characters of lpszSrc. - */ -DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) -{ - LPSTR lpszRet; - - TRACE("(%s,%p,0x%08x)\n", debugstr_a(lpszSrc), lpszDst, iLen); - - lpszRet = StrCpyNXA(lpszDst, lpszSrc, iLen); - return lpszRet - lpszDst + 1; -} - -/************************************************************************* * @ [SHLWAPI.364] * * Determine if an Ascii string converts to Unicode and back identically.

1 0

Michael Stefaniuc : comctl32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: f98f01b368eb7628591f96429b99b203886519df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98f01b368eb7628591f9642… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 4 20:19:51 2018 +0100 comctl32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 5 +---- dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 81461de..09ec4a1 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1366,10 +1366,7 @@ static void test_get_set_textmargin(void) BOOL ret; DWORD type; - margin_in.top = 1; - margin_in.left = 2; - margin_in.right = 3; - margin_in.bottom = 4; + SetRect(&margin_in, 2, 1, 3, 4); for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) { hwnd = create_button(type, NULL); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 7c78540..11a637f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1798,7 +1798,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_CALENDARDATE, ret); expect_hex(MCHT_CALENDARDATE, mchit.uHit); @@ -1815,7 +1815,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_TITLE, ret); expect_hex(MCHT_TITLE, mchit.uHit); @@ -1834,7 +1834,7 @@ static void test_hittest_v6(void) mchit.iOffset = -2; mchit.iCol = mchit.iRow = -2; mchit.uHit = ~0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); todo_wine expect_hex(MCHT_NOWHERE, ret); todo_wine expect_hex(MCHT_NOWHERE, mchit.uHit);

1 0

Nikolay Sivov : shlwapi: Forward SHCopyKey() to shcore.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 3e3ed6f431c034cfac77c8f0856e2f2ac7846017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3ed6f431c034cfac77c8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:18 2018 +0300 shlwapi: Forward SHCopyKey() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 133 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 135 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index fa091ab..2ff7977 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1994,139 +1994,6 @@ HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) return newKey; } - -/************************************************************************* - * SHCopyKeyA [SHLWAPI.@] - * - * Copy a key and its values/sub keys to another location. - * - * PARAMS - * hKeySrc [I] Source key to copy from - * lpszSrcSubKey [I] Sub key under hKeySrc, or NULL to use hKeySrc directly - * hKeyDst [I] Destination key - * dwReserved [I] Reserved, must be 0 - * - * RETURNS - * Success: ERROR_SUCCESS. The key is copied to the destination key. - * Failure: A standard windows error code. - * - * NOTES - * If hKeyDst is a key under hKeySrc, this function will misbehave - * (It will loop until out of stack, or the registry is full). This - * bug is present in Win32 also. - */ -DWORD WINAPI SHCopyKeyA(HKEY hKeySrc, LPCSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) -{ - WCHAR szSubKeyW[MAX_PATH]; - - TRACE("(hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); - - if (lpszSrcSubKey) - MultiByteToWideChar(CP_ACP, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); - - return SHCopyKeyW(hKeySrc, lpszSrcSubKey ? szSubKeyW : NULL, hKeyDst, dwReserved); -} - -/************************************************************************* - * SHCopyKeyW [SHLWAPI.@] - * - * See SHCopyKeyA. - */ -DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) -{ - DWORD dwKeyCount = 0, dwValueCount = 0, dwMaxKeyLen = 0; - DWORD dwMaxValueLen = 0, dwMaxDataLen = 0, i; - BYTE buff[1024]; - LPVOID lpBuff = buff; - WCHAR szName[MAX_PATH], *lpszName = szName; - DWORD dwRet = S_OK; - - TRACE("hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_w(lpszSrcSubKey), hKeyDst, dwReserved); - - if(!hKeyDst || !hKeySrc) - dwRet = ERROR_INVALID_PARAMETER; - else - { - /* Open source key */ - if(lpszSrcSubKey) - dwRet = RegOpenKeyExW(hKeySrc, lpszSrcSubKey, 0, KEY_ALL_ACCESS, &hKeySrc); - - if(dwRet) - hKeyDst = NULL; /* Don't close this key since we didn't open it */ - else - { - /* Get details about sub keys and values */ - dwRet = RegQueryInfoKeyW(hKeySrc, NULL, NULL, NULL, &dwKeyCount, &dwMaxKeyLen, - NULL, &dwValueCount, &dwMaxValueLen, &dwMaxDataLen, - NULL, NULL); - if(!dwRet) - { - if (dwMaxValueLen > dwMaxKeyLen) - dwMaxKeyLen = dwMaxValueLen; /* Get max size for key/value names */ - - if (dwMaxKeyLen++ > MAX_PATH - 1) - lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxKeyLen * sizeof(WCHAR)); - - if (dwMaxDataLen > sizeof(buff)) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwMaxDataLen); - - if (!lpszName || !lpBuff) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - } - } - } - - /* Copy all the sub keys */ - for(i = 0; i < dwKeyCount && !dwRet; i++) - { - HKEY hSubKeySrc, hSubKeyDst; - DWORD dwSize = dwMaxKeyLen; - - dwRet = RegEnumKeyExW(hKeySrc, i, lpszName, &dwSize, NULL, NULL, NULL, NULL); - - if(!dwRet) - { - /* Open source sub key */ - dwRet = RegOpenKeyExW(hKeySrc, lpszName, 0, KEY_READ, &hSubKeySrc); - - if(!dwRet) - { - /* Create destination sub key */ - dwRet = RegCreateKeyW(hKeyDst, lpszName, &hSubKeyDst); - - if(!dwRet) - { - /* Recursively copy keys and values from the sub key */ - dwRet = SHCopyKeyW(hSubKeySrc, NULL, hSubKeyDst, 0); - RegCloseKey(hSubKeyDst); - } - } - RegCloseKey(hSubKeySrc); - } - } - - /* Copy all the values in this key */ - for (i = 0; i < dwValueCount && !dwRet; i++) - { - DWORD dwNameSize = dwMaxKeyLen, dwType, dwLen = dwMaxDataLen; - - dwRet = RegEnumValueW(hKeySrc, i, lpszName, &dwNameSize, NULL, &dwType, lpBuff, &dwLen); - - if (!dwRet) - dwRet = SHSetValueW(hKeyDst, NULL, lpszName, dwType, lpBuff, dwLen); - } - - /* Free buffers if allocated */ - if (lpszName != szName) - HeapFree(GetProcessHeap(), 0, lpszName); - if (lpBuff != buff) - HeapFree(GetProcessHeap(), 0, lpBuff); - - if (lpszSrcSubKey && hKeyDst) - RegCloseKey(hKeyDst); - return dwRet; -} - /* * The following functions are ORDINAL ONLY: */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c104d82..55655a6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -680,8 +680,8 @@ @ stdcall PathUnquoteSpacesA (str) @ stdcall PathUnquoteSpacesW (wstr) @ stdcall SHAutoComplete(ptr long) -@ stdcall SHCopyKeyA(long str long long) -@ stdcall SHCopyKeyW(long wstr long long) +@ stdcall SHCopyKeyA(long str long long) shcore.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shcore.SHCopyKeyW @ stdcall SHCreateShellPalette(long) @ stdcall SHCreateStreamOnFileA(str long ptr) shcore.SHCreateStreamOnFileA @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shcore.SHCreateStreamOnFileEx

1 0

Nikolay Sivov : shlwapi: Forward SHUnicodeToUnicode() to shcore.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: f7c33804e3cca97aa62e11001151097aabd0e5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c33804e3cca97aa62e1100… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:16 2018 +0300 shlwapi: Forward SHUnicodeToUnicode() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4c31724..c96fcf0 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -343,7 +343,7 @@ 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) 345 stdcall -ordinal SHAnsiToAnsi(str ptr long) -346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) +346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW 349 stub -noname SHGetFileDescriptionA diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b190ffc..baa9c29 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2774,21 +2774,6 @@ DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) } /************************************************************************* - * @ [SHLWAPI.346] - * - * Unicode version of SSHAnsiToAnsi. - */ -DWORD WINAPI SHUnicodeToUnicode(LPCWSTR lpszSrc, LPWSTR lpszDst, int iLen) -{ - LPWSTR lpszRet; - - TRACE("(%s,%p,0x%08x)\n", debugstr_w(lpszSrc), lpszDst, iLen); - - lpszRet = StrCpyNXW(lpszDst, lpszSrc, iLen); - return lpszRet - lpszDst + 1; -} - -/************************************************************************* * @ [SHLWAPI.364] * * Determine if an Ascii string converts to Unicode and back identically.

1 0

Alistair Leslie-Hughes : comctl32/edit: Don' t set caret position when we don't have focus.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 929058a2ef890ab58ce7b5a2e5340d72f1adb64f URL: https://source.winehq.org/git/wine.git/?a=commit;h=929058a2ef890ab58ce7b5a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 5 10:07:45 2018 +0300 comctl32/edit: Don't set caret position when we don't have focus. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 06e1f49..1f17276 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1707,9 +1707,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1778,7 +1783,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); }

1 0

Alex Henrie : windowscodecs: Make constant 'valuename_format' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 5b9dbd92424865a57b9d5e6cd8de69e9a8a0c512 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9dbd92424865a57b9d5e6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:08 2018 -0700 windowscodecs: Make constant 'valuename_format' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71..3f53591 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1032,10 +1032,10 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { + static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; - const WCHAR valuename_format[] = {'%','d',0}; mask_size = (list->bitsperpixel + 7)/8;

1 0

Dmitry Timoshkov : windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: d90047ed91f783dea5395f54a8f4dc04f35b632a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90047ed91f783dea5395f54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:31 2018 +0300 windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fc1f756..c0e5a59 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -622,7 +622,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; - hr = E_FAIL; + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 5f4a5e1..d08a5fb 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -811,7 +811,6 @@ static void test_color_formats(void) hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -840,7 +839,6 @@ next_1: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -869,7 +867,6 @@ next_2: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -897,7 +894,6 @@ next_3: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load)

1 0

Matteo Bruni : d3dcompiler: Add an assert checking for writemask sanity in debug_writemask().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: e9231beb865da13941d19eca016a6ccac07cb3f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9231beb865da13941d19eca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 4 21:42:34 2018 +0100 d3dcompiler: Add an assert checking for writemask sanity in debug_writemask(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5499b8c..b872e34 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2142,6 +2142,8 @@ static const char *debug_writemask(DWORD writemask) char string[5]; unsigned int i = 0, pos = 0; + assert(!(writemask & ~BWRITERSP_WRITEMASK_ALL)); + while (writemask) { if (writemask & 1)

1 0

Dmitry Timoshkov : windowscodecs: find_decoder() should return an error it received from the decoder.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 957d1097d28d0b02a79b2b56c94ac3fd21ff6e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957d1097d28d0b02a79b2b56… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:23 2018 +0300 windowscodecs: find_decoder() should return an error it received from the decoder. If IWICBitmapDecoderInfo::MatchesPattern() has recognized the decoder by the pattern, and the called IWICBitmapDecoder::Initialize() has failed, an error should be returned right away instead of trying next codec. This allows report image format related errors instead of WINCODEC_ERR_COMPONENTNOTFOUND. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 42 ++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b564efc..fb235fb 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -131,22 +131,23 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( return hr; } -static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendor, - WICDecodeOptions metadataOptions) +static HRESULT find_decoder(IStream *pIStream, const GUID *pguidVendor, + WICDecodeOptions metadataOptions, IWICBitmapDecoder **decoder) { IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder = NULL; GUID vendor; HRESULT res; ULONG num_fetched; BOOL matches; + *decoder = NULL; + res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); - if (FAILED(res)) return NULL; + if (FAILED(res)) return res; - while (!decoder) + while (!*decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -171,18 +172,21 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo if (SUCCEEDED(res) && matches) { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(*decoder, pIStream, metadataOptions); if (FAILED(res)) { - IWICBitmapDecoder_Release(decoder); - decoder = NULL; + IWICBitmapDecoder_Release(*decoder); + IWICBitmapDecoderInfo_Release(decoderinfo); + IUnknown_Release(unkdecoderinfo); + *decoder = NULL; + return res; } } } @@ -198,7 +202,7 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo IEnumUnknown_Release(enumdecoders); - return decoder; + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( @@ -212,9 +216,9 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( metadataOptions, ppIDecoder); if (pguidVendor) - decoder = find_decoder(pIStream, pguidVendor, metadataOptions); + res = find_decoder(pIStream, pguidVendor, metadataOptions, &decoder); if (!decoder) - decoder = find_decoder(pIStream, NULL, metadataOptions); + res = find_decoder(pIStream, NULL, metadataOptions, &decoder); if (decoder) { @@ -229,17 +233,17 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( BYTE data[4]; ULONG bytesread; - WARN("failed to load from a stream\n"); + WARN("failed to load from a stream %#x\n", res); seek.QuadPart = 0; - res = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (SUCCEEDED(res)) - res = IStream_Read(pIStream, data, 4, &bytesread); - if (SUCCEEDED(res)) - WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK) + { + if (IStream_Read(pIStream, data, 4, &bytesread) == S_OK) + WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + } } *ppIDecoder = NULL; - return WINCODEC_ERR_COMPONENTNOTFOUND; + return res; } }

1 0

Dmitry Timoshkov : windowscodecs: Limit number of colors in a palette in BMP decoder.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 5a4f5ce8b4e2dd7a9597f8b94b2e58c0b37fd81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4f5ce8b4e2dd7a9597f8b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:15 2018 +0300 windowscodecs: Limit number of colors in a palette in BMP decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpdecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 6254b15..f5a2589 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -271,7 +271,7 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (This->bih.bV5ClrUsed == 0) count = 1 << This->bih.bV5BitCount; else - count = This->bih.bV5ClrUsed; + count = min(This->bih.bV5ClrUsed, 1 << This->bih.bV5BitCount); tablesize = sizeof(WICColor) * count; wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize);

1 0

Alex Henrie : d3dcompiler: Turn variable 'components' into a static constant.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 358b814873c73822b641e5d5eba57631768af392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358b814873c73822b641e5d5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:51 2018 -0700 d3dcompiler: Turn variable 'components' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index bda41c4..5499b8c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2138,7 +2138,8 @@ static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *construc static const char *debug_writemask(DWORD writemask) { - char string[5], components[] = {'x', 'y', 'z', 'w'}; + static const char components[] = {'x', 'y', 'z', 'w'}; + char string[5]; unsigned int i = 0, pos = 0; while (writemask)

1 0

Michael Stefaniuc : ddraw: Drop redundant memset() before memcpy().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 7d1c67948d94ca8bc5dd9b1f8efb3982d76e12c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d1c67948d94ca8bc5dd9b1f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 3 21:40:30 2018 +0100 ddraw: Drop redundant memset() before memcpy(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e6f8621..78a2fde 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -274,7 +274,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); @@ -927,7 +926,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size);

1 0

Hans Leidekker : webservices: Maximize the amount of data read with each recv call.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6ff78d1f82216f6b8b7134957d931af662e88097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff78d1f82216f6b8b713495… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:32 2018 +0100 webservices: Maximize the amount of data read with each recv call. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 270aecc..53448c1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -628,7 +628,7 @@ static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_A if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; - if (min_size > reader->input_size - reader->read_pos) + if (reader->read_pos) { memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); reader->read_size -= reader->read_pos;

1 0

Hans Leidekker : webservices: Allow calling WsAcceptChannel again with the same channel handle.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 953eea35cb5968ff520453f3dc3e3266cf26c56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=953eea35cb5968ff520453f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:30 2018 +0100 webservices: Allow calling WsAcceptChannel again with the same channel handle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index e06b394..de1abb5 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -644,7 +644,10 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) hr = WS_E_INVALID_OPERATION; + if (listener->state != WS_LISTENER_STATE_OPEN || (listener->channel && listener->channel != channel_handle)) + { + hr = WS_E_INVALID_OPERATION; + } else { wait = listener->wait;

1 0

Hans Leidekker : webservices: Add support for stream output.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 3e326c9a193645e0ef471b6a043d64aab88a9e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e326c9a193645e0ef471b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:28 2018 +0100 webservices: Add support for stream output. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 1 - dlls/webservices/tests/writer.c | 71 ++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++---- include/webservices.h | 14 +++-- 6 files changed, 172 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e326c9a193645e0ef47…

1 0

Nikolay Sivov : windowscodecs: Trace stream methods arguments.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: fc780fe313db0e36fd394928d48b54a7aaa18138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc780fe313db0e36fd394928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:44 2018 +0300 windowscodecs: Trace stream methods arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/stream.c | 106 +++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc780fe313db0e36fd39…

1 0

Nikolay Sivov : windowscodecs/tests: Add more stream tests.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 3ad1750e45c962826fa443c73560c2fd03818c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad1750e45c962826fa443c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:43 2018 +0300 windowscodecs/tests: Add more stream tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/stream.c | 382 +++++++++++++++++++++++++++++++++----- 1 file changed, 331 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ad1750e45c962826fa4…

1 0

Nikolay Sivov : windowscodecs: Implement GetContainerFormat() for encoders.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 938d00cd761de9d710882132b3119f7d26649aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=938d00cd761de9d710882132… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:42 2018 +0300 windowscodecs: Implement GetContainerFormat() for encoders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 5 +++++ dlls/windowscodecs/jpegformat.c | 12 ++++++++---- dlls/windowscodecs/pngformat.c | 12 ++++++++---- dlls/windowscodecs/tests/converter.c | 24 ++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 5 +++++ 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index fb04f9d..b8783a4 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -472,6 +472,11 @@ static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) + return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatBmp, sizeof(GUID)); return S_OK; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index bb3d418..451d725 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1381,11 +1381,15 @@ static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + memcpy(format, &GUID_ContainerFormatJpeg, sizeof(*format)); + return S_OK; } static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3ac7dee..fc1f756 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1968,11 +1968,15 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + memcpy(format, &GUID_ContainerFormatPng, sizeof(*format)); + return S_OK; } static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5f9f1d8..1e557a7 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -849,6 +849,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const struct setting *settings, const char *name, IWICPalette *palette) { + const GUID *container_format = NULL; HRESULT hr; IWICBitmapEncoder *encoder; BitmapTestSrc *src_obj; @@ -859,6 +860,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; + GUID guid; int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, @@ -868,6 +870,28 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) + container_format = &GUID_ContainerFormatPng; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder)) + container_format = &GUID_ContainerFormatBmp; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder)) + container_format = &GUID_ContainerFormatTiff; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) + container_format = &GUID_ContainerFormatJpeg; + else + ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); + + if (container_format) + { + memset(&guid, 0, sizeof(guid)); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &guid); + ok(SUCCEEDED(hr), "Failed to get container format, hr %#x.\n", hr); + ok(IsEqualGUID(container_format, &guid), "Unexpected container format %s.\n", wine_dbgstr_guid(&guid)); + } + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 67773fd..f9a61d4 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1884,6 +1884,11 @@ exit: static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) + return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)); return S_OK; }

1 0

Alex Henrie : ole32: Turn several variables into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: a05ce6ac6f7243f6d55f8fad888abe3541f2e980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a05ce6ac6f7243f6d55f8fad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:56 2018 -0700 ole32: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 886d9b9..a8bbd40 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10034,8 +10034,8 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName static const WCHAR wstrStreamName[] = {1,'C', 'o', 'm', 'p', 'O', 'b', 'j', 0}; WCHAR bufferW[OLESTREAM_MAX_STR_LEN]; - BYTE pCompObjUnknown1[] = {0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}; - BYTE pCompObjUnknown2[] = {0xF4, 0x39, 0xB2, 0x71}; + static const BYTE pCompObjUnknown1[] = {0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}; + static const BYTE pCompObjUnknown2[] = {0xF4, 0x39, 0xB2, 0x71}; /* Initialize the CompObj structure */ memset(&IStorageCompObj, 0, sizeof(IStorageCompObj)); @@ -10133,7 +10133,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, HRESULT hRes; IStream *pStream; static const WCHAR wstrStreamName[] = {2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0}; - BYTE pOlePresStreamHeader [] = + static const BYTE pOlePresStreamHeader[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -10141,7 +10141,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, 0x00, 0x00, 0x00, 0x00 }; - BYTE pOlePresStreamHeaderEmpty [] = + static const BYTE pOlePresStreamHeaderEmpty[] = { 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

1 0

Henri Verbeet : wined3d: Get rid of the "colRGBA" variable in light().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 3a386645c2e30904d777a3e92408c8ec385f7e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a386645c2e30904d777a3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 18:54:12 2018 +0330 wined3d: Get rid of the "colRGBA" variable in light(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 42c109d..8708aa09 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4152,35 +4152,15 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s else { float quad_att; - float colRGBA[] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glPushMatrix(); gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); - /* Diffuse: */ - colRGBA[0] = lightInfo->OriginalParms.diffuse.r; - colRGBA[1] = lightInfo->OriginalParms.diffuse.g; - colRGBA[2] = lightInfo->OriginalParms.diffuse.b; - colRGBA[3] = lightInfo->OriginalParms.diffuse.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, colRGBA); - checkGLcall("glLightfv"); - - /* Specular */ - colRGBA[0] = lightInfo->OriginalParms.specular.r; - colRGBA[1] = lightInfo->OriginalParms.specular.g; - colRGBA[2] = lightInfo->OriginalParms.specular.b; - colRGBA[3] = lightInfo->OriginalParms.specular.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, colRGBA); - checkGLcall("glLightfv"); - - /* Ambient */ - colRGBA[0] = lightInfo->OriginalParms.ambient.r; - colRGBA[1] = lightInfo->OriginalParms.ambient.g; - colRGBA[2] = lightInfo->OriginalParms.ambient.b; - colRGBA[3] = lightInfo->OriginalParms.ambient.a; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, colRGBA); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_DIFFUSE, &lightInfo->OriginalParms.diffuse.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPECULAR, &lightInfo->OriginalParms.specular.r); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_AMBIENT, &lightInfo->OriginalParms.ambient.r); checkGLcall("glLightfv"); if ((lightInfo->OriginalParms.range * lightInfo->OriginalParms.range) >= FLT_MIN)

1 0

Henri Verbeet : dxgi: Introduce the IWineDXGISwapChainFactory interface.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 8ba075a0592e776b3f4502fce09af207651e8c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba075a0592e776b3f4502fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 18:10:00 2018 +0330 dxgi: Introduce the IWineDXGISwapChainFactory interface. The basic idea is that a project like vkd3d could provide its own implementation of the IWineDXGISwapChainFactory interface, and so wouldn't need specific handling in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 3 +- dlls/dxgi/factory.c | 9 ++-- dlls/dxgi/swapchain.c | 63 ------------------------- include/wine/winedxgi.idl | 17 +++++++ 5 files changed, 141 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ba075a0592e776b3f45…

1 0

Hans Leidekker : webservices: Use stream I/ O for UDP and session-less TCP channel bindings.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 63b8da2ba2048e9c3653652595f04bed0e2e9354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b8da2ba2048e9c36536525… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:29 2018 +0100 webservices: Use stream I/O for UDP and session-less TCP channel bindings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 167 ++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63b8da2ba2048e9c3653…

1 0

Nikolay Sivov : windowscodecs: Fix InitializeFromIStream() to simply wrap target stream.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6704ef1430405742cee041f5600e659d02bd79d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6704ef1430405742cee041f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:45 2018 +0300 windowscodecs: Fix InitializeFromIStream() to simply wrap target stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/stream.c | 26 ++++++++++++++++++-------- dlls/windowscodecs/tests/stream.c | 36 ++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index ae90dfd..366d11b 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -912,16 +912,26 @@ static HRESULT WINAPI IWICStreamImpl_Clone(IWICStream *iface, return IStream_Clone(This->pStream, ppstm); } -static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, - IStream *pIStream) +static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, IStream *stream) { - ULARGE_INTEGER offset, size; - TRACE("(%p, %p)\n", iface, pIStream); + IWICStreamImpl *This = impl_from_IWICStream(iface); + HRESULT hr = S_OK; + + TRACE("(%p, %p)\n", iface, stream); + + if (!stream) return E_INVALIDARG; + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + IStream_AddRef(stream); - offset.QuadPart = 0; - size.u.LowPart = 0xffffffff; - size.u.HighPart = 0xffffffff; - return IWICStream_InitializeFromIStreamRegion(iface, pIStream, offset, size); + if (InterlockedCompareExchangePointer((void **)&This->pStream, stream, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(stream); + hr = WINCODEC_ERR_WRONGSTATE; + } + + return hr; } static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index c8fcdd1..3750c32 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -777,7 +777,7 @@ static void test_StreamOnIStream(void) hr = IWICStream_InitializeFromIStream(substream, (IStream *)stream); ok(hr == S_OK, "Failed to initialize stream, hr %#x.\n", hr); - CHECK_CUR_POS_TODO(substream, 1); + CHECK_CUR_POS(substream, 1); /* Seek */ CHECK_CUR_POS(stream, 1); @@ -785,12 +785,12 @@ static void test_StreamOnIStream(void) ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == sizeof(memory), "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); CHECK_CUR_POS(substream, sizeof(memory)); - CHECK_CUR_POS_TODO(stream, sizeof(memory)); + CHECK_CUR_POS(stream, sizeof(memory)); hr = IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, &newpos); ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == 0, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); CHECK_CUR_POS(substream, 0); hr = IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); @@ -801,41 +801,37 @@ static void test_StreamOnIStream(void) newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_SET, &newpos); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); CHECK_CUR_POS(substream, 0); pos.QuadPart = sizeof(memory) + 1; newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_SET, &newpos); -todo_wine { ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); -} - CHECK_CUR_POS_TODO(stream, 0); - CHECK_CUR_POS_TODO(substream, 0); + CHECK_CUR_POS(stream, 0); + CHECK_CUR_POS(substream, 0); pos.QuadPart = 1; newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_END, &newpos); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); - CHECK_CUR_POS_TODO(substream, 0); + CHECK_CUR_POS(stream, 0); + CHECK_CUR_POS(substream, 0); pos.QuadPart = -1; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_END, &newpos); ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == sizeof(memory) - 1, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, sizeof(memory) - 1); + CHECK_CUR_POS(stream, sizeof(memory) - 1); CHECK_CUR_POS(substream, sizeof(memory) - 1); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); @@ -846,23 +842,23 @@ todo_wine ok(read_len == 12, "Unexpected read length %u.\n", read_len); ok(!memcmp(buff, data, 12), "Unexpected data.\n"); CHECK_CUR_POS(substream, read_len); - CHECK_CUR_POS_TODO(stream, read_len); + CHECK_CUR_POS(stream, read_len); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); hr = IWICStream_Read(substream, memory, 10, &read_len); /* source = dest */ ok(hr == S_OK, "Failed to read from stream, hr %#x.\n", hr); ok(read_len == 10, "Unexpected read length %u.\n", read_len); ok(!memcmp(memory, data, read_len), "Unexpected data.\n"); - CHECK_CUR_POS_TODO(stream, 10); + CHECK_CUR_POS(stream, 10); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); hr = IWICStream_Read(substream, memory, 2 * sizeof(data), &read_len); /* request too many bytes */ ok(hr == S_OK, "Failed to read from stream, hr %#x.\n", hr); ok(read_len == 64, "Unexpected read length %u.\n", read_len); ok(!memcmp(memory, data, read_len), "Unexpected data.\n"); - CHECK_CUR_POS_TODO(stream, sizeof(data)); + CHECK_CUR_POS(stream, sizeof(data)); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); read_len = 0xdeadbeef; @@ -898,7 +894,7 @@ todo_wine ok(written == 3, "Unexpected written length %u.\n", written); ok(!memcmp(buff, memory, 3), "Unexpected stream data.\n"); CHECK_CUR_POS(substream, written); - CHECK_CUR_POS_TODO(stream, written); + CHECK_CUR_POS(stream, written); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); hr = IWICStream_Write(substream, buff, 0, &written); @@ -909,14 +905,14 @@ todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(written == 0xdeadbeef, "Unexpected written length %u.\n", written); CHECK_CUR_POS(substream, 0); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); written = 0xdeadbeef; hr = IWICStream_Write(substream, NULL, 0, &written); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(written == 0xdeadbeef, "Unexpected written length %u.\n", written); CHECK_CUR_POS(substream, 0); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); /* SetSize */ newpos.u.HighPart = 0;

1 0

Dmitry Timoshkov : windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 0b428f881972e656bc81c9af4f452bab9d460f58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b428f881972e656bc81c9af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:04 2018 +0300 windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f9a61d4..81c6394 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1969,7 +1969,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; - V_UNION(&v, bVal) = WICTiffCompressionDontCare; + V_UI1(&v) = WICTiffCompressionDontCare; hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr))

1 0

Józef Kucia : include: Add ntddvdeo.h.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: c7616efb98469590badc68cd33a8b94f9a04ae39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7616efb98469590badc68cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 19:52:44 2018 +0100 include: Add ntddvdeo.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntddvdeo.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2953748..fd47078 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -472,6 +472,7 @@ SOURCES = \ ntddndis.h \ ntddscsi.h \ ntddstor.h \ + ntddvdeo.h \ ntdef.h \ ntdsapi.h \ ntlsa.h \ diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h new file mode 100644 index 0000000..d2c0780 --- /dev/null +++ b/include/ntddvdeo.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTDDVDEO_ +#define _NTDDVDEO_ + +DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); + +#endif

1 0

Hans Leidekker : webservices: Implement WsFlushBody.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 5f7372afbdcf9ad6dbae5543ae9c44486333a4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f7372afbdcf9ad6dbae5543… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:31 2018 +0100 webservices: Implement WsFlushBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ada549c..31c424b 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -831,6 +831,33 @@ done: return hr; } +/************************************************************************** + * WsFlushBody [webservices.@] + */ +HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFlushWriter( msg->writer_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *localname ) { const WS_XML_NODE *node; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bd152b1..c8db3a0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -46,7 +46,7 @@ @ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) -@ stub WsFlushBody +@ stdcall WsFlushBody(ptr long ptr ptr) @ stdcall WsFlushWriter(ptr long ptr ptr) @ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr)

1 0