- wine-devel - winehq.org

[PATCH 7/7] kernel32: Implement QueryPerformanceCounter() directly.
by Huw Davies 02 May '19

02 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/cpu.c | 45 -------------------------------------------- dlls/kernel32/time.c | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 9445d0bc05..6e549a0f31 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,51 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/**************************************************************************** - * QueryPerformanceCounter (KERNEL32.@) - * - * Get the current value of the performance counter. - * - * PARAMS - * counter [O] Destination for the current counter reading - * - * RETURNS - * Success: TRUE. counter contains the current reading - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceFrequency. - */ -BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter) -{ - NtQueryPerformanceCounter( counter, NULL ); - return TRUE; -} - - -/**************************************************************************** - * QueryPerformanceFrequency (KERNEL32.@) - * - * Get the resolution of the performance counter. - * - * PARAMS - * frequency [O] Destination for the counter resolution - * - * RETURNS - * Success. TRUE. Frequency contains the resolution of the counter. - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceCounter. - */ -BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) -{ - LARGE_INTEGER counter; - NtQueryPerformanceCounter( &counter, frequency ); - return TRUE; -} - - /*********************************************************************** * GetSystemInfo [KERNEL32.@] * diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 35472c2400..bc7db67e38 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1621,3 +1621,45 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) { return monotonic_counter() / 10000; } + +/**************************************************************************** + * QueryPerformanceCounter (KERNEL32.@) + * + * Get the current value of the performance counter. + * + * PARAMS + * counter [O] Destination for the current counter reading + * + * RETURNS + * Success: TRUE. counter contains the current reading + * Failure: FALSE. + * + * SEE ALSO + * See QueryPerformanceFrequency. + */ +BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER *counter) +{ + counter->QuadPart = monotonic_counter(); + return TRUE; +} + +/**************************************************************************** + * QueryPerformanceFrequency (KERNEL32.@) + * + * Get the resolution of the performance counter. + * + * PARAMS + * frequency [O] Destination for the counter resolution + * + * RETURNS + * Success. TRUE. Frequency contains the resolution of the counter. + * Failure: FALSE. + * + * SEE ALSO + * See QueryPerformanceCounter. + */ +BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER *frequency) +{ + frequency->QuadPart = TICKSPERSEC; + return TRUE; +} -- 2.17.1

2 1

[PATCH 6/7] kernel32: Implement GetTickCount() directly.
by Huw Davies 02 May '19

02 May '19

On an i7-8700 CPU @ 3.20GHz running a kernel where CLOCK_MONOTONIC_RAW is handled by the vDSO it cuts the call cost from ~45ns to ~25ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/kernel_main.c | 31 ----------------------- dlls/kernel32/time.c | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index d3420ece06..7a0cc93b7d 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -179,37 +179,6 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) } -/****************************************************************************** - * GetTickCount64 (KERNEL32.@) - */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) -{ - LARGE_INTEGER counter, frequency; - - NtQueryPerformanceCounter( &counter, &frequency ); - return counter.QuadPart * 1000 / frequency.QuadPart; -} - - -/*********************************************************************** - * GetTickCount (KERNEL32.@) - * - * Get the number of milliseconds the system has been running. - * - * PARAMS - * None. - * - * RETURNS - * The current tick count. - * - * NOTES - * The value returned will wrap around every 2^32 milliseconds. - */ -DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) -{ - return GetTickCount64(); -} - /****************************************************************************** * GetSystemRegistryQuota (KERNEL32.@) */ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index b946aa177e..35472c2400 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -63,6 +63,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)(60 * 60 * 24)) #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) +/* return a monotonic time counter, in Win32 ticks */ +static inline ULONGLONG monotonic_counter(void) +{ + LARGE_INTEGER counter; + +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + NtQueryPerformanceCounter( &counter, NULL ); + return counter.QuadPart; +} + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -1571,3 +1594,30 @@ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) RtlQueryUnbiasedInterruptTime(time); return TRUE; } + +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + return monotonic_counter() / 10000; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + * + * Get the number of milliseconds the system has been running. + * + * PARAMS + * None. + * + * RETURNS + * The current tick count. + * + * NOTES + * The value returned will wrap around every 2^32 milliseconds. + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + return monotonic_counter() / 10000; +} -- 2.17.1

2 1

[PATCH 5/7] kernel32: Simplify GetSystemTime().
by Huw Davies 02 May '19

02 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index f773afd957..b946aa177e 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1339,14 +1339,11 @@ VOID WINAPI GetLocalTime(LPSYSTEMTIME systime) * RETURNS * Nothing. */ -VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) +void WINAPI GetSystemTime(SYSTEMTIME *systime) { FILETIME ft; - LARGE_INTEGER t; - NtQuerySystemTime(&t); - ft.dwLowDateTime = t.u.LowPart; - ft.dwHighDateTime = t.u.HighPart; + GetSystemTimeAsFileTime(&ft); FileTimeToSystemTime(&ft, systime); } -- 2.17.1

2 1

[PATCH 4/7] kernel32: Implement GetSystemTimeAsFileTime() directly.
by Huw Davies 02 May '19

02 May '19

On an i7-8700 CPU @ 3.20GHz with HZ=1000 it cuts the call cost from ~18ns to ~12ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index eb445a4cd5..f773afd957 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -59,6 +59,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define FILETIME2LL( pft, ll) \ ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; +#define TICKSPERSEC 10000000 +#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)(60 * 60 * 24)) +#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -764,7 +768,36 @@ void WINAPI GetSystemTimeAsFileTime( FILETIME *time ) { LARGE_INTEGER t; - NtQuerySystemTime( &t ); +#if defined(HAVE_CLOCK_GETTIME) + struct timespec ts; + static clockid_t clock_id = -1; + + if (clock_id == -1) + { + struct timespec res; + + /* Use CLOCK_REALTIME_COARSE if it has 1 ms or better resolution */ + if (!clock_getres( CLOCK_REALTIME_COARSE, &res ) && res.tv_sec == 0 && res.tv_nsec <= 1000000) + clock_id = CLOCK_REALTIME_COARSE; + else + clock_id = CLOCK_REALTIME; + } + + if (!clock_gettime( clock_id, &ts )) + { + t.QuadPart = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + t.QuadPart += (ts.tv_nsec + 50) / 100; + } + else +#endif + { + struct timeval now; + + gettimeofday( &now, 0 ); + t.QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + t.QuadPart += now.tv_usec * 10; + } + time->dwLowDateTime = t.u.LowPart; time->dwHighDateTime = t.u.HighPart; } -- 2.17.1

1 0

[PATCH 2/7] kernel32: Implement GetSystemTimePreciseAsFileTime() using RtlGetSystemTimePrecise().
by Huw Davies 02 May '19

02 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4a4c494b4f..eb445a4cd5 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -754,13 +754,16 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( * * Get the current time in utc format. * + * PARAMS + * time [out] Destination for the current utc time + * * RETURNS * Nothing. */ -VOID WINAPI GetSystemTimeAsFileTime( - LPFILETIME time) /* [out] Destination for the current utc time */ +void WINAPI GetSystemTimeAsFileTime( FILETIME *time ) { LARGE_INTEGER t; + NtQuerySystemTime( &t ); time->dwLowDateTime = t.u.LowPart; time->dwHighDateTime = t.u.HighPart; @@ -770,15 +773,21 @@ VOID WINAPI GetSystemTimeAsFileTime( /*********************************************************************** * GetSystemTimePreciseAsFileTime (KERNEL32.@) * - * Get the current time in utc format, with <1 us precision. + * Get the current time in utc format with greater accuracy. + * + * PARAMS + * time [out] Destination for the current utc time * * RETURNS * Nothing. */ -VOID WINAPI GetSystemTimePreciseAsFileTime( - LPFILETIME time) /* [out] Destination for the current utc time */ +void WINAPI GetSystemTimePreciseAsFileTime( FILETIME *time ) { - GetSystemTimeAsFileTime(time); + LARGE_INTEGER t; + + t.QuadPart = RtlGetSystemTimePrecise(); + time->dwLowDateTime = t.u.LowPart; + time->dwHighDateTime = t.u.HighPart; } -- 2.17.1

1 0

[PATCH resend 1/2] setupapi: Rewrite DiskSpaceList logic using lists.
by Vijay Kiran Kamuju 02 May '19

02 May '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/diskspace.c | 184 +++++++++++++++++++++----------------- 1 file changed, 102 insertions(+), 82 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 1ca45f96913..7c33542e5a8 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -1,6 +1,7 @@ /* * SetupAPI DiskSpace functions * + * Copyright 2016 Michael Müller * Copyright 2004 CodeWeavers (Aric Stewart) * * This library is free software; you can redistribute it and/or @@ -27,69 +28,51 @@ #include "winnls.h" #include "winreg.h" #include "setupapi.h" +#include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" +#include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -typedef struct { - WCHAR lpzName[20]; - LONGLONG dwFreeSpace; - LONGLONG dwWantedSpace; -} DRIVE_ENTRY, *LPDRIVE_ENTRY; +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; -typedef struct { - DWORD dwDriveCount; - DRIVE_ENTRY Drives[26]; -} DISKSPACELIST, *LPDISKSPACELIST; /*********************************************************************** * SetupCreateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID reserved1, DWORD reserved2, UINT flags) { - WCHAR drives[255]; - DWORD rc; - WCHAR *ptr; - LPDISKSPACELIST list=NULL; + struct space_list *list; - TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + TRACE("(%p, %u, 0x%08x)\n", reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + if (reserved1 || reserved2 || flags & ~SPDSL_IGNORE_DISK) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - rc = GetLogicalDriveStringsW(255,drives); - - if (rc == 0) - return NULL; - - list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); - - list->dwDriveCount = 0; - - ptr = drives; - - while (*ptr) + list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)); + if (list) { - DWORD type = GetDriveTypeW(ptr); - if (type == DRIVE_FIXED) - { - DWORD clusters; - DWORD sectors; - DWORD bytes; - DWORD total; - lstrcpyW(list->Drives[list->dwDriveCount].lpzName,ptr); - GetDiskFreeSpaceW(ptr,&sectors,&bytes,&clusters,&total); - list->Drives[list->dwDriveCount].dwFreeSpace = clusters * sectors * - bytes; - list->Drives[list->dwDriveCount].dwWantedSpace = 0; - list->dwDriveCount++; - } - ptr += lstrlenW(ptr) + 1; + list->flags = flags; + list_init(&list->files); } + return list; } @@ -105,32 +88,58 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID Reserved1, DWORD Reserved2, UINT /*********************************************************************** * SetupDuplicateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC diskspace, PVOID reserved1, DWORD reserved2, UINT flags) { - DISKSPACELIST *list_copy, *list_original = DiskSpace; + struct space_list *list_copy, *list = diskspace; + struct file_entry *file, *file_copy; + + TRACE("(%p, %p, %u, %u)\n", diskspace, reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags) + if (reserved1 || reserved2 || flags) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!DiskSpace) + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } - list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(DISKSPACELIST)); + list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*list_copy)); if (!list_copy) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - *list_copy = *list_original; + list_copy->flags = list->flags; + list_init(&list_copy->files); + + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + file_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*file_copy)); + if (!file_copy) goto error; + + file_copy->path = strdupW(file->path); + if (!file_copy->path) + { + HeapFree(GetProcessHeap(), 0, file_copy); + goto error; + } + + file_copy->operation = file->operation; + file_copy->size = file->size; + list_add_head(&list_copy->files, &file->entry); + } return list_copy; + +error: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupDestroyDiskSpaceList(list_copy); + return NULL; } /*********************************************************************** @@ -155,55 +164,51 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, /*********************************************************************** * SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, - LPCWSTR DriveSpec, LONGLONG *SpaceRequired, - PVOID Reserved1, UINT Reserved2) +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC diskspace, + LPCWSTR drivespec, LONGLONG *required, + PVOID reserved1, UINT reserved2) { - WCHAR *driveW; - unsigned int i; - LPDISKSPACELIST list = DiskSpace; - BOOL rc = FALSE; - static const WCHAR bkslsh[]= {'\\',0}; + struct space_list *list = diskspace; + struct file_entry *file; + LONGLONG sum = 0; - if (!DiskSpace) + TRACE("(%p, %s, %p, %p, %u)\n", diskspace, debugstr_w(drivespec), required, reserved1, reserved2); + + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DriveSpec) + if (!drivespec || !drivespec[0]) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(drivespec ? ERROR_INVALID_DRIVE : ERROR_INVALID_DRIVE); return FALSE; } - driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); - if (!driveW) + if (!required) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - lstrcpyW(driveW,DriveSpec); - lstrcatW(driveW,bkslsh); - - TRACE("Looking for drive %s\n",debugstr_w(driveW)); - - for (i = 0; i < list->dwDriveCount; i++) + if (tolowerW(drivespec[0]) < 'a' || tolowerW(drivespec[0]) > 'z' || + drivespec[1] != ':' || drivespec[2] != 0) { - TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); - if (lstrcmpW(driveW,list->Drives[i].lpzName)==0) - { - rc = TRUE; - *SpaceRequired = list->Drives[i].dwWantedSpace; - break; - } + FIXME("UNC paths not yet supported (%s)\n", debugstr_w(drivespec)); + SetLastError((GetVersion() & 0x80000000) ? ERROR_INVALID_DRIVE : ERROR_INVALID_PARAMETER); + return FALSE; } - HeapFree(GetProcessHeap(), 0, driveW); + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + if (tolowerW(file->path[0]) == tolowerW(drivespec[0]) && + file->path[1] == ':' && file->path[2] == '\\') + sum += file->size; + } - if (!rc) SetLastError(ERROR_INVALID_DRIVE); - return rc; + *required = sum; + return TRUE; } /*********************************************************************** @@ -253,10 +258,25 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, /*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ -BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) +BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC diskspace) { - LPDISKSPACELIST list = DiskSpace; - HeapFree(GetProcessHeap(),0,list); + struct space_list *list = diskspace; + struct file_entry *file, *file2; + + if (!diskspace) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(file, file2, &list->files, struct file_entry, entry) + { + HeapFree(GetProcessHeap(), 0, file->path); + list_remove(&file->entry); + HeapFree(GetProcessHeap(), 0, file); + } + + HeapFree(GetProcessHeap(), 0, list); return TRUE; } -- 2.17.0

1 1

[PATCH] ntdll: Add dummy apiset to PEB.
by Vijay Kiran Kamuju 02 May '19

02 May '19

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44658 From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ntdll/thread.c | 2 ++ include/Makefile.in | 1 + include/apiset.h | 37 +++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 include/apiset.h diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be4621819bc..d687043f51b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -70,6 +70,7 @@ static PEB_LDR_DATA ldr; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; +static API_SET_NAMESPACE_ARRAY apiset_map; static int nb_threads = 1; static RTL_CRITICAL_SECTION peb_lock; @@ -189,6 +190,7 @@ void thread_init(void) peb = addr; peb->FastPebLock = &peb_lock; + peb->ApiSetMap = &apiset_map; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; diff --git a/include/Makefile.in b/include/Makefile.in index 6c8d39ab76b..6ec4c51f18e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amsi.idl \ amstream.idl \ amvideo.idl \ + apiset.h \ appcompatapi.h \ appmgmt.h \ appmodel.h \ diff --git a/include/apiset.h b/include/apiset.h new file mode 100644 index 00000000000..6801cd5f509 --- /dev/null +++ b/include/apiset.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2017 Michael Müller + * + * 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 _API_SET_H_ +#define _API_SET_H_ + +#include <windef.h> + +typedef struct _API_SET_NAMESPACE_ENTRY +{ + ULONG NameOffset; + ULONG NameLength; + ULONG DataOffset; +} API_SET_NAMESPACE_ENTRY, *PAPI_SET_NAMESPACE_ENTRY; + +typedef struct _API_SET_NAMESPACE_ARRAY +{ + ULONG Version; + ULONG Count; + API_SET_NAMESPACE_ENTRY Array[1]; +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY; + +#endif diff --git a/include/winternl.h b/include/winternl.h index 2b3fb947b9b..1832f49994c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -23,6 +23,7 @@ #include <ntdef.h> #include <windef.h> +#include <apiset.h> #ifdef __cplusplus extern "C" { @@ -286,7 +287,7 @@ typedef struct _PEB ULONG EnvironmentUpdateCount; /* 028/050 */ PVOID KernelCallbackTable; /* 02c/058 */ ULONG Reserved[2]; /* 030/060 */ - PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 038/068 */ + PAPI_SET_NAMESPACE_ARRAY ApiSetMap; /* 038/068 */ ULONG TlsExpansionCounter; /* 03c/070 */ PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ -- 2.17.0

2 3

[PATCH V4] shell32: Implement NewMenu with new folder item.
by Vijay Kiran Kamuju 02 May '19

02 May '19

From: Michael Müller <michael(a)fds-team.de> v2: Added and Correct tests Use IContextMenu3 for all IContextMenu* interfaces. Use heap_alloc/free functions v3: Correct header issue when compiling i386 (var_arg) v4: Add context handler for directories New Menu to wine.inf Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812 From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_classes.idl | 5 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellnew.c | 498 +++++++++++++++++++++++++++++++ dlls/shell32/shellole.c | 1 + dlls/shell32/tests/shlview.c | 9 +- loader/wine.inf.in | 1 + 7 files changed, 515 insertions(+), 1 deletion(-) create mode 100644 dlls/shell32/shellnew.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 20365b96fb..0fbc86ecf9 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -32,6 +32,7 @@ C_SRCS = \ shelldispatch.c \ shellitem.c \ shelllink.c \ + shellnew.c \ shellole.c \ shellord.c \ shellpath.c \ diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 6ed497fea5..60de627be3 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -80,6 +80,11 @@ coclass KnownFolderManager { interface IKnownFolderManager; } uuid(4657278a-411b-11d2-839a-00c04fd918d0) ] coclass DragDropHelper { interface IDropTargetHelper; } +[ + threading(apartment), + uuid(d969a300-e7ff-11d0-a93b-00a0c90f2719) +] coclass NewMenu { interface IShellExtInit; } + [ threading(apartment), uuid(00bb2763-6a77-11d0-a535-00c04fd7d062) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8..6d6da97f11 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -103,6 +103,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) DECLSPEC_HIDDEN; HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellnew.c b/dlls/shell32/shellnew.c new file mode 100644 index 0000000000..89be091e03 --- /dev/null +++ b/dlls/shell32/shellnew.c @@ -0,0 +1,498 @@ +/* + * Copyright 2015 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" + +#include "winuser.h" +#include "wingdi.h" +#include "shlobj.h" +#include "undocshell.h" + +#include "pidl.h" +#include "shell32_main.h" +#include "shlguid.h" +#include "shlwapi.h" +#include "shresdef.h" +#include "shellfolder.h" + +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct +{ + IShellExtInit IShellExtInit_iface; + IContextMenu3 IContextMenu3_iface; + IObjectWithSite IObjectWithSite_iface; + + LONG ref; + IUnknown *site; + LPITEMIDLIST pidl; + HICON icon_folder; + + UINT folder_cmd; +} NewMenuImpl; + +static inline NewMenuImpl *impl_from_IShellExtInit(IShellExtInit *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IShellExtInit_iface); +} + +static inline NewMenuImpl *impl_from_IContextMenu3(IContextMenu3 *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IContextMenu3_iface); +} + +static inline NewMenuImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IObjectWithSite_iface); +} + +static HRESULT WINAPI +NewMenu_ExtInit_QueryInterface(IShellExtInit *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppv = &This->IShellExtInit_iface; + } + else if (IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppv = &This->IObjectWithSite_iface; + } + else if (IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2) || + IsEqualIID(riid, &IID_IContextMenu3)) + { + *ppv = &This->IContextMenu3_iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + TRACE("-- Interface: (%p)->(%p)\n", ppv, *ppv); + return S_OK; + } + + ERR("-- Interface: E_NOINTERFACE for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI +NewMenu_ExtInit_AddRef(IShellExtInit *iface) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI +NewMenu_ExtInit_Release(IShellExtInit *iface) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), refcount=%i\n", iface, ref); + + if (!ref) + { + if (This->site) IUnknown_Release(This->site); + if (This->pidl) ILFree(This->pidl); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI +NewMenu_ExtInit_Initialize(IShellExtInit *iface, LPCITEMIDLIST pidl, IDataObject *obj, HKEY key) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + + TRACE("(%p)->(%p, %p, %p)\n", This, pidl, obj, key ); + + if (!pidl) + return E_FAIL; + + if (This->pidl) ILFree(This->pidl); + This->pidl = ILClone(pidl); + This->icon_folder = LoadImageW(shell32_hInstance, (LPCWSTR)MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + return S_OK; +} + +static const IShellExtInitVtbl eivt = +{ + NewMenu_ExtInit_QueryInterface, + NewMenu_ExtInit_AddRef, + NewMenu_ExtInit_Release, + NewMenu_ExtInit_Initialize +}; + + +static HRESULT WINAPI +NewMenu_ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_QueryInterface(&This->IShellExtInit_iface, riid, ppv); +} + +static ULONG WINAPI +NewMenu_ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_AddRef(&This->IShellExtInit_iface); +} + +static ULONG WINAPI +NewMenu_ObjectWithSite_Release(IObjectWithSite *iface) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_Release(&This->IShellExtInit_iface); +} + +static HRESULT WINAPI +NewMenu_ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID iid, void **ppv) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), ppv); + + if (!This->site) + return E_FAIL; + + return IUnknown_QueryInterface(This->site, iid, ppv); +} + +static HRESULT WINAPI +NewMenu_ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *punk) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%p)\n", This, punk); + + if (punk) + IUnknown_AddRef(punk); + + if (This->site) + IUnknown_Release(This->site); + + This->site = punk; + return S_OK; +} + +static const IObjectWithSiteVtbl owsvt = +{ + NewMenu_ObjectWithSite_QueryInterface, + NewMenu_ObjectWithSite_AddRef, + NewMenu_ObjectWithSite_Release, + NewMenu_ObjectWithSite_SetSite, + NewMenu_ObjectWithSite_GetSite, +}; + + +static HRESULT WINAPI +NewMenu_ContextMenu3_QueryInterface(IContextMenu3 *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_QueryInterface(&This->IShellExtInit_iface, riid, ppv); +} + +static ULONG WINAPI +NewMenu_ContextMenu3_AddRef(IContextMenu3 *iface) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_AddRef(&This->IShellExtInit_iface); +} + +static ULONG WINAPI +NewMenu_ContextMenu3_Release(IContextMenu3 *iface) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_Release(&This->IShellExtInit_iface); +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_GetCommandString(IContextMenu3 *iface, UINT_PTR cmd, UINT type, + UINT *reserved, LPSTR name, UINT max_len) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + + FIXME("(%p)->(%lu %u %p %p %u): stub\n", This, cmd, type, reserved, name, max_len); + + return E_NOTIMPL; +} + +static HRESULT create_folder(NewMenuImpl *This, IShellView *view) +{ + IFolderView *folder_view = NULL; + IShellFolder *desktop = NULL; + IShellFolder *parent = NULL; + ISFHelper *helper = NULL; + LPITEMIDLIST pidl = NULL; + WCHAR nameW[MAX_PATH]; + HRESULT hr; + + if (view) + { + hr = IShellView_QueryInterface(view, &IID_IFolderView, (void **)&folder_view); + if (FAILED(hr)) return hr; + + hr = IFolderView_GetFolder(folder_view, &IID_IShellFolder, (void **)&parent); + if (FAILED(hr)) goto out; + } + else + { + hr = SHGetDesktopFolder(&desktop); + if (FAILED(hr)) goto out; + + hr = IShellFolder_BindToObject(desktop, This->pidl, NULL, &IID_IShellFolder, (void **)&parent); + if (FAILED(hr)) goto out; + } + + IShellFolder_QueryInterface(parent, &IID_ISFHelper, (void **)&helper); + if (FAILED(hr)) goto out; + + hr = ISFHelper_GetUniqueName(helper, nameW, MAX_PATH); + if (FAILED(hr)) goto out; + + hr = ISFHelper_AddFolder(helper, 0, nameW, &pidl); + if (FAILED(hr)) goto out; + + if (view) + { + IShellView_SelectItem(view, pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | + SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); + } + +out: + if (pidl) SHFree(pidl); + if (helper) ISFHelper_Release(helper); + if (parent) IShellFolder_Release(parent); + if (desktop) IShellFolder_Release(desktop); + if (folder_view) IFolderView_Release(folder_view); + return hr; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_InvokeCommand(IContextMenu3 *iface, LPCMINVOKECOMMANDINFO info) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + IShellBrowser *browser; + IShellView *view = NULL; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%p)\n", This, info); + + /* New Folder */ + if (info->lpVerb == 0) + { + if ((browser = (IShellBrowser *)SendMessageA(info->hwnd, CWM_GETISHELLBROWSER, 0, 0))) + { + if (FAILED(IShellBrowser_QueryActiveShellView(browser, &view))) + view = NULL; + } + hr = create_folder(This, view); + if (view) IShellView_Release(view); + } + + return hr; +} + +static UINT insert_new_menu_items(NewMenuImpl *This, HMENU menu, UINT pos, UINT cmd_first, UINT cmd_last) +{ + MENUITEMINFOW item; + WCHAR buffer[256]; + + memset(&item, 0, sizeof(item)); + item.cbSize = sizeof(item); + + if (cmd_first > cmd_last) + return cmd_first; + + /* FIXME: on windows it is only 'Folder' not 'New Folder' */ + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, buffer, sizeof(buffer) / sizeof(WCHAR))) + buffer[0] = 0; + + item.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + item.dwTypeData = buffer; + item.cch = strlenW(buffer); + item.wID = cmd_first; + item.hbmpItem = HBMMENU_CALLBACK; + if (InsertMenuItemW(menu, pos, TRUE, &item)) + { + This->folder_cmd = cmd_first++; + pos++; + } + + return cmd_first; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_QueryContextMenu(IContextMenu3 *iface, HMENU menu, UINT index, + UINT cmd_first, UINT cmd_last, UINT flags) +{ + static WCHAR newW[] = {'N','e','w',0}; + NewMenuImpl *This = impl_from_IContextMenu3(iface); + MENUITEMINFOW item; + HMENU submenu; + UINT id; + + TRACE("(%p)->(%p, %u, %u, %u, %u)\n", This, + menu, index, cmd_first, cmd_last, flags ); + + if (!This->pidl) + return E_FAIL; + + submenu = CreateMenu(); + if (!submenu) return E_FAIL; + + id = insert_new_menu_items(This, submenu, 0, cmd_first, cmd_last); + + memset(&item, 0, sizeof(item)); + item.cbSize = sizeof(item); + item.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; + item.fType = MFT_STRING; + item.wID = -1; + item.dwTypeData = newW; /* FIXME: load from resource file */ + item.cch = strlenW(newW); + item.fState = MFS_ENABLED; + item.hSubMenu = submenu; + + if (!InsertMenuItemW(menu, index, TRUE, &item)) + return E_FAIL; + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_HandleMenuMsg2(IContextMenu3 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *result) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + + TRACE("(%p)->(%u, %lx, %lx, %p)\n", This, uMsg, wParam, lParam, result); + + switch (uMsg) + { + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; + if (!mis || mis->CtlType != ODT_MENU) + break; + + if (This->folder_cmd == mis->itemID) + { + mis->itemWidth = GetSystemMetrics(SM_CXSMICON); + mis->itemHeight = GetSystemMetrics(SM_CYSMICON); + } + + if (result) *result = TRUE; + break; + } + + case WM_DRAWITEM: + { + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; + HICON icon = 0; + UINT x, y; + + if (!dis || dis->CtlType != ODT_MENU) + break; + + if (This->folder_cmd == dis->itemID) + icon = This->icon_folder; + + if (!icon) + break; + + x = (dis->rcItem.right - dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2; + y = (dis->rcItem.bottom - dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2; + DrawStateW(dis->hDC, NULL, NULL, (LPARAM)icon, 0, x, y, 0, 0, DST_ICON | DSS_NORMAL); + + if (result) *result = TRUE; + break; + } + } + + return S_OK; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_HandleMenuMsg(IContextMenu3 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return NewMenu_ContextMenu3_HandleMenuMsg2(iface, uMsg, wParam, lParam, NULL); +} + +static const IContextMenu3Vtbl cmvt3 = +{ + NewMenu_ContextMenu3_QueryInterface, + NewMenu_ContextMenu3_AddRef, + NewMenu_ContextMenu3_Release, + NewMenu_ContextMenu3_QueryContextMenu, + NewMenu_ContextMenu3_InvokeCommand, + NewMenu_ContextMenu3_GetCommandString, + NewMenu_ContextMenu3_HandleMenuMsg, + NewMenu_ContextMenu3_HandleMenuMsg2 +}; + +HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + NewMenuImpl *menu; + HRESULT hr; + + TRACE("outer=%p riid=%s\n", outer, debugstr_guid(riid)); + + *obj = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + menu = heap_alloc_zero(sizeof(NewMenuImpl)); + if (!menu) return E_OUTOFMEMORY; + + menu->ref = 1; + menu->IShellExtInit_iface.lpVtbl = &eivt; + menu->IContextMenu3_iface.lpVtbl = &cmvt3; + menu->IObjectWithSite_iface.lpVtbl = &owsvt; + + TRACE("(%p)\n", menu); + + hr = IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, riid, obj); + IShellExtInit_Release(&menu->IShellExtInit_iface); + return hr; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3fe96801aa..649e6460cf 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -89,6 +89,7 @@ static const struct { {&CLSID_Shell, IShellDispatch_Constructor}, {&CLSID_DestinationList, CustomDestinationList_Constructor}, {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, + {&CLSID_NewMenu, NewMenu_Constructor}, {NULL, NULL} }; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d44..dbb24d9356 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,6 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); -todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) { @@ -1491,6 +1490,14 @@ todo_wine ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu2, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu2, hr %#x.\n", hr); + IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); ok(hr == S_OK, "Failed to get IContextMenu3, hr %#x.\n", hr); IUnknown_Release(unk2); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93c35..0a9e8a4028 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -198,6 +198,7 @@ HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,Directory\Background\shellex\ContextMenuHandlers\New,,16 HKCR,DirectShow,,16 HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" -- 2.21.0

1 0

[resend PATCH] dxdiagn: Enumerate DirectSound devices and add some basic properties.
by Vijay Kiran Kamuju 02 May '19

02 May '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 91 +++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 141 +++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index c16396e464..e926d3b2a8 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 46193e90b0..fa17a5978f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -38,6 +38,7 @@ #include "wine/fil_data.h" #include "psapi.h" #include "wbemcli.h" +#include "dsound.h" #include "wine/debug.h" @@ -1365,11 +1366,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return fill_display_information_fallback(node); } +struct enum_context +{ + IDxDiagContainerImpl_Container *cont; + HRESULT hr; + int index; +}; + +static const WCHAR szGUIDFmt[] = +{ + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', + '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', + 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 +}; + +static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, szGUIDFmt, lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], + lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context) +{ + static const WCHAR deviceid_fmtW[] = {'%','u',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + + struct enum_context *enum_ctx = context; + IDxDiagContainerImpl_Container *device; + WCHAR buffer[256]; + const WCHAR *p, *name; + + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { + enum_ctx->hr = E_OUTOFMEMORY; + return FALSE; + } + + add_subcontainer(enum_ctx->cont, device); + + guid_to_string(buffer, guid); + enum_ctx->hr = add_bstr_property(device, szGuidDeviceID, buffer); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDescription, desc); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDriverPath, module); + if (FAILED(enum_ctx->hr)) + return FALSE; + + name = module; + if ((p = strrchrW(name, '\\'))) name = p + 1; + if ((p = strrchrW(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->index++; + return TRUE; +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + struct enum_context enum_ctx; IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); @@ -1378,12 +1453,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + cont = allocate_information_node(DxDiag_SoundCaptureDevices); if (!cont) return E_OUTOFMEMORY; add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + return S_OK; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 936707632a..c80717cd39 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -36,6 +36,11 @@ static IDxDiagContainer *pddc; static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e', + 'D','e','v','i','c','e','s',0}; /* Based on debugstr_variant in dlls/jscript/jsutils.c. */ static const char *debugstr_variant(const VARIANT *var) @@ -1022,6 +1027,140 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SoundDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_DxDiag_SoundCaptureDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundCaptureDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -1036,5 +1175,7 @@ START_TEST(container) test_root_children(); test_DxDiag_SystemInfo(); test_DxDiag_DisplayDevices(); + test_DxDiag_SoundDevices(); + test_DxDiag_SoundCaptureDevices(); CoUninitialize(); } -- 2.21.0

1 0

[PATCH] avifil32: Correctly handle compressed frames when desired format is specified.
by Vijay Kiran Kamuju 02 May '19

02 May '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/avifil32/getframe.c | 102 +++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index be4a2a9abff..2e6156806d3 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -405,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -416,64 +414,64 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } + } - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; - AVIFILE_CloseCompressor(This); + AVIFILE_CloseCompressor(This); - return AVIERR_COMPRESSOR; - } + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = { -- 2.17.0

1 0

[PATCH 01/13] setupapi: Avoid passing a NULL source root path to SetupQueueDefaultCopy() and SetupQueueCopySection().
by Zebediah Figura 01 May '19

01 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/install.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 05dda816ed..8ebea56d9c 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -155,11 +155,20 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg ) { struct files_callback_info *info = arg; + WCHAR src_root[MAX_PATH], *p; + + if (!info->src_root) + { + strcpyW( src_root, PARSER_get_inf_filename( hinf ) ); + if ((p = strrchrW( src_root, '\\' ))) *p = 0; + } if (field[0] == '@') /* special case: copy single file */ - SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, info->src_root, NULL, field+1, info->copy_flags ); + SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, + info->src_root ? info->src_root : src_root, NULL, field+1, info->copy_flags ); else - SetupQueueCopySectionW( info->queue, info->src_root, info->layout ? info->layout : hinf, hinf, field, info->copy_flags ); + SetupQueueCopySectionW( info->queue, info->src_root ? info->src_root : src_root, + info->layout ? info->layout : hinf, hinf, field, info->copy_flags ); return TRUE; } -- 2.21.0

2 24

[PATCH v4 1/3] wrc: Support Asturian
by Alex Henrie 01 May '19

01 May '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnt.rh | 1 + tools/wmc/po.c | 2 ++ tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 4 files changed, 6 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 8a8064a25f..bf10c50c63 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918a69..3f5affd49f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a531f1..a1e07b85b2 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, -- 2.21.0

2 5

[PATCH vkd3d 3/6] vkd3d-shader: Use more appropriate variables for descriptor range count.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Helps Clang Static Analyzer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7336a7a3f4c6..520e20811cfc 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3080,7 +3080,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, } p->u.descriptor_table.descriptor_ranges = ranges; ranges1 = p1->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) { ranges[j].range_type = ranges1[j].range_type; ranges[j].descriptor_count = ranges1[j].descriptor_count; @@ -3199,7 +3199,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, } p1->u.descriptor_table.descriptor_ranges = ranges1; ranges = p->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) { ranges1[j].range_type = ranges[j].range_type; ranges1[j].descriptor_count = ranges[j].descriptor_count; -- 2.21.0

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Use locale-insensitive string comparison.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 23 +++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- tests/vkd3d_shader_api.c | 6 +++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1129f1e3001a..244209243594 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,6 +88,29 @@ static inline unsigned int vkd3d_log2i(unsigned int x) #endif } +static inline int ascii_isupper(int c) +{ + return 'A' <= c && c <= 'Z'; +} + +static inline int ascii_tolower(int c) +{ + return ascii_isupper(c) ? c - 'A' + 'a' : c; +} + +static inline int ascii_strcasecmp(const char *a, const char *b) +{ + int c_a, c_b; + + do + { + c_a = ascii_tolower(*a++); + c_b = ascii_tolower(*b++); + } while (c_a == c_b && c_a != '\0'); + + return c_a - c_b; +} + #ifndef _WIN32 # if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ad927b2538f4..dc51644db1d0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3709,7 +3709,7 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; if (e->stream_index == signature_element->stream_index - && !strcasecmp(e->semantic_name, signature_element->semantic_name) + && !ascii_strcasecmp(e->semantic_name, signature_element->semantic_name) && e->semantic_index == signature_element->semantic_index) { xfb_element = e; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 9848202a0c72..aa486cca609a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -401,7 +401,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( e = signature->elements; for (i = 0; i < signature->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) + if (!ascii_strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_index == semantic_index && e[i].stream_index == stream_index) return &e[i]; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 41067c063312..f9bec7e41a37 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -19,6 +19,8 @@ #include "vkd3d_test.h" #include <vkd3d_shader.h> +#include <locale.h> + static void test_invalid_shaders(void) { struct vkd3d_shader_code spirv; @@ -112,7 +114,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n"); pfn_vkd3d_shader_free_shader_signature(&signature); @@ -128,6 +130,8 @@ static void test_vkd3d_shader_pfns(void) START_TEST(vkd3d_shader_api) { + setlocale(LC_ALL, ""); + run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); } -- 2.21.0

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Improve asserts for write mask component count.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Helps Clang Static Analyzer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 73ba93fe0133..54d070504d60 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -883,13 +883,14 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - assert(write_mask); - return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + unsigned int count = vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + assert(1 <= count && count <= VKD3D_VEC4_SIZE); + return count; } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) { - assert(component_count <= 4); + assert(component_count <= VKD3D_VEC4_SIZE); return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } -- 2.21.0

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Remove dead assignment.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d0304e085eb6..ad927b2538f4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3822,7 +3822,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi write_mask = signature_element->mask & 0xff; - component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) { -- 2.21.0

2 1

[PATCH vkd3d 1/6] vkd3d: Trace returned features.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5364df28bbc9..064557982107 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2129,6 +2129,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * *data = device->feature_options; + TRACE("Double precision shader ops %#x.\n", data->DoublePrecisionFloatShaderOps); + TRACE("Output merger logic op %#x.\n", data->OutputMergerLogicOp); + TRACE("Shader min precision support %#x.\n", data->MinPrecisionSupport); + TRACE("Tiled resources tier %#x.\n", data->TiledResourcesTier); + TRACE("Resource binding tier %#x.\n", data->ResourceBindingTier); + TRACE("PS specified stencil ref %#x.\n", data->PSSpecifiedStencilRefSupported); + TRACE("Typed UAV load and additional formats %#x.\n", data->TypedUAVLoadAdditionalFormats); + TRACE("ROV %#x.\n", data->ROVsSupported); + TRACE("Conservative rasterization tier %#x.\n", data->ConservativeRasterizationTier); + TRACE("Max GPU virtual address bits per resource %u.\n", data->MaxGPUVirtualAddressBitsPerResource); + TRACE("Standard swizzle 64KB %#x.\n", data->StandardSwizzle64KBSupported); + TRACE("Cross-node sharing tier %#x.\n", data->CrossNodeSharingTier); + TRACE("Cross-adapter row-major texture %#x.\n", data->CrossAdapterRowMajorTextureSupported); + TRACE("VP and RT array index from any shader without GS emulation %#x.\n", + data->VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation); + TRACE("Resource heap tier %#x.\n", data->ResourceHeapTier); return S_OK; } @@ -2148,7 +2164,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Assuming device does not support tile based rendering.\n"); + WARN("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; data->UMA = TRUE; @@ -2160,7 +2176,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) data->CacheCoherentUMA = FALSE; } - TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA); return S_OK; } @@ -2185,6 +2203,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } + + TRACE("Max supported feature level %#x.\n", data->MaxSupportedFeatureLevel); return S_OK; } @@ -2258,6 +2278,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * vkd3d_restrict_format_support_for_feature_level(data); + TRACE("Format %#x, support1 %#x, support2 %#x.\n", data->Format, data->Support1, data->Support2); return S_OK; } @@ -2287,6 +2308,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->MaxGPUVirtualAddressBitsPerResource = options->MaxGPUVirtualAddressBitsPerResource; data->MaxGPUVirtualAddressBitsPerProcess = options->MaxGPUVirtualAddressBitsPerResource; + + TRACE("Max GPU virtual address bits per resource %u, Max GPU virtual address bits per process %u.\n", + data->MaxGPUVirtualAddressBitsPerResource, data->MaxGPUVirtualAddressBitsPerProcess); return S_OK; } @@ -2303,6 +2327,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * TRACE("Request shader model %#x.\n", data->HighestShaderModel); data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + + TRACE("Shader model %#x.\n", data->HighestShaderModel); return S_OK; } @@ -2318,6 +2344,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Root signature version 1_1 not supported yet.\n"); data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + + TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; } -- 2.21.0

2 1

[PATCH vkd3d 6/6] vkd3d: Enable Vulkan debug extensions independently of debug log level.
by Józef Kucia 01 May '19

01 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 10 ++++++ libs/vkd3d-common/debug.c | 39 +++++++++++++++++++++++ libs/vkd3d/device.c | 58 +++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 7 +++++ 4 files changed, 97 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 418e2c4539de..7642dec5a15a 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -22,6 +22,7 @@ #include "vkd3d_common.h" #include <stdarg.h> +#include <stdint.h> #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) @@ -90,4 +91,13 @@ static inline const char *debugstr_guid(const GUID *guid) unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +struct vkd3d_debug_option +{ + const char *name; + uint64_t flag; +}; + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 6b9662bbbd19..9a27c22eda5d 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -25,6 +25,7 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> +#include <stdbool.h> #include <string.h> #define VKD3D_DEBUG_BUFFER_COUNT 64 @@ -316,3 +317,41 @@ unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) return default_value; } + +static bool is_option_separator(char c) +{ + return c == ',' || c == ';' || c == '\0'; +} + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) +{ + char prev_char, next_char; + uint64_t flags = 0; + unsigned int i; + const char *p; + + for (i = 0; i < option_count; ++i) + { + const struct vkd3d_debug_option *opt = &options[i]; + + p = string; + while (p) + { + if ((p = strstr(p, opt->name))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(opt->name); + next_char = *p; + + if (is_option_separator(prev_char) && is_option_separator(next_char)) + { + flags |= opt->flag; + break; + } + } + } + } + + return flags; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 064557982107..052d4f6f8fdd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -172,25 +172,19 @@ static bool is_extension_disabled(const char *extension_name) } static bool has_extension(const VkExtensionProperties *extensions, - unsigned int count, const char *extension_name, bool is_debug_only) + unsigned int count, const char *extension_name) { unsigned int i; for (i = 0; i < count; ++i) { - if (strcmp(extensions[i].extensionName, extension_name)) - continue; if (is_extension_disabled(extension_name)) { WARN("Extension %s is disabled.\n", debugstr_a(extension_name)); continue; } - if (is_debug_only && vkd3d_dbg_get_level() < VKD3D_DBG_LEVEL_WARN) - { - TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); - continue; - } - return true; + if (!strcmp(extensions[i].extensionName, extension_name)) + return true; } return false; } @@ -200,14 +194,15 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, const char * const *user_extensions, unsigned int user_extension_count, const char * const *optional_user_extensions, unsigned int optional_user_extension_count, - bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) + bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type, + bool is_debug_enabled) { unsigned int extension_count = 0; unsigned int i; for (i = 0; i < required_extension_count; ++i) { - if (!has_extension(extensions, count, required_extensions[i], false)) + if (!has_extension(extensions, count, required_extensions[i])) ERR("Required %s extension %s is not supported.\n", extension_type, debugstr_a(required_extensions[i])); ++extension_count; @@ -217,10 +212,16 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio { const char *extension_name = optional_extensions[i].extension_name; ptrdiff_t offset = optional_extensions[i].vulkan_info_offset; - bool is_debug_only = optional_extensions[i].is_debug_only; bool *supported = (void *)((uintptr_t)vulkan_info + offset); - if ((*supported = has_extension(extensions, count, extension_name, is_debug_only))) + if (!is_debug_enabled && optional_extensions[i].is_debug_only) + { + *supported = false; + TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); + continue; + } + + if ((*supported = has_extension(extensions, count, extension_name))) { TRACE("Found %s extension.\n", debugstr_a(extension_name)); ++extension_count; @@ -229,7 +230,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio for (i = 0; i < user_extension_count; ++i) { - if (!has_extension(extensions, count, user_extensions[i], false)) + if (!has_extension(extensions, count, user_extensions[i])) ERR("Required user %s extension %s is not supported.\n", extension_type, debugstr_a(user_extensions[i])); ++extension_count; @@ -238,7 +239,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio assert(!optional_user_extension_count || user_extension_supported); for (i = 0; i < optional_user_extension_count; ++i) { - if (has_extension(extensions, count, optional_user_extensions[i], false)) + if (has_extension(extensions, count, optional_user_extensions[i])) { user_extension_supported[i] = true; ++extension_count; @@ -360,7 +361,8 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, create_info->instance_extensions, create_info->instance_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "instance"); + *user_extension_supported, vulkan_info, "instance", + instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); vkd3d_free(vk_extensions); return S_OK; @@ -433,6 +435,25 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) instance->vk_debug_callback = callback; } +static const struct vkd3d_debug_option vkd3d_config_options[] = +{ + {"vk_debug", VKD3D_CONFIG_FLAG_VULKAN_DEBUG}, /* enable Vulkan debug extensions */ +}; + +static uint64_t vkd3d_init_config_flags(void) +{ + uint64_t config_flags; + const char *config; + + config = getenv("VKD3D_CONFIG"); + config_flags = vkd3d_parse_debug_options(config, vkd3d_config_options, ARRAY_SIZE(vkd3d_config_options)); + + if (config_flags) + TRACE("VKD3D_CONFIG='%s'.\n", config); + + return config_flags; +} + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { @@ -470,6 +491,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance->join_thread = create_info->pfn_join_thread; instance->wchar_size = create_info->wchar_size; + instance->config_flags = vkd3d_init_config_flags(); + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); @@ -1250,7 +1273,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "device"); + *user_extension_supported, vulkan_info, "device", + device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); if (depth_clip_features) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be82851a0788..b33318264891 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -113,6 +113,11 @@ struct vkd3d_vulkan_info D3D_FEATURE_LEVEL max_feature_level; }; +enum vkd3d_config_flags +{ + VKD3D_CONFIG_FLAG_VULKAN_DEBUG = 0x00000001, +}; + struct vkd3d_instance { VkInstance vk_instance; @@ -127,6 +132,8 @@ struct vkd3d_instance struct vkd3d_vk_global_procs vk_global_procs; void *libvulkan; + uint64_t config_flags; + VkDebugReportCallbackEXT vk_debug_callback; LONG refcount; -- 2.21.0

3 2

[PATCH 4/4] ntoskrnl.exe: Add work item tests.
by Jacek Caban 01 May '19

01 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 74 ++++++++++++++++++++++++-------- include/ddk/wdm.h | 5 +++ 2 files changed, 60 insertions(+), 19 deletions(-)

2 1

[PATCH 3/4] ntoskrnl.exe: Implement IoQueueWorkItem.
by Jacek Caban 01 May '19

01 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 29 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 10 ++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] ntoskrnl.exe: Implement IoAllocateWorkItem and IoFreeWorkItem.
by Jacek Caban 01 May '19

01 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 +++++++++++++++++++++++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle.
by Jacek Caban 01 May '19

01 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)

1 0

[PATCH v2 1/3] setupapi: Extract individual files from cabinets.
by Zebediah Figura 01 May '19

01 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Let's send the actual v2 patches this time... dlls/setupapi/queue.c | 88 ++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cc17966770..f033ef75da 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -353,8 +353,52 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) return strdupW( systemdir ); } +struct extract_cab_ctx +{ + const WCHAR *src; + const WCHAR *dst; +}; + +static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UINT_PTR param2 ) +{ + struct extract_cab_ctx *ctx = arg; + + switch (message) + { + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + const WCHAR *filename; + + if ((filename = strrchrW( info->NameInCabinet, '\\' ))) + filename++; + else + filename = info->NameInCabinet; + + if (lstrcmpiW( filename, ctx->src )) + return FILEOP_SKIP; -static void (WINAPI *pExtractFiles)( LPSTR, LPSTR, DWORD, DWORD, DWORD, DWORD ); + strcpyW( info->FullTargetName, ctx->dst ); + return FILEOP_DOIT; + } + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *paths = (const FILEPATHS_W *)param1; + return paths->Win32Error; + } + case SPFILENOTIFY_NEEDNEWCABINET: + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + strcpyW( (WCHAR *)param2, info->CabinetPath ); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_CABINETINFO: + return 0; + default: + FIXME("Unexpected message %#x.\n", message); + return 0; + } +} /*********************************************************************** * extract_cabinet_file @@ -365,44 +409,20 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, const WCHAR *src, const WCHAR *dst ) { static const WCHAR extW[] = {'.','c','a','b',0}; - static HMODULE advpack; - - char *cab_path, *cab_file; + static const WCHAR backslashW[] = {'\\',0}; + struct extract_cab_ctx ctx = {src, dst}; int len = strlenW( cabinet ); + WCHAR path[MAX_PATH]; /* make sure the cabinet file has a .cab extension */ if (len <= 4 || strcmpiW( cabinet + len - 4, extW )) return FALSE; - if (!pExtractFiles) - { - if (!advpack && !(advpack = LoadLibraryA( "advpack.dll" ))) - { - ERR( "could not load advpack.dll\n" ); - return FALSE; - } - if (!(pExtractFiles = (void *)GetProcAddress( advpack, "ExtractFiles" ))) - { - ERR( "could not find ExtractFiles in advpack.dll\n" ); - return FALSE; - } - } - if (!(cab_path = strdupWtoA( root ))) return FALSE; - len = WideCharToMultiByte( CP_ACP, 0, cabinet, -1, NULL, 0, NULL, NULL ); - if (!(cab_file = HeapAlloc( GetProcessHeap(), 0, strlen(cab_path) + len + 1 ))) - { - HeapFree( GetProcessHeap(), 0, cab_path ); - return FALSE; - } - strcpy( cab_file, cab_path ); - if (cab_file[0] && cab_file[strlen(cab_file)-1] != '\\') strcat( cab_file, "\\" ); - WideCharToMultiByte( CP_ACP, 0, cabinet, -1, cab_file + strlen(cab_file), len, NULL, NULL ); - FIXME( "awful hack: extracting cabinet %s\n", debugstr_a(cab_file) ); - pExtractFiles( cab_file, cab_path, 0, 0, 0, 0 ); - HeapFree( GetProcessHeap(), 0, cab_file ); - HeapFree( GetProcessHeap(), 0, cab_path ); - return CopyFileW( src, dst, FALSE /*FIXME*/ ); -} + strcpyW(path, root); + strcatW(path, backslashW); + strcatW(path, cabinet); + return SetupIterateCabinetW( path, 0, extract_cab_cb, &ctx ); +} /*********************************************************************** * SetupOpenFileQueue (SETUPAPI.@) @@ -1309,7 +1329,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op->src_tag) { if (extract_cabinet_file( op->src_tag, op->src_root, - paths.Source, paths.Target )) break; + op->src_file, paths.Target )) break; } paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR, -- 2.21.0

1 2

[PATCH 1/3] setupapi: Extract individual files from cabinets.
by Zebediah Figura 01 May '19

01 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/queue.c | 88 ++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cc17966770..f033ef75da 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -353,8 +353,52 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) return strdupW( systemdir ); } +struct extract_cab_ctx +{ + const WCHAR *src; + const WCHAR *dst; +}; + +static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UINT_PTR param2 ) +{ + struct extract_cab_ctx *ctx = arg; + + switch (message) + { + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + const WCHAR *filename; + + if ((filename = strrchrW( info->NameInCabinet, '\\' ))) + filename++; + else + filename = info->NameInCabinet; + + if (lstrcmpiW( filename, ctx->src )) + return FILEOP_SKIP; -static void (WINAPI *pExtractFiles)( LPSTR, LPSTR, DWORD, DWORD, DWORD, DWORD ); + strcpyW( info->FullTargetName, ctx->dst ); + return FILEOP_DOIT; + } + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *paths = (const FILEPATHS_W *)param1; + return paths->Win32Error; + } + case SPFILENOTIFY_NEEDNEWCABINET: + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + strcpyW( (WCHAR *)param2, info->CabinetPath ); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_CABINETINFO: + return 0; + default: + FIXME("Unexpected message %#x.\n", message); + return 0; + } +} /*********************************************************************** * extract_cabinet_file @@ -365,44 +409,20 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, const WCHAR *src, const WCHAR *dst ) { static const WCHAR extW[] = {'.','c','a','b',0}; - static HMODULE advpack; - - char *cab_path, *cab_file; + static const WCHAR backslashW[] = {'\\',0}; + struct extract_cab_ctx ctx = {src, dst}; int len = strlenW( cabinet ); + WCHAR path[MAX_PATH]; /* make sure the cabinet file has a .cab extension */ if (len <= 4 || strcmpiW( cabinet + len - 4, extW )) return FALSE; - if (!pExtractFiles) - { - if (!advpack && !(advpack = LoadLibraryA( "advpack.dll" ))) - { - ERR( "could not load advpack.dll\n" ); - return FALSE; - } - if (!(pExtractFiles = (void *)GetProcAddress( advpack, "ExtractFiles" ))) - { - ERR( "could not find ExtractFiles in advpack.dll\n" ); - return FALSE; - } - } - if (!(cab_path = strdupWtoA( root ))) return FALSE; - len = WideCharToMultiByte( CP_ACP, 0, cabinet, -1, NULL, 0, NULL, NULL ); - if (!(cab_file = HeapAlloc( GetProcessHeap(), 0, strlen(cab_path) + len + 1 ))) - { - HeapFree( GetProcessHeap(), 0, cab_path ); - return FALSE; - } - strcpy( cab_file, cab_path ); - if (cab_file[0] && cab_file[strlen(cab_file)-1] != '\\') strcat( cab_file, "\\" ); - WideCharToMultiByte( CP_ACP, 0, cabinet, -1, cab_file + strlen(cab_file), len, NULL, NULL ); - FIXME( "awful hack: extracting cabinet %s\n", debugstr_a(cab_file) ); - pExtractFiles( cab_file, cab_path, 0, 0, 0, 0 ); - HeapFree( GetProcessHeap(), 0, cab_file ); - HeapFree( GetProcessHeap(), 0, cab_path ); - return CopyFileW( src, dst, FALSE /*FIXME*/ ); -} + strcpyW(path, root); + strcatW(path, backslashW); + strcatW(path, cabinet); + return SetupIterateCabinetW( path, 0, extract_cab_cb, &ctx ); +} /*********************************************************************** * SetupOpenFileQueue (SETUPAPI.@) @@ -1309,7 +1329,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op->src_tag) { if (extract_cabinet_file( op->src_tag, op->src_root, - paths.Source, paths.Target )) break; + op->src_file, paths.Target )) break; } paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR, -- 2.21.0

1 2

[Discuss] DirectShow -> Graphvis and graph debugging
by Damjan Jovanovic 01 May '19

01 May '19

Hi I put together a rough patch for logging DirectShow graphs to .dot files in /tmp, which can be visually examined with Graphviz tools. Eg.: Add log_graph() in strategic places, like calls to AddFilter(), Connect(), Disconnect(). Run the application. $ dot /tmp/graph-0.dot -Tpdf -o /tmp/x.pdf && xdg-open /tmp/x.pdf An example graph is also attached. It's not intended for inclusion in the tree, but rather to experiment further and gather ideas about how to debug DirectShow graphs better. Should we have a debug channel that launches a graph viewer and stops that thread until the viewer exits, that can be used for interactive debugging? Is there a library that could be used instead, with with superior capabilities, eg. to examine media formats on pins? Is there a way to draw graphs in ASCII? Damjan

2 1

[PATCH] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
by Vijay Kiran Kamuju 01 May '19

01 May '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Added more error defines if DWM service is disabled in windows, it returns DWM_E_COMPOSITIONDISABLED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31350 From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee0671225..eb06d155072 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index 79be438e169..32680e097ce 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3091,6 +3091,13 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.0

1 0

[PATCH V2] include: Add dxva.h header file.
by Vijay Kiran Kamuju 01 May '19

01 May '19

From: Michael Müller <michael(a)fds-team.de> V2: add dummy union/struct names From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/Makefile.in | 1 + include/dxva.h | 215 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 include/dxva.h diff --git a/include/Makefile.in b/include/Makefile.in index 4a0f927082c..6c8d39ab76b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -251,6 +251,7 @@ SOURCES = \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ + dxva.h \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ diff --git a/include/dxva.h b/include/dxva.h new file mode 100644 index 00000000000..4791868fb75 --- /dev/null +++ b/include/dxva.h @@ -0,0 +1,215 @@ +/* + * Copyright 2015 Michael Müller for Pipelight + * + * 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 __WINE_DXVA_H +#define __WINE_DXVA_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DXVA_USUAL_BLOCK_WIDTH 8 +#define DXVA_USUAL_BLOCK_HEIGHT 8 +#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT) + +#include <pshpack1.h> + +typedef struct _DXVA_PictureParameters +{ + WORD wDecodedPictureIndex; + WORD wDeblockedPictureIndex; + WORD wForwardRefPictureIndex; + WORD wBackwardRefPictureIndex; + WORD wPicWidthInMBminus1; + WORD wPicHeightInMBminus1; + BYTE bMacroblockWidthMinus1; + BYTE bMacroblockHeightMinus1; + BYTE bBlockWidthMinus1; + BYTE bBlockHeightMinus1; + BYTE bBPPminus1; + BYTE bPicStructure; + BYTE bSecondField; + BYTE bPicIntra; + BYTE bPicBackwardPrediction; + BYTE bBidirectionalAveragingMode; + BYTE bMVprecisionAndChromaRelation; + BYTE bChromaFormat; + BYTE bPicScanFixed; + BYTE bPicScanMethod; + BYTE bPicReadbackRequests; + BYTE bRcontrol; + BYTE bPicSpatialResid8; + BYTE bPicOverflowBlocks; + BYTE bPicExtrapolation; + BYTE bPicDeblocked; + BYTE bPicDeblockConfined; + BYTE bPic4MVallowed; + BYTE bPicOBMC; + BYTE bPicBinPB; + BYTE bMV_RPS; + BYTE bReservedBits; + WORD wBitstreamFcodes; + WORD wBitstreamPCEelements; + BYTE bBitstreamConcealmentNeed; + BYTE bBitstreamConcealmentMethod; +} DXVA_PictureParameters, *LPDXVA_PictureParameters; + +typedef struct _DXVA_SliceInfo +{ + WORD wHorizontalPosition; + WORD wVerticalPosition; + DWORD dwSliceBitsInBuffer; + DWORD dwSliceDataLocation; + BYTE bStartCodeBitOffset; + BYTE bReservedBits; + WORD wMBbitOffset; + WORD wNumberMBsInSlice; + WORD wQuantizerScaleCode; + WORD wBadSliceChopping; +} DXVA_SliceInfo, *LPDXVA_SliceInfo; + +typedef struct _DXVA_QmatrixData +{ + BYTE bNewQmatrix[4]; + WORD Qmatrix[4][DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT]; +} DXVA_QmatrixData, *LPDXVA_QmatrixData; + +typedef struct +{ + union + { + struct + { + UCHAR Index7Bits : 7; + UCHAR AssociatedFlag : 1; + } DUMMYSTRUCTNAME; + UCHAR bPicEntry; + } DUMMYUNIONNAME; +} DXVA_PicEntry_H264; + +typedef struct +{ + USHORT wFrameWidthInMbsMinus1; + USHORT wFrameHeightInMbsMinus1; + DXVA_PicEntry_H264 CurrPic; + UCHAR num_ref_frames; + union + { + struct + { + USHORT field_pic_flag : 1; + USHORT MbaffFrameFlag : 1; + USHORT residual_colour_transform_flag : 1; + USHORT sp_for_switch_flag : 1; + USHORT chroma_format_idc : 2; + USHORT RefPicFlag : 1; + USHORT constrained_intra_pred_flag : 1; + USHORT weighted_pred_flag : 1; + USHORT weighted_bipred_idc : 2; + USHORT MbsConsecutiveFlag : 1; + USHORT frame_mbs_only_flag : 1; + USHORT transform_8x8_mode_flag : 1; + USHORT MinLumaBipredSize8x8Flag : 1; + USHORT IntraPicFlag : 1; + } DUMMYSTRUCTNAME; + USHORT wBitFields; + } DUMMYUNIONNAME; + UCHAR bit_depth_luma_minus8; + UCHAR bit_depth_chroma_minus8; + USHORT Reserved16Bits; + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_H264 RefFrameList[16]; + INT CurrFieldOrderCnt[2]; + INT FieldOrderCntList[16][2]; + CHAR pic_init_qs_minus26; + CHAR chroma_qp_index_offset; + CHAR second_chroma_qp_index_offset; + UCHAR ContinuationFlag; + CHAR pic_init_qp_minus26; + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + UCHAR Reserved8BitsA; + USHORT FrameNumList[16]; + + UINT UsedForReferenceFlags; + USHORT NonExistingFrameFlags; + USHORT frame_num; + UCHAR log2_max_frame_num_minus4; + UCHAR pic_order_cnt_type; + UCHAR log2_max_pic_order_cnt_lsb_minus4; + UCHAR delta_pic_order_always_zero_flag; + UCHAR direct_8x8_inference_flag; + UCHAR entropy_coding_mode_flag; + UCHAR pic_order_present_flag; + UCHAR num_slice_groups_minus1; + UCHAR slice_group_map_type; + UCHAR deblocking_filter_control_present_flag; + UCHAR redundant_pic_cnt_present_flag; + UCHAR Reserved8BitsB; + USHORT slice_group_change_rate_minus1; + UCHAR SliceGroupMap[810]; +} DXVA_PicParams_H264; + +typedef struct +{ + UCHAR bScalingLists4x4[6][16]; + UCHAR bScalingLists8x8[2][64]; +} DXVA_Qmatrix_H264; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; + USHORT first_mb_in_slice; + USHORT NumMbsForSlice; + USHORT BitOffsetToSliceData; + UCHAR slice_type; + UCHAR luma_log2_weight_denom; + UCHAR chroma_log2_weight_denom; + + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + CHAR slice_alpha_c0_offset_div2; + CHAR slice_beta_offset_div2; + UCHAR Reserved8Bits; + DXVA_PicEntry_H264 RefPicList[2][32]; + SHORT Weights[2][32][3][2]; + CHAR slice_qs_delta; + CHAR slice_qp_delta; + UCHAR redundant_pic_cnt; + UCHAR direct_spatial_mv_pred_flag; + UCHAR cabac_init_idc; + UCHAR disable_deblocking_filter_idc; + USHORT slice_id; +} DXVA_Slice_H264_Long; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; +} DXVA_Slice_H264_Short; + +#include <poppack.h> + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DXVA_H */ -- 2.17.0

1 0

[PATCH] include: Add dxva.h header file.
by Vijay Kiran Kamuju 01 May '19

01 May '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/Makefile.in | 1 + include/dxva.h | 215 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 include/dxva.h diff --git a/include/Makefile.in b/include/Makefile.in index 09c84d8254d..e9d7cc44ca8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -251,6 +251,7 @@ SOURCES = \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ + dxva.h \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ diff --git a/include/dxva.h b/include/dxva.h new file mode 100644 index 00000000000..e311488775a --- /dev/null +++ b/include/dxva.h @@ -0,0 +1,215 @@ +/* + * Copyright 2015 Michael Müller for Pipelight + * + * 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 __WINE_DXVA_H +#define __WINE_DXVA_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DXVA_USUAL_BLOCK_WIDTH 8 +#define DXVA_USUAL_BLOCK_HEIGHT 8 +#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT) + +#include <pshpack1.h> + +typedef struct _DXVA_PictureParameters +{ + WORD wDecodedPictureIndex; + WORD wDeblockedPictureIndex; + WORD wForwardRefPictureIndex; + WORD wBackwardRefPictureIndex; + WORD wPicWidthInMBminus1; + WORD wPicHeightInMBminus1; + BYTE bMacroblockWidthMinus1; + BYTE bMacroblockHeightMinus1; + BYTE bBlockWidthMinus1; + BYTE bBlockHeightMinus1; + BYTE bBPPminus1; + BYTE bPicStructure; + BYTE bSecondField; + BYTE bPicIntra; + BYTE bPicBackwardPrediction; + BYTE bBidirectionalAveragingMode; + BYTE bMVprecisionAndChromaRelation; + BYTE bChromaFormat; + BYTE bPicScanFixed; + BYTE bPicScanMethod; + BYTE bPicReadbackRequests; + BYTE bRcontrol; + BYTE bPicSpatialResid8; + BYTE bPicOverflowBlocks; + BYTE bPicExtrapolation; + BYTE bPicDeblocked; + BYTE bPicDeblockConfined; + BYTE bPic4MVallowed; + BYTE bPicOBMC; + BYTE bPicBinPB; + BYTE bMV_RPS; + BYTE bReservedBits; + WORD wBitstreamFcodes; + WORD wBitstreamPCEelements; + BYTE bBitstreamConcealmentNeed; + BYTE bBitstreamConcealmentMethod; +} DXVA_PictureParameters, *LPDXVA_PictureParameters; + +typedef struct _DXVA_SliceInfo +{ + WORD wHorizontalPosition; + WORD wVerticalPosition; + DWORD dwSliceBitsInBuffer; + DWORD dwSliceDataLocation; + BYTE bStartCodeBitOffset; + BYTE bReservedBits; + WORD wMBbitOffset; + WORD wNumberMBsInSlice; + WORD wQuantizerScaleCode; + WORD wBadSliceChopping; +} DXVA_SliceInfo, *LPDXVA_SliceInfo; + +typedef struct _DXVA_QmatrixData +{ + BYTE bNewQmatrix[4]; + WORD Qmatrix[4][DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT]; +} DXVA_QmatrixData, *LPDXVA_QmatrixData; + +typedef struct +{ + union + { + struct + { + UCHAR Index7Bits : 7; + UCHAR AssociatedFlag : 1; + }; + UCHAR bPicEntry; + }; +} DXVA_PicEntry_H264; + +typedef struct +{ + USHORT wFrameWidthInMbsMinus1; + USHORT wFrameHeightInMbsMinus1; + DXVA_PicEntry_H264 CurrPic; + UCHAR num_ref_frames; + union + { + struct + { + USHORT field_pic_flag : 1; + USHORT MbaffFrameFlag : 1; + USHORT residual_colour_transform_flag : 1; + USHORT sp_for_switch_flag : 1; + USHORT chroma_format_idc : 2; + USHORT RefPicFlag : 1; + USHORT constrained_intra_pred_flag : 1; + USHORT weighted_pred_flag : 1; + USHORT weighted_bipred_idc : 2; + USHORT MbsConsecutiveFlag : 1; + USHORT frame_mbs_only_flag : 1; + USHORT transform_8x8_mode_flag : 1; + USHORT MinLumaBipredSize8x8Flag : 1; + USHORT IntraPicFlag : 1; + }; + USHORT wBitFields; + }; + UCHAR bit_depth_luma_minus8; + UCHAR bit_depth_chroma_minus8; + USHORT Reserved16Bits; + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_H264 RefFrameList[16]; + INT CurrFieldOrderCnt[2]; + INT FieldOrderCntList[16][2]; + CHAR pic_init_qs_minus26; + CHAR chroma_qp_index_offset; + CHAR second_chroma_qp_index_offset; + UCHAR ContinuationFlag; + CHAR pic_init_qp_minus26; + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + UCHAR Reserved8BitsA; + USHORT FrameNumList[16]; + + UINT UsedForReferenceFlags; + USHORT NonExistingFrameFlags; + USHORT frame_num; + UCHAR log2_max_frame_num_minus4; + UCHAR pic_order_cnt_type; + UCHAR log2_max_pic_order_cnt_lsb_minus4; + UCHAR delta_pic_order_always_zero_flag; + UCHAR direct_8x8_inference_flag; + UCHAR entropy_coding_mode_flag; + UCHAR pic_order_present_flag; + UCHAR num_slice_groups_minus1; + UCHAR slice_group_map_type; + UCHAR deblocking_filter_control_present_flag; + UCHAR redundant_pic_cnt_present_flag; + UCHAR Reserved8BitsB; + USHORT slice_group_change_rate_minus1; + UCHAR SliceGroupMap[810]; +} DXVA_PicParams_H264; + +typedef struct +{ + UCHAR bScalingLists4x4[6][16]; + UCHAR bScalingLists8x8[2][64]; +} DXVA_Qmatrix_H264; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; + USHORT first_mb_in_slice; + USHORT NumMbsForSlice; + USHORT BitOffsetToSliceData; + UCHAR slice_type; + UCHAR luma_log2_weight_denom; + UCHAR chroma_log2_weight_denom; + + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + CHAR slice_alpha_c0_offset_div2; + CHAR slice_beta_offset_div2; + UCHAR Reserved8Bits; + DXVA_PicEntry_H264 RefPicList[2][32]; + SHORT Weights[2][32][3][2]; + CHAR slice_qs_delta; + CHAR slice_qp_delta; + UCHAR redundant_pic_cnt; + UCHAR direct_spatial_mv_pred_flag; + UCHAR cabac_init_idc; + UCHAR disable_deblocking_filter_idc; + USHORT slice_id; +} DXVA_Slice_H264_Long; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; +} DXVA_Slice_H264_Short; + +#include <poppack.h> + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DXVA_H */ -- 2.17.0

2 1

[PATCH] dbgeng/tests: Fix event handle leak (Coverity).
by Nikolay Sivov 01 May '19

01 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/tests/dbgeng.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 715649b7c3..293ae10f1e 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -477,6 +477,7 @@ static void test_module_information(void) CloseHandle(info.hProcess); CloseHandle(info.hThread); + CloseHandle(event); client->lpVtbl->Release(client); control->lpVtbl->Release(control); -- 2.20.1

1 0

[PATCH 1/3] setupapi: Extract individual files from cabinets.
by Zebediah Figura 01 May '19

01 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/queue.c | 88 ++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cc17966770..f033ef75da 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -353,8 +353,52 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) return strdupW( systemdir ); } +struct extract_cab_ctx +{ + const WCHAR *src; + const WCHAR *dst; +}; + +static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UINT_PTR param2 ) +{ + struct extract_cab_ctx *ctx = arg; + + switch (message) + { + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + const WCHAR *filename; + + if ((filename = strrchrW( info->NameInCabinet, '\\' ))) + filename++; + else + filename = info->NameInCabinet; + + if (lstrcmpiW( filename, ctx->src )) + return FILEOP_SKIP; -static void (WINAPI *pExtractFiles)( LPSTR, LPSTR, DWORD, DWORD, DWORD, DWORD ); + strcpyW( info->FullTargetName, ctx->dst ); + return FILEOP_DOIT; + } + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *paths = (const FILEPATHS_W *)param1; + return paths->Win32Error; + } + case SPFILENOTIFY_NEEDNEWCABINET: + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + strcpyW( (WCHAR *)param2, info->CabinetPath ); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_CABINETINFO: + return 0; + default: + FIXME("Unexpected message %#x.\n", message); + return 0; + } +} /*********************************************************************** * extract_cabinet_file @@ -365,44 +409,20 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, const WCHAR *src, const WCHAR *dst ) { static const WCHAR extW[] = {'.','c','a','b',0}; - static HMODULE advpack; - - char *cab_path, *cab_file; + static const WCHAR backslashW[] = {'\\',0}; + struct extract_cab_ctx ctx = {src, dst}; int len = strlenW( cabinet ); + WCHAR path[MAX_PATH]; /* make sure the cabinet file has a .cab extension */ if (len <= 4 || strcmpiW( cabinet + len - 4, extW )) return FALSE; - if (!pExtractFiles) - { - if (!advpack && !(advpack = LoadLibraryA( "advpack.dll" ))) - { - ERR( "could not load advpack.dll\n" ); - return FALSE; - } - if (!(pExtractFiles = (void *)GetProcAddress( advpack, "ExtractFiles" ))) - { - ERR( "could not find ExtractFiles in advpack.dll\n" ); - return FALSE; - } - } - if (!(cab_path = strdupWtoA( root ))) return FALSE; - len = WideCharToMultiByte( CP_ACP, 0, cabinet, -1, NULL, 0, NULL, NULL ); - if (!(cab_file = HeapAlloc( GetProcessHeap(), 0, strlen(cab_path) + len + 1 ))) - { - HeapFree( GetProcessHeap(), 0, cab_path ); - return FALSE; - } - strcpy( cab_file, cab_path ); - if (cab_file[0] && cab_file[strlen(cab_file)-1] != '\\') strcat( cab_file, "\\" ); - WideCharToMultiByte( CP_ACP, 0, cabinet, -1, cab_file + strlen(cab_file), len, NULL, NULL ); - FIXME( "awful hack: extracting cabinet %s\n", debugstr_a(cab_file) ); - pExtractFiles( cab_file, cab_path, 0, 0, 0, 0 ); - HeapFree( GetProcessHeap(), 0, cab_file ); - HeapFree( GetProcessHeap(), 0, cab_path ); - return CopyFileW( src, dst, FALSE /*FIXME*/ ); -} + strcpyW(path, root); + strcatW(path, backslashW); + strcatW(path, cabinet); + return SetupIterateCabinetW( path, 0, extract_cab_cb, &ctx ); +} /*********************************************************************** * SetupOpenFileQueue (SETUPAPI.@) @@ -1309,7 +1329,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op->src_tag) { if (extract_cabinet_file( op->src_tag, op->src_root, - paths.Source, paths.Target )) break; + op->src_file, paths.Target )) break; } paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR, -- 2.21.0

2 3

[PATCH] riched20: Implement ITextRange::SetRange.
by Vijay Kiran Kamuju 01 May '19

01 May '19

Rewrite the tests From: Jactry Zeng <wine(a)jactry.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/riched20/richole.c | 41 +++++++++++++++++++------------ dlls/riched20/tests/richole.c | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4b47310a8e..871d58a78a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2026,6 +2026,23 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde return E_NOTIMPL; } +static void cp2range(ME_TextEditor *editor, LONG *cp1, LONG *cp2) +{ + int len = ME_GetTextLength(editor) + 1; + *cp1 = max(*cp1, 0); + *cp2 = max(*cp2, 0); + *cp1 = min(*cp1, len); + *cp2 = min(*cp2, len); + if (*cp1 > *cp2) + { + int tmp = *cp1; + *cp1 = *cp2; + *cp2 = tmp; + } + if (*cp1 == len) + *cp1 = *cp2 = len - 1; +} + static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG active) { ITextRangeImpl *This = impl_from_ITextRange(me); @@ -2035,7 +2052,13 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + cp2range(This->child.reole->editor, &anchor, &active); + if (anchor == This->start && active == This->end) + return S_FALSE; + + This->start = anchor; + This->end = active; + return S_OK; } static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret) @@ -4109,26 +4132,12 @@ static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG c ITextRange **ppRange) { IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - const int len = ME_GetTextLength(This->editor) + 1; TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); if (!ppRange) return E_INVALIDARG; - cp1 = max(cp1, 0); - cp2 = max(cp2, 0); - cp1 = min(cp1, len); - cp2 = min(cp2, len); - if (cp1 > cp2) - { - LONG tmp; - tmp = cp1; - cp1 = cp2; - cp2 = tmp; - } - if (cp1 == len) - cp1 = cp2 = len - 1; - + cp2range(This->editor, &cp1, &cp2); return CreateITextRange(This, cp1, cp2, ppRange); } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 40feb76f2b..8fd8ef47f6 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3590,6 +3590,51 @@ static void _check_selection(ITextSelection *selection, LONG expected_start, LON expected_end, value); } +static void test_ITextRange_SetRange(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, 0, 0, &txtRge); + + hres = ITextRange_SetRange(txtRge, 2, 4); + ok(hres == S_OK, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 2, 4); + + hres = ITextRange_SetRange(txtRge, 2, 4); + ok(hres == S_FALSE, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 2, 4); + + hres = ITextRange_SetRange(txtRge, 4, 2); + ok(hres == S_FALSE, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 2, 4); + + hres = ITextRange_SetRange(txtRge, 14, 14); + ok(hres == S_OK, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 12, 12); + + hres = ITextRange_SetRange(txtRge, 15, 15); + ok(hres == S_FALSE, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 12, 12); + + hres = ITextRange_SetRange(txtRge, 14, 1); + ok(hres == S_OK, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 1, 13); + + hres = ITextRange_SetRange(txtRge, -1, 4); + ok(hres == S_OK, "ITextRange_SetRange\n"); + CHECK_RANGE(txtRge, 0, 4); + + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + static void test_Expand(void) { static const char test_text1[] = "TestSomeText"; @@ -3780,6 +3825,7 @@ START_TEST(richole) test_ITextRange_GetChar(); test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); + test_ITextRange_SetRange(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); test_GetClientSite(); -- 2.21.0

1 0

[PATCH v3] qcap/vfwcapture: Implement IPin::CheckMediaType().
by Zebediah Figura 01 May '19

01 May '19

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I've made some stylistic tweaks, and also removed test_property_bag which was only duplicating tests already extant in devenum. dlls/qcap/capture.h | 1 + dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/videocapture.c | 133 +++++++++++++++++++++++++++++++++ dlls/qcap/v4l.c | 40 ++++++++-- dlls/qcap/vfwcapture.c | 6 +- 5 files changed, 173 insertions(+), 10 deletions(-) create mode 100644 dlls/qcap/tests/videocapture.c diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 65ed2dfc27..aed88893e5 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -25,6 +25,7 @@ typedef struct _Capture Capture; Capture *qcap_driver_init(IPin*,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; +HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index 2b988476ad..a5b9d0e474 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -5,4 +5,5 @@ C_SRCS = \ audiorecord.c \ avico.c \ qcap.c \ - smartteefilter.c + smartteefilter.c \ + videocapture.c diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c new file mode 100644 index 0000000000..b80b0f2624 --- /dev/null +++ b/dlls/qcap/tests/videocapture.c @@ -0,0 +1,133 @@ +/* + * WDM video capture filter unit tests + * + * Copyright 2019 Damjan Jovanovic + * + * 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static void test_media_types(IPin *pin) +{ + IEnumMediaTypes *enum_media_types; + AM_MEDIA_TYPE mt, *pmt; + HRESULT hr; + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumMediaTypes_Next(enum_media_types, 1, &pmt, NULL) == S_OK) + { + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt); + } + IEnumMediaTypes_Release(enum_media_types); + + hr = IPin_QueryAccept(pin, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + memset(&mt, 0, sizeof(mt)); + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); +} + +static void test_capture(IBaseFilter *filter) +{ + IEnumPins *enum_pins; + IPin *pin; + HRESULT hr; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while ((hr = IEnumPins_Next(enum_pins, 1, &pin, NULL)) == S_OK) + { + PIN_DIRECTION pin_direction; + IPin_QueryDirection(pin, &pin_direction); + if (pin_direction == PINDIR_OUTPUT) + test_media_types(pin); + IPin_Release(pin); + } + + IEnumPins_Release(enum_pins); +} + +START_TEST(videocapture) +{ + ICreateDevEnum *dev_enum; + IEnumMoniker *class_enum; + IBaseFilter *filter; + IMoniker *moniker; + WCHAR *name; + HRESULT hr; + ULONG ref; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + &IID_ICreateDevEnum, (void **)&dev_enum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ICreateDevEnum_CreateClassEnumerator(dev_enum, &CLSID_VideoInputDeviceCategory, &class_enum, 0); + if (hr == S_FALSE) + { + skip("No video capture devices present.\n"); + ICreateDevEnum_Release(dev_enum); + CoUninitialize(); + return; + } + ok(hr == S_OK, "Got hr=%#x.\n", hr); + + while (IEnumMoniker_Next(class_enum, 1, &moniker, NULL) == S_OK) + { + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &name); + ok(hr == S_OK, "Got hr %#x.\n", hr); + trace("Testing device %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); + + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); + if (hr == S_OK) + { + test_capture(filter); + IBaseFilter_Release(filter); + } + else + skip("Failed to open capture device, hr=%#x.\n", hr); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMoniker_Release(moniker); + } + + ICreateDevEnum_Release(dev_enum); + IEnumMoniker_Release(class_enum); + CoUninitialize(); +} diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index f0875f7636..6fe394af0a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,20 +131,48 @@ HRESULT qcap_driver_destroy(Capture *capBox) return S_OK; } +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) +{ + HRESULT hr; + TRACE("device %p, mt %p.\n", device, mt); + dump_AM_MEDIA_TYPE(mt); + + if (!mt) + return E_POINTER; + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) + return S_FALSE; + + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) && mt->pbFormat + && mt->cbFormat >= sizeof(VIDEOINFOHEADER)) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; + if (vih->bmiHeader.biBitCount == 24 && vih->bmiHeader.biCompression == BI_RGB) + hr = S_OK; + else + { + FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, + vih->bmiHeader.biBitCount); + hr = S_FALSE; + } + } + else + hr = VFW_E_INVALIDMEDIATYPE; + + return hr; +} + HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) { struct v4l2_format format = {0}; int newheight, newwidth; VIDEOINFOHEADER *vih; int fd = device->fd; + HRESULT hr; + if (FAILED(hr = qcap_driver_check_format(device, mt))) + return hr; vih = (VIDEOINFOHEADER *)mt->pbFormat; - if (vih->bmiHeader.biBitCount != 24 || vih->bmiHeader.biCompression != BI_RGB) - { - FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, - vih->bmiHeader.biBitCount); - return VFW_E_INVALIDMEDIATYPE; - } newwidth = vih->bmiHeader.biWidth; newheight = vih->bmiHeader.biHeight; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6297a80e61..8cf25c19b2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -658,10 +658,10 @@ static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); } -static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *amt) +static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *mt) { - FIXME("(%p) stub\n", pin); - return E_NOTIMPL; + VfwPinImpl *filter = impl_from_BasePin(pin); + return qcap_driver_check_format(filter->parent->driver_info, mt); } static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt) -- 2.21.0

1 0

Tahoma bold font issue
by Alistair Leslie-Hughes 30 Apr '19

30 Apr '19

I'm having an issue with the Tahoma bold font which happens to be issue https://bugs.winehq.org/show_bug.cgi?id=26037 Using tahomabd.sfd/ttf from the reactos project makes the font bold once again. I don't have enough knowledge in this area to validate that it's not going to break something else or that wine has newer changes than the one in reactos. How could we get this into wine? Any advise on how to get the Tahoma font updated would be great. Regards Alistair.

1 0

[PATCH 4/4] ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest.
by Jacek Caban 30 Apr '19

30 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/4] ntoskrnl.exe: Implement ObOpenObjectByPointer.
by Jacek Caban 30 Apr '19

30 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 34 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 19 ++++++++++++++-- include/ddk/ntifs.h | 1 + 4 files changed, 53 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest.
by Jacek Caban 30 Apr '19

30 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel object.
by Jacek Caban 30 Apr '19

30 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++----------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 - dlls/ntoskrnl.exe/sync.c | 7 ++++--- 3 files changed, 10 insertions(+), 21 deletions(-)

1 0

Issues with new fake DLLs
by Derek Lesho 30 Apr '19

30 Apr '19

Hello, while working with EAC, I tracked down an error to EAC requiring the ntdll.dll it has read from system32 being over 4095 bytes in size. For some reason, it seems that the fake dlls have recently dropped in size, and consist of only a header. EAC also reads the export table later on and checks for mov instructions that are present in the old fake DLLs.

4 5

[PATCH 5/5] dxgi: Avoid magic constants.
by Józef Kucia 30 Apr '19

30 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d96cb1e5b237..859c24a105ed 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -149,8 +149,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_DESC3 *desc) { + char description[ARRAY_SIZE(desc->Description)]; struct wined3d_adapter_identifier adapter_id; - char description[128]; HRESULT hr; adapter_id.driver_size = 0; @@ -161,7 +161,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; - if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, ARRAY_SIZE(description))) { DWORD err = GetLastError(); ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); -- 2.21.0

2 1

[PATCH 4/5] wined3d: Assign *device in adapter_vk_create_device().
by Józef Kucia 30 Apr '19

30 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2047e7178e02..cb4dbab568b1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -268,6 +268,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + *device = &device_vk->d; + return WINED3D_OK; fail: -- 2.21.0

2 1

[PATCH 3/5] wined3d: Make wined3d_gpu_description from Vulkan physical device properties.
by Józef Kucia 30 Apr '19

30 Apr '19

This fallback for cards that are not present in wined3d database should be quite accurate. Almost all information required to fill wined3d_gpu_description can be retrieved from Vulkan. The GPU description string is expected to be slightly different from Windows. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 42 ++++++++++++++++++++++------------ dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3709c940c984..2047e7178e02 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -618,34 +618,53 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in return physical_devices[0]; } -const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysicalDeviceProperties *properties) +static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor vendor) { - const struct wined3d_gpu_description *description; + switch (vendor) + { + case HW_VENDOR_AMD: return DRIVER_AMD_RX; + case HW_VENDOR_INTEL: return DRIVER_INTEL_HD4000; + case HW_VENDOR_NVIDIA: return DRIVER_NVIDIA_GEFORCE8; + default: return DRIVER_WINE; + } +} + +static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, + const VkPhysicalDeviceProperties *properties) +{ + const struct wined3d_gpu_description *gpu_description; + struct wined3d_gpu_description description; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - if (!(description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) - description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) + gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - if (!description) + /* FIXME: Get vidmem from Vulkan. */ + if (!gpu_description) { FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); - description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + description.vendor = properties->vendorID; + description.device = properties->deviceID; + description.description = properties->deviceName; + description.driver = guess_display_driver(properties->vendorID); + description.vidmem = 0; + + gpu_description = &description; } - return description; + wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -676,12 +695,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) - { - ERR("Failed to get GPU description.\n"); - goto fail_vulkan; - } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + adapter_vk_init_driver_info(adapter, &properties2.properties); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 30acebd78d25..b8c151dc971d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -615,7 +615,7 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vendor = gpu_desc->vendor; driver_info->device = gpu_desc->device; - driver_info->description = gpu_desc->description; + wined3d_copy_name(driver_info->description, gpu_desc->description, ARRAY_SIZE(driver_info->description)); driver_info->vram_bytes = vram_bytes ? vram_bytes : (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e0aef5ba816..00e1de67c906 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2675,12 +2675,15 @@ const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description( enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; +/* 512 in Direct3D 8/9, 128 in DXGI. */ +#define WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH 512 + struct wined3d_driver_info { enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; const char *name; - const char *description; + char description[WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH]; UINT64 vram_bytes; UINT64 sysmem_bytes; DWORD version_high; -- 2.21.0

2 1

[PATCH 2/5] wined3d: Factor out wined3d_copy_name().
by Józef Kucia 30 Apr '19

30 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1c0b8879763..30acebd78d25 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -528,6 +528,18 @@ const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description( return gpu_desc; } +static void wined3d_copy_name(char *dst, const char *src, unsigned int dst_size) +{ + size_t len; + + if (dst_size) + { + len = min(strlen(src), dst_size - 1); + memcpy(dst, src, len); + memset(&dst[len], 0, dst_size - len); + } +} + void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { @@ -1198,7 +1210,6 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { const struct wined3d_adapter *adapter; - size_t len; TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", wined3d, adapter_idx, flags, identifier); @@ -1210,21 +1221,8 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, adapter = wined3d->adapters[adapter_idx]; - if (identifier->driver_size) - { - const char *name = adapter->driver_info.name; - len = min(strlen(name), identifier->driver_size - 1); - memcpy(identifier->driver, name, len); - memset(&identifier->driver[len], 0, identifier->driver_size - len); - } - - if (identifier->description_size) - { - const char *description = adapter->driver_info.description; - len = min(strlen(description), identifier->description_size - 1); - memcpy(identifier->description, description, len); - memset(&identifier->description[len], 0, identifier->description_size - len); - } + wined3d_copy_name(identifier->driver, adapter->driver_info.name, identifier->driver_size); + wined3d_copy_name(identifier->description, adapter->driver_info.description, identifier->description_size); /* Note that d3d8 doesn't supply a device name. */ if (identifier->device_name_size) -- 2.21.0

2 1

[PATCH 1/5] wined3d: Implement GPU description registry override for Vulkan adapter.
by Józef Kucia 30 Apr '19

30 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 25 ++++++------------------- dlls/wined3d/adapter_vk.c | 15 ++++++++++----- dlls/wined3d/directx.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0f554e7cf2e4..cedd012c89d1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -991,41 +991,28 @@ static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) static const struct wined3d_gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, UINT64 *vram_bytes) { - const struct wined3d_gpu_description *gpu_description; + const struct wined3d_gpu_description *gpu_description = NULL, *gpu_description_override; enum wined3d_pci_vendor vendor = PCI_VENDOR_NONE; enum wined3d_pci_device device = PCI_DEVICE_NONE; - static unsigned int once; + GLuint value; if (gl_info->supported[WGL_WINE_QUERY_RENDERER]) { - GLuint value; - if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VENDOR_ID_WINE, &value))) vendor = value; if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_DEVICE_ID_WINE, &value))) device = value; if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VIDEO_MEMORY_WINE, &value))) *vram_bytes = (UINT64)value * 1024 * 1024; + TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n", vendor, device, wine_dbgstr_longlong(*vram_bytes)); - } - if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) - { - vendor = wined3d_settings.pci_vendor_id; - TRACE("Overriding vendor PCI ID with 0x%04x.\n", vendor); - } - - if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - device = wined3d_settings.pci_device_id; - TRACE("Overriding device PCI ID with 0x%04x.\n", device); + gpu_description = wined3d_get_gpu_description(vendor, device); } - if (!(gpu_description = wined3d_get_gpu_description(vendor, device)) - && (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE - || wined3d_settings.pci_device_id != PCI_DEVICE_NONE) && !once++) - ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); + if ((gpu_description_override = wined3d_get_user_override_gpu_description(vendor, device))) + gpu_description = gpu_description_override; return gpu_description; } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 464f7914098e..3709c940c984 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -627,13 +627,18 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) - return description; + if (!(description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) + description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", - debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); + if (!description) + { + FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", + debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); + + description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + } - return wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + return description; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cacd9ac1849f..a1c0b8879763 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -28,6 +28,7 @@ #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define DEFAULT_REFRESH_RATE 0 @@ -501,6 +502,32 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p return NULL; } +const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) +{ + const struct wined3d_gpu_description *gpu_desc; + static unsigned int once; + + if (wined3d_settings.pci_vendor_id == PCI_VENDOR_NONE && wined3d_settings.pci_device_id == PCI_DEVICE_NONE) + return NULL; + + if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + { + vendor = wined3d_settings.pci_vendor_id; + TRACE("Overriding vendor PCI ID with 0x%04x.\n", vendor); + } + if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) + { + device = wined3d_settings.pci_device_id; + TRACE("Overriding device PCI ID with 0x%04x.\n", device); + } + + if (!(gpu_desc = wined3d_get_gpu_description(vendor, device)) && !once++) + ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); + + return gpu_desc; +} + void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf46f808e25f..8e0aef5ba816 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2670,6 +2670,8 @@ struct wined3d_gpu_description const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) DECLSPEC_HIDDEN; +const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) DECLSPEC_HIDDEN; enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; -- 2.21.0

2 1

[PATCH 1/2] mfplat: Add more attribute guids.
by Nikolay Sivov 30 Apr '19

30 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 13 +++++++++++++ include/mfidl.idl | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index abb269c26f..05ee1070af 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -564,6 +564,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_WRAPPED_TYPE), X(MF_MT_AVG_BITRATE), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS), X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), @@ -581,16 +582,21 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), X(MF_MT_AUDIO_FLOAT_SAMPLES_PER_SECOND), X(MFSampleExtension_ForwardedDecodeUnits), X(MF_EVENT_SOURCE_TOPOLOGY_CANCELED), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID), + X(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME), X(MF_MT_VIDEO_ROTATION), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MT_USER_DATA), X(MF_EVENT_STREAM_METADATA_SYSTEMID), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), X(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MFSampleExtension_3DVideo_SampleFormat), @@ -619,6 +625,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_IFO_FILE_URI), X(MF_EVENT_TOPOLOGY_STATUS), X(MF_BYTESTREAM_DLNA_PROFILE_ID), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE), X(MF_MT_MAJOR_TYPE), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), @@ -644,10 +651,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_SCRUBSAMPLE_TIME), X(MF_MT_INTERLACE_MODE), X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), + X(MF_DEVSOURCE_ATTRIBUTE_MEDIA_TYPE), X(MF_EVENT_MFT_INPUT_STREAM_ID), X(MF_READWRITE_MMCSS_PRIORITY), X(MF_MT_VIDEO_3D), @@ -659,6 +668,7 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_DecodeTimestamp), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_SINK_WRITER_DISABLE_THROTTLING), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), @@ -676,6 +686,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_DISABLE_DXVA), X(MF_MT_FORWARD_CUSTOM_NALU), X(MF_MT_SECURE), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), #undef X }; @@ -706,6 +717,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_RGB32), X(MFVideoFormat_RGB565), X(MFVideoFormat_RGB555), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), X(MFVideoFormat_A2R10G10B10), X(MFMediaType_Script), X(MFMediaType_Image), @@ -789,6 +801,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_v410), X(MFMediaType_Video), X(MFAudioFormat_AAC_HDCP), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID), X(MFAudioFormat_Dolby_AC3_HDCP), X(MFMediaType_Subtitle), X(MFMediaType_Stream), diff --git a/include/mfidl.idl b/include/mfidl.idl index ac59e0cb69..2bdb33938a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -648,3 +648,18 @@ cpp_quote("EXTERN_GUID(MF_PD_PLAYBACK_BOUNDARY_TIME, 0x6c990d3b, 0xbb8e, 0x477a cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ISVARIABLEBITRATE, 0x33026ee0, 0xe387, 0x4582, 0xae, 0x0a, 0x34, 0xa2, 0xad, 0x3b, 0xaa, 0x18);") cpp_quote("DEFINE_GUID(MF_PD_ADAPTIVE_STREAMING, 0xea0d5d97, 0x29f9, 0x488b, 0xae, 0x6b, 0x7d, 0x6b, 0x41, 0x36, 0x11, 0x2b);") cpp_quote("EXTERN_GUID(MF_PD_SAMI_STYLELIST, 0xe0b73c7f, 0x486d, 0x484e, 0x98, 0x72, 0x4d, 0xe5, 0x19, 0x2a, 0x7b, 0xf8);") + +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, 0xc60ac5fe, 0x252a, 0x478f, 0xa0, 0xef, 0xbc, 0x8f, 0xa5, 0xf7, 0xca, 0xd3);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_MEDIA_TYPE, 0x56a819ca, 0x0c78, 0x4de4, 0xa0, 0xa7, 0x3d, 0xda, 0xba, 0x0f, 0x24, 0xd4);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, 0x60d0e559, 0x52f8, 0x4fa2, 0xbb, 0xce, 0xac, 0xdb, 0x34, 0xa8, 0xec, 0x01);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK, 0x98d24b5e, 0x5930, 0x4614, 0xb5, 0xa1, 0xf6, 0x00, 0xf9, 0x35, 0x5a, 0x78);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID, 0x30da9258, 0xfeb9, 0x47a7, 0xa4, 0x53, 0x76, 0x3a, 0x7a, 0x8e, 0x1c, 0x5f);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE, 0xbc9d118e, 0x8c67, 0x4a18, 0x85, 0xd4, 0x12, 0xd3, 0x00, 0x40, 0x05, 0x52);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY, 0x77f0ae69, 0xc3bd, 0x4509, 0x94, 0x1d, 0x46, 0x7e, 0x4d, 0x24, 0x89, 0x9e);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE, 0xde7046ba, 0x54d6, 0x4487, 0xa2, 0xa4, 0xec, 0x7c, 0x0d, 0x1b, 0xd1, 0x63);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID, 0x36689d42, 0xa06c, 0x40ae, 0x84, 0xcf, 0xf5, 0xa0, 0x34, 0x06, 0x7c, 0xc4);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, 0x58f0aad8, 0x22bf, 0x4f8a, 0xbb, 0x3d, 0xd2, 0xc4, 0x97, 0x8c, 0x6e, 0x2f);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS, 0x7dd9b730, 0x4f2d, 0x41d5, 0x8f, 0x95, 0x0c, 0xc9, 0xa9, 0x12, 0xba, 0x26);") + +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID, 0x14dd9a1c, 0x7cff, 0x41be, 0xb1, 0xb9, 0xba, 0x1a, 0xc6, 0xec, 0xb5, 0x71);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID, 0x8ac3587a, 0x4ae7, 0x42d8, 0x99, 0xe0, 0x0a, 0x60, 0x13, 0xee, 0xf9, 0x0f);") -- 2.20.1

2 3

[PATCH] mfplat: Copy attributes when cloning presentation descriptor.
by Nikolay Sivov 30 Apr '19

30 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 3 ++- dlls/mfplat/tests/mfplat.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index aaf0714bdd..e522e90f01 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1616,7 +1616,8 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i object->descriptors[i] = presentation_desc->descriptors[i]; IMFStreamDescriptor_AddRef(object->descriptors[i].descriptor); } - /* FIXME: copy attributes */ + + attributes_CopyAllItems(&presentation_desc->attributes, (IMFAttributes *)&object->IMFPresentationDescriptor_iface); LeaveCriticalSection(&presentation_desc->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541b236731..b349c51af3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2289,6 +2289,7 @@ static void test_presentation_descriptor(void) IMFMediaType *media_type; unsigned int i; BOOL selected; + UINT64 value; DWORD count; HRESULT hr; @@ -2330,14 +2331,24 @@ static void test_presentation_descriptor(void) ok(!!selected, "Unexpected selected state.\n"); IMFStreamDescriptor_Release(stream_desc2); + hr = IMFPresentationDescriptor_SetUINT64(pd, &MF_PD_TOTAL_FILE_SIZE, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFPresentationDescriptor_Clone(pd, &pd2); ok(hr == S_OK, "Failed to clone, hr %#x.\n", hr); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd2, 0, &selected, &stream_desc2); ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); ok(!!selected, "Unexpected selected state.\n"); + ok(stream_desc2 == stream_desc[0], "Unexpected stream descriptor.\n"); IMFStreamDescriptor_Release(stream_desc2); + value = 0; + hr = IMFPresentationDescriptor_GetUINT64(pd2, &MF_PD_TOTAL_FILE_SIZE, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == 1, "Unexpected attribute value.\n"); + + IMFPresentationDescriptor_Release(pd2); IMFPresentationDescriptor_Release(pd); for (i = 0; i < ARRAY_SIZE(stream_desc); ++i) -- 2.20.1

2 1

[v2 PATCH] ntdll: Initialize critical section debug info with correct pointer value.
by Nikolay Sivov 30 Apr '19

30 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed todo_wine from ntdll tests. dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++---------------- dlls/ntdll/tests/rtl.c | 1 - 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d7004c..9f5b614508 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 188689a9f4..97566f1d84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2648,6 +2648,7 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); if (!pInitializeCriticalSectionEx) { @@ -2658,9 +2659,20 @@ static void test_crit_section(void) memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c8f6..e8ffc1ceed 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 5fe72ec38b..62662cb438 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3152,7 +3152,6 @@ static void test_RtlInitializeCriticalSectionEx(void) memset(&cs, 0x11, sizeof(cs)); pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); - todo_wine ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); -- 2.20.1

2 1

[PATCH] mfreadwrite: Wake waiting threads on stream states changes.
by Nikolay Sivov 30 Apr '19

30 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index aeb86db3e3..5ec5c9171d 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -418,6 +418,9 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re } LeaveCriticalSection(&reader->streams[i].cs); + + WakeAllConditionVariable(&reader->streams[i].sample_event); + break; } } -- 2.20.1

1 0

[PATCH] ntdll: Initialize critical section debug info with correct pointer value.
by Nikolay Sivov 30 Apr '19

30 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39614 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d7004c..9f5b614508 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 188689a9f4..97566f1d84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2648,6 +2648,7 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); if (!pInitializeCriticalSectionEx) { @@ -2658,9 +2659,20 @@ static void test_crit_section(void) memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c8f6..e8ffc1ceed 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); -- 2.20.1

2 1

[PATCH] crypt32: CryptMsgUpdate should skip broken certificates.
by Dmitry Timoshkov 30 Apr '19

30 Apr '19

CertOpenStore() already verifies the certificate before adding it to the memory store from the file, this patch makes CryptMsgUpdate() behave in a similar way. This patch fixes signature verification reported in the bug 45757. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ce068f3c47..aa697e3bfa 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -683,6 +683,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, &itemDecoded); if (ret) { + /* Ignore an item that failed to decode but the decoder doesn't want to fail the whole process */ + if (!size) + { + ptr += itemEncoded; + continue; + } + cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -5628,6 +5635,25 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + PCCERT_CONTEXT cert; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded); + if (!cert) + { + WARN("CertCreateCertificateContext error %#x\n", GetLastError()); + *pcbStructInfo = 0; + *pcbDecoded = 0; + return TRUE; + } + + CertFreeCertificateContext(cert); + + return CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); +} + static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5637,7 +5663,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, offsetof(CRYPT_SIGNED_INFO, cCertEncoded), offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), - CRYPT_AsnDecodeCopyBytes, + verify_and_copy_certificate, sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, -- 2.20.1

1 0

[PATCH] ntdll: Account for null terminating char in unload traces (Coverity).
by Nikolay Sivov 30 Apr '19

30 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 994ff6f215..034b98cfee 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -177,7 +177,7 @@ static unsigned int unload_trace_seq; static void module_push_unload_trace( const LDR_MODULE *ldr ) { RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; - unsigned int len = min(sizeof(ptr->ImageName), ldr->BaseDllName.Length); + unsigned int len = min(sizeof(ptr->ImageName) - sizeof(WCHAR), ldr->BaseDllName.Length); ptr->BaseAddress = ldr->BaseAddress; ptr->SizeOfImage = ldr->SizeOfImage; -- 2.20.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel