- wine-devel - winehq.org

[PATCH 1/2] ntdll/directory: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 22 May '19

22 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patch just adds support for the case-insensitive attribute on ext4 with newer kernels -- so it should be safe for upstream (barring stylistic and other changes). It has some conditional processing for perf reasons. Checking for the EXT4_CASEFOLD_FL attribute involves an ioctl, which operates on file descriptors, while all the former checks operated directly on the dir name (e.g. statfs). Obviously, it's best to avoid looking up the directory multiple times (also for correctness, so it refers to the same dir). So in the case that we *do* use a file descriptor, then use it (e.g. fstatfs) everywhere. However, to avoid a perf regression or downgrade on systems that don't support the EXT2_IOC_GETFLAGS ioctl (e.g. MacOS, FreeBSD), we continue using statfs and the like directly, this shaves off two syscalls (open/close). But in the case the EXT4_CASEFOLD_FL is not supported on Linux (i.e. on current kernels) or the directory doesn't have it (think of dirs outside drive_c), this will unfortunately involve a bit more syscalls now, because it has to open() and close() the fd. I'd really like if the fstatfs and fstatat can stay if we do use the fd, to somehow make it less impactful on current systems, so they won't have to lookup the directory again. So that's basically why the GET_DIR_CASE_SENSITIVITY_USE_FD constant is there. One last thing: as it is now, on Linux, we always set the EXT4_CASEFOLD_FL flag ourselves since it does no harm even if it's not supported. Thus, I can of course remove the .ciopfs old code and keep just the fstatat() call by assuming we always use fd on Linux, if you prefer it that way. I didn't remove it because I didn't want to "hardcode" this assumption, so I'm waiting for feedback. dlls/ntdll/directory.c | 66 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..315e0b4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -977,6 +985,25 @@ static char *get_device_mount_point( dev_t dev ) } +/*********************************************************************** + * get_dir_case_sensitivity_ioctl + * + * Checks if the specified directory is case sensitive or not. Uses ioctl(2). + */ +static int get_dir_case_sensitivity_ioctl(int fd) +{ +#define GET_DIR_CASE_SENSITIVITY_USE_FD 1 +#if defined(EXT2_IOC_GETFLAGS) && defined(EXT4_CASEFOLD_FL) + int flags; + if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) != -1 && (flags & EXT4_CASEFOLD_FL)) + return FALSE; +#else +#undef GET_DIR_CASE_SENSITIVITY_USE_FD +#define GET_DIR_CASE_SENSITIVITY_USE_FD 0 +#endif + return -1; +} + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) @@ -1115,12 +1142,16 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * Checks if the volume containing the specified directory is case * sensitive or not. Uses statfs(2) or statvfs(2). */ -static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) +static BOOLEAN get_dir_case_sensitivity_stat( const char *dir, int fd ) { #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatfs( fd, &stfs ) == -1) return FALSE; +#else if (statfs( dir, &stfs ) == -1) return FALSE; +#endif /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1157,7 +1188,11 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatvfs( fd, &stfs ) == -1) return FALSE; +#else if (statvfs( dir, &stfs ) == -1) return FALSE; +#endif /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -1170,7 +1205,11 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatfs( fd, &stfs ) == -1) return FALSE; +#else if (statfs( dir, &stfs ) == -1) return FALSE; +#endif if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -1180,6 +1219,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * This will break if somebody puts a file named ".ciopfs" in a non- * CIOPFS directory. */ + if (GET_DIR_CASE_SENSITIVITY_USE_FD) + { + if (fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT )) + return FALSE; + return TRUE; + } + cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); if (!cifile) return TRUE; strcpy( cifile, dir ); @@ -1205,12 +1251,26 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { + int case_sensitive, fd = -1; + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) - int case_sensitive = get_dir_case_sensitivity_attr( dir ); + case_sensitive = get_dir_case_sensitivity_attr( dir ); if (case_sensitive != -1) return case_sensitive; #endif - return get_dir_case_sensitivity_stat( dir ); + + if (GET_DIR_CASE_SENSITIVITY_USE_FD) + { + if ((fd = open(dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE)) == -1) + return TRUE; + if ((case_sensitive = get_dir_case_sensitivity_ioctl(fd)) != -1) + goto end; + } + case_sensitive = get_dir_case_sensitivity_stat(dir, fd); + +end: + if (GET_DIR_CASE_SENSITIVITY_USE_FD) close(fd); + return case_sensitive; } -- 2.21.0

1 1

[PATCH] xaudio2: Use new features from FAudio 19.06 (but keep compatibility for <=19.05)
by elee＠codeweavers.com 22 May '19

22 May '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/x3daudio.c | 5 +++++ dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index ee3367e092..51e8029fcd 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -25,6 +25,7 @@ #include "wine/debug.h" +#include <FAudio.h> /* For version information */ #include <F3DAudio.h> #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER @@ -51,8 +52,12 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); +#if FAUDIO_COMPILED_VERSION >= 190600 + return F3DAudioInitialize8(chanmask, speedofsound, handle); +#else F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; +#endif } #endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da21cc0353..371666991c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1796,9 +1796,13 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x)\n", This, operationSet); +#if FAUDIO_COMPILED_VERSION >= 190600 + return FAudio_CommitOperationSet(This->faudio, operationSet); +#else return FAudio_CommitChanges(This->faudio); +#endif } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, -- 2.21.0

2 1

[PATCH 2/2] urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it.
by Dmitry Timoshkov 22 May '19

22 May '19

This patch fixes regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325, and reported in the bug 47190. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/bindprot.c | 17 +++++++++++++---- dlls/urlmon/tests/url.c | 3 --- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 42d3d21925..4334d2336b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -509,13 +509,22 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, &IID_IUnknown, (void**)&protocol_unk); + if(SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + else if (hres == CLASS_E_NOAGGREGATION) + { + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + if(SUCCEEDED(hres)) + { + protocol_unk = (IUnknown*)protocol; + IUnknown_AddRef(protocol_unk); + } + } IClassFactory_Release(cf); - if(FAILED(hres)) - return hres; - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); if(FAILED(hres)) { - IUnknown_Release(protocol_unk); + if (protocol_unk) + IUnknown_Release(protocol_unk); return hres; } } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 84dedc07f4..5f3199ba37 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3109,11 +3109,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); else if(no_callback) { if(emulate_protocol) - todo_wine_if(no_aggregation) ok( WaitForSingleObject(complete_event2, 3000) == WAIT_OBJECT_0, "wait timed out\n" ); - todo_wine_if(no_aggregation) ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); - todo_wine_if(no_aggregation) ok(unk != NULL, "unk == NULL\n"); }else if(!(bindf & BINDF_ASYNCHRONOUS) && tymed == TYMED_FILE) { ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); -- 2.20.1

3 8

[PATCH 1/2] urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Jacek Caban 22 May '19

22 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 156 ++++++++++++++++++++++++++++------- 1 file changed, 128 insertions(+), 28 deletions(-)

2 1

[PATCH 2/2] urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it.
by Jacek Caban 22 May '19

22 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> This patch fixes regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47190 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 23 +++++++++++++++-------- dlls/urlmon/tests/protocol.c | 3 --- 2 files changed, 15 insertions(+), 11 deletions(-)

1 0

Handling of the x18 register in Wine on AArch64
by Martin Storsjö 22 May '19

22 May '19

Hi, I'm sending this discussion to both wine-devel and llvm-dev, to try to keep the discussion open for both sides, to try to find a workable compromise. This was preliminarily discussed on llvm-dev already a few weeks ago. One of the major unresolved issues with Wine for AArch64 is how to handle the platform specific register x18. (https://bugs.winehq.org/show_bug.cgi?id=38780) As Windows on AArch64 is commercially available for over a year now, it'd be nice to get this issue settled by at least some sort of compromise. Background: On AArch64, x18 is a platform specific register; some platforms treat it as reserved for platform specific use, while others (Linux) don't and treat it as any free temporary register. On Windows, it is used to hold the TEB pointer. When calling Wine builtin functions from the Windows native code, the Wine builtin functions can clobber the x18 register, as the Wine code is built for the ABI and calling conventions used on Linux. This part is easy to work around by compiling Wine with the flag -ffixed-x18, which makes the compiler treat this register as reserved, avoiding clobbering it. However, as the Wine code may end up calling functions in the surrounding host environment (mainly the libc, but potentially also other feature libraries that are used), and these libraries have not been built with the -ffixed-x18 flag. There are a few different options for going about this matter: 1) Rebuild the surrounding host environment (the whole linux distribution) with -ffixed-x18. This would be the perfect solution, but is highly impractical for general use of Wine by regular users in their existing setups. (Convincing major distributions to start configuring their compilers in this way also doesn't seem to be happening.) 2) Force relays on entry to Wine builtins, where the relay can restore x18 to the right TEB pointer on return. This is pretty simple and straightforward, but not very elegant. One benefit is that this doesn't need to back up the original value of x18 but can always refetch the right TEB pointer value and set it. A patch to this effect have been sent before (https://source.winehq.org/patches/data/137759) but wasn't picked up. One major limitation is that while this ensures the right value in x18 on return from the Wine functions, it doesn't help restoring x18 to the right value before calling callback functions. I've run with this approach for nearly two years, without running into any issues with it (with the limited amount of code I run in wine; I don't think any of the command line executables I run in wine use callbacks though). 3) Enhance the compiler to automatically back up x18 on entry to functions marked with __attribute__((ms_abi)) and restore it on return. This would have the same effect as 2) above (but more elegantly), but also with the same limitations wrt callbacks. (Using this with Wine requires changing where x18 is initialized, because when starting a process, x18 can get clobbered after signal_init_thread is called, before handing control over to the native code. A patch for this has been sent at https://source.winehq.org/patches/data/164651.) A proof of concept/RFC patch for LLVM to implement this feature has been sent at https://reviews.llvm.org/D61892. 4) Enhance the compiler to back up x18 in every function (if necessary) to restore it after every function call. (Except function calls to functions in the same translation unit, which can be expected to not clobber the register.) This should achieve almost everything; x18 is maintained containing the right value throughout the Wine code as far as possible, like when doing callbacks. If callbacks to native code is made from within a callback from an external library (e.g. qsort in libc), x18 can be lost though. I guess this isn't a common pattern for libc functions at least, but I have no idea if it's more common for other external feature libraries that Wine uses. A proof of concept/RFC patch for LLVM to implement this feature has been sent at https://reviews.llvm.org/D61894. Do note that this approach can be pretty controversial to upstream to LLVM. This also requires the same Wine patch as 3), but for a different reason. When signal_init_thread is called to initialize x18, the caller will restore the register on return. The most robust way to intitialize it is right before handing control over to native code. 5) Enclose every callback call in Wine with a wrapper/thunk that sets up the register correctly. This would be a perfect solution, but is practically unfeasible. As far as I know, this is the approach that was used for Win16 back in the day, calling WOWCallback16Ex every time Wine code should call back into Win16 code. Given the size of Wine today and the number of different places where callbacks are made (where the function pointers are called without any extra wrapping), this is unfeasible (and I have a very hard time seeing such a patch accepted into Wine). What are the potential acceptable compromises for taking this matter forward? // Martin

4 5

[PATCH v2] msvcrt: Implement fma and fmaf
by Andrew Eikum 22 May '19

22 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Add check for fma functions; add tests; add errno assigning. configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/math.c | 32 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 + dlls/ucrtbase/tests/misc.c | 60 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 8 files changed, 104 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 0490b53410a..83a8181f33c 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,8 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + fma \ + fmaf \ ilogb \ ilogbf \ j0 \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 75ecaf1effc..3a5991f1246 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -241,8 +241,8 @@ @ stub fdiml @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) ucrtbase.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 92ac3246e10..63dc44d32b3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2164,8 +2164,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index af6b0fe369d..9b7727e233d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1830,8 +1830,8 @@ @ cdecl fgetws(ptr long ptr) msvcr120.fgetws @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) msvcr120.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 049c3407321..63744e33e33 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -387,6 +387,22 @@ float CDECL MSVCRT_floorf( float x ) return floorf(x); } +/********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + /********************************************************************* * frexpf (MSVCRT.@) */ @@ -863,6 +879,22 @@ double CDECL MSVCRT_floor( double x ) return floor(x); } +/********************************************************************* + * fma (MSVCRT.@) + */ +double CDECL MSVCRT_fma( double x, double y, double z ) +{ +#ifdef HAVE_FMA + double w = fma(x, y, z); +#else + double w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + /********************************************************************* * fabs (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 952de55b49a..f464db2f9cc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1288,6 +1288,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ddb793851ab..7559edecc33 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -64,6 +64,25 @@ static inline float __port_infinity(void) } #define INFINITY __port_infinity() +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline double __port_min_pos_double(void) +{ + static const UINT64 __min_pos_double = 0x10000000000000; + return *(const double *)&__min_pos_double; +} + +static inline double __port_max_double(void) +{ + static const UINT64 __max_double = 0x7FEFFFFFFFFFFFFF; + return *(const double *)&__max_double; +} + #define M_PI_2 1.57079632679489661923 #define FE_TONEAREST 0 @@ -747,6 +766,30 @@ static void test_math_errors(void) {"pow", INFINITY, 1, -1, -1}, {"pow", INFINITY, 2, -1, -1}, }; + const struct { + char func[16]; + double a; + double b; + double c; + int error; + int exception; + } tests3d[] = { + /* 0 * inf --> EDOM */ + {"fma", INFINITY, 0, 0, EDOM, -1}, + {"fma", 0, INFINITY, 0, EDOM, -1}, + /* inf - inf -> EDOM */ + {"fma", INFINITY, 1, -INFINITY, EDOM, -1}, + {"fma", -INFINITY, 1, INFINITY, EDOM, -1}, + {"fma", 1, INFINITY, -INFINITY, EDOM, -1}, + {"fma", 1, -INFINITY, INFINITY, EDOM, -1}, + /* NaN */ + {"fma", NAN, 0, 0, -1, -1}, + {"fma", 0, NAN, 0, -1, -1}, + {"fma", 0, 0, NAN, -1, -1}, + /* over/underflow */ + {"fma", __port_max_double(), __port_max_double(), __port_max_double(), -1, -1}, + {"fma", __port_min_pos_double(), __port_min_pos_double(), 1, -1, -1}, + }; const struct { char func[16]; double a; @@ -770,6 +813,7 @@ static void test_math_errors(void) }; double (CDECL *p_funcd)(double); double (CDECL *p_func2d)(double, double); + double (CDECL *p_func3d)(double, double, double); double (CDECL *p_funcdl)(double, long); int i; @@ -808,6 +852,22 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } + for(i = 0; i < ARRAY_SIZE(tests3d); i++) { + p_func3d = (void*)GetProcAddress(module, tests3d[i].func); + *p_errno() = -1; + exception.type = -1; + p_func3d(tests3d[i].a, tests3d[i].b, tests3d[i].c); + ok(*p_errno() == tests3d[i].error, + "%s(%f, %f, %f) got errno %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, *p_errno()); + ok(exception.type == tests3d[i].exception, + "%s(%f, %f, %f) got exception type %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == tests3d[i].a, + "%s(%f, %f, %f) got exception arg1 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg1); + ok(exception.arg2 == tests3d[i].b, + "%s(%f, %f, %f) got exception arg2 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg2); + } + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b7f814a4907..c64fee2b260 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2305,8 +2305,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf -- 2.21.0

2 1

[PATCH v6 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang 22 May '19

22 May '19

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 162308~162314, fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. Supersede 164594~164599, 164612~164613 v5: Fix explorer patch triggered user32 test failures. Supersede 165122~165128. v6: Restructure patches. Supersede 165134~165140 dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 74 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 15 +++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 7 ++++ 5 files changed, 98 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..7d81de09ac --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,74 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + HKEY video_hkey = NULL; + DWORD disposition = 0; + BOOL success = FALSE; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + success = TRUE; + goto fail; + } + + success = TRUE; +fail: + RegCloseKey(video_hkey); + if (!success) + ERR("Failed to initialize display devices\n"); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..fbc5a104f6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,21 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..35dd36049b 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -201,6 +203,7 @@ RECT get_primary_monitor_rect(void) void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +237,10 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

2 1

[PATCH 3/4] d3d9/tests: Test IDirect3D9::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng 22 May '19

22 May '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c89723cb..73ecae9804 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); } -- 2.20.1

3 2

[PATCH v6 7/7] user32: Implement EnumDisplayDevicesW().
by Zhiyi Zhang 22 May '19

22 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 223 ++++++++++++++++++++++++++++++++---- dlls/user32/tests/monitor.c | 26 ++--- 2 files changed, 213 insertions(+), 36 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a03d70dde..92d8a0ea1b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -29,9 +29,13 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "winnls.h" #include "winternl.h" #include "controls.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -39,6 +43,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); + +static const WCHAR monitor_fmtW[] = + {'\\','M','o','n','i','t','o','r','%','d',0}; +static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR video_keyW[] = + {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR video_value_fmtW[] = + {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR nt_machine_prefixW[] = + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\'}; +static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; +static const WCHAR guid_devinterface_monitorW[] = + {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR nt_classW[] = + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -243,11 +283,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -285,28 +320,170 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD dwFlags ) +BOOL WINAPI EnumDisplayDevicesW(LPCWSTR name, DWORD index, LPDISPLAY_DEVICEW display_device, DWORD flags) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); - - if (i) - return FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + WCHAR *next_charW; + DWORD size; + DWORD type; + long adapter_index; + BOOL ret = FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + TRACE("%s %d %p 0x%08x\n", debugstr_w(name), index, display_device, flags); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + /* Find adapter */ + if (!name) + { + sprintfW(key_nameW, video_value_fmtW, index); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if(display_device->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(display_device->DeviceKey)) + strcpyW(display_device->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(display_device->DeviceName, adapter_fmtW, index + 1); + + /* Strip \Registry\Machine\ */ + strcpyW(key_nameW, bufferW + ARRAY_SIZE(nt_machine_prefixW)); + + /* DeviceString */ + size = sizeof(display_device->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + display_device->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(display_device->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD | RRF_ZEROONFAILURE, NULL, + &display_device->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (display_device->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(display_device->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + display_device->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + { + SetupDiDestroyDeviceInfoList(set); + return FALSE; + } + strcpyW(display_device->DeviceID, bufferW); + } + } - return TRUE; + return TRUE; + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(name, displayW, ARRAY_SIZE(displayW))) + return FALSE; + + adapter_index = strtolW(name + ARRAY_SIZE(displayW), NULL, 10); + sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); + + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, bufferW, + &size)) + return FALSE; + + /* DeviceName */ + sprintfW(display_device->DeviceName, adapter_fmtW, adapter_index); + sprintfW(display_device->DeviceName + strlenW(display_device->DeviceName), monitor_fmtW, index); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + strcpyW(key_nameW, bufferW + ARRAY_SIZE(nt_machine_prefixW)); + sprintfW(bufferW, mointor_id_value_fmtW, index); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, + NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto fail; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&display_device->StateFlags, sizeof(display_device->StateFlags), NULL, 0)) + goto fail; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)display_device->DeviceString, + sizeof(display_device->DeviceString), NULL)) + goto fail; + + /* DeviceKey */ + if (display_device->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(display_device->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto fail; + + strcpyW(display_device->DeviceKey, nt_classW); + strcatW(display_device->DeviceKey, bufferW); + } + + /* DeviceID */ + if (display_device->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(display_device->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { + strcpyW(display_device->DeviceID, monitor_interface_prefixW); + strcatW(display_device->DeviceID, instanceW); + strcatW(display_device->DeviceID, guid_devinterface_monitorW); + /* Replace '\\' with '#' after prefix */ + for (next_charW = display_device->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto fail; + + strcpyW(display_device->DeviceID, bufferW); + strcatW(display_device->DeviceID, backslashW); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto fail; + + strcatW(display_device->DeviceID, bufferW); + } + } + + ret = TRUE; + fail: + SetupDiDestroyDeviceInfoList(set); + return ret; + } } /*********************************************************************** diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bee1085a14..26ee28a122 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ @@ -201,16 +201,16 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */ lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); - todo_wine ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); - todo_wine ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); } static void test_enumdisplaydevices(void) @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

2 1

[PATCH v6 6/7] explorer: Create display device registry fallback data if necessary.
by Zhiyi Zhang 22 May '19

22 May '19

If user driver didn't initialize the display device registry data, create some fallback data to at least make EnumDisplayDevice report a primary adapter. Otherwise, report back the primary adapter GUID to store in the desktop HWND atom, instead of creating a new one. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 11 +-- dlls/user32/tests/monitor.c | 6 +- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 167 ++++++++++++++++++++++++++++------ 4 files changed, 143 insertions(+), 43 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..3662a68976 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -101,28 +101,21 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP static const WCHAR display_device_guid_propW[] = { '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','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}; switch (message) { case WM_NCCREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; + WCHAR *guid = cs->lpCreateParams; if (guid) { ATOM atom; - WCHAR buffer[37]; if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); + atom = GlobalAddAtomW( guid ); SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); } return TRUE; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c5e6745322..bee1085a14 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,7 +81,7 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[16]; + char video_name[32]; char video_value[128]; char buffer[128]; int number; @@ -107,7 +107,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de { sprintf(video_name, "\\Device\\Video%d", index); ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); if (!ls) { memset(video_value, 0, sizeof(video_value)); @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 374c6aaebe..13b0ed3dfa 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,5 +1,5 @@ MODULE = explorer.exe -IMPORTS = rpcrt4 user32 gdi32 advapi32 +IMPORTS = rpcrt4 user32 gdi32 advapi32 setupapi DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d4925f7c5b..48b97cb137 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -27,6 +27,11 @@ #include <rpc.h> #include <shlobj.h> #include <shellapi.h> +#include <wingdi.h> +#include <initguid.h> +#include <devguid.h> +#include <devpkey.h> +#include <setupapi.h> #include "exdisp.h" #include "wine/debug.h" @@ -748,24 +753,143 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) -{ - static const WCHAR device_keyW[] = { +/* Initialize the display device registry if user driver didn't do it, + * and report the primary adapter guid in paramter guid_string. */ +static BOOL initialize_fallback_display_devices( const WCHAR *driver_path, WCHAR *guid_string ) +{ + static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR device_video_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + static const WCHAR gpu_instanceW[] = { + 'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0','\\', + '0','0','0','0','0','0','0','0',0}; + static const WCHAR gpu_hardware_idW[] = { + 'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0,0}; + static const WCHAR device_key_fmtW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'V','i','d','e','o','\\', - '{','%','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','0','0','0',0}; + '{','%','s','}','\\', + '0','0','0','0',0}; + static const WCHAR guid_formatW[] = { + '%','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 const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; + static const DWORD primary_state_flags = DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_keyW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + DWORD disposition = 0; + DWORD size; + GUID guid; + HKEY hkey = NULL; + BOOL ret = FALSE; + + /* Create HKLM\HARDWARE\DEVICEMAP\VIDEO key if user drivers didn't do it */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disposition ); + + /* User driver did create it. Report back primary adapter guid */ + if (disposition != REG_CREATED_NEW_KEY) + { + size = sizeof(bufferW); + if (!RegQueryValueExW( hkey, device_video0W, NULL, NULL, (BYTE *)bufferW, &size )) + { + /* Skip over \Registry\Machine\System\CurrentControlSet\Control\Video\{ to get guid string */ + memcpy( guid_string, bufferW + 58, 36 * sizeof(WCHAR) ); + guid_string[36] = 0; + RegCloseKey( hkey ); + return TRUE; + } + /* Falling through */ + } + + /* Create basic display device registry data so that functions like EnumDisplayDevice can at least report + * a primary adapter */ + /* Init GPU */ + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + if (!SetupDiOpenDeviceInfoW( devinfo, gpu_instanceW, NULL, 0, &device_data )) + { + SetupDiCreateDeviceInfoW( devinfo, gpu_instanceW, &GUID_DEVCLASS_DISPLAY, NULL, NULL, 0, &device_data ); + if (!SetupDiRegisterDeviceInfo( devinfo, &device_data, 0, NULL, NULL, NULL )) + goto fail; + } + + /* Write HardwareID */ + if (!SetupDiSetDeviceRegistryPropertyW( devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)(gpu_hardware_idW), + sizeof(gpu_hardware_idW) )) + goto fail; + + /* Init primary adapter */ + UuidCreate( &guid ); + swprintf( guid_string, 37, guid_formatW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); + swprintf( adapter_keyW, ARRAY_SIZE(adapter_keyW), device_key_fmtW, guid_string ); + lstrcpyW( bufferW, device_video_prefixW ); + lstrcatW( bufferW, adapter_keyW ); + + /* Write value of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW( hkey, device_video0W, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) )) + goto fail; + RegCloseKey( hkey ); + hkey = NULL; + + /* Write GraphicsDriver */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ); + if (RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)driver_path, (lstrlenW( driver_path ) + 1) * sizeof(WCHAR) )) + goto fail; + + /* Write DriverDesc */ + if (RegSetValueExW( hkey, driver_descW, 0, REG_SZ, (const BYTE *)wine_gpuW, (lstrlenW( wine_gpuW ) + 1) * sizeof(WCHAR) )) + goto fail; + + RegCloseKey( hkey ); + hkey = NULL; + + RegCreateKeyExW( HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ); + /* Write StateFlags */ + if (RegSetValueExW( hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&primary_state_flags, + sizeof(primary_state_flags) )) + goto fail; + + ret = TRUE; +fail: + RegCloseKey( hkey ); + SetupDiDestroyDeviceInfoList( devinfo ); + if (!ret) + ERR("Failed to initialize fallback display device registry data\n"); + return ret; +} + +/* Load graphics driver, return its module handle in hmodule and report primary adapter guid in guid */ +static void load_graphics_driver( const WCHAR *driver, HMODULE *hmodule, WCHAR *guid ) +{ static const WCHAR driversW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -808,27 +932,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) } if (module) - { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } - swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + initialize_fallback_display_devices( buffer, guid ); + TRACE( "display %s driver %s\n", debugstr_w(guid), debugstr_w(buffer) ); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, - REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) - { - if (module) - RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); - else - RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); - RegCloseKey( hkey ); - } - - return module; + *hmodule = module; } static void initialize_display_settings(void) @@ -887,7 +996,7 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; + WCHAR guid[37] = {0}; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -939,13 +1048,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + load_graphics_driver( driver, &graphics_driver, guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, guid ); if (hwnd) { -- 2.20.1

2 1

[PATCH 1/2] kernelbase: Add some URL API functions from shlwapi.
by Nikolay Sivov 22 May '19

22 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 26 +- dlls/kernelbase/path.c | 1144 +++++++++++++++++++++++++++++++ 2 files changed, 1157 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 874db20c9c..f9f9f2487b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1018,8 +1018,8 @@ # @ stub PackageSidFromFamilyName # @ stub PackageSidFromProductId # @ stub ParseApplicationUserModelId -@ stdcall ParseURLA(str ptr) shlwapi.ParseURLA -@ stdcall ParseURLW(wstr ptr) shlwapi.ParseURLW +@ stdcall ParseURLA(str ptr) +@ stdcall ParseURLW(wstr ptr) @ stdcall PathAddBackslashA(str) @ stdcall PathAddBackslashW(wstr) @ stdcall PathAddExtensionA(str str) @@ -1053,9 +1053,9 @@ @ stdcall PathCombineW(ptr wstr wstr) @ stdcall PathCommonPrefixA(str str ptr) @ stdcall PathCommonPrefixW(wstr wstr ptr) -@ stdcall PathCreateFromUrlA(str ptr ptr long) shlwapi.PathCreateFromUrlA -@ stdcall PathCreateFromUrlAlloc(wstr ptr long) shlwapi.PathCreateFromUrlAlloc -@ stdcall PathCreateFromUrlW(wstr ptr ptr long) shlwapi.PathCreateFromUrlW +@ stdcall PathCreateFromUrlA(str ptr ptr long) +@ stdcall PathCreateFromUrlAlloc(wstr ptr long) +@ stdcall PathCreateFromUrlW(wstr ptr ptr long) @ stdcall PathFileExistsA(str) @ stdcall PathFileExistsW(wstr) @ stdcall PathFindExtensionA(str) @@ -1089,8 +1089,8 @@ @ stdcall PathIsUNCServerShareW(wstr) @ stdcall PathIsUNCServerW(wstr) @ stdcall PathIsUNCW(wstr) -@ stdcall PathIsURLA(str) shlwapi.PathIsURLA -@ stdcall PathIsURLW(wstr) shlwapi.PathIsURLW +@ stdcall PathIsURLA(str) +@ stdcall PathIsURLW(wstr) @ stdcall PathIsValidCharA(long long) @ stdcall PathIsValidCharW(long long) @ stdcall PathMatchSpecA(str str) @@ -1630,16 +1630,16 @@ @ stdcall UpdateProcThreadAttribute(ptr long long ptr long ptr ptr) kernel32.UpdateProcThreadAttribute @ stdcall UrlApplySchemeA(str ptr ptr long) shlwapi.UrlApplySchemeA @ stdcall UrlApplySchemeW(wstr ptr ptr long) shlwapi.UrlApplySchemeW -@ stdcall UrlCanonicalizeA(str ptr ptr long) shlwapi.UrlCanonicalizeA -@ stdcall UrlCanonicalizeW(wstr ptr ptr long) shlwapi.UrlCanonicalizeW +@ stdcall UrlCanonicalizeA(str ptr ptr long) +@ stdcall UrlCanonicalizeW(wstr ptr ptr long) @ stdcall UrlCombineA(str str ptr ptr long) shlwapi.UrlCombineA @ stdcall UrlCombineW(wstr wstr ptr ptr long) shlwapi.UrlCombineW @ stdcall UrlCompareA(str str long) shlwapi.UrlCompareA @ stdcall UrlCompareW(wstr wstr long) shlwapi.UrlCompareW @ stdcall UrlCreateFromPathA(str ptr ptr long) shlwapi.UrlCreateFromPathA @ stdcall UrlCreateFromPathW(wstr ptr ptr long) shlwapi.UrlCreateFromPathW -@ stdcall UrlEscapeA(str ptr ptr long) shlwapi.UrlEscapeA -@ stdcall UrlEscapeW(wstr ptr ptr long) shlwapi.UrlEscapeW +@ stdcall UrlEscapeA(str ptr ptr long) +@ stdcall UrlEscapeW(wstr ptr ptr long) @ stdcall UrlFixupW(wstr wstr long) shlwapi.UrlFixupW @ stdcall UrlGetLocationA(str) shlwapi.UrlGetLocationA @ stdcall UrlGetLocationW(wstr) shlwapi.UrlGetLocationW @@ -1653,8 +1653,8 @@ @ stdcall UrlIsOpaqueA(str) shlwapi.UrlIsOpaqueA @ stdcall UrlIsOpaqueW(wstr) shlwapi.UrlIsOpaqueW @ stdcall UrlIsW(wstr long) shlwapi.UrlIsW -@ stdcall UrlUnescapeA(str ptr ptr long) shlwapi.UrlUnescapeA -@ stdcall UrlUnescapeW(wstr ptr ptr long) shlwapi.UrlUnescapeW +@ stdcall UrlUnescapeA(str ptr ptr long) +@ stdcall UrlUnescapeW(wstr ptr ptr long) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA @ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW @ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index ca951cfd3f..44d58ea73b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -24,12 +24,34 @@ #include "pathcch.h" #include "strsafe.h" #include "shlwapi.h" +#include "wininet.h" +#include "intshcut.h" +#include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(path); +static const char hexDigits[] = "0123456789ABCDEF"; + +static WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static char *char_next(const char *ptr) { if (!*ptr) return (LPSTR)ptr; @@ -2598,3 +2620,1125 @@ BOOL WINAPI PathFileExistsW(const WCHAR *path) SetErrorMode(prev_mode); return attrs != INVALID_FILE_ATTRIBUTES; } + +static const struct +{ + URL_SCHEME scheme_number; + WCHAR scheme_name[12]; +} +url_schemes[] = +{ + { URL_SCHEME_FTP, {'f','t','p',0}}, + { URL_SCHEME_HTTP, {'h','t','t','p',0}}, + { URL_SCHEME_GOPHER, {'g','o','p','h','e','r',0}}, + { URL_SCHEME_MAILTO, {'m','a','i','l','t','o',0}}, + { URL_SCHEME_NEWS, {'n','e','w','s',0}}, + { URL_SCHEME_NNTP, {'n','n','t','p',0}}, + { URL_SCHEME_TELNET, {'t','e','l','n','e','t',0}}, + { URL_SCHEME_WAIS, {'w','a','i','s',0}}, + { URL_SCHEME_FILE, {'f','i','l','e',0}}, + { URL_SCHEME_MK, {'m','k',0}}, + { URL_SCHEME_HTTPS, {'h','t','t','p','s',0}}, + { URL_SCHEME_SHELL, {'s','h','e','l','l',0}}, + { URL_SCHEME_SNEWS, {'s','n','e','w','s',0}}, + { URL_SCHEME_LOCAL, {'l','o','c','a','l',0}}, + { URL_SCHEME_JAVASCRIPT, {'j','a','v','a','s','c','r','i','p','t',0}}, + { URL_SCHEME_VBSCRIPT, {'v','b','s','c','r','i','p','t',0}}, + { URL_SCHEME_ABOUT, {'a','b','o','u','t',0}}, + { URL_SCHEME_RES, {'r','e','s',0}}, +}; + +static DWORD get_scheme_code(const WCHAR *scheme, DWORD scheme_len) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(url_schemes); ++i) + { + if (scheme_len == strlenW(url_schemes[i].scheme_name) + && !strncmpiW(scheme, url_schemes[i].scheme_name, scheme_len)) + return url_schemes[i].scheme_number; + } + + return URL_SCHEME_UNKNOWN; +} + +HRESULT WINAPI ParseURLA(const char *url, PARSEDURLA *result) +{ + WCHAR scheme[INTERNET_MAX_SCHEME_LENGTH]; + const char *ptr = url; + int len; + + TRACE("%s, %p\n", wine_dbgstr_a(url), result); + + if (result->cbSize != sizeof(*result)) + return E_INVALIDARG; + + while (*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) + ptr++; + + if (*ptr != ':' || ptr <= url + 1) + { + result->pszProtocol = NULL; + return URL_E_INVALID_SYNTAX; + } + + result->pszProtocol = url; + result->cchProtocol = ptr - url; + result->pszSuffix = ptr + 1; + result->cchSuffix = strlen(result->pszSuffix); + + len = MultiByteToWideChar(CP_ACP, 0, url, ptr - url, scheme, ARRAY_SIZE(scheme)); + result->nScheme = get_scheme_code(scheme, len); + + return S_OK; +} + +HRESULT WINAPI ParseURLW(const WCHAR *url, PARSEDURLW *result) +{ + const WCHAR *ptr = url; + + TRACE("%s, %p\n", wine_dbgstr_w(url), result); + + if (result->cbSize != sizeof(*result)) + return E_INVALIDARG; + + while (*ptr && (isalnumW(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) + ptr++; + + if (*ptr != ':' || ptr <= url + 1) + { + result->pszProtocol = NULL; + return URL_E_INVALID_SYNTAX; + } + + result->pszProtocol = url; + result->cchProtocol = ptr - url; + result->pszSuffix = ptr + 1; + result->cchSuffix = strlenW(result->pszSuffix); + result->nScheme = get_scheme_code(url, ptr - url); + + return S_OK; +} + +HRESULT WINAPI UrlUnescapeA(char *url, char *unescaped, DWORD *unescaped_len, DWORD flags) +{ + BOOL stop_unescaping = FALSE; + const char *src; + char *dst, next; + DWORD needed; + HRESULT hr; + + TRACE("%s, %p, %p, %#x\n", wine_dbgstr_a(url), unescaped, unescaped_len, flags); + + if (!url) + return E_INVALIDARG; + + if (flags & URL_UNESCAPE_INPLACE) + dst = url; + else + { + if (!unescaped || !unescaped_len) return E_INVALIDARG; + dst = unescaped; + } + + for (src = url, needed = 0; *src; src++, needed++) + { + if (flags & URL_DONT_UNESCAPE_EXTRA_INFO && (*src == '#' || *src == '?')) + { + stop_unescaping = TRUE; + next = *src; + } + else if (*src == '%' && isxdigit(*(src + 1)) && isxdigit(*(src + 2)) && !stop_unescaping) + { + INT ih; + char buf[3]; + memcpy(buf, src + 1, 2); + buf[2] = '\0'; + ih = strtol(buf, NULL, 16); + next = (CHAR) ih; + src += 2; /* Advance to end of escape */ + } + else + next = *src; + + if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) + *dst++ = next; + } + + if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) + { + *dst = '\0'; + hr = S_OK; + } + else + { + needed++; /* add one for the '\0' */ + hr = E_POINTER; + } + + if (!(flags & URL_UNESCAPE_INPLACE)) + *unescaped_len = needed; + + if (hr == S_OK) + TRACE("result %s\n", flags & URL_UNESCAPE_INPLACE ? wine_dbgstr_a(url) : wine_dbgstr_a(unescaped)); + + return hr; +} + +HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, DWORD flags) +{ + BOOL stop_unescaping = FALSE; + const WCHAR *src; + WCHAR *dst, next; + DWORD needed; + HRESULT hr; + + TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(url), unescaped, unescaped_len, flags); + + if (!url) + return E_INVALIDARG; + + if (flags & URL_UNESCAPE_INPLACE) + dst = url; + else + { + if (!unescaped || !unescaped_len) return E_INVALIDARG; + dst = unescaped; + } + + for (src = url, needed = 0; *src; src++, needed++) + { + if (flags & URL_DONT_UNESCAPE_EXTRA_INFO && (*src == '#' || *src == '?')) + { + stop_unescaping = TRUE; + next = *src; + } + else if (*src == '%' && isxdigitW(*(src + 1)) && isxdigitW(*(src + 2)) && !stop_unescaping) + { + INT ih; + WCHAR buf[5] = {'0','x',0}; + memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); + buf[4] = 0; + StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); + next = (WCHAR) ih; + src += 2; /* Advance to end of escape */ + } + else + next = *src; + + if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) + *dst++ = next; + } + + if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) + { + *dst = '\0'; + hr = S_OK; + } + else + { + needed++; /* add one for the '\0' */ + hr = E_POINTER; + } + + if (!(flags & URL_UNESCAPE_INPLACE)) + *unescaped_len = needed; + + if (hr == S_OK) + TRACE("result %s\n", flags & URL_UNESCAPE_INPLACE ? wine_dbgstr_w(url) : wine_dbgstr_w(unescaped)); + + return hr; +} + +HRESULT WINAPI PathCreateFromUrlA(const char *pszUrl, char *pszPath, DWORD *pcchPath, DWORD dwReserved) +{ + WCHAR bufW[MAX_PATH]; + WCHAR *pathW = bufW; + UNICODE_STRING urlW; + HRESULT ret; + DWORD lenW = ARRAY_SIZE(bufW), lenA; + + if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) + return E_INVALIDARG; + + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) + return E_INVALIDARG; + if((ret = PathCreateFromUrlW(urlW.Buffer, pathW, &lenW, dwReserved)) == E_POINTER) { + pathW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + ret = PathCreateFromUrlW(urlW.Buffer, pathW, &lenW, dwReserved); + } + if(ret == S_OK) { + RtlUnicodeToMultiByteSize(&lenA, pathW, lenW * sizeof(WCHAR)); + if(*pcchPath > lenA) { + RtlUnicodeToMultiByteN(pszPath, *pcchPath - 1, &lenA, pathW, lenW * sizeof(WCHAR)); + pszPath[lenA] = 0; + *pcchPath = lenA; + } else { + *pcchPath = lenA + 1; + ret = E_POINTER; + } + } + if(pathW != bufW) HeapFree(GetProcessHeap(), 0, pathW); + RtlFreeUnicodeString(&urlW); + return ret; +} + +HRESULT WINAPI PathCreateFromUrlW(const WCHAR *url, WCHAR *path, DWORD *pcchPath, DWORD dwReserved) +{ + static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; + static const WCHAR localhost[] = { 'l','o','c','a','l','h','o','s','t',0 }; + DWORD nslashes, unescape, len; + const WCHAR *src; + WCHAR *tpath, *dst; + HRESULT hr = S_OK; + + TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(url), path, pcchPath, dwReserved); + + if (!url || !path || !pcchPath || !*pcchPath) + return E_INVALIDARG; + + if (lstrlenW(url) < 5) + return E_INVALIDARG; + + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, url, 5, file_colon, 5) != CSTR_EQUAL) + return E_INVALIDARG; + + url += 5; + + src = url; + nslashes = 0; + while (*src == '/' || *src == '\\') + { + nslashes++; + src++; + } + + /* We need a temporary buffer so we can compute what size to ask for. + * We know that the final string won't be longer than the current pszUrl + * plus at most two backslashes. All the other transformations make it + * shorter. + */ + len = 2 + lstrlenW(url) + 1; + if (*pcchPath < len) + tpath = heap_alloc(len * sizeof(WCHAR)); + else + tpath = path; + + len = 0; + dst = tpath; + unescape = 1; + switch (nslashes) + { + case 0: + /* 'file:' + escaped DOS path */ + break; + case 1: + /* 'file:/' + escaped DOS path */ + /* fall through */ + case 3: + /* 'file:///' (implied localhost) + escaped DOS path */ + if (!isalphaW(*src) || (src[1] != ':' && src[1] != '|')) + src -= 1; + break; + case 2: + if (lstrlenW(src) >= 10 && CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, + src, 9, localhost, 9) == CSTR_EQUAL && (src[9] == '/' || src[9] == '\\')) + { + /* 'file://localhost/' + escaped DOS path */ + src += 10; + } + else if (isalphaW(*src) && (src[1] == ':' || src[1] == '|')) + { + /* 'file://' + unescaped DOS path */ + unescape = 0; + } + else + { + /* 'file://hostname:port/path' (where path is escaped) + * or 'file:' + escaped UNC path (\\server\share\path) + * The second form is clearly specific to Windows and it might + * even be doing a network lookup to try to figure it out. + */ + while (*src && *src != '/' && *src != '\\') + src++; + len = src - url; + StrCpyNW(dst, url, len + 1); + dst += len; + if (*src && isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + { + /* 'Forget' to add a trailing '/', just like Windows */ + src++; + } + } + break; + case 4: + /* 'file://' + unescaped UNC path (\\server\share\path) */ + unescape = 0; + if (isalphaW(*src) && (src[1] == ':' || src[1] == '|')) + break; + /* fall through */ + default: + /* 'file:/...' + escaped UNC path (\\server\share\path) */ + src -= 2; + } + + /* Copy the remainder of the path */ + len += lstrlenW(src); + strcpyW(dst, src); + + /* First do the Windows-specific path conversions */ + for (dst = tpath; *dst; dst++) + if (*dst == '/') *dst = '\\'; + if (isalphaW(*tpath) && tpath[1] == '|') + tpath[1] = ':'; /* c| -> c: */ + + /* And only then unescape the path (i.e. escaped slashes are left as is) */ + if (unescape) + { + hr = UrlUnescapeW(tpath, NULL, &len, URL_UNESCAPE_INPLACE); + if (hr == S_OK) + { + /* When working in-place UrlUnescapeW() does not set len */ + len = lstrlenW(tpath); + } + } + + if (*pcchPath < len + 1) + { + hr = E_POINTER; + *pcchPath = len + 1; + } + else + { + *pcchPath = len; + if (tpath != path) + strcpyW(path, tpath); + } + if (tpath != path) + heap_free(tpath); + + TRACE("Returning (%u) %s\n", *pcchPath, wine_dbgstr_w(path)); + return hr; +} + +HRESULT WINAPI PathCreateFromUrlAlloc(const WCHAR *url, WCHAR **path, DWORD reserved) +{ + WCHAR pathW[MAX_PATH]; + DWORD size; + HRESULT hr; + + size = MAX_PATH; + hr = PathCreateFromUrlW(url, pathW, &size, reserved); + if (SUCCEEDED(hr)) + { + /* Yes, this is supposed to crash if 'path' is NULL */ + *path = StrDupW(pathW); + } + + return hr; +} + +BOOL WINAPI PathIsURLA(const char *path) +{ + PARSEDURLA base; + HRESULT hr; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return FALSE; + + /* get protocol */ + base.cbSize = sizeof(base); + hr = ParseURLA(path, &base); + return hr == S_OK && (base.nScheme != URL_SCHEME_INVALID); +} + +BOOL WINAPI PathIsURLW(const WCHAR *path) +{ + PARSEDURLW base; + HRESULT hr; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return FALSE; + + /* get protocol */ + base.cbSize = sizeof(base); + hr = ParseURLW(path, &base); + return hr == S_OK && (base.nScheme != URL_SCHEME_INVALID); +} + +#define WINE_URL_BASH_AS_SLASH 0x01 +#define WINE_URL_COLLAPSE_SLASHES 0x02 +#define WINE_URL_ESCAPE_SLASH 0x04 +#define WINE_URL_ESCAPE_HASH 0x08 +#define WINE_URL_ESCAPE_QUESTION 0x10 +#define WINE_URL_STOP_ON_HASH 0x20 +#define WINE_URL_STOP_ON_QUESTION 0x40 + +static BOOL url_needs_escape(WCHAR ch, DWORD flags, DWORD int_flags) +{ + if (flags & URL_ESCAPE_SPACES_ONLY) + return ch == ' '; + + if ((flags & URL_ESCAPE_PERCENT) && (ch == '%')) + return TRUE; + + if ((flags & URL_ESCAPE_AS_UTF8) && (ch >= 0x80)) + return TRUE; + + if (ch <= 31 || (ch >= 127 && ch <= 255) ) + return TRUE; + + if (isalnumW(ch)) + return FALSE; + + switch (ch) { + case ' ': + case '<': + case '>': + case '\"': + case '{': + case '}': + case '|': + case '\\': + case '^': + case ']': + case '[': + case '`': + case '&': + return TRUE; + case '/': + return !!(int_flags & WINE_URL_ESCAPE_SLASH); + case '?': + return !!(int_flags & WINE_URL_ESCAPE_QUESTION); + case '#': + return !!(int_flags & WINE_URL_ESCAPE_HASH); + default: + return FALSE; + } +} + +HRESULT WINAPI UrlEscapeA(const char *url, char *escaped, DWORD *escaped_len, DWORD flags) +{ + WCHAR bufW[INTERNET_MAX_URL_LENGTH]; + WCHAR *escapedW = bufW; + UNICODE_STRING urlW; + HRESULT hr; + DWORD lenW = ARRAY_SIZE(bufW), lenA; + + if (!escaped || !escaped_len || !*escaped_len) + return E_INVALIDARG; + + if (!RtlCreateUnicodeStringFromAsciiz(&urlW, url)) + return E_INVALIDARG; + + if (flags & URL_ESCAPE_AS_UTF8) + { + RtlFreeUnicodeString(&urlW); + return E_NOTIMPL; + } + + if ((hr = UrlEscapeW(urlW.Buffer, escapedW, &lenW, flags)) == E_POINTER) + { + escapedW = heap_alloc(lenW * sizeof(WCHAR)); + hr = UrlEscapeW(urlW.Buffer, escapedW, &lenW, flags); + } + + if (hr == S_OK) + { + RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR)); + if (*escaped_len > lenA) + { + RtlUnicodeToMultiByteN(escaped, *escaped_len - 1, &lenA, escapedW, lenW * sizeof(WCHAR)); + escaped[lenA] = 0; + *escaped_len = lenA; + } + else + { + *escaped_len = lenA + 1; + hr = E_POINTER; + } + } + if (escapedW != bufW) + heap_free(escapedW); + RtlFreeUnicodeString(&urlW); + return hr; +} + +HRESULT WINAPI UrlEscapeW(const WCHAR *url, WCHAR *escaped, DWORD *escaped_len, DWORD flags) +{ + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + DWORD needed = 0, slashes = 0, int_flags; + WCHAR next[12], *dst, *dst_ptr; + BOOL stop_escaping = FALSE; + PARSEDURLW parsed_url; + const WCHAR *src; + INT i, len; + HRESULT hr; + + TRACE("%p, %s, %p, %p, %#x\n", url, wine_dbgstr_w(url), escaped, escaped_len, flags); + + if (!url || !escaped_len || !escaped || *escaped_len == 0) + return E_INVALIDARG; + + if (flags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO | + URL_ESCAPE_PERCENT | URL_ESCAPE_AS_UTF8)) + { + FIXME("Unimplemented flags: %08x\n", flags); + } + + dst_ptr = dst = heap_alloc(*escaped_len * sizeof(WCHAR)); + if (!dst_ptr) + return E_OUTOFMEMORY; + + /* fix up flags */ + if (flags & URL_ESCAPE_SPACES_ONLY) + /* if SPACES_ONLY specified, reset the other controls */ + flags &= ~(URL_DONT_ESCAPE_EXTRA_INFO | URL_ESCAPE_PERCENT | URL_ESCAPE_SEGMENT_ONLY); + else + /* if SPACES_ONLY *not* specified the assume DONT_ESCAPE_EXTRA_INFO */ + flags |= URL_DONT_ESCAPE_EXTRA_INFO; + + int_flags = 0; + if (flags & URL_ESCAPE_SEGMENT_ONLY) + int_flags = WINE_URL_ESCAPE_QUESTION | WINE_URL_ESCAPE_HASH | WINE_URL_ESCAPE_SLASH; + else + { + parsed_url.cbSize = sizeof(parsed_url); + if (ParseURLW(url, &parsed_url) != S_OK) + parsed_url.nScheme = URL_SCHEME_INVALID; + + TRACE("scheme = %d (%s)\n", parsed_url.nScheme, debugstr_wn(parsed_url.pszProtocol, parsed_url.cchProtocol)); + + if (flags & URL_DONT_ESCAPE_EXTRA_INFO) + int_flags = WINE_URL_STOP_ON_HASH | WINE_URL_STOP_ON_QUESTION; + + switch(parsed_url.nScheme) { + case URL_SCHEME_FILE: + int_flags |= WINE_URL_BASH_AS_SLASH | WINE_URL_COLLAPSE_SLASHES | WINE_URL_ESCAPE_HASH; + int_flags &= ~WINE_URL_STOP_ON_HASH; + break; + + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + int_flags |= WINE_URL_BASH_AS_SLASH; + if(parsed_url.pszSuffix[0] != '/' && parsed_url.pszSuffix[0] != '\\') + int_flags |= WINE_URL_ESCAPE_SLASH; + break; + + case URL_SCHEME_MAILTO: + int_flags |= WINE_URL_ESCAPE_SLASH | WINE_URL_ESCAPE_QUESTION | WINE_URL_ESCAPE_HASH; + int_flags &= ~(WINE_URL_STOP_ON_QUESTION | WINE_URL_STOP_ON_HASH); + break; + + case URL_SCHEME_INVALID: + break; + + case URL_SCHEME_FTP: + default: + if(parsed_url.pszSuffix[0] != '/') + int_flags |= WINE_URL_ESCAPE_SLASH; + break; + } + } + + for (src = url; *src; ) + { + WCHAR cur = *src; + len = 0; + + if ((int_flags & WINE_URL_COLLAPSE_SLASHES) && src == url + parsed_url.cchProtocol + 1) + { + int localhost_len = ARRAY_SIZE(localhost) - 1; + while (cur == '/' || cur == '\\') + { + slashes++; + cur = *++src; + } + if (slashes == 2 && !strncmpiW(src, localhost, localhost_len)) { /* file://localhost/ -> file:/// */ + if(*(src + localhost_len) == '/' || *(src + localhost_len) == '\\') + src += localhost_len + 1; + slashes = 3; + } + + switch (slashes) + { + case 1: + case 3: + next[0] = next[1] = next[2] = '/'; + len = 3; + break; + case 0: + len = 0; + break; + default: + next[0] = next[1] = '/'; + len = 2; + break; + } + } + if (len == 0) + { + if (cur == '#' && (int_flags & WINE_URL_STOP_ON_HASH)) + stop_escaping = TRUE; + + if (cur == '?' && (int_flags & WINE_URL_STOP_ON_QUESTION)) + stop_escaping = TRUE; + + if (cur == '\\' && (int_flags & WINE_URL_BASH_AS_SLASH) && !stop_escaping) cur = '/'; + + if (url_needs_escape(cur, flags, int_flags) && !stop_escaping) + { + if (flags & URL_ESCAPE_AS_UTF8) + { + char utf[16]; + + if ((cur >= 0xd800 && cur <= 0xdfff) && (src[1] >= 0xdc00 && src[1] <= 0xdfff)) + { + len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, utf, sizeof(utf), NULL, NULL); + src++; + } + else + len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf), NULL, NULL); + + if (!len) + { + utf[0] = 0xef; + utf[1] = 0xbf; + utf[2] = 0xbd; + len = 3; + } + + for (i = 0; i < len; ++i) + { + next[i*3+0] = '%'; + next[i*3+1] = hexDigits[(utf[i] >> 4) & 0xf]; + next[i*3+2] = hexDigits[utf[i] & 0xf]; + } + len *= 3; + } + else + { + next[0] = '%'; + next[1] = hexDigits[(cur >> 4) & 0xf]; + next[2] = hexDigits[cur & 0xf]; + len = 3; + } + } + else + { + next[0] = cur; + len = 1; + } + src++; + } + + if (needed + len <= *escaped_len) + { + memcpy(dst, next, len*sizeof(WCHAR)); + dst += len; + } + needed += len; + } + + if (needed < *escaped_len) + { + *dst = '\0'; + memcpy(escaped, dst_ptr, (needed+1)*sizeof(WCHAR)); + hr = S_OK; + } + else + { + needed++; /* add one for the '\0' */ + hr = E_POINTER; + } + *escaped_len = needed; + + heap_free(dst_ptr); + return hr; +} + +HRESULT WINAPI UrlCanonicalizeA(const char *src_url, char *canonicalized, DWORD *canonicalized_len, DWORD flags) +{ + LPWSTR url, canonical; + HRESULT hr; + + TRACE("%s, %p, %p, %#x\n", wine_dbgstr_a(src_url), canonicalized, canonicalized_len, flags); + + if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len) + return E_INVALIDARG; + + url = heap_strdupAtoW(src_url); + canonical = heap_alloc(*canonicalized_len * sizeof(WCHAR)); + if (!url || !canonical) + { + heap_free(url); + heap_free(canonical); + return E_OUTOFMEMORY; + } + + hr = UrlCanonicalizeW(url, canonical, canonicalized_len, flags); + if (hr == S_OK) + WideCharToMultiByte(CP_ACP, 0, canonical, -1, canonicalized, *canonicalized_len + 1, NULL, NULL); + + heap_free(url); + heap_free(canonical); + return hr; +} + +HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWORD *canonicalized_len, DWORD flags) +{ + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + static const WCHAR wszRes[] = {'r','e','s',':'}; + static const WCHAR wszHttp[] = {'h','t','t','p',':'}; + static const WCHAR wszLocalhost[] = {'l','o','c','a','l','h','o','s','t'}; + static const WCHAR wszFilePrefix[] = {'f','i','l','e',':','/','/','/'}; + WCHAR *url_copy, *url, *wk2, *mp, *mp2; + DWORD nByteLen, nLen, nWkLen; + const WCHAR *wk1, *root; + DWORD escape_flags; + WCHAR slash = '\0'; + HRESULT hr = S_OK; + BOOL is_file_url; + INT state; + + TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags); + + if (!src_url || !canonicalized || !canonicalized || !*canonicalized_len) + return E_INVALIDARG; + + if (!*src_url) + { + *canonicalized = 0; + return S_OK; + } + + /* Remove '\t' characters from URL */ + nByteLen = (strlenW(src_url) + 1) * sizeof(WCHAR); /* length in bytes */ + url = HeapAlloc(GetProcessHeap(), 0, nByteLen); + if(!url) + return E_OUTOFMEMORY; + + wk1 = src_url; + wk2 = url; + do + { + while(*wk1 == '\t') + wk1++; + *wk2++ = *wk1; + } while (*wk1++); + + /* Allocate memory for simplified URL (before escaping) */ + nByteLen = (wk2-url)*sizeof(WCHAR); + url_copy = heap_alloc(nByteLen + sizeof(wszFilePrefix) + sizeof(WCHAR)); + if (!url_copy) + { + heap_free(url); + return E_OUTOFMEMORY; + } + + is_file_url = !strncmpW(wszFile, url, ARRAY_SIZE(wszFile)); + + if ((nByteLen >= sizeof(wszHttp) && !memcmp(wszHttp, url, sizeof(wszHttp))) || is_file_url) + slash = '/'; + + if ((flags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) && is_file_url) + slash = '\\'; + + if (nByteLen >= sizeof(wszRes) && !memcmp(wszRes, url, sizeof(wszRes))) + { + flags &= ~URL_FILE_USE_PATHURL; + slash = '\0'; + } + + /* + * state = + * 0 initial 1,3 + * 1 have 2[+] alnum 2,3 + * 2 have scheme (found :) 4,6,3 + * 3 failed (no location) + * 4 have // 5,3 + * 5 have 1[+] alnum 6,3 + * 6 have location (found /) save root location + */ + + wk1 = url; + wk2 = url_copy; + state = 0; + + /* Assume path */ + if (url[1] == ':') + { + memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); + wk2 += ARRAY_SIZE(wszFilePrefix); + if (flags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) + { + slash = '\\'; + --wk2; + } + else + flags |= URL_ESCAPE_UNSAFE; + state = 5; + is_file_url = TRUE; + } + else if (url[0] == '/') + { + state = 5; + is_file_url = TRUE; + } + + while (*wk1) + { + switch (state) + { + case 0: + if (!isalnumW(*wk1)) {state = 3; break;} + *wk2++ = *wk1++; + if (!isalnumW(*wk1)) {state = 3; break;} + *wk2++ = *wk1++; + state = 1; + break; + case 1: + *wk2++ = *wk1; + if (*wk1++ == ':') state = 2; + break; + case 2: + *wk2++ = *wk1++; + if (*wk1 != '/') {state = 6; break;} + *wk2++ = *wk1++; + if ((flags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) && is_file_url + && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))) + { + wk1 += ARRAY_SIZE(wszLocalhost); + while (*wk1 == '\\' && (flags & URL_FILE_USE_PATHURL)) + wk1++; + } + + if (*wk1 == '/' && (flags & URL_FILE_USE_PATHURL)) + wk1++; + else if (is_file_url) + { + const WCHAR *body = wk1; + + while (*body == '/') + ++body; + + if (isalnumW(*body) && *(body+1) == ':') + { + if (!(flags & (URL_WININET_COMPATIBILITY | URL_FILE_USE_PATHURL))) + { + if (slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + } + else + { + if (flags & URL_WININET_COMPATIBILITY) + { + if (*wk1 == '/' && *(wk1 + 1) != '/') + { + *wk2++ = '\\'; + } + else + { + *wk2++ = '\\'; + *wk2++ = '\\'; + } + } + else + { + if (*wk1 == '/' && *(wk1+1) != '/') + { + if (slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + } + } + wk1 = body; + } + state = 4; + break; + case 3: + nWkLen = strlenW(wk1); + memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; + wk1 += nWkLen; + wk2 += nWkLen; + + if (slash) + { + while (mp < wk2) + { + if (*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } + } + break; + case 4: + if (!isalnumW(*wk1) && (*wk1 != '-') && (*wk1 != '.') && (*wk1 != ':')) + { + state = 3; + break; + } + while (isalnumW(*wk1) || (*wk1 == '-') || (*wk1 == '.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + if (!*wk1) + { + if (slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') + { + state = 3; + break; + } + while (*wk1 == '/' || *wk1 == '\\') + { + if (slash) + *wk2++ = slash; + else + *wk2++ = *wk1; + wk1++; + } + state = 6; + break; + case 6: + if (flags & URL_DONT_SIMPLIFY) + { + state = 3; + break; + } + + /* Now at root location, cannot back up any more. */ + /* "root" will point at the '/' */ + + root = wk2-1; + while (*wk1) + { + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if (mp2 && (!mp || mp2 < mp)) + mp = mp2; + if (!mp) + { + nWkLen = strlenW(wk1); + memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + wk1 += nWkLen; + wk2 += nWkLen; + continue; + } + nLen = mp - wk1; + if (nLen) + { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + if (slash) + *wk2++ = slash; + else + *wk2++ = *wk1; + wk1++; + + while (*wk1 == '.') + { + TRACE("found '/.'\n"); + if (wk1[1] == '/' || wk1[1] == '\\') + { + /* case of /./ -> skip the ./ */ + wk1 += 2; + } + else if (wk1[1] == '.' && (wk1[2] == '/' || wk1[2] == '\\' || wk1[2] == '?' + || wk1[2] == '#' || !wk1[2])) + { + /* case /../ -> need to backup wk2 */ + TRACE("found '/../'\n"); + *(wk2-1) = '\0'; /* set end of string */ + mp = strrchrW(root, '/'); + mp2 = strrchrW(root, '\\'); + if (mp2 && (!mp || mp2 < mp)) + mp = mp2; + if (mp && (mp >= root)) + { + /* found valid backup point */ + wk2 = mp + 1; + if(wk1[2] != '/' && wk1[2] != '\\') + wk1 += 2; + else + wk1 += 3; + } + else + { + /* did not find point, restore '/' */ + *(wk2-1) = slash; + break; + } + } + else + break; + } + } + *wk2 = '\0'; + break; + default: + FIXME("how did we get here - state=%d\n", state); + heap_free(url_copy); + heap_free(url); + return E_INVALIDARG; + } + *wk2 = '\0'; + TRACE("Simplified, orig <%s>, simple <%s>\n", wine_dbgstr_w(src_url), wine_dbgstr_w(url_copy)); + } + nLen = lstrlenW(url_copy); + while ((nLen > 0) && ((url_copy[nLen-1] <= ' '))) + url_copy[--nLen]=0; + + if ((flags & URL_UNESCAPE) || ((flags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) + && !memcmp(wszFile, url, sizeof(wszFile)))) + { + UrlUnescapeW(url_copy, NULL, &nLen, URL_UNESCAPE_INPLACE); + } + + escape_flags = flags & (URL_ESCAPE_UNSAFE | URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_PERCENT | + URL_DONT_ESCAPE_EXTRA_INFO | URL_ESCAPE_SEGMENT_ONLY); + + if (escape_flags) + { + escape_flags &= ~URL_ESCAPE_UNSAFE; + hr = UrlEscapeW(url_copy, canonicalized, canonicalized_len, escape_flags); + } + else + { + /* No escaping needed, just copy the string */ + nLen = lstrlenW(url_copy); + if (nLen < *canonicalized_len) + memcpy(canonicalized, url_copy, (nLen + 1)*sizeof(WCHAR)); + else + { + hr = E_POINTER; + nLen++; + } + *canonicalized_len = nLen; + } + + heap_free(url_copy); + heap_free(url); + + if (hr == S_OK) + TRACE("result %s\n", wine_dbgstr_w(canonicalized)); + + return hr; +} -- 2.20.1

1 1

[PATCH v6 5/7] winex11.drv: Handle display device changes.
by Zhiyi Zhang 22 May '19

22 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 2 ++ dlls/winex11.drv/display.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbdcb3..c69c2122ab 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", @@ -303,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 2cc36763db..7a96822a7f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -374,7 +374,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(const char *name, BOOL force) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -391,12 +391,15 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); + if (name && strcmp(handler.name, name)) + TRACE("Wrong handler name %s, ignoring\n", name); + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) goto fail; /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) { success = TRUE; goto fail; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 40392b03c0..035d7cc9ab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -740,7 +740,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(const char *name, BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 69478741f1..b0fa225565 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(NULL, FALSE); return TRUE; } -- 2.20.1

1 0

[PATCH v6 4/7] winex11.drv: Initialize monitor registry data.
by Zhiyi Zhang 22 May '19

22 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 120 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 22 +++++++ dlls/winex11.drv/xinerama.c | 53 ++++++++++++++++ 3 files changed, 190 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 300a05e8c0..2cc36763db 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,11 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -90,6 +98,13 @@ static const WCHAR nt_classW[] = { 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'C','l','a','s','s','\\',0}; +static const WCHAR monitor_instance_fmtW[] = { + 'D','I','S','P','L','A','Y','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '%','0','4','X','&','%','0','4','X',0}; +static const WCHAR monitor_hardware_idW[] = { + 'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; @@ -185,7 +200,7 @@ fail: return ret; } -static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, INT monitor_count, const struct x11drv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) { @@ -195,6 +210,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, HKEY hkey = NULL; BOOL ret = FALSE; LSTATUS ls; + INT i; sprintfW(key_nameW, device_video_fmtW, video_index); strcpyW(bufferW, machine_prefixW); @@ -229,6 +245,15 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto fail; + /* Write all monitor instances paths under this adapter */ + for (i = 0; i < monitor_count; i++) + { + sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(bufferW, monitor_instance_fmtW, video_index, i); + if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -242,6 +267,64 @@ fail: return ret; } +static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, + int video_index) +{ + WCHAR bufferW[MAX_PATH]; + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + HKEY hkey = NULL; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, monitor->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + + /* Write HaredwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto fail; + + /* Open driver key */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)monitor->name, + (strlenW(monitor->name) + 1) * sizeof(WCHAR))) + goto fail; + + /* FIXME: + * Following properties are Wine specific, see comments in X11DRV_InitAdapter for details */ + /* StateFlags */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, + (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) + goto fail; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto fail; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto fail; + + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + /* Adapter name */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -249,8 +332,18 @@ static void prepare_devices(void) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with * each initialization run. We clean up non present GPUs at the end of initialization */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -285,9 +378,10 @@ void X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct x11drv_monitor *monitors = NULL; + INT gpu_count, adapter_count, monitor_count; + INT gpu, adapter, monitor; + HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -316,6 +410,7 @@ void X11DRV_DisplayDevices_Init(void) prepare_devices(); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) @@ -332,10 +427,22 @@ void X11DRV_DisplayDevices_Init(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + goto fail; + + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto fail; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto fail; + } + + handler.pFreeMonitors(monitors); + monitors = NULL; video_index++; } @@ -346,12 +453,15 @@ void X11DRV_DisplayDevices_Init(void) success = TRUE; fail: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); if (adapters) handler.pFreeAdapters(adapters); + if (monitors) + handler.pFreeMonitors(monitors); if (!success) ERR("Failed to initialize display devices\n"); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5d99d69eff..40392b03c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,19 @@ struct x11drv_adapter DWORD state_flags; }; +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -710,11 +723,20 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 3f6fdebb1e..49427890cb 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -291,6 +291,57 @@ static void xinerama_free_adapters( struct x11drv_adapter *adapters ) heap_free( adapters ); } +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + { + strcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -331,8 +382,10 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; handler.pFreeGpus = xinerama_free_gpus; handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

1 0

[PATCH v6 3/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang 22 May '19

22 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 121 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 18 ++++++ dlls/winex11.drv/xinerama.c | 69 ++++++++++++++++++++ 3 files changed, 203 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c45a0a4657..300a05e8c0 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','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}; @@ -67,6 +70,26 @@ static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'V','I','D','E','O',0}; +static const WCHAR adapter_key_fmtW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '%','s','\\', + '%','0','4','x',0}; +static const WCHAR device_video_fmtW[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR machine_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; static struct x11drv_display_device_handler handler; @@ -79,8 +102,9 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } -/* Initialize a GPU instance */ -static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, + WCHAR *driver) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -129,6 +153,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g RegCloseKey(hkey); hkey = NULL; + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto fail; + strcpyW(driver, nt_classW); + strcatW(driver, bufferW); + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); if (hkey == INVALID_HANDLE_VALUE) @@ -144,6 +175,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto fail; } + strcpyW(guid_string, bufferW); ret = TRUE; fail: @@ -153,6 +185,63 @@ fail: return ret; } +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, + const struct x11drv_gpu *gpu, const WCHAR *guid_string, + const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) +{ + WCHAR adapter_keyW[MAX_PATH]; + WCHAR key_nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + BOOL ret = FALSE; + LSTATUS ls; + + sprintfW(key_nameW, device_video_fmtW, video_index); + strcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + strcatW(bufferW, adapter_keyW); + + /* Write value of \Device\Video? (adapter key) in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW(video_hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Create HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} link to GPU driver */ + ls = RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (ls == ERROR_ALREADY_EXISTS) + RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (RegSetValueExW(hkey, symbolic_link_valueW, 0, REG_LINK, (const BYTE *)gpu_driver, + strlenW(gpu_driver) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information are Wine specific, they don't really exist on Windows. They are used so that we can + * implement EnumDisplayDevices etc by querying registry only. These information are most likely reported by the + * device driver on Windows */ + RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + + /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match + * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -195,11 +284,15 @@ static void cleanup_devices(void) void X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct x11drv_adapter *adapters = NULL; + INT gpu_count, adapter_count; + INT gpu, adapter; HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; + INT video_index = 0; DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; BOOL success = FALSE; TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -230,8 +323,24 @@ void X11DRV_DisplayDevices_Init(void) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto fail; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto fail; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto fail; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } success = TRUE; @@ -241,6 +350,8 @@ fail: RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); if (!success) ERR("Failed to initialize display devices\n"); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e50158d282..5d99d69eff 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -681,6 +681,15 @@ struct x11drv_gpu UINT revision_id; }; +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -695,8 +704,17 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 520f59f93d..3f6fdebb1e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -224,6 +224,73 @@ static void xinerama_free_gpus( struct x11drv_gpu *gpus ) heap_free( gpus ); } +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + INT primary_index; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + primary_index = primary_monitor; + if (primary_index >= nb_monitors) + primary_index = 0; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + if (i == primary_index) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + /* Primary adapter has to be first */ + if (primary_index) + { + struct x11drv_adapter tmp; + tmp = adapters[primary_index]; + adapters[primary_index] = adapters[0]; + adapters[0] = tmp; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -263,7 +330,9 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

1 0

[PATCH 2/4] d3d8/tests: Test IDirect3D8::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng 22 May '19

22 May '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b11b..bab08e38bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); } -- 2.20.1

2 1

[PATCH v3] gdi32: create_polypolygon_region should return empty region when area is empty
by Fabian Maurer 22 May '19

22 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v3: Add test for NULLREGION --- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/clipping.c | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428dc9..93238b5a84 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2627,8 +2627,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - if (!(nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ))) - goto done; + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if (!(obj = alloc_region( nb_points / 2 ))) goto done; diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 60bd31e8e4..08fe490dfa 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -533,6 +533,44 @@ static void test_window_dc_clipping(void) DestroyWindow(hwnd); } +static void test_CreatePolyPolygonRgn(void) +{ + HRGN region; + POINT points_zero[] = { {0, 0}, {0, 0}, {0, 0} }; + POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; + POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; + POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + INT counts_single_poly[] = { 3 }; + INT counts_two_poly[] = { 3, 3 }; + int ret; + RECT rect; + + /* When all polygons are just one point or line, return must not be NULL */ + + region = CreatePolyPolygonRgn(points_zero, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n"); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_six, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n"); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_line, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n"); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_mixed, counts_two_poly, ARRAY_SIZE(counts_two_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n"); + DeleteObject(region); +} START_TEST(clipping) { @@ -541,4 +579,5 @@ START_TEST(clipping) test_GetClipRgn(); test_memory_dc_clipping(); test_window_dc_clipping(); + test_CreatePolyPolygonRgn(); } -- 2.21.0

2 1

[PATCH v4] gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty.
by Huw Davies 22 May '19

22 May '19

From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/clipping.c | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428dc9..93238b5a84 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2627,8 +2627,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - if (!(nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ))) - goto done; + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if (!(obj = alloc_region( nb_points / 2 ))) goto done; diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 60bd31e8e4..d04ef77ca3 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -533,6 +533,44 @@ static void test_window_dc_clipping(void) DestroyWindow(hwnd); } +static void test_CreatePolyPolygonRgn(void) +{ + HRGN region; + POINT points_zero[] = { {0, 0}, {0, 0}, {0, 0} }; + POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; + POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; + POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + INT counts_single_poly[] = { 3 }; + INT counts_two_poly[] = { 3, 3 }; + int ret; + RECT rect; + + /* When all polygons are just one point or line, return must not be NULL */ + + region = CreatePolyPolygonRgn(points_zero, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_six, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_line, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_mixed, counts_two_poly, ARRAY_SIZE(counts_two_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); +} START_TEST(clipping) { @@ -541,4 +579,5 @@ START_TEST(clipping) test_GetClipRgn(); test_memory_dc_clipping(); test_window_dc_clipping(); + test_CreatePolyPolygonRgn(); } -- 2.18.0

1 0

[PATCH 2/2] urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it.
by Dmitry Timoshkov 22 May '19

22 May '19

This patch fixes regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325, and reported in the bug 47190. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/bindprot.c | 23 +++++++++++++++-------- dlls/urlmon/tests/protocol.c | 3 --- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 42d3d21925..e9c97e8a9d 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -509,15 +509,19 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, &IID_IUnknown, (void**)&protocol_unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(SUCCEEDED(hres)) + This->protocol_unk = protocol_unk; + else + IUnknown_Release(protocol_unk); + } + else if(hres == CLASS_E_NOAGGREGATION) + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + IClassFactory_Release(cf); if(FAILED(hres)) return hres; - - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); - if(FAILED(hres)) { - IUnknown_Release(protocol_unk); - return hres; - } } StringFromCLSID(&clsid, &clsid_str); @@ -703,8 +707,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(This->protocol) { IInternetProtocol_Terminate(This->protocol, 0); - IInternetProtocol_Release(This->protocol); - This->protocol = NULL; + + if (This->protocol_unk) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } } set_binding_sink(This, NULL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index eb8b1099d7..20a8e89d0d 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3884,9 +3884,7 @@ static void test_CreateBinding(void) trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); -todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); - if (hres != S_OK) goto fail; trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol); @@ -4040,7 +4038,6 @@ todo_wine_if (no_aggregation) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); -fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session); -- 2.20.1

2 1

[PATCH 1/2] urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation. (v3)
by Dmitry Timoshkov 22 May '19

22 May '19

v2: moved to protocol.c v3: Added more refcount tests. Just in case heres a testbot run of this patch alone: https://testbot.winehq.org/JobDetails.pl?Key=52658 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/tests/protocol.c | 167 +++++++++++++++++++++++++++++------ 1 file changed, 141 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 999b591f5f..eb8b1099d7 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(Switch); DEFINE_EXPECT(Continue); DEFINE_EXPECT(CreateInstance); +DEFINE_EXPECT(CreateInstance_no_aggregation); +DEFINE_EXPECT(CreateInstance_no_aggregation_fail); DEFINE_EXPECT(Start); DEFINE_EXPECT(StartEx); DEFINE_EXPECT(Terminate); @@ -159,6 +161,7 @@ static DWORD prot_read, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; static BOOL empty_file, no_mime, bind_from_cache, file_with_hash, reuse_protocol_thread; +static BOOL no_aggregation; enum { STATE_CONNECTING, @@ -214,6 +217,12 @@ static const WCHAR binding_urls[][130] = { static const CHAR post_data[] = "mode=Test"; +static LONG obj_refcount(void *obj) +{ + IUnknown_AddRef((IUnknown *)obj); + return IUnknown_Release((IUnknown *)obj); +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -1532,15 +1541,23 @@ static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, static ULONG WINAPI InternetPriority_AddRef(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI InternetPriority_Release(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LONG nPriority) @@ -1621,6 +1638,12 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; static const IID unknown_iid2 = {0x5b7ebc0c,0xf630,0x4cea,{0x89,0xd3,0x5a,0xf0,0x38,0xed,0x05,0x5c}}; + if(IsEqualGUID(riid, &IID_IInternetProtocolEx)) { + *ppv = &This->IInternetProtocolEx_iface; + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + return S_OK; + } + /* FIXME: Why is it calling here instead of outer IUnknown? */ if(IsEqualGUID(riid, &IID_IInternetPriority)) { *ppv = &This->IInternetPriority_iface; @@ -1636,15 +1659,23 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static ULONG WINAPI ProtocolEmul_AddRef(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI ProtocolEmul_Release(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static DWORD WINAPI thread_proc(PVOID arg) @@ -2215,6 +2246,7 @@ static Protocol *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { + static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; Protocol *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -2243,6 +2275,10 @@ static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, v CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); *ppv = NULL; return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { + trace("QI(%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; }else { ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -2569,12 +2605,28 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown { Protocol *ret; - CHECK_EXPECT(CreateInstance); + trace("CF_CreateInstance(%s,%p)\n", wine_dbgstr_guid(riid), pOuter); - ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); + if (!pOuter) + { + ok(IsEqualGUID(&IID_IInternetProtocol, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + CHECK_EXPECT(CreateInstance_no_aggregation); + } + else + { + ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + if (no_aggregation) + { + CHECK_EXPECT(CreateInstance_no_aggregation_fail); + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + CHECK_EXPECT(CreateInstance); + } + ret = heap_alloc(sizeof(*ret)); ret->IUnknown_inner.lpVtbl = &ProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &ProtocolVtbl; @@ -2584,7 +2636,10 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ret->outer_ref = 0; protocol_emul = ret; - *ppv = &ret->IUnknown_inner; + if (!pOuter) + *ppv = &ret->IInternetProtocolEx_iface; + else + *ppv = &ret->IUnknown_inner; return S_OK; } @@ -3763,7 +3818,7 @@ static void test_CreateBinding(void) {'t','e','s','t',':','/','/','f','i','l','e','.','h','t','m','l',0}; static const WCHAR wsz_test[] = {'t','e','s','t',0}; - trace("Testing CreateBinding...\n"); + trace("Testing CreateBinding%s...\n", no_aggregation ? "(no aggregation)" : ""); init_test(BIND_TEST, TEST_BINDING); hres = pCoInternetGetSession(0, &session, 0); @@ -3811,37 +3866,75 @@ static void test_CreateBinding(void) ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); SET_EXPECT(QueryService_InternetProtocol); - SET_EXPECT(CreateInstance); + + if(no_aggregation) { + SET_EXPECT(CreateInstance_no_aggregation_fail); + SET_EXPECT(CreateInstance_no_aggregation); + SET_EXPECT(StartEx); + } else { + SET_EXPECT(CreateInstance); + SET_EXPECT(Start); + } + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); SET_EXPECT(SetPriority); - SET_EXPECT(Start); + + ok(obj_refcount(protocol) == 4, "wrong protocol refcount %d\n", obj_refcount(protocol)); trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); +todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); + if (hres != S_OK) goto fail; trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol); - CHECK_CALLED(CreateInstance); + + if(no_aggregation) { + ok(obj_refcount(protocol) == 4, "wrong protocol refcount %d\n", obj_refcount(protocol)); + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_NOT_CALLED(CreateInstance); + CHECK_CALLED(CreateInstance_no_aggregation_fail); + CHECK_CALLED(CreateInstance_no_aggregation); + } else { + ok(obj_refcount(protocol) == 5 || broken(obj_refcount(protocol) == 4) /* before win7 */, "wrong protocol refcount %d\n", obj_refcount(protocol)); + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_CALLED(CreateInstance); + CHECK_NOT_CALLED(CreateInstance_no_aggregation_fail); + CHECK_NOT_CALLED(CreateInstance_no_aggregation); + } + CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); CHECK_CALLED(SetPriority); - CHECK_CALLED(Start); + if(no_aggregation) + CHECK_CALLED(StartEx); + else + CHECK_CALLED(Start); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetHttpInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&http_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetHttpInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetHttpInfo); + else + CHECK_CALLED(QueryInterface_IWinInetHttpInfo); SET_EXPECT(Read); read = 0xdeadbeef; @@ -3865,11 +3958,20 @@ static void test_CreateBinding(void) hres = IInternetPriority_SetPriority(priority, 101); ok(hres == S_OK, "SetPriority failed: %08x\n", hres); + if(no_aggregation) { + ok(obj_refcount(protocol) == 4, "wrong protocol refcount %d\n", obj_refcount(protocol)); + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + } else { + ok(obj_refcount(protocol) == 5 || broken(obj_refcount(protocol) == 4) /* before win7 */, "wrong protocol refcount %d\n", obj_refcount(protocol)); + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + } + SET_EXPECT(Terminate); hres = IInternetProtocol_Terminate(protocol, 0xdeadbeef); ok(hres == S_OK, "Terminate failed: %08x\n", hres); CHECK_CALLED(Terminate); + ok(obj_refcount(protocol) == 4, "wrong protocol refcount %d\n", obj_refcount(protocol)); ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); SET_EXPECT(Continue); @@ -3880,12 +3982,19 @@ static void test_CreateBinding(void) SET_EXPECT(Read); read = 0xdeadbeef; hres = IInternetProtocol_Read(protocol, expect_pv = buf, sizeof(buf), &read); - todo_wine - ok(hres == E_ABORT, "Read failed: %08x\n", hres); - todo_wine - ok(read == 0, "read = %d\n", read); - todo_wine - CHECK_NOT_CALLED(Read); + if(no_aggregation) + { + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(read == 100, "read = %d\n", read); + CHECK_CALLED(Read); + } else { + todo_wine + ok(hres == E_ABORT, "Read failed: %08x\n", hres); + todo_wine + ok(read == 0, "read = %d\n", read); + todo_wine + CHECK_NOT_CALLED(Read); + } hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = emptyW); @@ -3901,6 +4010,8 @@ static void test_CreateBinding(void) IInternetPriority_Release(priority); IInternetBindInfo_Release(prot_bind_info); + ok(obj_refcount(protocol) == 1, "wrong protocol refcount %d\n", obj_refcount(protocol)); + SET_EXPECT(Protocol_destructor); IInternetProtocol_Release(protocol); CHECK_CALLED(Protocol_destructor); @@ -3929,6 +4040,7 @@ static void test_CreateBinding(void) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); +fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session); @@ -4186,6 +4298,9 @@ START_TEST(protocol) test_gopher_protocol(); test_mk_protocol(); test_CreateBinding(); + no_aggregation = TRUE; + test_CreateBinding(); + no_aggregation = FALSE; bindf &= ~BINDF_FROMURLMON; trace("Testing file binding (mime verification, emulate prot)...\n"); -- 2.20.1

2 1

[PATCH 1/6] setupapi: Implement SetupDiRegisterCoDeviceInstallers().
by Zebediah Figura 22 May '19

22 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 51 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1db2e52399..d2921bcf44 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -108,6 +108,7 @@ struct driver { WCHAR inf_path[MAX_PATH]; WCHAR manufacturer[LINE_LEN]; + WCHAR mfg_key[LINE_LEN]; WCHAR description[LINE_LEN]; }; @@ -4117,12 +4118,53 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_d /*********************************************************************** * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%p, %p stub\n", dev, info_data); + static const WCHAR coinstallersW[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; + WCHAR coinst_key[LINE_LEN], coinst_key_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, coinst_key, ARRAY_SIZE(coinst_key), NULL); + SetupDiGetActualSectionToInstallW(hinf, coinst_key, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); + strcatW(coinst_key_ext, coinstallersW); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, coinst_key_ext, SPINST_ALL, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return TRUE; } /* Check whether the given hardware or compatible ID matches any of the device's @@ -4231,6 +4273,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); strcpyW(device->drivers[count - 1].inf_path, path); strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + strcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, ARRAY_SIZE(device->drivers[count - 1].description), NULL); -- 2.21.0

2 11

[PATCH 1/5] strmbase: Rename BaseFilter_Destroy() to strmbase_filter_cleanup().
by Zebediah Figura 22 May '19

22 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/vfwcapture.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/strmbase/filter.c | 4 ++-- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 0139dbca88..feb9c08e85 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -177,7 +177,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface) IPin_Release(conn); } IPin_Release(This->pOutputPin); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); ObjectRefCount(FALSE); } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b4afae92ed..a331d3359a 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) CoTaskMemFree(This->pszFileName); if (This->pmt) DeleteMediaType(This->pmt); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index a8917d99ec..9798ea71a2 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -193,7 +193,7 @@ void Parser_Destroy(ParserImpl *This) } CoTaskMemFree(This->ppPins); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 3a39ec4e06..325620e8de 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - BaseFilter_Destroy(This); + strmbase_filter_cleanup(This); return refCount; } @@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID This->pFuncsTable = pBaseFuncsTable; } -HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) +HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This) { if (This->pClock) IReferenceClock_Release(This->pClock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index d263b208eb..c6c7978235 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -298,7 +298,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); - BaseFilter_Destroy(&filter->filter); + strmbase_filter_cleanup(&filter->filter); } HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 9cb18b2c3e..8b63d2d5aa 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -194,7 +194,7 @@ static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); IUnknown_Release(This->seekthru_unk); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return refCount; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8e9278dca9..3653f647c4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1298,7 +1298,7 @@ static void GST_Destroy(GSTImpl *This) gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); gst_object_unref(This->bus); } - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 19042ed5d1..651a4a8c6b 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -337,7 +337,7 @@ static void QT_Destroy(QTSplitter *This) This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 18336c037d..d51fdb47c7 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table); -HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); +HRESULT WINAPI strmbase_filter_cleanup(BaseFilter *filter); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); -- 2.21.0

1 4

[PATCH] dinput: Increase MAX_JOYDEV to 1024.
by Noor Schat 22 May '19

22 May '19

As defined in drivers/input/input.c in the linux kernel, the highest number an evdev node can get assigned is 1023. Signed-off-by: Noor Schat <creeperlwd(a)gmail.com> --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db848c..f6b0331f1a 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -179,7 +179,7 @@ static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) -#define MAX_JOYDEV 64 +#define MAX_JOYDEV 1024 static int have_joydevs = -1; static struct JoyDev *joydevs = NULL; -- 2.21.0

3 2

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 22 May '19

22 May '19

1 0

[PATCH] dinput: Increase MAX_JOYDEV to 1024.
by Noor Schat 21 May '19

21 May '19

As defined in drivers/input/input.c in the linux kernel, the highest number an evdev node can get assigned is 1023. Signed-off-by: Noor Schat <creeperlwd(a)gmail.com> --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db848c..f6b0331f1a 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -179,7 +179,7 @@ static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) -#define MAX_JOYDEV 64 +#define MAX_JOYDEV 1024 static int have_joydevs = -1; static struct JoyDev *joydevs = NULL; -- 2.21.0

1 0

[PATCH] crypt32/tests: Fix some memory leaks (Valgrind).
by Gijs Vermeulen 21 May '19

21 May '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/cert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e4f4c59c76..880ae720a4 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1736,6 +1736,7 @@ static void testGetIssuerCert(void) CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); + CertFreeCertificateContext(cert3); CertCloseStore(store, 0); HeapFree(GetProcessHeap(), 0, certencoded); @@ -1750,6 +1751,7 @@ static void testGetIssuerCert(void) ok(!parent, "Expected NULL\n"); ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); + CertFreeCertificateContext(cert1); CertCloseStore(store, 0); } -- 2.21.0

1 0

[PATCH] hid: Fix usage value mask
by Andrew Eikum 21 May '19

21 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47223 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8c046703b40..c780dbe2d30 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -64,7 +64,7 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN if (remaining_bits < copy_bits) copy_bits = remaining_bits; - data |= ((report[byte_index] >> bit_index) & ((2 << copy_bits) - 1)) << shift; + data |= ((report[byte_index] >> bit_index) & ((1 << copy_bits) - 1)) << shift; shift += copy_bits; bit_index = 0; -- 2.21.0

2 1

[PATCH 1/7] setupapi: Add an initial implementation of SetupDiBuildDriverInfoList().
by Zebediah Figura 21 May '19

21 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 120 ++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 12 ---- 2 files changed, 120 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 32bcd0ed39..2d7cb99590 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -103,6 +103,13 @@ static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; static const WCHAR emptyW[] = {0}; +struct driver +{ + WCHAR inf_path[MAX_PATH]; + WCHAR manufacturer[LINE_LEN]; + WCHAR description[LINE_LEN]; +}; + /* is used to identify if a DeviceInfoSet pointer is valid or not */ #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff056 @@ -127,6 +134,9 @@ struct device struct list entry; BOOL removed; SP_DEVINSTALL_PARAMS_W params; + struct driver *drivers; + unsigned int driver_count; + struct driver *selected_driver; }; struct device_iface @@ -4113,3 +4123,113 @@ BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA inf SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/* Check whether the given hardware or compatible ID matches any of the device's + * own hardware or compatible IDs. */ +static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, const WCHAR *id) +{ + WCHAR *device_ids; + const WCHAR *p; + DWORD size; + + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, NULL, &size)) + { + device_ids = heap_alloc(size); + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, device_ids, &size)) + { + for (p = device_ids; *p; p += strlenW(p) + 1) + { + if (!strcmpiW(p, id)) + { + heap_free(device_ids); + return TRUE; + } + } + } + heap_free(device_ids); + } + + return FALSE; +} + +static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) +{ + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN]; + INFCONTEXT ctx; + DWORD i, j, k; + HINF hinf; + + TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); + + if ((hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return; + + for (i = 0; SetupGetLineByIndexW(hinf, manufacturerW, i, &ctx); ++i) + { + SetupGetStringFieldW(&ctx, 0, mfg_name, ARRAY_SIZE(mfg_name), NULL); + if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) + strcpyW(mfg_key, mfg_name); + + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) + { + WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key)); + continue; + } + + for (j = 0; SetupGetLineByIndexW(hinf, mfg_key_ext, j, &ctx); ++j) + { + for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) + { + if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) + { + unsigned int count = ++device->driver_count; + + device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); + strcpyW(device->drivers[count - 1].inf_path, path); + strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, + ARRAY_SIZE(device->drivers[count - 1].description), NULL); + + TRACE("Found compatible driver: manufacturer %s, desc %s.\n", + debugstr_w(mfg_name), debugstr_w(device->drivers[count - 1].description)); + } + } + } + } + + SetupCloseInfFile(hinf); +} + +/*********************************************************************** + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ +BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, type %#x.\n", devinfo, device_data, type); + + if (type != SPDIT_COMPATDRIVER) + { + FIXME("Unhandled type %#x.\n", type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (device->params.Flags & DI_ENUMSINGLEINF) + { + enum_compat_drivers_from_file(device, device->params.DriverPath); + } + else + { + FIXME("Searching in a directory is not yet implemented.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + return TRUE; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ede878f1de..1be10ced39 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -575,18 +575,6 @@ BOOL WINAPI SetupLogFileA( return FALSE; } -/*********************************************************************** - * SetupDiBuildDriverInfoList (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) - { - FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - /*********************************************************************** * SetupDiDestroyDriverInfoList (SETUPAPI.@) */ -- 2.21.0

2 9

[PATCH 3/3] libwine: Ignore 0 weights as described in Unicode collation algorithm.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 8 ++++---- libs/port/sortkey.c | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-)

1 0

[PATCH 2/3] libwine: Decompose characters before comparing in wine_compare_string.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 24 +++++++++--------- libs/port/sortkey.c | 48 ++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 31 deletions(-)

1 0

[PATCH 1/3] libwine: Add helper function to compare character weights.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- libs/port/sortkey.c | 169 ++++++++++---------------------------------- 1 file changed, 36 insertions(+), 133 deletions(-)

1 0

[PATCH 3/3] mshtml: Implement IOleInPlaceObjectWindowless::SetObjectRects.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/oleobj.c | 13 +++++++-- dlls/mshtml/tests/htmldoc.c | 56 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-)

1 0

[PATCH 2/3] mshtml: Return rect relative to parent window in IOleDocumentView::GetRect.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/view.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/3] mshtml: Fix window size in IOleDocumentView::SetRect implementation.
by Jacek Caban 21 May '19

21 May '19

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

1 0

Recent GIT changes to msvcp crash for me if i compile with --without-mingw
by Sveinar Søpler 21 May '19

21 May '19

I found that recent GIT changes makes msvcp100.dll crash with: --- 0009:err:heap:HEAP_GetPtr Invalid heap (nil)! 0009:err:heap:HEAP_GetPtr Invalid heap (nil)! 0009:err:module:LdrInitializeThunk "msvcp100.dll" failed to initialize, aborting --- when compiling wine with the --without-mingw option. If i compile with default (ie. mingw enabled), seemingly things work. Is this intentional, and mingw is now "required" for wine compile? Or would i perhaps have gotten away with the it if jumping through some hoops with dll-overrides and winetricks usage? Git 0d175fe861826d4cf756291bd43404aba065cec6 and older seems to work as before tho. Sveinar

2 2

[PATCH v3 5/5] dxgi/tests: Add factory window association tests.
by Zhiyi Zhang 21 May '19

21 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 250 +++++++++++++++++++++++++++++++++++- 2 files changed, 250 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957..fbce9d3dd0 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 d3d11 dxgi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..d4d0f93795 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -40,9 +40,16 @@ static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + static struct test_entry { void (*test)(void); @@ -539,6 +546,56 @@ success: return dxgi_device; } +static ID3D11Device *create_d3d11_device(const struct device_desc *desc) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; + unsigned int feature_level_count; + IDXGIAdapter *adapter; + ID3D11Device *device; + HRESULT hr; + + if (desc && desc->feature_level) + { + feature_level = desc->feature_level; + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + } + + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -4985,6 +5042,197 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIFactory *factory, *factory2; + IDXGIDevice *devices[2] = {0}; + ID3D11Device *d3d11_device; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + HWND hwnd, hwnd2; + LONG_PTR wndproc; + BOOL fullscreen; + ULONG refcount; + HRESULT hr; + INT i, j; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here. + * 1. Posting them to the window doesn't exit fullscreen like Alt+Enter does. + * Alt+Tab and Alt+Esc are handled somewhere else, e.g., not calling IDXGISwapChain::Present + * will break Alt+Tab and Alt+Esc while Alt+Enter will still function. + * 2. Posting them hangs the posting thread. Another thread keep sending input is needed to avoid the hang. + * The hang is not because of flush_events. */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + /* d3d10 */ + devices[0] = create_device(0); + + /* d3d11 */ + d3d11_device = create_d3d11_device(NULL); + if (d3d11_device) + { + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, (void **)&devices[1]); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); + ID3D11Device_Release(d3d11_device); + } + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + /* Get pointer to original WNDPROC */ + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(devices); i++) + { + if (!devices[i]) + { + skip("Create device failed. Skipping IDXGIFactory window association test.\n"); + continue; + } + + hr = IDXGIDevice_GetAdapter(devices[i], &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + /* Parameter check */ + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "GetWindowAssociation failed, hr %#x.\n", hr); + + for (j = 0; j <= DXGI_MWA_VALID; j++) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + ok(SUCCEEDED(hr), "GetWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + /* Yes, GetWindowAssociation always return NULL for hwnd even though MakeWindowAssociation and + * GetWindowAssociation are successfully called. I wonder why. */ + ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "MakeWindowAssociation succeeded, hr %#x.\n", hr); + + /* Alt+Enter tests */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)devices[i], &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "SetFullscreenState failed, hr %#x.\n", hr); + if (FAILED(hr)) + skip("Could not change fullscreen state.\n"); + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(tests); j++) + { + /* Associate a window first with opposite flags */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate current test window */ + hwnd = tests[j].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[j].flag); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate a new test window doesn't override old window */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Wrong factory doesn't affect current test window */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(SUCCEEDED(hr), "Test %d: GetFullscreenState failed, hr %#x.\n", j, hr); + ok(fullscreen == tests[j].expect_fullscreen || broken(tests[j].broken_d3d10 && i == 0 && fullscreen), + "Test %d: got unexpected fullscreen %#x.\n", j, fullscreen); + + /* Verify WNDPROC unmodified. Currently Wine modifies WNPPROC during after fullscreen transition */ + todo_wine_if(tests[j].expect_fullscreen) + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + } + } + + /* Set to windowed mode before releasing resources, otherwise there might be unhandled exceptions */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + refcount = IDXGIDevice_Release(devices[i]); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "IDXGIAdapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5029,7 +5277,6 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; - BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; char **argv; @@ -5084,6 +5331,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); -- 2.20.1

2 1

[PATCH v3 4/5] dxgi: Implement Alt+Enter handling.
by Zhiyi Zhang 21 May '19

21 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 + dlls/wined3d/swapchain.c | 132 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 19 +++++ include/wine/wined3d.h | 2 + 5 files changed, 157 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 030bb67c22..4c90012b86 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -221,6 +221,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); + wined3d_swapchain_disable_window_hook(swapchain->wined3d_swapchain); wined3d_swapchain_decref(swapchain->wined3d_swapchain); if (device) IWineDXGIDevice_Release(device); @@ -849,6 +850,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } } wined3d_mutex_unlock(); + wined3d_swapchain_enable_window_hook(swapchain->wined3d_swapchain); return S_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 808602cb15..be0610d087 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); +static struct list hooked_swapchains = LIST_INIT(hooked_swapchains); +static struct list window_hooks = LIST_INIT(window_hooks); + static void wined3d_swapchain_destroy_object(void *object) { swapchain_destroy_contexts(object); @@ -1492,3 +1495,132 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha return WINED3D_OK; } + +static LRESULT CALLBACK window_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct wined3d_window_association *association_entry; + struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_swapchain_desc swapchain_desc; + MSG *msg = (MSG *)lparam; + BOOL handled = FALSE; + BOOL skip = FALSE; + + /* Handle Alt+Enter */ + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN && msg->wParam == VK_RETURN + && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(swapchain_entry, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->swapchain->device_window != msg->hwnd) + continue; + + LIST_FOR_EACH_ENTRY(association_entry, &window_associations, struct wined3d_window_association, entry) + { + if (association_entry->hwnd == msg->hwnd + && (association_entry->flags & (WINED3D_MWA_NO_WINDOW_CHANGES | WINED3D_MWA_NO_ALT_ENTER))) + { + skip = TRUE; + break; + } + } + + if (!skip) + { + wined3d_swapchain_get_desc(swapchain_entry->swapchain, &swapchain_desc); + swapchain_desc.windowed = !swapchain_desc.windowed; + wined3d_swapchain_set_fullscreen(swapchain_entry->swapchain, &swapchain_desc, NULL); + } + + handled = TRUE; + break; + } + wined3d_mutex_unlock(); + } + + return handled ? 1 : CallNextHookEx(0, code, wparam, lparam); +} + +void CDECL wined3d_swapchain_enable_window_hook(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_swapchain_window_hook *hook_entry; + BOOL has_hook = FALSE; + + if (!(swapchain_entry = heap_alloc_zero(sizeof(*swapchain_entry)))) + return; + + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->device_window, NULL); + wined3d_mutex_lock(); + list_add_head(&hooked_swapchains, &swapchain_entry->entry); + /* Add hook for new thread if needed */ + LIST_FOR_EACH_ENTRY(hook_entry, &window_hooks, struct wined3d_swapchain_window_hook, entry) + { + if (hook_entry->thread_id == swapchain_entry->thread_id) + { + has_hook = TRUE; + break; + } + } + + if (!has_hook) + { + if (!(hook_entry = heap_alloc_zero(sizeof(*hook_entry)))) + { + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + wined3d_mutex_unlock(); + return; + } + + hook_entry->thread_id = swapchain_entry->thread_id; + hook_entry->hook = SetWindowsHookExW(WH_GETMESSAGE, window_hook_proc, 0, hook_entry->thread_id); + list_add_head(&window_hooks, &hook_entry->entry); + } + wined3d_mutex_unlock(); +} + +void CDECL wined3d_swapchain_disable_window_hook(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry, *swapchain_entry2; + struct wined3d_swapchain_window_hook *hook_entry, *hook_entry2; + BOOL hook_in_use = FALSE; + DWORD thread_id = 0; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(swapchain_entry, swapchain_entry2, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->swapchain == swapchain) + { + thread_id = swapchain_entry->thread_id; + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + break; + } + } + /* Check if hook is still used by other swapchains */ + LIST_FOR_EACH_ENTRY(swapchain_entry, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->thread_id == thread_id) + { + hook_in_use = TRUE; + break; + } + } + /* Remove hook if it's not longer used by any thread */ + if (!hook_in_use) + { + LIST_FOR_EACH_ENTRY_SAFE(hook_entry, hook_entry2, &window_hooks, struct wined3d_swapchain_window_hook, entry) + { + if (hook_entry->thread_id == thread_id) + { + list_remove(&hook_entry->entry); + UnhookWindowsHookEx(hook_entry->hook); + heap_free(hook_entry); + break; + } + } + } + wined3d_mutex_unlock(); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 733eedb485..f93c8d38fe 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -263,6 +263,8 @@ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) +@ cdecl wined3d_swapchain_disable_window_hook(ptr) +@ cdecl wined3d_swapchain_enable_window_hook(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f277d898f3..ec920536c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4177,6 +4177,25 @@ struct wined3d_swapchain HWND backup_wnd; }; +struct wined3d_hooked_swapchain +{ + struct wined3d_swapchain *swapchain; + DWORD thread_id; + struct list entry; +}; + +struct wined3d_swapchain_window_hook +{ + HHOOK hook; + DWORD thread_id; + struct list entry; +}; + +/* Equivalences of DXGI_MWA_* flags */ +#define WINED3D_MWA_NO_WINDOW_CHANGES 0x1 +#define WINED3D_MWA_NO_ALT_ENTER 0x2 +#define WINED3D_MWA_NO_PRINT_SCREEN 0x4 + void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8514860a79..e41a9080df 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2664,6 +2664,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); +void __cdecl wined3d_swapchain_disable_window_hook(struct wined3d_swapchain *swapchain); +void __cdecl wined3d_swapchain_enable_window_hook(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); -- 2.20.1

1 0

[PATCH v3 3/5] dxgi: Retrieve fullscreen state from wined3d_swapchain.
by Zhiyi Zhang 21 May '19

21 May '19

Because wined3d_swapchain may change its fullscreen state after user input. For example, user pressed Alt+Enter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/swapchain.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c729a..553eacee3b 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,7 +173,6 @@ struct d3d11_swapchain IWineDXGIDevice *device; IDXGIFactory *factory; - BOOL fullscreen; IDXGIOutput *target; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d..030bb67c22 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -388,7 +388,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (SUCCEEDED(hr)) { - swapchain->fullscreen = fullscreen; if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; @@ -404,11 +403,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = swapchain->fullscreen; + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + *fullscreen = !swapchain_desc.windowed; + } if (target) { @@ -781,6 +786,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + BOOL fullscreen; HRESULT hr; /* A reference to the implicit swapchain is held by the wined3d device. In @@ -813,7 +819,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); - swapchain->fullscreen = !desc->windowed; + fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) @@ -823,7 +829,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->target = NULL; - if (swapchain->fullscreen) + if (fullscreen) { desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, -- 2.20.1

1 0

[PATCH v3 2/5] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Zhiyi Zhang 21 May '19

21 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a574090026..8e7500d933 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -192,9 +192,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFac static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + /* Yes, tests show that it always return NULL for unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, -- 2.20.1

1 0

[PATCH v3 1/5] dxgi: Implement dxgi_factory_MakeWindowAssociation().
by Zhiyi Zhang 21 May '19

21 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Add tests to show that window association doesn't modify WNDPROC. v3: Move most of the code into wined3d. Supersede 163626~163629 dlls/dxgi/factory.c | 15 ++++++-- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_main.c | 62 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 10 ++++++ include/wine/wined3d.h | 2 ++ 6 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145bc6a..a574090026 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -174,9 +174,20 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); - return S_OK; + TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + + if (flags > DXGI_MWA_VALID) + return DXGI_ERROR_INVALID_CALL; + + if (!window) + { + wined3d_remove_window_association(factory->wined3d); + return S_OK; + } + + return wined3d_add_window_association(factory->wined3d, window, flags); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470d..808602cb15 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -22,6 +22,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/list.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 040b9fc4ac..733eedb485 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,6 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() +@ cdecl wined3d_add_window_association(ptr ptr long) @ cdecl wined3d_calculate_format_pitch(ptr long long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) @ cdecl wined3d_check_device_format(ptr long long long long long long long) @@ -20,6 +21,7 @@ @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) +@ cdecl wined3d_remove_window_association(ptr) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 180e2d262e..9ef023dfb7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,6 +48,8 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; +struct list window_associations = LIST_INIT(window_associations); + static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { @@ -555,6 +557,66 @@ void wined3d_unregister_window(HWND window) wined3d_wndproc_mutex_unlock(); } +HRESULT CDECL wined3d_add_window_association(struct wined3d *wined3d, HWND hwnd, UINT flags) +{ + struct wined3d_window_association *association; + BOOL found = FALSE; + HRESULT hr = S_OK; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(association, &window_associations, struct wined3d_window_association, entry) + { + if (hwnd == association->hwnd) + { + found = TRUE; + break; + } + } + + if (found) + { + if(association->wined3d != wined3d) + WARN("window %p is already associated\n", hwnd); + else + association->flags = flags; + goto done; + } + else + { + association = heap_alloc_zero(sizeof(*association)); + if (!association) + { + hr = E_OUTOFMEMORY; + goto done; + } + + association->wined3d = wined3d; + association->hwnd = hwnd; + association->flags = flags; + list_add_head(&window_associations, &association->entry); + } + +done: + wined3d_mutex_unlock(); + return hr; +} + +void CDECL wined3d_remove_window_association(struct wined3d *wined3d) +{ + struct wined3d_window_association *association, *association2; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(association, association2, &window_associations, struct wined3d_window_association, entry) + { + if (wined3d == association->wined3d) + { + list_remove(&association->entry); + heap_free(association); + } + } + wined3d_mutex_unlock(); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fc56462b0..f277d898f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -215,6 +215,16 @@ struct wined3d_d3d_info DWORD multisample_draw_location; }; +struct wined3d_window_association +{ + struct wined3d *wined3d; + HWND hwnd; + UINT flags; + struct list entry; +}; + +extern struct list window_associations DECLSPEC_HIDDEN; + static const struct color_fixup_desc COLOR_FIXUP_IDENTITY = {0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W}; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 958ade166c..8514860a79 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2172,6 +2172,7 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); +HRESULT __cdecl wined3d_add_window_association(struct wined3d *wined3d, HWND hwnd, UINT flags); UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, @@ -2211,6 +2212,7 @@ HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); +void __cdecl wined3d_remove_window_association(struct wined3d *wined3d); HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); -- 2.20.1

1 0

[PATCH] mferror: Add some more error messages.
by Nikolay Sivov 21 May '19

21 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mferror/mferror.mc | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/mferror/mferror.mc b/dlls/mferror/mferror.mc index 826f8e562c..6934611ab4 100644 --- a/dlls/mferror/mferror.mc +++ b/dlls/mferror/mferror.mc @@ -526,6 +526,97 @@ SymbolicName=MF_E_UNSUPPORTED_CHARACTERISTICS Language=ENU Unsupported media source characteristics. . +MessageId=19000 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINK_REMOVED +Language=ENU +Stream sink was removed. +. +MessageId=19002 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINKS_OUT_OF_SYNC +Language=ENU +Stream sinks are out of sync. +. +MessageId=19003 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINKS_FIXED +Language=ENU +Media sink stream sinks set is fixed. +. +MessageId=19004 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINK_EXISTS +Language=ENU +Stream sink already exists. +. +MessageId=19005 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLEALLOCATOR_CANCELED +Language=ENU +Sample allocation was canceled. +. +MessageId=19006 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLEALLOCATOR_EMPTY +Language=ENU +Sample allocator is empty. +. +MessageId=19007 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_ALREADYSTOPPED +Language=ENU +Sink was already stopped. +. +MessageId=19008 +Severity=Error +Facility=MF +SymbolicName=MF_E_ASF_FILESINK_BITRATE_UNKNOWN +Language=ENU +Bitrate was unknown for ASF file sink. +. +MessageId=19009 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_NO_STREAMS +Language=ENU +No streams were selected for the sink. +. +MessageId=19010 +Severity=Success +Facility=MF +SymbolicName=MF_S_SINK_NOT_FINALIZED +Language=ENU +Sink has not been finalized. +. +MessageId=19011 +Severity=Error +Facility=MF +SymbolicName=MF_E_METADATA_TOO_LONG +Language=ENU +Metadata was too long. +. +MessageId=19012 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_NO_SAMPLES_PROCESSED +Language=ENU +No samples were processed by the sink. +. +MessageId=19013 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_HEADERS_NOT_FOUND +Language=ENU +Sink was not provided with required headers. +. MessageId=21006 Severity=Error Facility=MF -- 2.20.1

1 0

Supporting ext4 case-insensitive directories
by Gabriel Ivăncescu 21 May '19

21 May '19

Hi, With the latest kernel release candidate, ext4 received support for native case-insensitivity on a per-directory basis. This is done using the EXT2_IOC_SETFLAGS ioctl and the EXT4_CASEFOLD_FL flag (and GETFLAGS to retrieve it) for a given directory. Note that it works only on empty directories. I'll add support for it, and retrieving it should not be a problem to add in Wine. However my question now is: should Wine, by default, attempt to create the 'drive_c' directory with this attribute on (on new prefixes)? Do we want to do that? Thankfully we don't need to apply it to other directories, because according to: https://github.com/torvalds/linux/blob/master/fs/ext4/ext4.h EXT4_FL_INHERITED contains EXT4_CASEFOLD_FL, so it is inherited on new subdirectories automatically. This means we really only need to set it when creating drive_c itself. Thoughts?

1 0

[PATCH] kernelbase: Add most of path API from shlwapi.
by Nikolay Sivov 21 May '19

21 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 38 +-- dlls/kernelbase/path.c | 422 ++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 46163150c1..874db20c9c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1056,14 +1056,14 @@ @ stdcall PathCreateFromUrlA(str ptr ptr long) shlwapi.PathCreateFromUrlA @ stdcall PathCreateFromUrlAlloc(wstr ptr long) shlwapi.PathCreateFromUrlAlloc @ stdcall PathCreateFromUrlW(wstr ptr ptr long) shlwapi.PathCreateFromUrlW -@ stdcall PathFileExistsA(str) shlwapi.PathFileExistsA -@ stdcall PathFileExistsW(wstr) shlwapi.PathFileExistsW +@ stdcall PathFileExistsA(str) +@ stdcall PathFileExistsW(wstr) @ stdcall PathFindExtensionA(str) @ stdcall PathFindExtensionW(wstr) @ stdcall PathFindFileNameA(str) @ stdcall PathFindFileNameW(wstr) -@ stdcall PathFindNextComponentA(str) shlwapi.PathFindNextComponentA -@ stdcall PathFindNextComponentW(wstr) shlwapi.PathFindNextComponentW +@ stdcall PathFindNextComponentA(str) +@ stdcall PathFindNextComponentW(wstr) @ stdcall PathGetArgsA(str) @ stdcall PathGetArgsW(wstr) @ stdcall PathGetCharTypeA(long) @@ -1080,8 +1080,8 @@ @ stdcall PathIsRelativeW(wstr) @ stdcall PathIsRootA(str) @ stdcall PathIsRootW(wstr) -@ stdcall PathIsSameRootA(str str) shlwapi.PathIsSameRootA -@ stdcall PathIsSameRootW(wstr wstr) shlwapi.PathIsSameRootW +@ stdcall PathIsSameRootA(str str) +@ stdcall PathIsSameRootW(wstr wstr) @ stdcall PathIsUNCA(str) @ stdcall PathIsUNCEx(wstr ptr) @ stdcall PathIsUNCServerA(str) @@ -1093,16 +1093,16 @@ @ stdcall PathIsURLW(wstr) shlwapi.PathIsURLW @ stdcall PathIsValidCharA(long long) @ stdcall PathIsValidCharW(long long) -@ stdcall PathMatchSpecA(str str) shlwapi.PathMatchSpecA +@ stdcall PathMatchSpecA(str str) # @ stub PathMatchSpecExA # @ stub PathMatchSpecExW -@ stdcall PathMatchSpecW(wstr wstr) shlwapi.PathMatchSpecW +@ stdcall PathMatchSpecW(wstr wstr) @ stdcall PathParseIconLocationA(str) shlwapi.PathParseIconLocationA @ stdcall PathParseIconLocationW(wstr) shlwapi.PathParseIconLocationW -@ stdcall PathQuoteSpacesA(str) shlwapi.PathQuoteSpacesA -@ stdcall PathQuoteSpacesW(wstr) shlwapi.PathQuoteSpacesW -@ stdcall PathRelativePathToA(ptr str long str long) shlwapi.PathRelativePathToA -@ stdcall PathRelativePathToW(ptr wstr long wstr long) shlwapi.PathRelativePathToW +@ stdcall PathQuoteSpacesA(str) +@ stdcall PathQuoteSpacesW(wstr) +@ stdcall PathRelativePathToA(ptr str long str long) +@ stdcall PathRelativePathToW(ptr wstr long wstr long) @ stdcall PathRemoveBackslashA(str) @ stdcall PathRemoveBackslashW(wstr) @ stdcall PathRemoveBlanksA(str) @@ -1113,13 +1113,13 @@ @ stdcall PathRemoveFileSpecW(wstr) @ stdcall PathRenameExtensionA(str str) @ stdcall PathRenameExtensionW(wstr wstr) -@ stdcall PathSearchAndQualifyA(str ptr long) shlwapi.PathSearchAndQualifyA -@ stdcall PathSearchAndQualifyW(wstr ptr long) shlwapi.PathSearchAndQualifyW -@ stdcall PathSkipRootA(str) shlwapi.PathSkipRootA -@ stdcall PathSkipRootW(wstr) shlwapi.PathSkipRootW -@ stdcall PathStripPathA(str) shlwapi.PathStripPathA -@ stdcall PathStripPathW(wstr) shlwapi.PathStripPathW -@ stdcall PathStripToRootA(str) shlwapi.PathStripToRootA +@ stdcall PathSearchAndQualifyA(str ptr long) +@ stdcall PathSearchAndQualifyW(wstr ptr long) +@ stdcall PathSkipRootA(str) +@ stdcall PathSkipRootW(wstr) +@ stdcall PathStripPathA(str) +@ stdcall PathStripPathW(wstr) +@ stdcall PathStripToRootA(str) @ stdcall PathStripToRootW(wstr) @ stdcall PathUnExpandEnvStringsA(str ptr long) shlwapi.PathUnExpandEnvStringsA @ stdcall PathUnExpandEnvStringsW(wstr ptr long) shlwapi.PathUnExpandEnvStringsW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 49af28effe..ca951cfd3f 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2176,3 +2176,425 @@ BOOL WINAPI PathIsValidCharW(WCHAR c, DWORD class) return class & path_charclass[c]; } + +char * WINAPI PathFindNextComponentA(const char *path) +{ + char *slash; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return NULL; + + if ((slash = StrChrA(path, '\\'))) + { + if (slash[1] == '\\') + slash++; + return slash + 1; + } + + return (char *)path + strlen(path); +} + +WCHAR * WINAPI PathFindNextComponentW(const WCHAR *path) +{ + WCHAR *slash; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return NULL; + + if ((slash = StrChrW(path, '\\'))) + { + if (slash[1] == '\\') + slash++; + return slash + 1; + } + + return (WCHAR *)path + strlenW(path); +} + +char * WINAPI PathSkipRootA(const char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return NULL; + + if (*path == '\\' && path[1] == '\\') + { + /* Network share: skip share server and mount point */ + path += 2; + if ((path = StrChrA(path, '\\')) && (path = StrChrA(path + 1, '\\'))) + path++; + return (char *)path; + } + + if (IsDBCSLeadByte(*path)) + return NULL; + + /* Check x:\ */ + if (path[0] && path[1] == ':' && path[2] == '\\') + return (char *)path + 3; + + return NULL; +} + +WCHAR * WINAPI PathSkipRootW(const WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return NULL; + + if (*path == '\\' && path[1] == '\\') + { + /* Network share: skip share server and mount point */ + path += 2; + if ((path = StrChrW(path, '\\')) && (path = StrChrW(path + 1, '\\'))) + path++; + return (WCHAR *)path; + } + + /* Check x:\ */ + if (path[0] && path[1] == ':' && path[2] == '\\') + return (WCHAR *)path + 3; + + return NULL; +} + +void WINAPI PathStripPathA(char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (path) + { + char *filename = PathFindFileNameA(path); + if (filename != path) + RtlMoveMemory(path, filename, strlen(filename) + 1); + } +} + +void WINAPI PathStripPathW(WCHAR *path) +{ + WCHAR *filename; + + TRACE("%s\n", wine_dbgstr_w(path)); + filename = PathFindFileNameW(path); + if (filename != path) + RtlMoveMemory(path, filename, (strlenW(filename) + 1) * sizeof(WCHAR)); +} + +BOOL WINAPI PathSearchAndQualifyA(const char *path, char *buffer, UINT length) +{ + TRACE("%s, %p, %u\n", wine_dbgstr_a(path), buffer, length); + + if (SearchPathA(NULL, path, NULL, length, buffer, NULL)) + return TRUE; + + return !!GetFullPathNameA(path, length, buffer, NULL); +} + +BOOL WINAPI PathSearchAndQualifyW(const WCHAR *path, WCHAR *buffer, UINT length) +{ + TRACE("%s, %p, %u\n", wine_dbgstr_w(path), buffer, length); + + if (SearchPathW(NULL, path, NULL, length, buffer, NULL)) + return TRUE; + return !!GetFullPathNameW(path, length, buffer, NULL); +} + +BOOL WINAPI PathRelativePathToA(char *path, const char *from, DWORD attributes_from, const char *to, + DWORD attributes_to) +{ + WCHAR pathW[MAX_PATH], fromW[MAX_PATH], toW[MAX_PATH]; + BOOL ret; + + TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_a(from), attributes_from, wine_dbgstr_a(to), attributes_to); + + if (!path || !from || !to) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, from, -1, fromW, ARRAY_SIZE(fromW)); + MultiByteToWideChar(CP_ACP, 0, to, -1, toW, ARRAY_SIZE(toW)); + ret = PathRelativePathToW(pathW, fromW, attributes_from, toW, attributes_to); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, MAX_PATH, 0, 0); + + return ret; +} + +BOOL WINAPI PathRelativePathToW(WCHAR *path, const WCHAR *from, DWORD attributes_from, const WCHAR *to, + DWORD attributes_to) +{ + static const WCHAR szPrevDirSlash[] = { '.', '.', '\\', '\0' }; + static const WCHAR szPrevDir[] = { '.', '.', '\0' }; + WCHAR fromW[MAX_PATH], toW[MAX_PATH]; + DWORD len; + + TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_w(from), attributes_from, wine_dbgstr_w(to), attributes_to); + + if (!path || !from || !to) + return FALSE; + + *path = '\0'; + lstrcpynW(fromW, from, ARRAY_SIZE(fromW)); + lstrcpynW(toW, to, ARRAY_SIZE(toW)); + + if (!(attributes_from & FILE_ATTRIBUTE_DIRECTORY)) + PathRemoveFileSpecW(fromW); + if (!(attributes_to & FILE_ATTRIBUTE_DIRECTORY)) + PathRemoveFileSpecW(toW); + + /* Paths can only be relative if they have a common root */ + if (!(len = PathCommonPrefixW(fromW, toW, 0))) + return FALSE; + + /* Strip off 'from' components to the root, by adding "..\" */ + from = fromW + len; + if (!*from) + { + path[0] = '.'; + path[1] = '\0'; + } + if (*from == '\\') + from++; + + while (*from) + { + from = PathFindNextComponentW(from); + strcatW(path, *from ? szPrevDirSlash : szPrevDir); + } + + /* From the root add the components of 'to' */ + to += len; + /* We check to[-1] to avoid skipping end of string. See the notes for this function. */ + if (*to && to[-1]) + { + if (*to != '\\') + to--; + len = strlenW(path); + if (len + strlenW(to) >= MAX_PATH) + { + *path = '\0'; + return FALSE; + } + strcpyW(path + len, to); + } + + return TRUE; +} + +static BOOL path_match_maskA(const char *name, const char *mask) +{ + while (*name && *mask && *mask != ';') + { + if (*mask == '*') + { + do + { + if (path_match_maskA(name, mask + 1)) + return TRUE; /* try substrings */ + } while (*name++); + return FALSE; + } + + if (toupper(*mask) != toupper(*name) && *mask != '?') + return FALSE; + + name = CharNextA(name); + mask = CharNextA(mask); + } + + if (!*name) + { + while (*mask == '*') + mask++; + if (!*mask || *mask == ';') + return TRUE; + } + + return FALSE; +} + + +BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +{ + TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); + + if (!lstrcmpA(mask, "*.*")) + return TRUE; /* Matches every path */ + + while (*mask) + { + while (*mask == ' ') + mask++; /* Eat leading spaces */ + + if (path_match_maskA(path, mask)) + return TRUE; /* Matches the current mask */ + + while (*mask && *mask != ';') + mask = CharNextA(mask); /* masks separated by ';' */ + + if (*mask == ';') + mask++; + } + + return FALSE; +} + +static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) +{ + while (*name && *mask && *mask != ';') + { + if (*mask == '*') + { + do + { + if (path_match_maskW(name, mask + 1)) + return TRUE; /* try substrings */ + } while (*name++); + return FALSE; + } + + if (toupperW(*mask) != toupperW(*name) && *mask != '?') + return FALSE; + + name++; + mask++; + } + + if (!*name) + { + while (*mask == '*') + mask++; + if (!*mask || *mask == ';') + return TRUE; + } + + return FALSE; +} + +BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +{ + static const WCHAR maskallW[] = {'*','.','*',0}; + + TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); + + if (!lstrcmpW(mask, maskallW)) + return TRUE; /* Matches every path */ + + while (*mask) + { + while (*mask == ' ') + mask++; /* Eat leading spaces */ + + if (path_match_maskW(path, mask)) + return TRUE; /* Matches the current path */ + + while (*mask && *mask != ';') + mask++; /* masks separated by ';' */ + + if (*mask == ';') + mask++; + } + + return FALSE; +} + +void WINAPI PathQuoteSpacesA(char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (path && StrChrA(path, ' ')) + { + size_t len = strlen(path) + 1; + + if (len + 2 < MAX_PATH) + { + memmove(path + 1, path, len); + path[0] = '"'; + path[len] = '"'; + path[len + 1] = '\0'; + } + } +} + +void WINAPI PathQuoteSpacesW(WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (path && StrChrW(path, ' ')) + { + int len = strlenW(path) + 1; + + if (len + 2 < MAX_PATH) + { + memmove(path + 1, path, len * sizeof(WCHAR)); + path[0] = '"'; + path[len] = '"'; + path[len + 1] = '\0'; + } + } +} + +BOOL WINAPI PathIsSameRootA(const char *path1, const char *path2) +{ + const char *start; + int len; + + TRACE("%s, %s\n", wine_dbgstr_a(path1), wine_dbgstr_a(path2)); + + if (!path1 || !path2 || !(start = PathSkipRootA(path1))) + return FALSE; + + len = PathCommonPrefixA(path1, path2, NULL) + 1; + return start - path1 <= len; +} + +BOOL WINAPI PathIsSameRootW(const WCHAR *path1, const WCHAR *path2) +{ + const WCHAR *start; + int len; + + TRACE("%s, %s\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2)); + + if (!path1 || !path2 || !(start = PathSkipRootW(path1))) + return FALSE; + + len = PathCommonPrefixW(path1, path2, NULL) + 1; + return start - path1 <= len; +} + +BOOL WINAPI PathFileExistsA(const char *path) +{ + UINT prev_mode; + DWORD attrs; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return FALSE; + + /* Prevent a dialog box if path is on a disk that has been ejected. */ + prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS); + attrs = GetFileAttributesA(path); + SetErrorMode(prev_mode); + return attrs != INVALID_FILE_ATTRIBUTES; +} + +BOOL WINAPI PathFileExistsW(const WCHAR *path) +{ + UINT prev_mode; + DWORD attrs; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return FALSE; + + prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS); + attrs = GetFileAttributesW(path); + SetErrorMode(prev_mode); + return attrs != INVALID_FILE_ATTRIBUTES; +} -- 2.20.1

1 0

[PATCH v2] urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Dmitry Timoshkov 21 May '19

21 May '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/tests/protocol.c | 156 +++++++++++++++++++++++++++++------ 1 file changed, 130 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 999b591f5f..a9698f73ef 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(Switch); DEFINE_EXPECT(Continue); DEFINE_EXPECT(CreateInstance); +DEFINE_EXPECT(CreateInstance_no_aggregation); +DEFINE_EXPECT(CreateInstance_no_aggregation_fail); DEFINE_EXPECT(Start); DEFINE_EXPECT(StartEx); DEFINE_EXPECT(Terminate); @@ -159,6 +161,7 @@ static DWORD prot_read, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; static BOOL empty_file, no_mime, bind_from_cache, file_with_hash, reuse_protocol_thread; +static BOOL no_aggregation; enum { STATE_CONNECTING, @@ -1532,15 +1535,23 @@ static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, static ULONG WINAPI InternetPriority_AddRef(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI InternetPriority_Release(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LONG nPriority) @@ -1621,6 +1632,12 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; static const IID unknown_iid2 = {0x5b7ebc0c,0xf630,0x4cea,{0x89,0xd3,0x5a,0xf0,0x38,0xed,0x05,0x5c}}; + if(IsEqualGUID(riid, &IID_IInternetProtocolEx)) { + *ppv = &This->IInternetProtocolEx_iface; + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + return S_OK; + } + /* FIXME: Why is it calling here instead of outer IUnknown? */ if(IsEqualGUID(riid, &IID_IInternetPriority)) { *ppv = &This->IInternetPriority_iface; @@ -1636,15 +1653,23 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static ULONG WINAPI ProtocolEmul_AddRef(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI ProtocolEmul_Release(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static DWORD WINAPI thread_proc(PVOID arg) @@ -2215,6 +2240,7 @@ static Protocol *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { + static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; Protocol *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -2243,6 +2269,10 @@ static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, v CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); *ppv = NULL; return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { + trace("QI(%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; }else { ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -2569,12 +2599,28 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown { Protocol *ret; - CHECK_EXPECT(CreateInstance); + trace("CF_CreateInstance(%s,%p)\n", wine_dbgstr_guid(riid), pOuter); - ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); + if (!pOuter) + { + ok(IsEqualGUID(&IID_IInternetProtocol, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + CHECK_EXPECT(CreateInstance_no_aggregation); + } + else + { + ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + if (no_aggregation) + { + CHECK_EXPECT(CreateInstance_no_aggregation_fail); + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + CHECK_EXPECT(CreateInstance); + } + ret = heap_alloc(sizeof(*ret)); ret->IUnknown_inner.lpVtbl = &ProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &ProtocolVtbl; @@ -2584,7 +2630,10 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ret->outer_ref = 0; protocol_emul = ret; - *ppv = &ret->IUnknown_inner; + if (!pOuter) + *ppv = &ret->IInternetProtocolEx_iface; + else + *ppv = &ret->IUnknown_inner; return S_OK; } @@ -3763,7 +3812,7 @@ static void test_CreateBinding(void) {'t','e','s','t',':','/','/','f','i','l','e','.','h','t','m','l',0}; static const WCHAR wsz_test[] = {'t','e','s','t',0}; - trace("Testing CreateBinding...\n"); + trace("Testing CreateBinding%s...\n", no_aggregation ? "(no aggregation)" : ""); init_test(BIND_TEST, TEST_BINDING); hres = pCoInternetGetSession(0, &session, 0); @@ -3811,37 +3860,76 @@ static void test_CreateBinding(void) ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); SET_EXPECT(QueryService_InternetProtocol); - SET_EXPECT(CreateInstance); + + if(no_aggregation) { + SET_EXPECT(CreateInstance_no_aggregation_fail); + SET_EXPECT(CreateInstance_no_aggregation); + SET_EXPECT(StartEx); + } else { + SET_EXPECT(CreateInstance); + SET_EXPECT(Start); + } + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); SET_EXPECT(SetPriority); - SET_EXPECT(Start); trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); +todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); + if (hres != S_OK) goto fail; trace("Start <\n"); + if(no_aggregation) + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + else + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_CALLED(QueryService_InternetProtocol); - CHECK_CALLED(CreateInstance); + + if(no_aggregation) { + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_NOT_CALLED(CreateInstance); + CHECK_CALLED(CreateInstance_no_aggregation_fail); + CHECK_CALLED(CreateInstance_no_aggregation); + } else { + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_CALLED(CreateInstance); + CHECK_NOT_CALLED(CreateInstance_no_aggregation_fail); + CHECK_NOT_CALLED(CreateInstance_no_aggregation); + } + CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); CHECK_CALLED(SetPriority); - CHECK_CALLED(Start); + if(no_aggregation) + CHECK_CALLED(StartEx); + else + CHECK_CALLED(Start); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetHttpInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&http_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetHttpInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetHttpInfo); + else + CHECK_CALLED(QueryInterface_IWinInetHttpInfo); SET_EXPECT(Read); read = 0xdeadbeef; @@ -3865,6 +3953,11 @@ static void test_CreateBinding(void) hres = IInternetPriority_SetPriority(priority, 101); ok(hres == S_OK, "SetPriority failed: %08x\n", hres); + if(no_aggregation) + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + else + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + SET_EXPECT(Terminate); hres = IInternetProtocol_Terminate(protocol, 0xdeadbeef); ok(hres == S_OK, "Terminate failed: %08x\n", hres); @@ -3880,12 +3973,19 @@ static void test_CreateBinding(void) SET_EXPECT(Read); read = 0xdeadbeef; hres = IInternetProtocol_Read(protocol, expect_pv = buf, sizeof(buf), &read); - todo_wine - ok(hres == E_ABORT, "Read failed: %08x\n", hres); - todo_wine - ok(read == 0, "read = %d\n", read); - todo_wine - CHECK_NOT_CALLED(Read); + if(no_aggregation) + { + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(read == 100, "read = %d\n", read); + CHECK_CALLED(Read); + } else { + todo_wine + ok(hres == E_ABORT, "Read failed: %08x\n", hres); + todo_wine + ok(read == 0, "read = %d\n", read); + todo_wine + CHECK_NOT_CALLED(Read); + } hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = emptyW); @@ -3929,6 +4029,7 @@ static void test_CreateBinding(void) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); +fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session); @@ -4186,6 +4287,9 @@ START_TEST(protocol) test_gopher_protocol(); test_mk_protocol(); test_CreateBinding(); + no_aggregation = TRUE; + test_CreateBinding(); + no_aggregation = FALSE; bindf &= ~BINDF_FROMURLMON; trace("Testing file binding (mime verification, emulate prot)...\n"); -- 2.20.1

2 2

[PATCH vkd3d 4/4] vkd3d: Always return render pass from d3d12_pipeline_state_get_or_create_pipeline().
by Józef Kucia 21 May '19

21 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 3 --- libs/vkd3d/state.c | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2fdd980ea5b3..a4659f701ebb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2431,9 +2431,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list list->primitive_topology, list->strides, list->dsv_format, &vk_render_pass))) return false; - if (!vk_render_pass) - vk_render_pass = list->state->u.graphics.render_pass; - /* The render pass cache ensures that we use the same Vulkan render pass * object for compatible render passes. */ if (list->pso_render_pass != vk_render_pass) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c5f66b699548..eb2626d1aef1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2761,8 +2761,6 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta assert(d3d12_pipeline_state_is_graphics(state)); - *vk_render_pass = VK_NULL_HANDLE; - memset(&pipeline_key, 0, sizeof(pipeline_key)); pipeline_key.topology = topology; @@ -2853,22 +2851,23 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta pipeline_desc.pColorBlendState = &blend_desc; pipeline_desc.pDynamicState = &dynamic_desc; pipeline_desc.layout = graphics->root_signature->vk_pipeline_layout; - pipeline_desc.renderPass = graphics->render_pass; pipeline_desc.subpass = 0; pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; pipeline_desc.basePipelineIndex = -1; /* Create a render pass for pipelines with DXGI_FORMAT_UNKNOWN. */ - if (!pipeline_desc.renderPass) + if (!(pipeline_desc.renderPass = graphics->render_pass)) { - TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); + if (graphics->null_attachment_mask & (1u << graphics->rt_count)) + TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); + if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, dsv_format, &pipeline_desc.renderPass))) return VK_NULL_HANDLE; - - *vk_render_pass = pipeline_desc.renderPass; } + *vk_render_pass = pipeline_desc.renderPass; + if ((vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, device->vk_pipeline_cache, 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) { -- 2.21.0

2 1

[PATCH vkd3d 3/4] tests: Test RTVFormat equal to DXGI_FORMAT_UNKNOWN with depth-stencil.
by Józef Kucia 21 May '19

21 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 87addc3d3e18..5c445632dbc9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4749,6 +4749,7 @@ static void test_unknown_rtv_format(void) D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3]; ID3D12Resource *render_targets[2]; + struct depth_stencil_resource ds; struct test_context_desc desc; struct test_context context; ID3D12CommandQueue *queue; @@ -4784,11 +4785,17 @@ static void test_unknown_rtv_format(void) command_list = context.list; queue = context.queue; + init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs); for (i = 0; i < ARRAY_SIZE(rtvs); ++i) pso_desc.RTVFormats[i] = desc.rt_format; pso_desc.RTVFormats[0] = DXGI_FORMAT_UNKNOWN; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); @@ -4811,10 +4818,11 @@ static void test_unknown_rtv_format(void) ID3D12Device_CreateRenderTargetView(context.device, NULL, &rtv_desc, get_cpu_rtv_handle(&context, context.rtv_heap, 0)); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -4834,8 +4842,14 @@ static void test_unknown_rtv_format(void) expected_vec4.x = 3.0f; check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) ID3D12Resource_Release(render_targets[i]); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH vkd3d 2/4] tests: Actually test count buffers with indirect draws.
by Józef Kucia 21 May '19

21 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5ad3ea72be99..87addc3d3e18 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21589,6 +21589,11 @@ static void test_execute_indirect(void) {{-1.0f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, {{ 0.5f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, {{ 0.5f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, + + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, }; static const uint32_t indices[] = {0, 1, 2, 3, 2, 1}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = @@ -21672,26 +21677,42 @@ static void test_execute_indirect(void) }; static const struct argument_data { - D3D12_DRAW_ARGUMENTS draw; + D3D12_DRAW_ARGUMENTS draws[4]; D3D12_DISPATCH_ARGUMENTS dispatch; D3D12_DRAW_INDEXED_ARGUMENTS indexed_draws[2]; } argument_data = { - {3, 1, 0, 0}, + {{6, 1, 4, 0}, {6, 1, 8, 0}, {6, 1, 0, 0}}, {2, 3, 4}, {{6, 1, 0, 0, 0}, {6, 1, 0, 4, 0}}, }; - static const uint32_t count_data[] = {1, 2}; + static const uint32_t count_data[] = {2, 1}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; memset(&desc, 0, sizeof(desc)); desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; if (!init_test_context(&context, &desc)) return; command_list = context.list; queue = context.queue; + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); count_buffer = create_upload_buffer(context.device, sizeof(count_data), count_data); @@ -21702,10 +21723,11 @@ static void test_execute_indirect(void) ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 2, argument_buffer, 0, NULL, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -21720,10 +21742,11 @@ static void test_execute_indirect(void) ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer, 0, + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 4, argument_buffer, 0, count_buffer, 0); transition_resource_state(command_list, context.render_target, @@ -21776,22 +21799,6 @@ static void test_execute_indirect(void) ID3D12CommandSignature_Release(command_signature); command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); - ID3D12PipelineState_Release(context.pipeline_state); - input_layout.pInputElementDescs = layout_desc; - input_layout.NumElements = ARRAY_SIZE(layout_desc); - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); - - vb = create_upload_buffer(context.device, sizeof(vertices), vertices); - vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); - vbv.StrideInBytes = sizeof(*vertices); - vbv.SizeInBytes = sizeof(vertices); - - ib = create_upload_buffer(context.device, sizeof(indices), indices); - ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); - ibv.SizeInBytes = sizeof(indices); - ibv.Format = DXGI_FORMAT_R32_UINT; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21837,14 +21844,7 @@ static void test_execute_indirect(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - set_box(&box, 0, 0, 0, 32, 8, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); - set_box(&box, 24, 8, 0, 32, 32, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); - set_box(&box, 0, 8, 0, 24, 32, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 0); - release_resource_readback(&rb); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffff00, 0); ID3D12PipelineState_Release(pipeline_state); ID3D12RootSignature_Release(root_signature); -- 2.21.0

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Add enum for minimum-precision data types.
by Józef Kucia 21 May '19

21 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 11 ++++++++++- libs/vkd3d-shader/dxbc.c | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 318a438501c9..e6cccd84cc67 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -571,6 +571,15 @@ enum vkd3d_sysval_semantic VKD3D_FORCE_32_BIT_ENUM(VKD3D_SYSVAL_SEMANTIC), }; +enum vkd3d_shader_minimum_precision +{ + VKD3D_SHADER_MINIMUM_PRECISION_NONE = 0, + VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, + VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, + VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, +}; + struct vkd3d_shader_signature_element { const char *semantic_name; @@ -580,7 +589,7 @@ struct vkd3d_shader_signature_element enum vkd3d_component_type component_type; unsigned int register_index; unsigned int mask; - unsigned int min_precision; + enum vkd3d_shader_minimum_precision min_precision; }; struct vkd3d_shader_signature diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 92ea174bb6cf..a9cda49162d8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1992,11 +1992,11 @@ static int parse_dxbc(const char *data, size_t data_size, static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, struct vkd3d_shader_signature *s) { + bool has_stream_index, has_min_precision; struct vkd3d_shader_signature_element *e; const char *ptr = data; unsigned int i; DWORD count; - bool has_stream_index, has_min_precision; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -2032,6 +2032,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, read_dword(&ptr, &e[i].stream_index); else e[i].stream_index = 0; + read_dword(&ptr, &name_offset); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { @@ -2048,7 +2049,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, if (has_min_precision) read_dword(&ptr, &e[i].min_precision); else - e[i].min_precision = 0; + e[i].min_precision = VKD3D_SHADER_MINIMUM_PRECISION_NONE; TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, precision %u.\n", -- 2.21.0

2 1

[PATCH] ntoskrnl.exe: Implement PsGetThreadProcessId.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-)

2 1

[PATCH v5 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang 21 May '19

21 May '19

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 162308~162314, fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. Supersede 164594~164599, 164612~164613 v5: Fix explorer patch triggered user32 test failures. Supersede 165122~165128. dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 74 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 77 +++++++++++++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 154 +++++++++++++++++++++++++++++++++ 5 files changed, 307 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..7d81de09ac --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,74 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + HKEY video_hkey = NULL; + DWORD disposition = 0; + BOOL success = FALSE; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + success = TRUE; + goto fail; + } + + success = TRUE; +fail: + RegCloseKey(video_hkey); + if (!success) + ERR("Failed to initialize display devices\n"); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..40392b03c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,83 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..49427890cb 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -199,8 +201,150 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + INT primary_index; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + primary_index = primary_monitor; + if (primary_index >= nb_monitors) + primary_index = 0; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + if (i == primary_index) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + /* Primary adapter has to be first */ + if (primary_index) + { + struct x11drv_adapter tmp; + tmp = adapters[primary_index]; + adapters[primary_index] = adapters[0]; + adapters[0] = tmp; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + { + strcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +378,16 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; + handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

2 1

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